Commit 1bd57faa authored by salix5's avatar salix5

Merge branch 'Tianchenglipu-patch-34'

revert:
utility.lua
c6330307.lua
parents 70fbc1bf 8b8f585d
...@@ -49,9 +49,7 @@ function c11502550.splimit(e,se,sp,st) ...@@ -49,9 +49,7 @@ function c11502550.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c11502550.spfilter(c,code) function c11502550.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c11502550.spcon(e,c) function c11502550.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -52,9 +52,7 @@ function c17032740.splimit(e,se,sp,st) ...@@ -52,9 +52,7 @@ function c17032740.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c17032740.spfilter(c,code) function c17032740.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c17032740.spcon(e,c) function c17032740.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -38,14 +38,11 @@ function c27346636.splimit(e,se,sp,st) ...@@ -38,14 +38,11 @@ function c27346636.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end end
function c27346636.spfilter1(c,tp) function c27346636.spfilter1(c,tp)
return c:IsCode(78868776) and c:IsAbleToDeckAsCost() and c:IsCanBeFusionMaterial(true) return c:IsCode(78868776) and c:IsAbleToDeckOrExtraAsCost() and c:IsCanBeFusionMaterial(true)
and Duel.IsExistingMatchingCard(c27346636.spfilter2,tp,LOCATION_MZONE,0,2,c) and Duel.IsExistingMatchingCard(c27346636.spfilter2,tp,LOCATION_MZONE,0,2,c)
end end
function c27346636.spfilter2(c) function c27346636.spfilter2(c)
local tpe=c:GetOriginalType() return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial() and
((bit.band(tpe,TYPE_FUSION)>0 and c:IsAbleToExtraAsCost()) or
(bit.band(tpe,TYPE_FUSION)==0 and c:IsAbleToDeckAsCost()))
end end
function c27346636.sprcon(e,c) function c27346636.sprcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -52,9 +52,7 @@ function c28677304.splimit(e,se,sp,st) ...@@ -52,9 +52,7 @@ function c28677304.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c28677304.spfilter(c,code) function c28677304.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c28677304.spcon(e,c) function c28677304.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -52,10 +52,7 @@ function c29357956.splimit(e,se,sp,st) ...@@ -52,10 +52,7 @@ function c29357956.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end end
function c29357956.spfilter(c) function c29357956.spfilter(c)
local tpe=c:GetOriginalType() return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial() and
((bit.band(tpe,TYPE_FUSION)>0 and c:IsAbleToExtraAsCost()) or
(bit.band(tpe,TYPE_FUSION)==0 and c:IsAbleToDeckAsCost()))
end end
function c29357956.sprcon(e,c) function c29357956.sprcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -46,14 +46,11 @@ function c48156348.splimit(e,se,sp,st) ...@@ -46,14 +46,11 @@ function c48156348.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end end
function c48156348.spfilter1(c,tp) function c48156348.spfilter1(c,tp)
return c:IsCode(41470137) and c:IsAbleToDeckAsCost() and c:IsCanBeFusionMaterial(true) return c:IsCode(41470137) and c:IsAbleToDeckOrExtraAsCost() and c:IsCanBeFusionMaterial(true)
and Duel.IsExistingMatchingCard(c48156348.spfilter2,tp,LOCATION_MZONE,0,1,c) and Duel.IsExistingMatchingCard(c48156348.spfilter2,tp,LOCATION_MZONE,0,1,c)
end end
function c48156348.spfilter2(c) function c48156348.spfilter2(c)
local tpe=c:GetOriginalType() return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial() and
((bit.band(tpe,TYPE_FUSION)>0 and c:IsAbleToExtraAsCost()) or
(bit.band(tpe,TYPE_FUSION)==0 and c:IsAbleToDeckAsCost()))
end end
function c48156348.sprcon(e,c) function c48156348.sprcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -52,9 +52,7 @@ function c48996569.splimit(e,se,sp,st) ...@@ -52,9 +52,7 @@ function c48996569.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c48996569.spfilter(c,code) function c48996569.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c48996569.spcon(e,c) function c48996569.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -60,9 +60,7 @@ function c49352945.splimit(e,se,sp,st) ...@@ -60,9 +60,7 @@ function c49352945.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c49352945.spfilter(c,code) function c49352945.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c49352945.spcon(e,c) function c49352945.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -34,14 +34,10 @@ function c5128859.splimit(e,se,sp,st) ...@@ -34,14 +34,10 @@ function c5128859.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c5128859.spfilter(c,code) function c5128859.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c5128859.spfilter2(c,code) function c5128859.spfilter2(c,code)
if c:GetOriginalCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetOriginalCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c5128859.spcon(e,c) function c5128859.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -52,9 +52,7 @@ function c55171412.splimit(e,se,sp,st) ...@@ -52,9 +52,7 @@ function c55171412.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c55171412.spfilter(c,code) function c55171412.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c55171412.spcon(e,c) function c55171412.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -24,10 +24,7 @@ function c73285669.splimit(e,se,sp,st) ...@@ -24,10 +24,7 @@ function c73285669.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end end
function c73285669.spfilter(c) function c73285669.spfilter(c)
local tpe=c:GetOriginalType() return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial() and
((bit.band(tpe,TYPE_FUSION)>0 and c:IsAbleToExtraAsCost()) or
(bit.band(tpe,TYPE_FUSION)==0 and c:IsAbleToDeckAsCost()))
end end
function c73285669.sprcon(e,c) function c73285669.sprcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -58,9 +58,7 @@ function c78512663.splimit(e,se,sp,st) ...@@ -58,9 +58,7 @@ function c78512663.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c78512663.spfilter(c,code) function c78512663.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c78512663.spcon(e,c) function c78512663.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -49,9 +49,7 @@ function c81566151.splimit(e,se,sp,st) ...@@ -49,9 +49,7 @@ function c81566151.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c81566151.spfilter(c,code) function c81566151.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c81566151.spcon(e,c) function c81566151.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -53,9 +53,7 @@ function c85507811.splimit(e,se,sp,st) ...@@ -53,9 +53,7 @@ function c85507811.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) return not e:GetHandler():IsLocation(LOCATION_EXTRA)
end end
function c85507811.spfilter(c,code) function c85507811.spfilter(c,code)
if c:GetCode()~=code then return false end return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
else return c:IsAbleToDeckAsCost() end
end end
function c85507811.spcon(e,c) function c85507811.spcon(e,c)
if c==nil then return true end if c==nil then return true end
......
...@@ -47,14 +47,11 @@ function c90957527.splimit(e,se,sp,st) ...@@ -47,14 +47,11 @@ function c90957527.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end end
function c90957527.spfilter1(c,tp) function c90957527.spfilter1(c,tp)
return c:IsCode(79580323) and c:IsAbleToDeckAsCost() and c:IsCanBeFusionMaterial(true) return c:IsCode(79580323) and c:IsAbleToDeckOrExtraAsCost() and c:IsCanBeFusionMaterial(true)
and Duel.IsExistingMatchingCard(c90957527.spfilter2,tp,LOCATION_MZONE,0,1,c) and Duel.IsExistingMatchingCard(c90957527.spfilter2,tp,LOCATION_MZONE,0,1,c)
end end
function c90957527.spfilter2(c) function c90957527.spfilter2(c)
local tpe=c:GetOriginalType() return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial() and
((bit.band(tpe,TYPE_FUSION)>0 and c:IsAbleToExtraAsCost()) or
(bit.band(tpe,TYPE_FUSION)==0 and c:IsAbleToDeckAsCost()))
end end
function c90957527.sprcon(e,c) function c90957527.sprcon(e,c)
if c==nil then return true end if c==nil then return true 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