Revert "Fix ヘビーメタルフォーゼ・アマルガム (#3064)"

This reverts commit 25298d23.

c24220368.lua

@@ -2,12 +2,6 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,1264319)
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		pre_select_mat_location=s.pre_select_mat_location,
-		fusion_spell_matfilter=s.fusion_spell_matfilter,
-		additional_fcheck=s.fcheck
-	})
 	--Activate 1
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
@@ -16,7 +10,6 @@ function s.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -61,7 +54,12 @@ function s.fcheck(tp,mg,fc,all_mg)
 end
 
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=s.pre_select_mat_location,
+		fusion_spell_matfilter=s.fusion_spell_matfilter,
+		additional_fcheck=s.fcheck
+	})
 	local res=fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)
 	local b1=res and (Duel.GetFlagEffect(tp,id)==0 or not e:IsCostChecked())
 	local b2=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK+LOCATION_REMOVED,0,1,nil)
@@ -99,7 +97,12 @@ end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetLabel()==1 then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			fusfilter=s.fusfilter,
+			pre_select_mat_location=s.pre_select_mat_location,
+			fusion_spell_matfilter=s.fusion_spell_matfilter,
+			additional_fcheck=s.fcheck
+		})
 		fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 	elseif e:GetLabel()==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)

c29143457.lua

 --炎舞－「隠元」
 local s,id,o=GetID()
 function s.initial_effect(c)
-	--- fusion effect
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter()
-	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -13,7 +8,6 @@ function s.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 	--tohand
 	local e2=Effect.CreateEffect(c)
@@ -34,7 +28,10 @@ function s.fusfilter(c)
 end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		fusfilter=s.fusfilter,
+		matfilter=aux.NecroValleyFilter()
+	})
 	if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
 		Duel.BreakEffect()
 		fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)

c3496543.lua

 --白き森の罪宝
 local s,id,o=GetID()
 function s.initial_effect(c)
-	--- fusion effect
-	local e0=FusionSpell.CreateSummonEffect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
@@ -13,7 +11,6 @@ function s.initial_effect(c)
 	e1:SetCondition(s.fscon)
 	e1:SetTarget(s.fstg)
 	e1:SetOperation(s.fsop)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
@@ -39,7 +36,7 @@ end
 function s.fstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local res1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler())
 	local res2=fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)
 	if chk==0 then return res1 or res2 end
 	local op=0
@@ -75,7 +72,7 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp)
 			end
 		end
 	elseif e:GetLabel()==2 then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler())
 		fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 	end
 end

c51510279.lua

 --繋がれし魔鍵
 local s,id,o=GetID()
 function s.initial_effect(c)
-	--- fusion effect
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter(),
-		sumpos=POS_FACEUP_DEFENSE
-	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -16,7 +10,6 @@ function s.initial_effect(c)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -43,7 +36,11 @@ end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local th=Duel.GetFirstTarget()
 	if not th:IsRelateToEffect(e) or Duel.SendtoHand(th,nil,REASON_EFFECT)==0 or not th:IsLocation(LOCATION_HAND) then return end
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		fusfilter=s.fusfilter,
+		matfilter=aux.NecroValleyFilter(),
+		sumpos=POS_FACEUP_DEFENSE
+	})
 	local rmg1=Duel.GetRitualMaterial(tp)
 	local rsg=Duel.GetMatchingGroup(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,nil,s.rfilter,e,tp,rmg1,nil,Card.GetLevel,"Greater")
 	local off=1

c59514116.lua

@@ -2,9 +2,6 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,46986414,38033121)
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		additional_fcheck=s.fcheck
-	})
 	--activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
@@ -14,7 +11,6 @@ function s.initial_effect(c)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -32,7 +28,9 @@ function s.rcheck(tp,g,c)
 end
 
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		additional_fcheck=s.fcheck
+	})
 	local res1=fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)
 	local mg3=Duel.GetRitualMaterial(tp)
 	aux.RCheckAdditional=s.rcheck
@@ -67,7 +65,9 @@ end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetLabel()==0 then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			additional_fcheck=s.fcheck
+		})
 		fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 	elseif e:GetLabel()==1 then
 		::rcancel::

c6153210.lua

 --計都星辰
 local s,id,o=GetID()
 function s.initial_effect(c)
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter()
-	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -13,7 +9,6 @@ function s.initial_effect(c)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -39,7 +34,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 		Duel.AdjustAll()
 		if Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_MZONE,1,nil) then
