Skip to content

Y
ygopro-scripts
Commit 96cd651f authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

update RESET_SELF_TURN RESET_OPPO_TURN (#1544)

parent 6d26c6ca
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 42 deletions
c12421694.lua
View file @ 96cd651f
...@@ -44,7 +44,7 @@ function c12421694.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,7 +44,7 @@ function c12421694.atkop(e,tp,eg,ep,ev,re,r,rp)
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_CANNOT_ATTACK) e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
end end
......
c21576077.lua
View file @ 96cd651f
...@@ -57,7 +57,7 @@ function c21576077.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,7 +57,7 @@ function c21576077.atkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(2000) e1:SetValue(2000)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
end end
c220414.lua
View file @ 96cd651f
...@@ -74,11 +74,7 @@ function c220414.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -74,11 +74,7 @@ function c220414.rmop(e,tp,eg,ep,ev,re,r,rp)
local fid=c:GetFieldID() local fid=c:GetFieldID()
local tc=og:GetFirst() local tc=og:GetFirst()
while tc do while tc do
if tc:IsControler(tp) then tc:RegisterFlagEffect(220414,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,2,fid)
tc:RegisterFlagEffect(220414,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,2,fid)
else
tc:RegisterFlagEffect(220414,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,2,fid)
end
tc=og:GetNext() tc=og:GetNext()
end end
c:SetTurnCounter(0) c:SetTurnCounter(0)
......
c22398665.lua
View file @ 96cd651f
...@@ -40,7 +40,7 @@ function c22398665.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,7 @@ function c22398665.thop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetValue(-1000) e1:SetValue(-1000)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
if not tc:IsHasEffect(EFFECT_REVERSE_UPDATE) and c:IsRelateToEffect(e) then if not tc:IsHasEffect(EFFECT_REVERSE_UPDATE) and c:IsRelateToEffect(e) then
Duel.SendtoHand(c,nil,REASON_EFFECT) Duel.SendtoHand(c,nil,REASON_EFFECT)
......
c37192109.lua
View file @ 96cd651f
...@@ -52,11 +52,7 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,11 +52,7 @@ function c37192109.rmop(e,tp,eg,ep,ev,re,r,rp)
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
while oc do while oc do
if oc:IsControler(tp) then oc:RegisterFlagEffect(37192109,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,rct,fid)
oc:RegisterFlagEffect(37192109,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,rct,fid)
else
oc:RegisterFlagEffect(37192109,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,0,rct,fid)
end
oc=og:GetNext() oc=og:GetNext()
end end
og:KeepAlive() og:KeepAlive()
......
c49221191.lua
View file @ 96cd651f
...@@ -53,11 +53,7 @@ function c49221191.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -53,11 +53,7 @@ function c49221191.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetValue(0) e1:SetValue(0)
if Duel.GetTurnPlayer()~=tp then e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
else
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,1)
end
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetCode(EFFECT_SET_DEFENSE_FINAL) e2:SetCode(EFFECT_SET_DEFENSE_FINAL)
......
c57970721.lua
View file @ 96cd651f
...@@ -40,7 +40,7 @@ function c57970721.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,7 @@ function c57970721.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(-1000) e1:SetValue(-1000)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
if not tc:IsHasEffect(EFFECT_REVERSE_UPDATE) and lc:IsRelateToEffect(e) and lc:IsControler(1-tp) then if not tc:IsHasEffect(EFFECT_REVERSE_UPDATE) and lc:IsRelateToEffect(e) and lc:IsControler(1-tp) then
Duel.Destroy(lc,REASON_EFFECT) Duel.Destroy(lc,REASON_EFFECT)
......
c59228631.lua
View file @ 96cd651f
...@@ -67,7 +67,7 @@ function c59228631.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,7 +67,7 @@ function c59228631.atkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(1000) e1:SetValue(1000)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
end end
c74586817.lua
View file @ 96cd651f
...@@ -60,11 +60,7 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -60,11 +60,7 @@ function c74586817.rmop(e,tp,eg,ep,ev,re,r,rp)
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
while oc do while oc do
if oc:IsControler(tp) then oc:RegisterFlagEffect(74586817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,1,fid)
oc:RegisterFlagEffect(74586817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,1,fid)
else
oc:RegisterFlagEffect(74586817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,0,1,fid)
end
oc=og:GetNext() oc=og:GetNext()
end end
og:KeepAlive() og:KeepAlive()
......
c75147529.lua
View file @ 96cd651f
...@@ -60,20 +60,14 @@ function c75147529.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -60,20 +60,14 @@ function c75147529.rmop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetCondition(c75147529.retcon) e1:SetCondition(c75147529.retcon)
e1:SetOperation(c75147529.retop) e1:SetOperation(c75147529.retop)
local reset=0
if tc:IsControler(tp) then
reset=RESET_OPPO_TURN
else
reset=RESET_SELF_TURN
end
if Duel.GetTurnPlayer()==1-tp and Duel.GetCurrentPhase()==PHASE_END then if Duel.GetTurnPlayer()==1-tp and Duel.GetCurrentPhase()==PHASE_END then
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2) e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,2)
e1:SetValue(Duel.GetTurnCount()) e1:SetValue(Duel.GetTurnCount())
tc:RegisterFlagEffect(75147529,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+reset,0,2) tc:RegisterFlagEffect(75147529,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,2)
else else
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN) e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
e1:SetValue(0) e1:SetValue(0)
tc:RegisterFlagEffect(75147529,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+reset,0,1) tc:RegisterFlagEffect(75147529,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,1)
end end
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
......
c79544790.lua
View file @ 96cd651f
...@@ -33,7 +33,7 @@ function c79544790.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,7 +33,7 @@ function c79544790.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetCondition(c79544790.descon) e1:SetCondition(c79544790.descon)
e1:SetOperation(c79544790.desop) e1:SetOperation(c79544790.desop)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
e1:SetCountLimit(1) e1:SetCountLimit(1)
tc:RegisterEffect(e1,true) tc:RegisterEffect(e1,true)
end end
......
c80335817.lua
View file @ 96cd651f
...@@ -72,11 +72,7 @@ function c80335817.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,11 +72,7 @@ function c80335817.rmop(e,tp,eg,ep,ev,re,r,rp)
local og=Duel.GetOperatedGroup() local og=Duel.GetOperatedGroup()
local oc=og:GetFirst() local oc=og:GetFirst()
while oc do while oc do
if oc:IsControler(tp) then oc:RegisterFlagEffect(80335817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,1)
oc:RegisterFlagEffect(80335817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,0,1)
else
oc:RegisterFlagEffect(80335817,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,0,1)
end
oc=og:GetNext() oc=og:GetNext()
end end
og:KeepAlive() og:KeepAlive()
......
c82257671.lua
View file @ 96cd651f
...@@ -89,7 +89,7 @@ function c82257671.imop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,7 +89,7 @@ function c82257671.imop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetCode(EFFECT_IMMUNE_EFFECT)
e1:SetValue(c82257671.efilter) e1:SetValue(c82257671.efilter)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
e1:SetOwnerPlayer(tp) e1:SetOwnerPlayer(tp)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
......
c95440946.lua
View file @ 96cd651f
...@@ -77,7 +77,7 @@ function c95440946.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,7 +77,7 @@ function c95440946.thop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetValue(1000) e1:SetValue(1000)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetCode(EFFECT_UPDATE_DEFENSE) e2:SetCode(EFFECT_UPDATE_DEFENSE)
......
c97300502.lua
View file @ 96cd651f
...@@ -66,7 +66,7 @@ function c97300502.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,7 +66,7 @@ function c97300502.atkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(atk) e1:SetValue(atk)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END,Duel.GetTurnPlayer()==tp and 2 or 1) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
c:RegisterEffect(e1) c:RegisterEffect(e1)
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