Resolved merge conflicts for selected blocks in scripts

c32467459.lua

@@ -3,14 +3,23 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	--fusion
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetCode(EFFECT_FUSION_MATERIAL)
-	e0:SetCondition(s.FShaddollCondition)
-	e0:SetOperation(s.FShaddollOperation)
-	c:RegisterEffect(e0)
+	if aux.AddFusionProcShaddoll then
+		--old function
+		local e0=Effect.CreateEffect(c)
+		e0:SetType(EFFECT_TYPE_SINGLE)
+		e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+		e0:SetCode(EFFECT_FUSION_MATERIAL)
+		e0:SetCondition(s.FShaddollCondition)
+		e0:SetOperation(s.FShaddollOperation)
+		c:RegisterEffect(e0)
+	else
+		--new function
+		aux.AddFusionProcMix(c,false,true,
+			function (mc) return mc:IsFusionSetCard(0x9d) end,
+			function (mc) return aux.FShaddollFilter2(mc,ATTRIBUTE_DARK) end,
+			function (mc) return aux.FShaddollFilter2(mc,ATTRIBUTE_EARTH) end
+		)
+	end
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

c45675980.lua

@@ -29,13 +29,19 @@ function c45675980.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c45675980.syncheck(g,tp,syncard)
-	return g:IsExists(Card.IsRace,1,nil,RACE_DRAGON) and syncard:IsSynchroSummonable(nil,g,#g-1,#g-1) and aux.SynMixHandCheck(g,tp,syncard)
+	return g:IsExists(Card.IsRace,1,nil,RACE_DRAGON)
+		and aux.SynMixHandCheck(g,tp,syncard) and syncard:IsSynchroSummonable(nil,g,#g-1,#g-1)
 end
 function c45675980.spfilter(c,tp,mg)
-	return mg:CheckSubGroup(c45675980.syncheck,2,#mg,tp,c)
+	if not c:IsType(TYPE_SYNCHRO) then return false end
+	aux.GCheckAdditional=aux.SynGroupCheckLevelAddition(c)
+	local res=mg:CheckSubGroup(c45675980.syncheck,2,#mg,tp,c)
+	aux.GCheckAdditional=nil
+	return res
 end
 function c45675980.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
+		if not Duel.IsPlayerCanSpecialSummon(tp) then return false end
 		local mg=Duel.GetSynchroMaterial(tp)
 		if mg:IsExists(Card.GetHandSynchro,1,nil) then
 			local mg2=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,nil)

c77124096.lua

@@ -2,6 +2,16 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,94820406,72043279)
+	--- fusion effect
+	local e0=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=LOCATION_MZONE|LOCATION_GRAVE|LOCATION_REMOVED,
+		mat_operation_code_map={
+			{ [LOCATION_DECK]=FusionSpell.FUSION_OPERATION_GRAVE },
+			{ [0xff]=FusionSpell.FUSION_OPERATION_SHUFFLE }
+		},
+		sumtype=SUMMON_VALUE_DARK_FUSION
+	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
@@ -9,32 +19,19 @@ function s.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_FUSION_SUMMON)
 	e1:SetTarget(s.target)
+	e1:SetLabelObject(e0)
 	e1:SetOperation(s.operation)
 	c:RegisterEffect(e1)
 end
-s.fusion_effect=true
-function s.filter1(c,e)
-	return (c:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) or c:IsFaceup()) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck()
-		and not c:IsImmuneToEffect(e)
-end
-function s.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and c.dark_calling and (not f or f(c))
-		and c:IsCanBeSpecialSummoned(e,SUMMON_VALUE_DARK_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
+
+function s.fusfilter(c)
+	return c.dark_calling==true
 end
+
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local chkf=tp
-	local mg=Duel.GetMatchingGroup(s.filter1,tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,e)
+	local fusion_effect=e:GetLabelObject()
 	local b0=Duel.GetFlagEffect(tp,id)==0 or not e:IsCostChecked()
-	local b1=b0 and Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg,nil,chkf)
-	if b0 and not b1 then
-		local ce=Duel.GetChainMaterial(tp)
-		if ce~=nil then
-			local fgroup=ce:GetTarget()
-			local mg3=fgroup(ce,e,tp)
-			local mf=ce:GetValue()
-			b1=Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg3,mf,chkf)
-		end
-	end
+	local b1=b0 and fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)
 	local b2=Duel.IsExistingMatchingCard(s.thfilter2,tp,LOCATION_DECK,0,1,nil)
 		and (Duel.GetFlagEffect(tp,id+o)==0 or not e:IsCostChecked())
 	if chk==0 then return b1 or b2 end
