Skip to content

Y
ygopro-scripts-888
Commit 810fd764 authored by Chen Bill's avatar Chen Bill
Browse files
Options

fix: redefined local

parent 29a86159
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
procedure.lua
View file @ 810fd764
...@@ -1058,10 +1058,10 @@ function Auxiliary.FCheckMixRepTemplate(c,cond,tp,mg,sg,g,fc,sub,chkfnf,fun1,min ...@@ -1058,10 +1058,10 @@ function Auxiliary.FCheckMixRepTemplate(c,cond,tp,mg,sg,g,fc,sub,chkfnf,fun1,min
for i,f in ipairs({...}) do for i,f in ipairs({...}) do
if f(c,fc,sub,mg,sg) then if f(c,fc,sub,mg,sg) then
g:AddCard(c) g:AddCard(c)
local sub=sub and f(c,fc,false,mg,sg) local subf=sub and f(c,fc,false,mg,sg)
local t={...} local t={...}
table.remove(t,i) table.remove(t,i)
local res=cond(tp,mg,sg,g,fc,sub,chkfnf,fun1,minc,maxc,table.unpack(t)) local res=cond(tp,mg,sg,g,fc,subf,chkfnf,fun1,minc,maxc,table.unpack(t))
g:RemoveCard(c) g:RemoveCard(c)
if res then return true end if res then return true end
end end
...@@ -1069,8 +1069,8 @@ function Auxiliary.FCheckMixRepTemplate(c,cond,tp,mg,sg,g,fc,sub,chkfnf,fun1,min ...@@ -1069,8 +1069,8 @@ function Auxiliary.FCheckMixRepTemplate(c,cond,tp,mg,sg,g,fc,sub,chkfnf,fun1,min
if maxc>0 then if maxc>0 then
if fun1(c,fc,sub,mg,sg) then if fun1(c,fc,sub,mg,sg) then
g:AddCard(c) g:AddCard(c)
local sub=sub and fun1(c,fc,false,mg,sg) local subf1=sub and fun1(c,fc,false,mg,sg)
local res=cond(tp,mg,sg,g,fc,sub,chkfnf,fun1,minc-1,maxc-1,...) local res=cond(tp,mg,sg,g,fc,subf1,chkfnf,fun1,minc-1,maxc-1,...)
g:RemoveCard(c) g:RemoveCard(c)
if res then return true end if res then return true end
end end
...@@ -1101,15 +1101,15 @@ function Auxiliary.FCheckSelectMixRepAll(c,tp,mg,sg,g,fc,sub,chkf,fun1,minc,maxc ...@@ -1101,15 +1101,15 @@ function Auxiliary.FCheckSelectMixRepAll(c,tp,mg,sg,g,fc,sub,chkf,fun1,minc,maxc
if fun2 then if fun2 then
if fun2(c,fc,sub,mg,sg) then if fun2(c,fc,sub,mg,sg) then
g:AddCard(c) g:AddCard(c)
local sub=sub and fun2(c,fc,false,mg,sg) local subf2=sub and fun2(c,fc,false,mg,sg)
local res=Auxiliary.FCheckSelectMixRep(tp,mg,sg,g,fc,sub,chkf,fun1,minc,maxc,...) local res=Auxiliary.FCheckSelectMixRep(tp,mg,sg,g,fc,subf2,chkf,fun1,minc,maxc,...)
g:RemoveCard(c) g:RemoveCard(c)
return res return res
end end
elseif maxc>0 and fun1(c,fc,sub,mg,sg) then elseif maxc>0 and fun1(c,fc,sub,mg,sg) then
g:AddCard(c) g:AddCard(c)
local sub=sub and fun1(c,fc,false,mg,sg) local subf1=sub and fun1(c,fc,false,mg,sg)
local res=Auxiliary.FCheckSelectMixRep(tp,mg,sg,g,fc,sub,chkf,fun1,minc-1,maxc-1) local res=Auxiliary.FCheckSelectMixRep(tp,mg,sg,g,fc,subf1,chkf,fun1,minc-1,maxc-1)
g:RemoveCard(c) g:RemoveCard(c)
return res return res
end end
...@@ -1292,8 +1292,8 @@ end ...@@ -1292,8 +1292,8 @@ end
--Contact Fusion --Contact Fusion
function Auxiliary.AddContactFusionProcedure(c,filter,self_location,opponent_location,mat_operation,...) function Auxiliary.AddContactFusionProcedure(c,filter,self_location,opponent_location,mat_operation,...)
local self_location=self_location or 0 self_location=self_location or 0
local opponent_location=opponent_location or 0 opponent_location=opponent_location or 0
local operation_params={...} local operation_params={...}
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
......
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