Commit 6fddc765 authored by nanahira's avatar nanahira

Auto Push by Nanahira

parent 7d8d1851
...@@ -155,7 +155,7 @@ if Group.SelectUnselect then ...@@ -155,7 +155,7 @@ if Group.SelectUnselect then
local ct=sg:GetCount() local ct=sg:GetCount()
local ag=g:Filter(cm.CheckGroupRecursive,sg,sg,g,f,min,max,ext_params) local ag=g:Filter(cm.CheckGroupRecursive,sg,sg,g,f,min,max,ext_params)
while ct<max and ag:GetCount()>0 do while ct<max and ag:GetCount()>0 do
local finish=(ct>=min and and ct<=max and f(sg,...)) local finish=(ct>=min and ct<=max and f(sg,...))
local seg=sg:Clone() local seg=sg:Clone()
local dmin=min-cg:GetCount() local dmin=min-cg:GetCount()
local dmax=math.min(max-cg:GetCount(),g:GetCount()) local dmax=math.min(max-cg:GetCount(),g:GetCount())
...@@ -349,7 +349,7 @@ function cm.XyzProcedureCustomCondition(func,gf,minct,maxct,ext_params) ...@@ -349,7 +349,7 @@ function cm.XyzProcedureCustomCondition(func,gf,minct,maxct,ext_params)
mg=Duel.GetMatchingGroup(cm.XyzProcedureCustomFilter,tp,LOCATION_MZONE,0,nil,c,func,ext_params) mg=Duel.GetMatchingGroup(cm.XyzProcedureCustomFilter,tp,LOCATION_MZONE,0,nil,c,func,ext_params)
end end
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
local ce={Duel.IsPlayerAffectedByEffect(EFFECT_MUST_BE_XMATERIAL)} local ce={Duel.IsPlayerAffectedByEffect(tp,EFFECT_MUST_BE_XMATERIAL)}
for _,te in ipairs(ce) do for _,te in ipairs(ce) do
local tc=te:GetHandler() local tc=te:GetHandler()
if not mg:IsContains(tc) then return false end if not mg:IsContains(tc) then return false end
...@@ -376,7 +376,7 @@ function cm.XyzProcedureCustomTarget(func,gf,minct,maxct,ext_params) ...@@ -376,7 +376,7 @@ function cm.XyzProcedureCustomTarget(func,gf,minct,maxct,ext_params)
minc=math.max(minc,min) minc=math.max(minc,min)
maxc=math.min(maxc,max) maxc=math.min(maxc,max)
end end
local ce={Duel.IsPlayerAffectedByEffect(EFFECT_MUST_BE_XMATERIAL)} local ce={Duel.IsPlayerAffectedByEffect(tp,EFFECT_MUST_BE_XMATERIAL)}
for _,te in ipairs(ce) do for _,te in ipairs(ce) do
local tc=te:GetHandler() local tc=te:GetHandler()
sg:AddCard(tc) sg:AddCard(tc)
...@@ -1762,7 +1762,7 @@ return function(e,g,gc,chkfnf) ...@@ -1762,7 +1762,7 @@ return function(e,g,gc,chkfnf)
if not cm.FusionFilter_3L(gc,fc,mf,sub) then return false end if not cm.FusionFilter_3L(gc,fc,mf,sub) then return false end
sg:AddCard(gc) sg:AddCard(gc)
end end
local ce={Duel.IsPlayerAffectedByEffect(EFFECT_MUST_BE_FMATERIAL)} local ce={Duel.IsPlayerAffectedByEffect(tp,EFFECT_MUST_BE_FMATERIAL)}
for _,te in ipairs(ce) do for _,te in ipairs(ce) do
local tc=te:GetHandler() local tc=te:GetHandler()
if not mg:IsContains(tc) then return false end if not mg:IsContains(tc) then return false end
...@@ -1782,7 +1782,7 @@ return function(e,tp,eg,ep,ev,re,r,rp,gc,chkfnf) ...@@ -1782,7 +1782,7 @@ return function(e,tp,eg,ep,ev,re,r,rp,gc,chkfnf)
if gc then if gc then
sg:AddCard(gc) sg:AddCard(gc)
end end
local ce={Duel.IsPlayerAffectedByEffect(EFFECT_MUST_BE_FMATERIAL)} local ce={Duel.IsPlayerAffectedByEffect(tp,EFFECT_MUST_BE_FMATERIAL)}
for _,te in ipairs(ce) do for _,te in ipairs(ce) do
local tc=te:GetHandler() local tc=te:GetHandler()
sg:AddCard(tc) sg:AddCard(tc)
......
...@@ -53,8 +53,8 @@ function cm.sptg2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -53,8 +53,8 @@ function cm.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
end end
function cm.spop2(e,tp,eg,ep,ev,re,r,rp) function cm.spop2(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) or not c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,true,true) then return end
local c=e:GetHandler() local c=e:GetHandler()
if not c:IsRelateToEffect(e) or not c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,true,true) then return end
local mg=Duel.GetRitualMaterial(tp):Filter(cm.matfilter,c,c) local mg=Duel.GetRitualMaterial(tp):Filter(cm.matfilter,c,c)
if c.mat_filter then if c.mat_filter then
mg=mg:Filter(c.mat_filter,nil) mg=mg:Filter(c.mat_filter,nil)
......
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