Skip to content

Y
ygopro-scripts
Commit 5bccfb3b authored by wind2009's avatar wind2009
Browse files
Options

Add Card.IsRelateToBattle before Duel.CalculateDamage

parent 78cb60fb
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
c13166648.lua
View file @ 5bccfb3b
...@@ -51,7 +51,7 @@ function c13166648.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,7 +51,7 @@ function c13166648.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
if ss then if ss and a:IsRelateToBattle() then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
c21924381.lua
View file @ 5bccfb3b
...@@ -28,7 +28,7 @@ function c21924381.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,7 +28,7 @@ function c21924381.activate(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e)
and a:IsAttackable() and a:IsRelateToEffect(e) and not a:IsImmuneToEffect(e)then and a:IsRelateToBattle() and a:IsAttackable() and a:IsRelateToEffect(e) and not a:IsImmuneToEffect(e)then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
......
c23446369.lua
View file @ 5bccfb3b
...@@ -70,7 +70,7 @@ end ...@@ -70,7 +70,7 @@ end
function s.tattack(e,tp,eg,ep,ev,re,r,rp) function s.tattack(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc and tc:IsRelateToEffect(e) and a:IsAttackable() and not a:IsImmuneToEffect(e) then if tc and tc:IsRelateToEffect(e) and a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
c2434862.lua
View file @ 5bccfb3b
...@@ -43,7 +43,7 @@ function c2434862.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,7 +43,7 @@ function c2434862.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,tc) Duel.CalculateDamage(at,tc)
end end
end end
......
c2732323.lua
View file @ 5bccfb3b
...@@ -28,7 +28,7 @@ function c2732323.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,7 +28,7 @@ function c2732323.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.DisableSelfDestroyCheck() Duel.DisableSelfDestroyCheck()
if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 then if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 then
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
......
c3103067.lua
View file @ 5bccfb3b
...@@ -29,11 +29,10 @@ function c3103067.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -29,11 +29,10 @@ function c3103067.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c3103067.operation(e,tp,eg,ep,ev,re,r,rp) function c3103067.operation(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if not a or not a:IsRelateToBattle() then return end
if e:GetLabel()==0 then if e:GetLabel()==0 then
if a and a:IsRelateToBattle() then
Duel.Destroy(a,REASON_EFFECT) Duel.Destroy(a,REASON_EFFECT)
end end
end
if e:GetLabel()==1 then if e:GetLabel()==1 then
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc and tc:IsRelateToEffect(e) and a:IsAttackable() and not a:IsImmuneToEffect(e) then if tc and tc:IsRelateToEffect(e) and a:IsAttackable() and not a:IsImmuneToEffect(e) then
......
c34475451.lua
View file @ 5bccfb3b
...@@ -25,7 +25,7 @@ function c34475451.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -25,7 +25,7 @@ function c34475451.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
......
c36708764.lua
View file @ 5bccfb3b
...@@ -35,7 +35,7 @@ function c36708764.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,7 +35,7 @@ function c36708764.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(36708764,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(36708764,0))
local tc=g:Select(tp,1,1,nil):GetFirst() local tc=g:Select(tp,1,1,nil):GetFirst()
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,tc) Duel.CalculateDamage(at,tc)
end end
end end
...@@ -47,7 +47,7 @@ function c36708764.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c36708764.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(36708764,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(36708764,0))
local tc=g:Select(tp,1,1,nil):GetFirst() local tc=g:Select(tp,1,1,nil):GetFirst()
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,tc) Duel.CalculateDamage(at,tc)
end end
end end
......
c43452193.lua
View file @ 5bccfb3b
...@@ -26,7 +26,7 @@ end ...@@ -26,7 +26,7 @@ end
function c43452193.activate(e,tp,eg,ep,ev,re,r,rp) function c43452193.activate(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local at=Duel.GetAttackTarget() local at=Duel.GetAttackTarget()
if a:IsRelateToEffect(e) and a:IsAttackable() and at:IsRelateToEffect(e) then if a:IsRelateToBattle() and a:IsRelateToEffect(e) and a:IsAttackable() and at:IsRelateToEffect(e) then
if Duel.SwapControl(a,at,RESET_PHASE+PHASE_END,1) then if Duel.SwapControl(a,at,RESET_PHASE+PHASE_END,1) then
Duel.CalculateDamage(a,at) Duel.CalculateDamage(a,at)
end end
......
c51993760.lua
View file @ 5bccfb3b
...@@ -63,7 +63,7 @@ function c51993760.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,7 +63,7 @@ function c51993760.operation(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
......
c54912977.lua
View file @ 5bccfb3b
...@@ -34,7 +34,7 @@ function c54912977.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -34,7 +34,7 @@ function c54912977.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if tc and tc:IsRelateToEffect(e) if tc and tc:IsRelateToEffect(e)
and a:IsAttackable() and not a:IsImmuneToEffect(e) then and a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
......
c63767246.lua
View file @ 5bccfb3b
...@@ -68,7 +68,7 @@ function c63767246.cbop(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,7 +68,7 @@ function c63767246.cbop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,c) Duel.CalculateDamage(at,c)
end end
end end
......
c64966519.lua
View file @ 5bccfb3b
...@@ -32,7 +32,7 @@ function c64966519.cbop(e,tp,eg,ep,ev,re,r,rp) ...@@ -32,7 +32,7 @@ function c64966519.cbop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsFaceup() and c:IsRelateToEffect(e) then if c:IsFaceup() and c:IsRelateToEffect(e) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) and not c:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not c:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,c) Duel.CalculateDamage(at,c)
end end
end end
......
c67385964.lua
View file @ 5bccfb3b
...@@ -49,7 +49,7 @@ function c67385964.hspop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function c67385964.hspop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
......
c67630339.lua
View file @ 5bccfb3b
...@@ -56,7 +56,7 @@ function c67630339.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -56,7 +56,7 @@ function c67630339.operation(e,tp,eg,ep,ev,re,r,rp)
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local d=c67630339[2] local d=c67630339[2]
if a:GetFlagEffect(67630339)~=0 and d:GetFlagEffect(67630339)~=0 if a:GetFlagEffect(67630339)~=0 and d:GetFlagEffect(67630339)~=0
and a:IsAttackable() and not a:IsImmuneToEffect(e) and not d:IsImmuneToEffect(e) then and a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) and not d:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,d) Duel.CalculateDamage(a,d)
end end
end end
c69181753.lua
View file @ 5bccfb3b
...@@ -26,7 +26,7 @@ function c69181753.hspop(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,7 +26,7 @@ function c69181753.hspop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_REVERSE_DAMAGE) e1:SetCode(EFFECT_REVERSE_DAMAGE)
......
c7864030.lua
View file @ 5bccfb3b
...@@ -47,7 +47,7 @@ function c7864030.operation1(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c7864030.operation1(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not tc:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,tc) Duel.CalculateDamage(at,tc)
end end
end end
...@@ -59,7 +59,7 @@ function c7864030.operation2(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,7 +59,7 @@ function c7864030.operation2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,c) Duel.CalculateDamage(at,c)
end end
end end
......
c8170654.lua
View file @ 5bccfb3b
...@@ -36,7 +36,8 @@ end ...@@ -36,7 +36,8 @@ end
function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP_DEFENSE)~=0 and a:IsAttackable() and not a:IsImmuneToEffect(e) then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP_DEFENSE)~=0
and a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,c) Duel.CalculateDamage(a,c)
end end
end end
......
c86049351.lua
View file @ 5bccfb3b
...@@ -48,7 +48,7 @@ function c86049351.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,7 +48,7 @@ function c86049351.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
sc:RegisterEffect(e1) sc:RegisterEffect(e1)
if bc==Duel.GetAttackTarget() then bc,sc=sc,bc end if bc==Duel.GetAttackTarget() then bc,sc=sc,bc end
if bc:IsAttackable() and not bc:IsImmuneToEffect(e) and not sc:IsImmuneToEffect(e) then if bc:IsRelateToBattle() and bc:IsAttackable() and not bc:IsImmuneToEffect(e) and not sc:IsImmuneToEffect(e) then
Duel.CalculateDamage(bc,sc) Duel.CalculateDamage(bc,sc)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Damage(tp,atk,REASON_EFFECT) Duel.Damage(tp,atk,REASON_EFFECT)
......
c8687195.lua
View file @ 5bccfb3b
...@@ -23,7 +23,7 @@ end ...@@ -23,7 +23,7 @@ end
function c8687195.operation(e,tp,eg,ep,ev,re,r,rp) function c8687195.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if tc and tc:IsRelateToEffect(e) and a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and tc and tc:IsRelateToEffect(e) and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
c91499077.lua
View file @ 5bccfb3b
...@@ -61,7 +61,7 @@ function c91499077.cbop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function c91499077.cbop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsFaceup() and c:IsRelateToEffect(e) and Duel.ChangePosition(c,POS_FACEUP_DEFENSE)~=0 then if c:IsFaceup() and c:IsRelateToEffect(e) and Duel.ChangePosition(c,POS_FACEUP_DEFENSE)~=0 then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) and not c:IsImmuneToEffect(e) then if at:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not c:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,c) Duel.CalculateDamage(at,c)
end end
end end
......
c93504463.lua
View file @ 5bccfb3b
...@@ -30,7 +30,7 @@ function c93504463.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -30,7 +30,7 @@ function c93504463.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
......
c96008713.lua
View file @ 5bccfb3b
...@@ -29,7 +29,7 @@ function c96008713.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -29,7 +29,7 @@ function c96008713.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.GetControl(tc,tp,PHASE_BATTLE,1)~=0 then if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.GetControl(tc,tp,PHASE_BATTLE,1)~=0 then
if a:IsAttackable() and not a:IsImmuneToEffect(e) then if a:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then
Duel.CalculateDamage(a,tc) Duel.CalculateDamage(a,tc)
end end
end end
......
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