fix 烙印融合 (#1884)

c1906812.lua

@@ -33,6 +33,9 @@ function c1906812.initial_effect(c)
 	e2:SetOperation(c1906812.thop)
 	c:RegisterEffect(e2)
 end
+function c1906812.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,c1906812.mfilter,nil)
+end
 function c1906812.mfilter(c)
 	return c:IsStatus(STATUS_SPSUMMON_TURN) and c:IsFusionType(TYPE_EFFECT) and c:IsLocation(LOCATION_MZONE)
 end

c3410461.lua

@@ -43,6 +43,9 @@ function c3410461.initial_effect(c)
 	e4:SetOperation(c3410461.thop)
 	c:RegisterEffect(e4)
 end
+function c3410461.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsRace,RACE_DRAGON)
+end
 function c3410461.cfilter(c,fc)
 	return c:IsAbleToGraveAsCost() and (c:IsControler(fc:GetControler()) or c:IsFaceup())
 end

c34848821.lua

@@ -42,6 +42,9 @@ function c34848821.initial_effect(c)
 	e4:SetOperation(c34848821.thop)
 	c:RegisterEffect(e4)
 end
+function c34848821.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsLevelAbove,8)
+end
 function c34848821.imcon(e)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end

c41373230.lua

@@ -37,6 +37,9 @@ function c41373230.initial_effect(c)
 	e4:SetOperation(c41373230.thop)
 	c:RegisterEffect(e4)
 end
+function c41373230.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsAttackAbove,2500)
+end
 function c41373230.matfilter(c)
 	return c:IsFusionType(TYPE_MONSTER) and c:GetOriginalLevel()>0
 end

c44146295.lua

@@ -34,7 +34,10 @@ function c44146295.sfcfilter(c,fc)
 	return c:IsFusionCode(68468459) or c:CheckFusionSubstitute(fc)
 end
 function c44146295.synchro_fusion_check(tp,sg,fc)
-	return aux.gffcheck(sg,c44146295.sfcfilter,fc,Card.IsFusionType,TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK)
+	return aux.gffcheck(sg,c44146295.sfcfilter,fc,Card.IsFusionType,TYPE_SYNCHRO)
+end
+function c44146295.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsFusionType,TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK)
 end
 function c44146295.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetFlagEffect(44146295)==0

c44362883.lua

@@ -37,11 +37,15 @@ function c44362883.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end
 function c44362883.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,68468459) and (not f or f(c))
-		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
+	if not (c:IsType(TYPE_FUSION) and aux.IsMaterialListCode(c,68468459) and (not f or f(c))
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false)) then return false end
+	aux.FCheckAdditional=c.branded_fusion_check or c44362883.fcheck
+	local res=c:CheckFusionMaterial(m,nil,chkf)
+	aux.FCheckAdditional=nil
+	return res
 end
 function c44362883.fcheck(tp,sg,fc)
-	return sg:GetCount()<=2
+	return sg:GetCount()<=2 and sg:IsExists(Card.IsFusionCode,1,nil,68468459)
 end
 function c44362883.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
@@ -49,9 +53,7 @@ function c44362883.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		local mg1=Duel.GetFusionMaterial(tp)
 		local mg2=Duel.GetMatchingGroup(c44362883.filter0,tp,LOCATION_DECK,0,nil)
 		mg1:Merge(mg2)
-		aux.FCheckAdditional=c44362883.fcheck
 		local res=Duel.IsExistingMatchingCard(c44362883.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
-		aux.FCheckAdditional=nil
 		if not res then
 			local ce=Duel.GetChainMaterial(tp)
 			if ce~=nil then
@@ -70,9 +72,7 @@ function c44362883.activate(e,tp,eg,ep,ev,re,r,rp)
 	local mg1=Duel.GetFusionMaterial(tp):Filter(c44362883.filter1,nil,e)
 	local mg2=Duel.GetMatchingGroup(c44362883.filter0,tp,LOCATION_DECK,0,nil)
 	mg1:Merge(mg2)
-	aux.FCheckAdditional=c44362883.fcheck
 	local sg1=Duel.GetMatchingGroup(c44362883.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
-	aux.FCheckAdditional=nil
 	local mg3=nil
 	local sg2=nil
 	local ce=Duel.GetChainMaterial(tp)
@@ -89,7 +89,7 @@ function c44362883.activate(e,tp,eg,ep,ev,re,r,rp)
 		local tg=sg:Select(tp,1,1,nil)
 		local tc=tg:GetFirst()
 		if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
-			aux.FCheckAdditional=c44362883.fcheck
+			aux.FCheckAdditional=tc.branded_fusion_check or c44362883.fcheck
 			local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
 			aux.FCheckAdditional=nil
 			tc:SetMaterial(mat1)

c70534340.lua

@@ -17,6 +17,9 @@ function c70534340.initial_effect(c)
 	e1:SetOperation(c70534340.spop)
 	c:RegisterEffect(e1)
 end
+function c70534340.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsFusionAttribute,ATTRIBUTE_DARK)
+end
 function c70534340.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end

c87746184.lua

@@ -35,6 +35,9 @@ function c87746184.initial_effect(c)
 	e3:SetOperation(c87746184.thop)
 	c:RegisterEffect(e3)
 end
+function c87746184.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,Card.IsFusionAttribute,ATTRIBUTE_LIGHT)
+end
 function c87746184.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and Duel.GetCurrentPhase()&(PHASE_DAMAGE+PHASE_DAMAGE_CAL)==0
 end