Commit 9f9ea9b8 authored by POLYMER's avatar POLYMER

fix

parent 223e25cd
...@@ -157,11 +157,9 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp) ...@@ -157,11 +157,9 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
local tc=g:Filter(function(c) return c:GetSequence()==ct end,nil):GetFirst() local tc=g:Filter(function(c) return c:GetSequence()==ct end,nil):GetFirst()
if KOISHI_CHECK then if KOISHI_CHECK then
c:SetEntityCode(tc:GetOriginalCode()) c:SetEntityCode(tc:GetOriginalCode())
if tc:GetOriginalType()&0x11~=0x11 or tc:GetOriginalType()&TYPE_PENDULUM>0 then c:ReplaceEffect(80316585,0)
c:ReplaceEffect(tc:GetOriginalCode(),0) c:SetStatus(STATUS_EFFECT_REPLACED,false)
else if tc.initial_effect then tc.initial_effect(c) end
c:ReplaceEffect(80316585,0)
end
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
Duel.Exile(tc,0) Duel.Exile(tc,0)
else else
......
...@@ -134,7 +134,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -134,7 +134,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e1:SetCode(EVENT_CHAIN_SOLVED) e1:SetCode(EVENT_CHAIN_SOLVED)
e1:SetOperation(function(e) e1:SetOperation(function(e)
if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then
Duel.Hint(HINT_OPSELECTED,tp,aux.Stringid(11451902,2)) Duel.Hint(HINT_OPSELECTED,0,aux.Stringid(11451902,2))
Duel.Hint(HINT_OPSELECTED,1,aux.Stringid(11451902,2))
--change code --change code
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
...@@ -145,8 +146,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -145,8 +146,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end) e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end)
e3:SetReset(RESET_PHASE+PHASE_END) e3:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end) end)
e1:SetReset(RESET_CHAIN) e1:SetReset(RESET_CHAIN)
e1:SetLabel(Duel.GetCurrentChain()) e1:SetLabel(Duel.GetCurrentChain())
......
...@@ -148,7 +148,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -148,7 +148,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e1:SetCode(EVENT_CHAIN_SOLVED) e1:SetCode(EVENT_CHAIN_SOLVED)
e1:SetOperation(function(e) e1:SetOperation(function(e)
if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then
Duel.Hint(HINT_OPSELECTED,tp,aux.Stringid(11451902,2)) Duel.Hint(HINT_OPSELECTED,0,aux.Stringid(11451902,2))
Duel.Hint(HINT_OPSELECTED,1,aux.Stringid(11451902,2))
--change code --change code
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
...@@ -159,8 +160,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -159,8 +160,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end) e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end)
e3:SetReset(RESET_PHASE+PHASE_END) e3:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end) end)
e1:SetReset(RESET_CHAIN) e1:SetReset(RESET_CHAIN)
e1:SetLabel(Duel.GetCurrentChain()) e1:SetLabel(Duel.GetCurrentChain())
...@@ -176,7 +177,8 @@ function cm.cpcost2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -176,7 +177,8 @@ function cm.cpcost2(e,tp,eg,ep,ev,re,r,rp,chk)
e1:SetCode(EVENT_CHAIN_SOLVED) e1:SetCode(EVENT_CHAIN_SOLVED)
e1:SetOperation(function(e) e1:SetOperation(function(e)
if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then
Duel.Hint(HINT_OPSELECTED,tp,aux.Stringid(11451902,2)) Duel.Hint(HINT_OPSELECTED,0,aux.Stringid(11451902,2))
Duel.Hint(HINT_OPSELECTED,1,aux.Stringid(11451902,2))
--change code --change code
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
...@@ -187,8 +189,8 @@ function cm.cpcost2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -187,8 +189,8 @@ function cm.cpcost2(e,tp,eg,ep,ev,re,r,rp,chk)
e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end) e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end)
e3:SetReset(RESET_PHASE+PHASE_END) e3:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end) end)
e1:SetReset(RESET_CHAIN) e1:SetReset(RESET_CHAIN)
e1:SetLabel(Duel.GetCurrentChain()) e1:SetLabel(Duel.GetCurrentChain())
......
...@@ -82,7 +82,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -82,7 +82,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e1:SetCode(EVENT_CHAIN_SOLVED) e1:SetCode(EVENT_CHAIN_SOLVED)
e1:SetOperation(function(e) e1:SetOperation(function(e)
if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then if Duel.GetFlagEffect(1,11451901)==0 and Duel.GetCurrentChain()==e:GetLabel() then
Duel.Hint(HINT_OPSELECTED,tp,aux.Stringid(11451902,2)) Duel.Hint(HINT_OPSELECTED,0,aux.Stringid(11451902,2))
Duel.Hint(HINT_OPSELECTED,1,aux.Stringid(11451902,2))
--change code --change code
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
...@@ -93,8 +94,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -93,8 +94,8 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end) e3:SetValue(function(e,c) return 0x527+c:GetFieldID() end)
e3:SetReset(RESET_PHASE+PHASE_END) e3:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e3,tp) Duel.RegisterEffect(e3,tp)
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
Duel.RegisterFlagEffect(1,11451901,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end) end)
e1:SetReset(RESET_CHAIN) e1:SetReset(RESET_CHAIN)
e1:SetLabel(Duel.GetCurrentChain()) e1:SetLabel(Duel.GetCurrentChain())
......
...@@ -104,7 +104,7 @@ function s.spfilter(c,e,tp) ...@@ -104,7 +104,7 @@ function s.spfilter(c,e,tp)
return c:IsFaceup() and c:IsCode(12866605) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsFaceup() and c:IsCode(12866605) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetMZoneCount(tp,e:GetHandler())>0
and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
end end
......
...@@ -171,6 +171,7 @@ function s.acop(e,tp,eg,ep,ev,re,r,rp) ...@@ -171,6 +171,7 @@ function s.acop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
pnfl_adjusting=false pnfl_adjusting=false
end end
pnfl_adjusting=false
e:Reset() e:Reset()
end end
function s.retfilter(c,fid) function s.retfilter(c,fid)
......
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