Merge branch 'new-fusion-Dual-Avatar' into 'master'

Add 双天 to new fusion

See merge request !33

c87669904.lua

 --双天招来
-function c87669904.initial_effect(c)
+local s,id,o=GetID()
+function s.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN+CATEGORY_HANDES+CATEGORY_FUSION_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCountLimit(1,87669904+EFFECT_COUNT_CODE_OATH)
-	e1:SetTarget(c87669904.target)
-	e1:SetOperation(c87669904.activate)
+	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
+	e1:SetTarget(s.target)
+	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
 end
-function c87669904.filter1(c,e)
-	return not c:IsImmuneToEffect(e)
+
+function s.fusfilter(c)
+	return c:IsSetCard(0x14f)
 end
-function c87669904.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x14f) and (not f or f(c))
-		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
-end
-function c87669904.target(e,tp,eg,ep,ev,re,r,rp,chk)
+
+function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler(),REASON_EFFECT) and ft>0
 		and Duel.IsPlayerCanSpecialSummonMonster(tp,87669905,0x14f,TYPES_TOKEN_MONSTER,0,0,2,RACE_WARRIOR,ATTRIBUTE_LIGHT) end
@@ -26,17 +25,18 @@ function c87669904.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
-function c87669904.activate(e,tp,eg,ep,ev,re,r,rp)
+
+function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local count=0
+	local can_fusion=false
 	if Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_EFFECT+REASON_DISCARD,nil,REASON_EFFECT)~=0 then
 		local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 		if ft>0 and Duel.IsPlayerCanSpecialSummonMonster(tp,87669905,0x14f,TYPES_TOKEN_MONSTER,0,0,2,RACE_WARRIOR,ATTRIBUTE_LIGHT) then
 			if Duel.IsPlayerAffectedByEffect(tp,59822133) then ft=1 end
 			for i=1,ft do
 				local token=Duel.CreateToken(tp,87669905)
-				if Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP) and count==0 then
-					count=2
+				if Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP) then
+					can_fusion=true
 				end
 			end
 			Duel.SpecialSummonComplete()
@@ -48,7 +48,7 @@ function c87669904.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	e1:SetCountLimit(1)
-	e1:SetOperation(c87669904.desop)
+	e1:SetOperation(s.desop)
 	Duel.RegisterEffect(e1,tp)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -66,51 +66,33 @@ function c87669904.activate(e,tp,eg,ep,ev,re,r,rp)
 	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e4:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e4:SetTargetRange(1,0)
-	e4:SetTarget(c87669904.splimit)
+	e4:SetTarget(s.splimit)
 	e4:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e4,tp)
-	while count>0 do
-		local chkf=tp
-		local mg1=Duel.GetFusionMaterial(tp):Filter(c87669904.filter1,nil,e)
-		local sg1=Duel.GetMatchingGroup(c87669904.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
-		local mg2=nil
-		local sg2=nil
-		local ce=Duel.GetChainMaterial(tp)
-		if ce~=nil then
-			local fgroup=ce:GetTarget()
-			mg2=fgroup(ce,e,tp)
-			local mf=ce:GetValue()
-			sg2=Duel.GetMatchingGroup(c87669904.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg2,mf,chkf)
-		end
-		if (sg1:GetCount()>0 or (sg2~=nil and sg2:GetCount()>0)) and Duel.SelectYesNo(tp,aux.Stringid(87669904,0)) then
-			Duel.BreakEffect()
-			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)
+	if can_fusion==true then
+		local fusion_effect=FusionSpell.CreateSummonEffect(c,{
+			fusfilter=s.fusfilter,
+			matfilter=aux.NecroValleyFilter()
+		})
+		for i=1,2 do
+			if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)==false then
+				break
+			end
+			if Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 				Duel.BreakEffect()
-				Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+			    fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 			else
-				local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
-				local fop=ce:GetOperation()
-				fop(ce,e,tp,tc,mat2)
+				break
 			end
-			tc:CompleteProcedure()
-			count=count-1
-		else
-			count=0
 		end
 	end
 end
-function c87669904.desop(e,tp,eg,ep,ev,re,r,rp)
+
+function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tg=Duel.GetMatchingGroup(Card.IsType,tp,LOCATION_MZONE,0,nil,TYPE_TOKEN)
 	Duel.Destroy(tg,REASON_EFFECT)
 end
-function c87669904.splimit(e,c)
+
+function s.splimit(e,c)
 	return not c:IsType(TYPE_FUSION) and c:IsLocation(LOCATION_EXTRA)
 end