@@ -76,56 +73,16 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 		s.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
+
 function s.fsop(e,tp,eg,ep,ev,re,r,rp)
-	local chkf=tp
-	local mg=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.filter1),tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,e)
-	local sg1=Duel.GetMatchingGroup(s.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg,nil,chkf)
-	local mg3=nil
-	local sg2=nil
-	local ce=Duel.GetChainMaterial(tp)
-	if ce~=nil then
-		local fgroup=ce:GetTarget()
-		mg3=fgroup(ce,e,tp)
-		local mf=ce:GetValue()
-		sg2=Duel.GetMatchingGroup(s.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg3,mf,chkf)
-	end
-	if sg1:GetCount()>0 or (sg2~=nil and sg2:GetCount()>0) then
-		local sg=sg1:Clone()
-		if sg2 then sg:Merge(sg2) end
-		::cancel::
-		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 (ce and not Duel.SelectYesNo(tp,ce:GetDescription()))) then
-			local mat=Duel.SelectFusionMaterial(tp,tc,mg,nil,chkf)
-			if #mat==0 then goto cancel end
-			tc:SetMaterial(mat)
-			if mat:IsExists(Card.IsFacedown,1,nil) then
-				local cg=mat:Filter(Card.IsFacedown,nil)
-				Duel.ConfirmCards(1-tp,cg)
-			end
-			if mat:Filter(s.cfilter,nil):GetCount()>0 then
-				local cg=mat:Filter(s.cfilter,nil)
-				Duel.HintSelection(cg)
-			end
-			Duel.SendtoDeck(mat,nil,SEQ_DECKSHUFFLE,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-			Duel.BreakEffect()
-			Duel.SpecialSummon(tc,SUMMON_VALUE_DARK_FUSION,tp,tp,false,false,POS_FACEUP)
-		elseif ce~=nil then
-			local mat2=Duel.SelectFusionMaterial(tp,tc,mg3,nil,chkf)
-			if #mat2==0 then goto cancel end
-			local fop=ce:GetOperation()
-			fop(ce,e,tp,tc,mat2,SUMMON_VALUE_DARK_FUSION)
-		end
-		tc:CompleteProcedure()
-	end
-end
-function s.cfilter(c)
-	return c:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) or (c:IsLocation(LOCATION_MZONE) and c:IsFaceup())
+	local fusion_effect=e:GetLabelObject()
+	fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 end
+
 function s.thfilter2(c)
 	return c:IsCode(94820406,72043279) and c:IsAbleToHand()
 end
+
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,s.thfilter2,tp,LOCATION_DECK,0,1,1,nil)

c84343351.lua

@@ -4,6 +4,12 @@ function s.initial_effect(c)
 	c:EnableReviveLimit()
 	--material
 	aux.AddSynchroMixProcedure(c,aux.FilterBoolFunction(Card.IsCode,82044279),nil,nil,aux.Tuner(nil),1,99,s.syncheck)
+	--double tuner check
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetCode(EFFECT_MATERIAL_CHECK)
+	e0:SetValue(s.valcheck)
+	c:RegisterEffect(e0)
 	--cannot special summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
@@ -36,6 +42,17 @@ function s.initial_effect(c)
 	e3:SetOperation(s.spop)
 	c:RegisterEffect(e3)
 end
+function s.valcheck(e,c)
+	local g=c:GetMaterial()
+	if g:IsExists(Card.IsType,2,nil,TYPE_TUNER) then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+		e1:SetCode(21142671)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD+RESET_PHASE+PHASE_END)
+		c:RegisterEffect(e1)
+	end
+end
 function s.mfilter2(c,mg,syncard)
 	return c:IsCode(82044279) and (mg:IsExists(Card.IsType,1,c,TYPE_SYNCHRO) or #mg-1>=2) and not mg:IsExists(s.chkfilter,1,c,syncard)
 end

c8852158.lua

@@ -3,8 +3,14 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	--fusion
-	aux.AddFusionProcShaddoll(c,ATTRIBUTE_WIND)
+	-- using new function
+	if aux.AddFusionProcShaddoll then
+		--old function
+		aux.AddFusionProcShaddoll(c,ATTRIBUTE_WIND)
+	else
+		--new function
+		aux.AddFusionProcFun2(c,function (mc) return mc:IsFusionSetCard(0x9d) end, function (mc) return aux.FShaddollFilter2(mc,ATTRIBUTE_WIND) end, true)
+	end
 	--cannot spsummon
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)