Commit b2e5c63f authored by nanahira's avatar nanahira

catchup

parent e7f18d3f
...@@ -918,8 +918,8 @@ function cm.Nanahira(c) ...@@ -918,8 +918,8 @@ function cm.Nanahira(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function cm.NanahiraPendulum(c) function cm.NanahiraPendulum(c)
if not PENDULUM_CHECKLIST then if not Auxiliary.PendulumChecklist then
PENDULUM_CHECKLIST=0 Auxiliary.PendulumChecklist=0
local ge1=Effect.GlobalEffect() local ge1=Effect.GlobalEffect()
ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
ge1:SetCode(EVENT_PHASE_START+PHASE_DRAW) ge1:SetCode(EVENT_PHASE_START+PHASE_DRAW)
...@@ -993,7 +993,7 @@ function cm.PConditionFilterNanahira(c,e,tp,lscale,rscale,f,tc,eset) ...@@ -993,7 +993,7 @@ function cm.PConditionFilterNanahira(c,e,tp,lscale,rscale,f,tc,eset)
end end
local bool=aux.PendulumSummonableBool(c) local bool=aux.PendulumSummonableBool(c)
return lv>lscale and lv<rscale and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_PENDULUM,tp,bool,bool) return lv>lscale and lv<rscale and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_PENDULUM,tp,bool,bool)
and (PENDULUM_CHECKLIST&(0x1<<tp)==0 or aux.PConditionExtraFilter(c,e,tp,lscale,rscale,eset)) and (Auxiliary.PendulumChecklist&(0x1<<tp)==0 or aux.PConditionExtraFilter(c,e,tp,lscale,rscale,eset))
and not c:IsForbidden() and (not f or f(c,tc)) and not c:IsForbidden() and (not f or f(c,tc))
end end
function cm.SetForceExtra(tp,res) function cm.SetForceExtra(tp,res)
...@@ -1006,7 +1006,7 @@ function cm.PendConditionNanahira() ...@@ -1006,7 +1006,7 @@ function cm.PendConditionNanahira()
if c==nil then return true end if c==nil then return true end
local tp=c:GetControler() local tp=c:GetControler()
local eset={Duel.IsPlayerAffectedByEffect(tp,EFFECT_EXTRA_PENDULUM_SUMMON)} local eset={Duel.IsPlayerAffectedByEffect(tp,EFFECT_EXTRA_PENDULUM_SUMMON)}
if PENDULUM_CHECKLIST&(0x1<<tp)~=0 and #eset==0 then return false end if Auxiliary.PendulumChecklist&(0x1<<tp)~=0 and #eset==0 then return false end
local rpz=cm.GetPendulumCard(tp,1) local rpz=cm.GetPendulumCard(tp,1)
if rpz==nil or c==rpz then return false end if rpz==nil or c==rpz then return false end
local lscale=c:GetLeftScale() local lscale=c:GetLeftScale()
...@@ -1112,7 +1112,7 @@ function cm.PendOperationNanahira() ...@@ -1112,7 +1112,7 @@ function cm.PendOperationNanahira()
maxlist[LOCATION_EXTRA]=ect maxlist[LOCATION_EXTRA]=ect
end end
local ce=nil local ce=nil
local b1=PENDULUM_CHECKLIST&(0x1<<tp)==0 local b1=Auxiliary.PendulumChecklist&(0x1<<tp)==0
local b2=#eset>0 local b2=#eset>0
if b1 and b2 then if b1 and b2 then
local options={1163} local options={1163}
...@@ -1142,7 +1142,7 @@ function cm.PendOperationNanahira() ...@@ -1142,7 +1142,7 @@ function cm.PendOperationNanahira()
Duel.Hint(HINT_CARD,0,ce:GetOwner():GetOriginalCode()) Duel.Hint(HINT_CARD,0,ce:GetOwner():GetOriginalCode())
ce:Reset() ce:Reset()
else else
PENDULUM_CHECKLIST=PENDULUM_CHECKLIST|(0x1<<tp) Auxiliary.PendulumChecklist=Auxiliary.PendulumChecklist|(0x1<<tp)
end end
sg:Merge(g) sg:Merge(g)
Duel.HintSelection(Group.FromCards(c)) Duel.HintSelection(Group.FromCards(c))
......
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