Commit bc3d2759 authored by POLYMER's avatar POLYMER

fix

parent 32ea0f1d
...@@ -47,7 +47,7 @@ function cm.checkop3(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function cm.checkop3(e,tp,eg,ep,ev,re,r,rp)
local tg=eg:Filter(Card.IsLocation,nil,LOCATION_MZONE) local tg=eg:Filter(Card.IsLocation,nil,LOCATION_MZONE)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m+1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m+1,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
...@@ -55,7 +55,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,7 +55,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_MZONE,LOCATION_MZONE,nil) local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_MZONE,LOCATION_MZONE,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m+1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m+1,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
......
...@@ -118,7 +118,7 @@ function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -118,7 +118,7 @@ function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil) then if Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local tc=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil):GetFirst() local tc=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil):GetFirst()
c:SetCardTarget(tc) e:GetHandler():SetCardTarget(tc)
e:GetLabelObject():AddCard(tc) e:GetLabelObject():AddCard(tc)
end end
end end
......
...@@ -67,13 +67,13 @@ if not Duel.GetMustMaterial then ...@@ -67,13 +67,13 @@ if not Duel.GetMustMaterial then
end end
function cm.checkop(e,tp,eg,ep,ev,re,r,rp) function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetAttackTarget() local tc=Duel.GetAttackTarget()
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m,RESET_EVENT+0x1fc0000,0,1)
end end
function cm.checkop3(e,tp,eg,ep,ev,re,r,rp) function cm.checkop3(e,tp,eg,ep,ev,re,r,rp)
local tg=eg:Filter(Card.IsOnField,nil) local tg=eg:Filter(Card.IsOnField,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
...@@ -81,7 +81,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp) ...@@ -81,7 +81,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
......
...@@ -94,7 +94,7 @@ function cm.initial_effect(c) ...@@ -94,7 +94,7 @@ function cm.initial_effect(c)
end end
function cm.checkop(e,tp,eg,ep,ev,re,r,rp) function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetAttackTarget() local tc=Duel.GetAttackTarget()
tc:RegisterFlagEffect(m-1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m-1,RESET_EVENT+0x1fc0000,0,1)
end end
function cm.checkop2(e,tp,eg,ep,ev,re,r,rp) function cm.checkop2(e,tp,eg,ep,ev,re,r,rp)
if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return end if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return end
...@@ -104,7 +104,7 @@ function cm.checkop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -104,7 +104,7 @@ function cm.checkop2(e,tp,eg,ep,ev,re,r,rp)
local tg=g:Filter(Card.IsOnField,nil) local tg=g:Filter(Card.IsOnField,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m-1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m-1,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
...@@ -114,7 +114,7 @@ function cm.checkop3(e,tp,eg,ep,ev,re,r,rp) ...@@ -114,7 +114,7 @@ function cm.checkop3(e,tp,eg,ep,ev,re,r,rp)
local tg=eg:Filter(Card.IsOnField,nil) local tg=eg:Filter(Card.IsOnField,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m-1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m-1,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
...@@ -137,7 +137,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp) ...@@ -137,7 +137,7 @@ function cm.checkop6(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) local tg=Duel.GetMatchingGroup(cm.ctgfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
if #tg>0 then if #tg>0 then
for tc in aux.Next(tg) do for tc in aux.Next(tg) do
tc:RegisterFlagEffect(m-1,RESET_EVENT+RESETS_STANDARD,0,1) tc:RegisterFlagEffect(m-1,RESET_EVENT+0x1fc0000,0,1)
end end
end end
end end
......
...@@ -139,9 +139,9 @@ end ...@@ -139,9 +139,9 @@ end
function pnflpf.chkval(e,te) function pnflpf.chkval(e,te)
if te and te:GetHandler() and not te:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then if te and te:GetHandler() and not te:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then
if e:GetHandler():GetFlagEffect(11451854)==0 then if e:GetHandler():GetFlagEffect(11451854)==0 then
local prop=0 local prop=EFFECT_FLAG_SET_AVAILABLE
if PNFL_PROPHECY_FLIGHT_STONE_HAIL then prop=EFFECT_FLAG_CLIENT_HINT end if PNFL_PROPHECY_FLIGHT_STONE_HAIL then prop=prop|EFFECT_FLAG_CLIENT_HINT end
e:GetHandler():RegisterFlagEffect(11451854,RESET_EVENT+RESETS_STANDARD,prop,1,0,aux.Stringid(11451854,2)) e:GetHandler():RegisterFlagEffect(11451854,RESET_EVENT+0x1fc0000,prop,1,0,aux.Stringid(11451854,2))
end end
end end
return false return false
......
...@@ -26,7 +26,7 @@ function cm.initial_effect(c) ...@@ -26,7 +26,7 @@ function cm.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function cm.spcost2(e,tp,eg,ep,ev,re,r,rp,chk) function cm.spcost2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return Duel.IsPlayerCanSSet(1-tp) end
local tg=Duel.SelectMatchingCard(1-tp,Card.IsSSetable,tp,0,LOCATION_HAND,1,1,nil) local tg=Duel.SelectMatchingCard(1-tp,Card.IsSSetable,tp,0,LOCATION_HAND,1,1,nil)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SET) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SET)
if #tg>0 then Duel.SSet(1-tp,tg,1-tp,false) end if #tg>0 then Duel.SSet(1-tp,tg,1-tp,false) end
...@@ -79,7 +79,7 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,7 +79,7 @@ function cm.disop(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) then
if not tc:IsOnField() then if not tc:IsOnField() then
if 1==1 then return end if 1==1 then return tc:IsImmuneToEffect(e) end
local tg=Duel.GetMatchingGroup(nil,tc:GetControler(),tc:GetLocation(),0,nil) local tg=Duel.GetMatchingGroup(nil,tc:GetControler(),tc:GetLocation(),0,nil)
local b1=tc:GetSequence()~=0 local b1=tc:GetSequence()~=0
local b2=tc:GetSequence()~=#tg-1 local b2=tc:GetSequence()~=#tg-1
......
...@@ -11,10 +11,9 @@ function cm.initial_effect(c) ...@@ -11,10 +11,9 @@ function cm.initial_effect(c)
e1:SetTarget(cm.target) e1:SetTarget(cm.target)
e1:SetOperation(cm.activate) e1:SetOperation(cm.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function cm.condition(e,tp,eg,ep,ev,re,r,rp) function cm.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(Card.IsFacedown,tp,LOCATION_EXTRA,0,1,nil) return Duel.GetMatchingGroupCount(Card.IsFacedown,tp,LOCATION_EXTRA,0,nil)==1
end end
function cm.spfilter(c,e,tp) function cm.spfilter(c,e,tp)
return c:IsFacedown() and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0 return c:IsFacedown() and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
...@@ -38,5 +37,5 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -38,5 +37,5 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se) function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not se:GetHandler():IsCode(e:GetOwner():GetCount()) and c:IsLocation(LOCATION_EXTRA) return not se:GetHandler():IsCode(e:GetOwner():GetCode()) and c:IsLocation(LOCATION_EXTRA)
end end
...@@ -71,7 +71,9 @@ function c50223005.op2(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,7 +71,9 @@ function c50223005.op2(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c50223005.con3(e,tp,eg,ep,ev,re,r,rp) function c50223005.con3(e,tp,eg,ep,ev,re,r,rp)
return r==REASON_FUSION or r==REASON_XYZ local c=e:GetHandler()
local rc=c:GetReasonCard()
return (r==REASON_FUSION or r==REASON_XYZ) and rc:IsSetCard(0x3b)
end end
function c50223005.op3(e,tp,eg,ep,ev,re,r,rp) function c50223005.op3(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -7,7 +7,6 @@ function c98920017.initial_effect(c) ...@@ -7,7 +7,6 @@ function c98920017.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_UNCOPYABLE) e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
e1:SetCode(EFFECT_SPSUMMON_PROC) e1:SetCode(EFFECT_SPSUMMON_PROC)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCountLimit(1,98920017+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(c98920017.sprcon) e1:SetCondition(c98920017.sprcon)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--counter --counter
......
...@@ -72,7 +72,7 @@ function c9910176.distg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -72,7 +72,7 @@ function c9910176.distg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c9910176.disop(e,tp,eg,ep,ev,re,r,rp) function c9910176.disop(e,tp,eg,ep,ev,re,r,rp)
local rc=re:GetHandler() local rc=re:GetHandler()
if Duel.NegateActivation(ev) and rc:IsRelateToEffect(re) and rc:IsAbleToRemove() if Duel.NegateActivation(ev) and rc:IsRelateToEffect(re) and not rc:IsLocation(LOCATION_REMOVED) and rc:IsAbleToRemove()
and (Duel.GetCustomActivityCount(9910176,tp,ACTIVITY_CHAIN)~=0 and (Duel.GetCustomActivityCount(9910176,tp,ACTIVITY_CHAIN)~=0
or Duel.GetCustomActivityCount(9910176,1-tp,ACTIVITY_CHAIN)~=0) or Duel.GetCustomActivityCount(9910176,1-tp,ACTIVITY_CHAIN)~=0)
and Duel.SelectYesNo(tp,aux.Stringid(9910176,1)) then and Duel.SelectYesNo(tp,aux.Stringid(9910176,1)) then
......
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