ybb

expansions/script/c66915034.lua

@@ -31,9 +31,9 @@ function c66915034.sumlimit(e,c,sump,sumtype,sumpos,targetp)
 end
 function c66915034.fcheck(tp,sg,fc)
 	local ct=Duel.GetFieldGroupCount(tp,LOCATION_SZONE,0)
-	if sg:IsExists(Card.IsLocation,1,nil,LOCATION_EXTRA) then
-		return sg:IsExists(c66915034.filterchk,1,nil) and #sg>=3 and sg:FilterCount(Card.IsLocation,nil,LOCATION_EXTRA)<=ct end
-	return #sg>=3 and sg:FilterCount(Card.IsLocation,nil,LOCATION_EXTRA)<=ct
+	return sg:GetCount()>=3
+		and (not sg:IsExists(Card.IsLocation,1,nil,LOCATION_EXTRA)
+		or (sg:IsExists(c66915034.filterchk,1,nil) and sg:FilterCount(Card.IsLocation,nil,LOCATION_EXTRA)<=ct))
 end
 function c66915034.filterchk(c)
 	return c:IsSummonType(SUMMON_TYPE_FUSION) and c:IsOnField()
@@ -53,10 +53,8 @@ function c66915034.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		local chkf=tp
 		local mg=Duel.GetFusionMaterial(tp)
 		local mg2=Duel.GetMatchingGroup(c66915034.filter0,tp,LOCATION_EXTRA,0,nil)
-		if mg:IsExists(c66915034.filterchk,1,nil) and mg2:GetCount()>0 then
-			mg:Merge(mg2)
-			aux.FGoalCheckAdditional=c66915034.fcheck
-		end
+		mg:Merge(mg2)
+		aux.FGoalCheckAdditional=c66915034.fcheck
 		local res=Duel.IsExistingMatchingCard(c66915034.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg,nil,chkf)
 		aux.FGoalCheckAdditional=nil
 		if not res then
@@ -75,12 +73,9 @@ function c66915034.activate(e,tp,eg,ep,ev,re,r,rp)
 	local chkf=tp
 	local mg1=Duel.GetFusionMaterial(tp):Filter(c66915034.filter1,nil,e)
 	local mg2=Duel.GetMatchingGroup(c66915034.filter0,tp,LOCATION_EXTRA,0,nil)
-	if mg1:IsExists(c66915034.filterchk,1,nil) and mg2:GetCount()>0 then
-		mg1:Merge(mg2)
-		aux.FGoalCheckAdditional=c66915034.fcheck
-	end
+	mg1:Merge(mg2)
+	aux.FGoalCheckAdditional=c66915034.fcheck
 	local sg1=Duel.GetMatchingGroup(c66915034.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
-	aux.FGoalCheckAdditional=nil
 	local mg2=nil
 	local sg2=nil
 	local ce=Duel.GetChainMaterial(tp)
@@ -90,26 +85,26 @@ function c66915034.activate(e,tp,eg,ep,ev,re,r,rp)
 		local mf=ce:GetValue()
 		sg2=Duel.GetMatchingGroup(c66915034.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg2,mf,chkf)
 	end
-	local sg=sg1:Clone()
-	if sg2 then sg:Merge(sg2) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local tg=sg:Select(tp,1,1,nil)
-	local tc=tg:GetFirst()
-	if not tc then return end
-	if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
-		aux.FGoalCheckAdditional=c66915034.fcheck
-		local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
-		aux.FGoalCheckAdditional=nil
-		tc:SetMaterial(mat1)
-		Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-		Duel.BreakEffect()
-		Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
-	else
-		local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
-		local fop=ce:GetOperation()
-		fop(ce,e,tp,tc,mat2)
+	if sg1:GetCount()>0 or (sg2~=nil and sg2:GetCount()>0) then
+		local sg=sg1:Clone()
+		if sg2 then sg:Merge(sg2) end
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		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
+			local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
+			tc:SetMaterial(mat1)
+			Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
+			Duel.BreakEffect()
+			Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+		else
+			local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
+			local fop=ce:GetOperation()
+			fop(ce,e,tp,tc,mat2)
+		end
+		tc:CompleteProcedure()
 	end
-	tc:CompleteProcedure()
+	aux.FGoalCheckAdditional=nil
 end
 function c66915034.sumlimit(e,c,sump,sumtype,sumpos,targetp)
 	return c:IsLocation(LOCATION_EXTRA) and not c:IsSetCard(0x1374)