Commit 21e7c292 authored by DailyShana's avatar DailyShana

update Card.IsNotTuner EFFECT_NONTUNER

parent d9a4afd6
...@@ -29,7 +29,7 @@ function c3096468.initial_effect(c) ...@@ -29,7 +29,7 @@ function c3096468.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c3096468.synfilter(c,syncard,tuner,f) function c3096468.synfilter(c,syncard,tuner,f)
return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c3096468.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c3096468.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
......
...@@ -72,7 +72,7 @@ function c33541430.cardiansynlevel(c) ...@@ -72,7 +72,7 @@ function c33541430.cardiansynlevel(c)
return 2 return 2
end end
function c33541430.synfilter(c,syncard,tuner,f) function c33541430.synfilter(c,syncard,tuner,f)
return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c33541430.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c33541430.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
......
...@@ -31,7 +31,7 @@ function c55863245.initial_effect(c) ...@@ -31,7 +31,7 @@ function c55863245.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c55863245.synfilter(c,syncard,tuner,f) function c55863245.synfilter(c,syncard,tuner,f)
return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c55863245.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c55863245.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
......
...@@ -85,7 +85,7 @@ function c57261568.cardiansynlevel(c) ...@@ -85,7 +85,7 @@ function c57261568.cardiansynlevel(c)
return 2 return 2
end end
function c57261568.synfilter(c,syncard,tuner,f) function c57261568.synfilter(c,syncard,tuner,f)
return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c57261568.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c57261568.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
......
...@@ -25,10 +25,10 @@ function c64910482.initial_effect(c) ...@@ -25,10 +25,10 @@ function c64910482.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c64910482.synfilter1(c,syncard,tuner,f) function c64910482.synfilter1(c,syncard,tuner,f)
return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c64910482.synfilter2(c,syncard,tuner,f) function c64910482.synfilter2(c,syncard,tuner,f)
return c:IsSetCard(0x27) and c:IsNotTuner() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return c:IsSetCard(0x27) and c:IsNotTuner(syncard) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c64910482.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c64910482.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
...@@ -115,6 +115,6 @@ function c64910482.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -115,6 +115,6 @@ function c64910482.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
function c64910482.hsyntg(e,c) function c64910482.hsyntg(e,c,syncard)
return c:IsSetCard(0x27) and c:IsNotTuner() return c:IsSetCard(0x27) and c:IsNotTuner(syncard)
end end
...@@ -77,7 +77,7 @@ function c89818984.cardiansynlevel(c) ...@@ -77,7 +77,7 @@ function c89818984.cardiansynlevel(c)
return 2 return 2
end end
function c89818984.synfilter(c,syncard,tuner,f) function c89818984.synfilter(c,syncard,tuner,f)
return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c)) return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
end end
function c89818984.syncheck(c,g,mg,tp,lv,syncard,minc,maxc) function c89818984.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
g:AddCard(c) g:AddCard(c)
......
...@@ -46,7 +46,7 @@ function c90036274.cfilter1(c,tp) ...@@ -46,7 +46,7 @@ function c90036274.cfilter1(c,tp)
and Duel.IsExistingMatchingCard(c90036274.cfilter2,tp,LOCATION_MZONE,0,1,c,c:GetLevel()) and Duel.IsExistingMatchingCard(c90036274.cfilter2,tp,LOCATION_MZONE,0,1,c,c:GetLevel())
end end
function c90036274.cfilter2(c,lv) function c90036274.cfilter2(c,lv)
return c:IsFaceup() and c:IsNotTuner() and c:IsLevel(7-lv) and c:IsAbleToGraveAsCost() return c:IsFaceup() and not c:IsType(TYPE_TUNER) and c:IsLevel(7-lv) and c:IsAbleToGraveAsCost()
end end
function c90036274.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c90036274.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c90036274.cfilter1,tp,LOCATION_MZONE,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(c90036274.cfilter1,tp,LOCATION_MZONE,0,1,nil,tp) end
......
...@@ -241,8 +241,8 @@ function Auxiliary.Tuner(f,...) ...@@ -241,8 +241,8 @@ function Auxiliary.Tuner(f,...)
end end
function Auxiliary.NonTuner(f,...) function Auxiliary.NonTuner(f,...)
local ext_params={...} local ext_params={...}
return function(target) return function(target,syncard)
return target:IsNotTuner() and (not f or f(target,table.unpack(ext_params))) return target:IsNotTuner(syncard) and (not f or f(target,table.unpack(ext_params)))
end end
end end
function Auxiliary.GetValueType(v) function Auxiliary.GetValueType(v)
...@@ -348,8 +348,8 @@ end ...@@ -348,8 +348,8 @@ end
function Auxiliary.SynMaterialFilter(c,syncard) function Auxiliary.SynMaterialFilter(c,syncard)
return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard) return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard)
end end
function Auxiliary.SynLimitFilter(c,f,e) function Auxiliary.SynLimitFilter(c,f,e,syncard)
return f and not f(e,c) return f and not f(e,c,syncard)
end end
function Auxiliary.GetSynchroLevelFlowerCardian(c) function Auxiliary.GetSynchroLevelFlowerCardian(c)
return 2 return 2
...@@ -404,7 +404,7 @@ function Auxiliary.SynMixTarget(f1,f2,f3,f4,minc,maxc,gc) ...@@ -404,7 +404,7 @@ function Auxiliary.SynMixTarget(f1,f2,f3,f4,minc,maxc,gc)
for i=0,maxc-1 do for i=0,maxc-1 do
local mg2=mg:Clone() local mg2=mg:Clone()
if f4 then if f4 then
mg2=mg2:Filter(f4,nil) mg2=mg2:Filter(f4,nil,c)
end end
local cg=mg2:Filter(Auxiliary.SynMixCheckRecursive,g4,tp,g4,mg2,i,minc,maxc,c,g,smat,gc) local cg=mg2:Filter(Auxiliary.SynMixCheckRecursive,g4,tp,g4,mg2,i,minc,maxc,c,g,smat,gc)
if cg:GetCount()==0 then break end if cg:GetCount()==0 then break end
...@@ -458,7 +458,7 @@ function Auxiliary.SynMixFilter4(c,f4,minc,maxc,syncard,mg1,smat,c1,c2,c3,gc) ...@@ -458,7 +458,7 @@ function Auxiliary.SynMixFilter4(c,f4,minc,maxc,syncard,mg1,smat,c1,c2,c3,gc)
if c3 then sg:AddCard(c3) end if c3 then sg:AddCard(c3) end
local mg=mg1:Clone() local mg=mg1:Clone()
if f4 then if f4 then
mg=mg:Filter(f4,nil) mg=mg:Filter(f4,nil,syncard)
end end
return aux.SynMixCheck(mg,sg,minc-1,maxc-1,syncard,smat,gc) return aux.SynMixCheck(mg,sg,minc-1,maxc-1,syncard,smat,gc)
end end
...@@ -501,7 +501,7 @@ function Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc) ...@@ -501,7 +501,7 @@ function Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc)
local he,hf,hmin,hmax=c:GetHandSynchro() local he,hf,hmin,hmax=c:GetHandSynchro()
if he then if he then
found=true found=true
if hf and hg:IsExists(Auxiliary.SynLimitFilter,1,c,hf,he) then return false end if hf and hg:IsExists(Auxiliary.SynLimitFilter,1,c,hf,he,syncard) then return false end
if (hmin and hct<hmin) or (hmax and hct>hmax) then return false end if (hmin and hct<hmin) or (hmax and hct>hmax) then return false end
end end
end end
...@@ -515,7 +515,7 @@ function Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc) ...@@ -515,7 +515,7 @@ function Auxiliary.SynMixCheckGoal(tp,sg,minc,ct,syncard,sg1,smat,gc)
local llct=g:FilterCount(Card.IsLocation,c,lloc) local llct=g:FilterCount(Card.IsLocation,c,lloc)
if llct~=lct then return false end if llct~=lct then return false end
end end
if lf and g:IsExists(Auxiliary.SynLimitFilter,1,c,lf,le) then return false end if lf and g:IsExists(Auxiliary.SynLimitFilter,1,c,lf,le,syncard) then return false end
if (lmin and lct<lmin) or (lmax and lct>lmax) then return false end if (lmin and lct<lmin) or (lmax and lct>lmax) then return false end
end end
end end
......
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