Commit 46ddbedb authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/MZMI' into master

parents c65bd763 84fabb79
...@@ -38,7 +38,6 @@ function s.initial_effect(c) ...@@ -38,7 +38,6 @@ function s.initial_effect(c)
e3:SetCondition(s.spcon2) e3:SetCondition(s.spcon2)
e3:SetTarget(s.sptg2) e3:SetTarget(s.sptg2)
e3:SetOperation(s.spop2) e3:SetOperation(s.spop2)
e3:SetLabelObject(e2)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function s.cfilter(c,tp,se) function s.cfilter(c,tp,se)
...@@ -68,6 +67,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -68,6 +67,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
local tc=Duel.GetAttacker() local tc=Duel.GetAttacker()
if tc==c then tc=Duel.GetAttackTarget() end if tc==c then tc=Duel.GetAttackTarget() end
if chk==0 then return tc end if chk==0 then return tc end
c:RegisterFlagEffect(id,RESET_CHAIN,0,1)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,Group.FromCards(c,tc),1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,Group.FromCards(c,tc),1,0,0)
end end
function s.desop(e,tp,eg,ep,ev,re,r,rp) function s.desop(e,tp,eg,ep,ev,re,r,rp)
...@@ -78,8 +78,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,8 +78,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.spcon2(e,tp,eg,ep,ev,re,r,rp) function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0 return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0 and e:GetHandler():GetFlagEffect(id)==0
and not re~=e:GetLabelObject()
end end
function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
return (c:IsCode(45231177) or aux.IsCodeListed(c,45231177)) and c:IsLevelBelow(7) return (c:IsCode(45231177) or aux.IsCodeListed(c,45231177)) and c:IsLevelBelow(7)
......
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