Commit 79ab7733 authored by Amiya's avatar Amiya

修复

parent eced3a14
...@@ -42,7 +42,7 @@ function s.cfilter(c) ...@@ -42,7 +42,7 @@ function s.cfilter(c)
return c:GetBaseAttack()==1850 and c:IsRace(RACE_SPELLCASTER) and c:IsFaceup() return c:GetBaseAttack()==1850 and c:IsRace(RACE_SPELLCASTER) and c:IsFaceup()
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -75,29 +75,26 @@ end ...@@ -75,29 +75,26 @@ end
function s.disop(e,tp,eg,ep,ev,re,r,rp) function s.disop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToChain() then if tc:IsFaceup() and tc:IsRelateToChain()
if tc:IsCanBeDisabledByEffect(e) then and (tc:IsCanBeDisabledByEffect(e) or not tc:IsCode(101304116)) then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
e2:SetReset(RESET_EVENT+RESETS_STANDARD) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end local e3=Effect.CreateEffect(c)
if not c:IsCode(101304116) then e3:SetType(EFFECT_TYPE_SINGLE)
local e3=Effect.CreateEffect(c) e3:SetCode(EFFECT_CHANGE_CODE)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCode(EFFECT_CHANGE_CODE) e3:SetReset(RESET_EVENT+RESETS_STANDARD)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetValue(101304116)
e3:SetReset(RESET_EVENT+RESETS_STANDARD) tc:RegisterEffect(e3)
e3:SetValue(101304116)
tc:RegisterEffect(e3)
end
end end
end end
\ No newline at end of file
...@@ -25,18 +25,18 @@ function s.initial_effect(c) ...@@ -25,18 +25,18 @@ function s.initial_effect(c)
e2:SetOperation(s.tgop) e2:SetOperation(s.tgop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--return --return
local e1=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,1)) e3:SetDescription(aux.Stringid(id,1))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_QUICK_O)
e1:SetRange(LOCATION_GRAVE) e3:SetRange(LOCATION_GRAVE)
e1:SetCode(EVENT_FREE_CHAIN) e3:SetCode(EVENT_FREE_CHAIN)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetHintTiming(0,TIMING_END_PHASE) e3:SetHintTiming(0,TIMING_END_PHASE)
e1:SetCountLimit(1,id+o) e3:SetCountLimit(1,id+o)
e1:SetTarget(s.sptg) e3:SetTarget(s.sptg)
e1:SetOperation(s.spop) e3:SetOperation(s.spop)
c:RegisterEffect(e1) c:RegisterEffect(e3)
end end
function s.etg(e,c) function s.etg(e,c)
return c:IsSetCard(0x2db) and c:GetOriginalAttribute()==ATTRIBUTE_LIGHT return c:IsSetCard(0x2db) and c:GetOriginalAttribute()==ATTRIBUTE_LIGHT
......
...@@ -59,29 +59,26 @@ end ...@@ -59,29 +59,26 @@ end
function s.disop(e,tp,eg,ep,ev,re,r,rp) function s.disop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToChain() then if tc:IsFaceup() and tc:IsRelateToChain()
if tc:IsCanBeDisabledByEffect(e) then and (tc:IsCanBeDisabledByEffect(e) or not tc:IsCode(101304116)) then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
e2:SetReset(RESET_EVENT+RESETS_STANDARD) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end local e3=Effect.CreateEffect(c)
if not c:IsCode(101304116) then e3:SetType(EFFECT_TYPE_SINGLE)
local e3=Effect.CreateEffect(c) e3:SetCode(EFFECT_CHANGE_CODE)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCode(EFFECT_CHANGE_CODE) e3:SetReset(RESET_EVENT+RESETS_STANDARD)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetValue(101304116)
e3:SetReset(RESET_EVENT+RESETS_STANDARD) tc:RegisterEffect(e3)
e3:SetValue(101304116)
tc:RegisterEffect(e3)
end
end end
end end
\ No newline at end of file
...@@ -108,7 +108,7 @@ end ...@@ -108,7 +108,7 @@ end
function s.eqop(e,tp,eg,ep,ev,re,r,rp) function s.eqop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if not c:IsRelateToChain() then return end if not c:IsRelateToChain() then return end
if not aux.NecroValleyFilter()(tc) then return end if not aux.NecroValleyFilter()(c) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local g=Duel.SelectMatchingCard(tp,s.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g=Duel.SelectMatchingCard(tp,s.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
local tc=g:GetFirst() local tc=g:GetFirst()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment