Commit d37eb486 authored by POLYMER's avatar POLYMER

fix

parent b104613d
...@@ -116,11 +116,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -116,11 +116,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
local tc=rg:GetFirst() local tc=rg:GetFirst()
if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)>0 then if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)>0 then
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4)) tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4))
local ph=Duel.GetCurrentPhase()
local code=EVENT_ADJUST
if ph==PHASE_END then code=EVENT_PREDRAW end
if ph==PHASE_DRAW then code=EVENT_PHASE_START+PHASE_STANDBY end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetDescription(aux.Stringid(m,3)) e1:SetDescription(aux.Stringid(m,3))
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_ADJUST) e1:SetCode(code)
e1:SetLabel(Duel.GetCurrentPhase()) e1:SetLabel(ph)
e1:SetLabelObject(tc) e1:SetLabelObject(tc)
e1:SetCondition(cm.retcon) e1:SetCondition(cm.retcon)
e1:SetOperation(cm.retop) e1:SetOperation(cm.retop)
......
...@@ -55,10 +55,14 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -55,10 +55,14 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase()
local code=EVENT_ADJUST
if ph==PHASE_END then code=EVENT_PREDRAW end
if ph==PHASE_DRAW then code=EVENT_PHASE_START+PHASE_STANDBY end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_ADJUST) e1:SetCode(code)
e1:SetLabel(Duel.GetCurrentPhase()) e1:SetLabel(ph)
e1:SetCondition(function() return not pnfl_adjusting end) e1:SetCondition(function() return not pnfl_adjusting end)
e1:SetOperation(cm.adjustop) e1:SetOperation(cm.adjustop)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
......
...@@ -304,11 +304,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -304,11 +304,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
oc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4)) oc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4))
end end
og:KeepAlive() og:KeepAlive()
local ph=Duel.GetCurrentPhase()
local code=EVENT_ADJUST
if ph==PHASE_END then code=EVENT_PREDRAW end
if ph==PHASE_DRAW then code=EVENT_PHASE_START+PHASE_STANDBY end
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(m,3)) e1:SetDescription(aux.Stringid(m,3))
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_ADJUST) e1:SetCode(code)
e1:SetLabel(Duel.GetCurrentPhase()) e1:SetLabel(ph)
e1:SetLabelObject(og) e1:SetLabelObject(og)
e1:SetCondition(cm.retcon) e1:SetCondition(cm.retcon)
e1:SetOperation(cm.retop) e1:SetOperation(cm.retop)
......
...@@ -241,11 +241,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -241,11 +241,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
oc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4)) oc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451911,4))
end end
og:KeepAlive() og:KeepAlive()
local ph=Duel.GetCurrentPhase()
local code=EVENT_ADJUST
if ph==PHASE_END then code=EVENT_PREDRAW end
if ph==PHASE_DRAW then code=EVENT_PHASE_START+PHASE_STANDBY end
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(m,1)) e1:SetDescription(aux.Stringid(m,1))
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_ADJUST) e1:SetCode(code)
e1:SetLabel(Duel.GetCurrentPhase()) e1:SetLabel(ph)
e1:SetLabelObject(og) e1:SetLabelObject(og)
e1:SetCondition(cm.retcon) e1:SetCondition(cm.retcon)
e1:SetOperation(cm.retop) e1:SetOperation(cm.retop)
......
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