Merge branch 'patch-34' of https://github.com/Tianchenglipu/ygopro into Tianchenglipu-patch-34

script/c11502550.lua

@@ -49,9 +49,7 @@ function c11502550.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c11502550.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c11502550.spcon(e,c)
 	if c==nil then return true end 

script/c17032740.lua

@@ -52,9 +52,7 @@ function c17032740.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c17032740.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c17032740.spcon(e,c)
 	if c==nil then return true end 

script/c27346636.lua

@@ -38,14 +38,11 @@ function c27346636.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 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)
 end
 function c27346636.spfilter2(c)
-	local tpe=c:GetOriginalType()
-	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()))
+	return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c27346636.sprcon(e,c)
 	if c==nil then return true end 

script/c28677304.lua

@@ -52,9 +52,7 @@ function c28677304.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c28677304.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c28677304.spcon(e,c)
 	if c==nil then return true end 

script/c29357956.lua

@@ -52,10 +52,7 @@ function c29357956.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 function c29357956.spfilter(c)
-	local tpe=c:GetOriginalType()
-	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()))
+	return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c29357956.sprcon(e,c)
 	if c==nil then return true end

script/c48156348.lua

@@ -46,14 +46,11 @@ function c48156348.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 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)
 end
 function c48156348.spfilter2(c)
-	local tpe=c:GetOriginalType()
-	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()))
+	return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c48156348.sprcon(e,c)
 	if c==nil then return true end 

script/c48996569.lua

@@ -52,9 +52,7 @@ function c48996569.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c48996569.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c48996569.spcon(e,c)
 	if c==nil then return true end 

script/c49352945.lua

@@ -60,9 +60,7 @@ function c49352945.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c49352945.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c49352945.spcon(e,c)
 	if c==nil then return true end 

script/c5128859.lua

@@ -34,14 +34,10 @@ function c5128859.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c5128859.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c5128859.spfilter2(c,code)
-	if c:GetOriginalCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetOriginalCode()==code
 end
 function c5128859.spcon(e,c)
 	if c==nil then return true end 

script/c55171412.lua

@@ -52,9 +52,7 @@ function c55171412.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c55171412.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c55171412.spcon(e,c)
 	if c==nil then return true end 

script/c73285669.lua

@@ -24,10 +24,7 @@ function c73285669.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 function c73285669.spfilter(c)
-	local tpe=c:GetOriginalType()
-	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()))
+	return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c73285669.sprcon(e,c)
 	if c==nil then return true end 

script/c78512663.lua

@@ -58,9 +58,7 @@ function c78512663.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c78512663.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c78512663.spcon(e,c)
 	if c==nil then return true end 

script/c81566151.lua

@@ -49,9 +49,7 @@ function c81566151.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c81566151.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c81566151.spcon(e,c)
 	if c==nil then return true end 

script/c85507811.lua

@@ -53,9 +53,7 @@ function c85507811.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c85507811.spfilter(c,code)
-	if c:GetCode()~=code then return false end
-	if c:IsType(TYPE_FUSION) then return c:IsAbleToExtraAsCost()
-	else return c:IsAbleToDeckAsCost() end
+	return c:IsAbleToDeckOrExtraAsCost() and c:GetCode()==code
 end
 function c85507811.spcon(e,c)
 	if c==nil then return true end 

script/c90957527.lua

@@ -47,14 +47,11 @@ function c90957527.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 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)
 end
 function c90957527.spfilter2(c)
-	local tpe=c:GetOriginalType()
-	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()))
+	return c:IsSetCard(0x19) and c:IsCanBeFusionMaterial(true) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c90957527.sprcon(e,c)
 	if c==nil then return true end