2023/12/26 统一融合术手续

script/RDFusion.lua

 -- Rush Duel 融合术/结合
 RushDuel = RushDuel or {}
 
--- 添加 融合术/结合 素材
+-- 添加 融合术/结合 素材 (指定素材与数量)
 function RushDuel.AddFusionProcedure(card, ...)
-    Auxiliary.AddFusionProcMix(card, true, true, ...)
+    local insf = true
+    local sub = true
+    Auxiliary.AddFusionProcMix(card, sub, insf, ...)
+end
+-- 添加 融合术/结合 素材 (指定条件与数量)
+function RushDuel.AddFusionProcedureType(card, ...)
+    local insf = true
+    local sub = false
+    Auxiliary.AddFusionProcMix(card, sub, insf, ...)
 end
 -- 添加 融合术/结合 素材 (特殊的素材要求)
 function RushDuel.AddFusionProcedureSP(card, matfilter, matcheck, min, max, insf, sub)
@@ -78,6 +86,22 @@ function RushDuel.FusionProcOperation(matfilter, matcheck, min, max, insf, sub)
     end
 end
 
+-- 手动添加融合素材列表
+function RushDuel.SetFusionMaterial(card, codes, min, max)
+    if not card:IsStatus(STATUS_COPYING_EFFECT) then
+		local mt = getmetatable(card)
+		if mt.material == nil then
+			mt.material = {}
+            for _, code in ipairs(codes) do
+                mt.material[code] = true
+            end
+		end
+		if mt.material_count == nil then
+			mt.material_count = { min, max }
+		end
+	end
+end
+
 -- 创建效果: 融合术/结合 召唤
 function RushDuel.CreateFusionEffect(card, matfilter, spfilter, exfilter, s_range, o_range, mat_check, mat_move, target_action, operation_action, including_self)
     local self_range = s_range or 0

script/c120238001.lua

@@ -3,7 +3,7 @@ local cm=_G["c"..m]
 cm.name="五神龙"
 function cm.initial_effect(c)
 	--Fusion Material
-	aux.AddFusionProcFunRep(c,cm.matfilter,5,true)
+	RD.AddFusionProcedureType(c,cm.matfilter,cm.matfilter,cm.matfilter,cm.matfilter,cm.matfilter)
 	--Only Fusion Summon
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)

script/c120244034.lua

@@ -5,7 +5,7 @@ cm.name="银河冠临融合夏娃"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,1,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter)
 	--Draw
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120244035.lua

@@ -5,7 +5,7 @@ cm.name="永恒银河舰忘却龙"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,2,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter,cm.matfilter)
 	--Indes
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120244045.lua

@@ -5,7 +5,7 @@ cm.name="太空融合-额外探险等离子体号"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,1,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter)
 	--Destroy
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120245002.lua

@@ -5,7 +5,7 @@ cm.name="穿越侍·变星之线性海牛侍"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,1,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter)
 	--Atk Up
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120252001.lua

@@ -6,17 +6,7 @@ function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
 	RD.AddFusionProcedureSP(c,cm.matfilter,cm.check,2,3)
-	if not c:IsStatus(STATUS_COPYING_EFFECT) then
-		local mt=getmetatable(c)
-		if c.material==nil then
-			local mat={}
-			mat[120120000]=true
-			mt.material=mat
-		end
-		if mt.material_count==nil then
-			mt.material_count={3,3}
-		end
-	end
+	RD.SetFusionMaterial(c,{120120000},3,3)
 end
 --Fusion Material
 function cm.matfilter(c,fc,sub)

script/c120253035.lua

@@ -5,7 +5,7 @@ cm.name="暗冥厄运巨星"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,1,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter)
 	--To Hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120254019.lua

@@ -5,7 +5,7 @@ cm.name="虚空噬骸兵·混沌战鹰巨人"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material
-	aux.AddFusionProcCodeFun(c,list[1],cm.matfilter,1,true,true)
+	RD.AddFusionProcedure(c,list[1],cm.matfilter)
 	--To Deck
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

script/c120254042.lua

@@ -3,7 +3,7 @@ local cm=_G["c"..m]
 cm.name="传导士 炼金化学人·水雷"
 function cm.initial_effect(c)
 	--Fusion Material
-	aux.AddFusionProcFun2(c,cm.matfilter1,cm.matfilter2,true)
+	RD.AddFusionProcedureType(c,cm.matfilter1,cm.matfilter2)
 	--Atk Up
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))