Commit 2cbf0f68 authored by POLYMER's avatar POLYMER

fix

parent 4a7b73e1
...@@ -147,10 +147,10 @@ function cm.resetop(e,tp,eg,ep,ev,re,r,rp) ...@@ -147,10 +147,10 @@ function cm.resetop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.dsop(e,tp,eg,ep,ev,re,r,rp) function cm.dsop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetFlagEffect(tp,m)>0 then return end if Duel.GetFlagEffect(tp,m)>0 then return end
Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
local c=e:GetHandler() local c=e:GetHandler()
if not re:GetHandler():IsSetCard(0x6e) or not c:IsSSetable() or cm.column~=0 then return end if not re:GetHandler():IsSetCard(0x6e) or not c:IsSSetable() or cm.column~=0 then return end
if Duel.SelectEffectYesNo(tp,c) then if Duel.SelectEffectYesNo(tp,c) then
Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
Duel.Hint(HINT_CARD,0,m) Duel.Hint(HINT_CARD,0,m)
Duel.SSet(tp,c,tp,true) Duel.SSet(tp,c,tp,true)
--c:RegisterFlagEffect(m-11,RESET_CHAIN,0,1) --c:RegisterFlagEffect(m-11,RESET_CHAIN,0,1)
......
...@@ -142,6 +142,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp) ...@@ -142,6 +142,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
if te:GetLabel()==e:GetLabel() then res=true break end if te:GetLabel()==e:GetLabel() then res=true break end
end end
if not res then e:Reset() return end if not res then e:Reset() return end
for i=1,1+#{Duel.IsPlayerAffectedByEffect(0,11451973)} do
local d=Duel.TossDice(tp,1) local d=Duel.TossDice(tp,1)
if d>5 then return end if d>5 then return end
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(m,2)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(m,2))
...@@ -151,6 +152,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp) ...@@ -151,6 +152,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
Duel.HintSelection(g) Duel.HintSelection(g)
Duel.Destroy(g,REASON_EFFECT) Duel.Destroy(g,REASON_EFFECT)
end end
end
end end
function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -138,6 +138,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp) ...@@ -138,6 +138,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
if te:GetLabel()==e:GetLabel() then res=true break end if te:GetLabel()==e:GetLabel() then res=true break end
end end
if not res then e:Reset() return end if not res then e:Reset() return end
for i=1,1+#{Duel.IsPlayerAffectedByEffect(0,11451973)} do
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(m,2)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(m,2))
local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil)
if #g>0 then if #g>0 then
...@@ -155,6 +156,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp) ...@@ -155,6 +156,7 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
e1:SetLabel(eid) e1:SetLabel(eid)
g:GetFirst():RegisterFlagEffect(m+0xffffff,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4)) g:GetFirst():RegisterFlagEffect(m+0xffffff,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4))
end end
end
end end
function cm.efilter(e,te) function cm.efilter(e,te)
if e:GetHandler():GetFlagEffect(m+0xffffff)>0 and te and te:GetHandler() and not te:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) and te:IsHasType(EFFECT_TYPE_ACTIONS) then if e:GetHandler():GetFlagEffect(m+0xffffff)>0 and te and te:GetHandler() and not te:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) and te:IsHasType(EFFECT_TYPE_ACTIONS) then
......
...@@ -118,7 +118,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp) ...@@ -118,7 +118,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
de:SetDescription(aux.Stringid(11451961+#eset,8)) de:SetDescription(aux.Stringid(11451961+#eset,8))
de:SetLabel(eid) de:SetLabel(eid)
de:SetType(EFFECT_TYPE_FIELD) de:SetType(EFFECT_TYPE_FIELD)
de:SetCode(0x20000000+11451961) de:SetCode(EFFECT_FLAG_EFFECT+11451961)
de:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT) de:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
de:SetTargetRange(1,0) de:SetTargetRange(1,0)
Duel.RegisterEffect(de,tp) Duel.RegisterEffect(de,tp)
...@@ -145,6 +145,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -145,6 +145,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp)
if chk==0 then return tg(e,tp,eg,ep,ev,re,r,rp,0) end if chk==0 then return tg(e,tp,eg,ep,ev,re,r,rp,0) end
e:SetTarget(tg) e:SetTarget(tg)
tg(e,tp,eg,ep,ev,re,r,rp,1) tg(e,tp,eg,ep,ev,re,r,rp,1)
for i=1,1+#{Duel.IsPlayerAffectedByEffect(0,11451973)} do
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_COUNTER) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_COUNTER)
local g=Duel.SelectMatchingCard(tp,Card.IsCanAddCounter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,0x1972,1) local g=Duel.SelectMatchingCard(tp,Card.IsCanAddCounter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,0x1972,1)
if #g>0 then if #g>0 then
...@@ -154,6 +155,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -154,6 +155,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp)
te:SetProperty(prop1,prop2) te:SetProperty(prop1,prop2)
end end
end end
end
te:SetTarget(tg2) te:SetTarget(tg2)
end end
function cm.recon(e,tp,eg,ep,ev,re,r,rp) function cm.recon(e,tp,eg,ep,ev,re,r,rp)
...@@ -166,11 +168,13 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp) ...@@ -166,11 +168,13 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
if te:GetLabel()==e:GetLabel() then res=true break end if te:GetLabel()==e:GetLabel() then res=true break end
end end
if not res then e:Reset() return end if not res then e:Reset() return end
for i=1,1+#{Duel.IsPlayerAffectedByEffect(0,11451973)} do
Duel.Hint(HINT_SELECTMSG,rp,HINTMSG_COUNTER) Duel.Hint(HINT_SELECTMSG,rp,HINTMSG_COUNTER)
local g=Duel.SelectMatchingCard(rp,Card.IsCanAddCounter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,0x1972,1) local g=Duel.SelectMatchingCard(rp,Card.IsCanAddCounter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,0x1972,1)
if #g>0 then if #g>0 then
g:GetFirst():AddCounter(0x1972,1) g:GetFirst():AddCounter(0x1972,1)
end end
end
end end
function cm.efilter(e,re) function cm.efilter(e,re)
return e:GetHandlerPlayer()~=re:GetOwnerPlayer() return e:GetHandlerPlayer()~=re:GetOwnerPlayer()
......
...@@ -66,7 +66,7 @@ function cm.spfilter1(c,e,tp) ...@@ -66,7 +66,7 @@ function cm.spfilter1(c,e,tp)
end end
function cm.spfilter2(c,e,tp) function cm.spfilter2(c,e,tp)
return c:IsCode(21123811) and c:IsCanBeSpecialSummoned(e,0,tp,true,true) return c:IsCode(71527471) and c:IsCanBeSpecialSummoned(e,0,tp,true,true)
end end
function cm.fitn(g,e,tp) function cm.fitn(g,e,tp)
return (g:FilterCount(Card.IsType,nil,TYPE_FUSION)>0 and g:FilterCount(Card.IsType,nil,TYPE_SYNCHRO)>0 and g:FilterCount(Card.IsType,nil,TYPE_XYZ)>0 and g:FilterCount(Card.IsType,nil,TYPE_LINK)>0 and Duel.IsExistingMatchingCard(cm.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp)) or Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) return (g:FilterCount(Card.IsType,nil,TYPE_FUSION)>0 and g:FilterCount(Card.IsType,nil,TYPE_SYNCHRO)>0 and g:FilterCount(Card.IsType,nil,TYPE_XYZ)>0 and g:FilterCount(Card.IsType,nil,TYPE_LINK)>0 and Duel.IsExistingMatchingCard(cm.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp)) or Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp)
......
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