-			local fusion_effect=e:GetLabelObject()
+			local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+				fusfilter=s.fusfilter,
+				matfilter=aux.NecroValleyFilter()
+			})
 			if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
 				Duel.BreakEffect()
 				Duel.ShuffleHand(tp)

c63181559.lua

 --トリックスター・ディフュージョン
 local s,id,o=GetID()
 function s.initial_effect(c)
-	-- fusion effect
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		pre_select_mat_location=LOCATION_GRAVE,
-		mat_operation_code_map={
-			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
-			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
-		}
-	})
 	--
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
@@ -18,7 +9,6 @@ function s.initial_effect(c)
 	e1:SetCountLimit(1,id)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 	--
 	local e2=Effect.CreateEffect(c)
@@ -44,7 +34,14 @@ function s.filter(c)
 end
 
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=LOCATION_GRAVE,
+		mat_operation_code_map={
+			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+		}
+	})
 	local res=fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0)
 	if chk==0 then
 		return res or Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_EXTRA,0,1,nil)
@@ -73,7 +70,14 @@ end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local op=e:GetLabel()
 	if op==1 then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			fusfilter=s.fusfilter,
+			pre_select_mat_location=LOCATION_GRAVE,
+			mat_operation_code_map={
+				{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+				{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+			}
+		})
 		fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 	elseif op==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)

c6763530.lua

 --烙印追放
 local s,id,o=GetID()
 function s.initial_effect(c)
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter(),
-		pre_select_mat_location=LOCATION_MZONE,
-		pre_select_mat_opponent_location=LOCATION_MZONE,
-		mat_operation_code_map={
-			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
-			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
-		}
-	})
 	--activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -21,7 +11,6 @@ function s.initial_effect(c)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -46,7 +35,16 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 and tc:IsLocation(LOCATION_MZONE) then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			fusfilter=s.fusfilter,
+			matfilter=aux.NecroValleyFilter(),
+			pre_select_mat_location=LOCATION_MZONE,
+			pre_select_mat_opponent_location=LOCATION_MZONE,
+			mat_operation_code_map={
+				{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+				{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+			}
+		})
 		if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 			Duel.BreakEffect()
 			fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)

c71422989.lua

 --吸光融合
 local s,id,o=GetID()
 function s.initial_effect(c)
-	-- fusion
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter(),
-		mat_operation_code_map={
-			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
-			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
-		},
-	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -19,7 +10,6 @@ function s.initial_effect(c)
 	e1:SetCost(s.cost)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 	Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,s.counterfilter)
 end
@@ -64,7 +54,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			fusfilter=s.fusfilter,
+			matfilter=aux.NecroValleyFilter(),
+			mat_operation_code_map={
+				{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+				{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+			},
+		})
 		if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 			Duel.BreakEffect()
 			fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)

c77124096.lua

@@ -2,23 +2,12 @@
 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))
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(s.target)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -27,7 +16,15 @@ function s.fusfilter(c)
 end
 
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		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
+	})
 	local b0=Duel.GetFlagEffect(tp,id)==0 or not e:IsCostChecked()
 	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)
@@ -66,7 +63,15 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.fsop(e,tp,eg,ep,ev,re,r,rp)
-	local fusion_effect=e:GetLabelObject()
+	local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+		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
+	})
 	fusion_effect:GetOperation()(e,tp,eg,ep,ev,re,r,rp)
 end
 

c82738008.lua

@@ -2,16 +2,6 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,68468459)
-	--- fusion effect
-	local e0=FusionSpell.CreateSummonEffect(c,{
-		fusfilter=s.fusfilter,
-		matfilter=aux.NecroValleyFilter(),
-		mat_operation_code_map={
-			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
-			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
-		},
-		stage_x_operation=s.stage_x_operation
-	})
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
@@ -21,7 +11,6 @@ function s.initial_effect(c)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
-	e1:SetLabelObject(e0)
 	c:RegisterEffect(e1)
 end
 
@@ -44,7 +33,15 @@ end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
-		local fusion_effect=e:GetLabelObject()
+		local fusion_effect=FusionSpell.CreateSummonEffect(e:GetHandler(),{
+			fusfilter=s.fusfilter,
+			matfilter=aux.NecroValleyFilter(),
+			mat_operation_code_map={
+				{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+				{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+			},
+			stage_x_operation=s.stage_x_operation
+		})
 		if fusion_effect:GetTarget()(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 			Duel.BreakEffect()
 			Duel.ShuffleHand(tp)