Skip to content

Y
ygopro-scripts
Commit 297a05f2 authored by wind2009's avatar wind2009
Browse files
Options

Add controller judgement

parent 5bccfb3b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
c21924381.lua
View file @ 297a05f2
...@@ -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:IsRelateToBattle() 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)
...@@ -43,6 +43,8 @@ function c21924381.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,6 +43,8 @@ function c21924381.activate(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
a:RegisterEffect(e3) a:RegisterEffect(e3)
Duel.CalculateDamage(a,tc) if tc:IsControler(tp) then
Duel.CalculateDamage(a,tc)
end
end end
end end
c23446369.lua
View file @ 297a05f2
...@@ -70,7 +70,8 @@ end ...@@ -70,7 +70,8 @@ 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:IsRelateToBattle() and a:IsAttackable() and not a:IsImmuneToEffect(e) then if tc and tc:IsRelateToEffect(e) and tc:IsControler(1-tp)
and 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 @ 297a05f2
...@@ -33,7 +33,7 @@ end ...@@ -33,7 +33,7 @@ end
function c54912977.operation(e,tp,eg,ep,ev,re,r,rp) 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 tc:IsControler(1-tp)
and a:IsRelateToBattle() 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
......
c63767246.lua
View file @ 297a05f2
...@@ -66,7 +66,7 @@ function c63767246.cbcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -66,7 +66,7 @@ function c63767246.cbcost(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c63767246.cbop(e,tp,eg,ep,ev,re,r,rp) 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) and c:IsControler(tp) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsRelateToBattle() and 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)
......
c64966519.lua
View file @ 297a05f2
...@@ -30,7 +30,7 @@ function c64966519.cbcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -30,7 +30,7 @@ function c64966519.cbcon(e,tp,eg,ep,ev,re,r,rp)
end end
function c64966519.cbop(e,tp,eg,ep,ev,re,r,rp) 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) and c:IsControler(tp) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsRelateToBattle() and 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)
......
c67630339.lua
View file @ 297a05f2
...@@ -51,11 +51,12 @@ end ...@@ -51,11 +51,12 @@ end
function c67630339.condition(e,tp,eg,ep,ev,re,r,rp) function c67630339.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp and Duel.GetAttackTarget()==nil and c67630339[tp]==2 return Duel.GetTurnPlayer()~=tp and Duel.GetAttackTarget()==nil and c67630339[tp]==2
and c67630339[2]:GetFlagEffect(67630339)~=0 and Duel.GetAttacker()~=c67630339[2] and c67630339[2]:GetFlagEffect(67630339)~=0 and Duel.GetAttacker()~=c67630339[2]
and c67630339[2]:IsControler(1-tp)
end end
function c67630339.operation(e,tp,eg,ep,ev,re,r,rp) 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 d:IsControler(1-tp)
and a:IsRelateToBattle() 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
......
c7864030.lua
View file @ 297a05f2
...@@ -45,7 +45,7 @@ function c7864030.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -45,7 +45,7 @@ function c7864030.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c7864030.operation1(e,tp,eg,ep,ev,re,r,rp) 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) and tc:IsControler(tp) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsRelateToBattle() and 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)
...@@ -57,7 +57,7 @@ function c7864030.condition2(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,7 +57,7 @@ function c7864030.condition2(e,tp,eg,ep,ev,re,r,rp)
end end
function c7864030.operation2(e,tp,eg,ep,ev,re,r,rp) 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) and c:IsControler(tp) then
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsRelateToBattle() and 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)
......
c91499077.lua
View file @ 297a05f2
...@@ -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:IsRelateToBattle() and at:IsAttackable() and not at:IsImmuneToEffect(e) and not c:IsImmuneToEffect(e) then if c:IsControler(tp) and 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
......
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