Add 影牢の呪縛 to new fusion

script/c81788994.lua

+--影牢の呪縛
+local s,id,o=GetID()
+function s.initial_effect(c)
+	c:EnableCounterPermit(0x16)
+	--Activate
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	c:RegisterEffect(e1)
+	--counter
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
+	e2:SetRange(LOCATION_FZONE)
+	e2:SetCondition(s.ctcon)
+	e2:SetOperation(s.ctop)
+	c:RegisterEffect(e2)
+	--atkdown
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_UPDATE_ATTACK)
+	e3:SetRange(LOCATION_FZONE)
+	e3:SetTargetRange(0,LOCATION_MZONE)
+	e3:SetCondition(s.atkcon)
+	e3:SetValue(s.atkval)
+	c:RegisterEffect(e3)
+	-- Each time you Fusion Summon a "Shaddoll" Fusion Monster, you can remove 3 Spellstone Counters from this card to use 1 appropriate face-up monster your opponent controls as 1 of the Fusion Materials.
+	local e4=Effect.CreateEffect(c)
+	e4:SetDescription(aux.Stringid(id,0))
+	e4:SetType(EFFECT_TYPE_FIELD)
+	e4:SetCode(EFFECT_EXTRA_FUSION_MATERIAL)
+	e4:SetRange(LOCATION_FZONE)
+	e4:SetCondition(s.extra_material_con)
+	e4:SetTargetRange(0,LOCATION_MZONE)
+	e4:SetTarget(function(_,mc) return mc:IsFaceup() and mc:IsType(TYPE_MONSTER) end)
+	e4:SetCost(s.extra_material_cost)
+	e4:SetOperation(function() return FusionSpell.FUSION_OPERATION_INHERIT end)
+	e4:SetValue(function(fusion_effect,tc) return tc and tc:IsSetCard(0x9d) and c:IsControler(fusion_effect:GetHandlerPlayer()) end)
+	e4:SetLabel(1)  --- at most 1 material per fusion effect
+	c:RegisterEffect(e4)
+end
+function s.cfilter(c)
+	return c:IsSetCard(0x9d) and c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT)
+end
+function s.ctcon(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(s.cfilter,1,nil)
+end
+function s.ctop(e,tp,eg,ep,ev,re,r,rp)
+	local ct=eg:FilterCount(s.cfilter,nil)
+	---e:GetHandler():AddCounter(0x16,ct)
+	---fake: put 100 counter instead
+	e:GetHandler():AddCounter(0x16,ct*100)
+end
+function s.atkcon(e)
+	return Duel.GetTurnPlayer()~=e:GetHandlerPlayer()
+end
+function s.atkval(e,c)
+	return e:GetHandler():GetCounter(0x16)*-100
+end
+function s.extra_material_con(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsCanRemoveCounter(tp,0x16,3,REASON_ACTION)
+end
+---@param e Effect
+function s.extra_material_cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		return e:GetHandler():IsCanRemoveCounter(tp,0x16,3,REASON_ACTION)
+	end
+	e:GetHandler():RemoveCounter(tp,0x16,3,REASON_ACTION)
+end

script/procedure.lua

@@ -2389,12 +2389,16 @@ FusionSpell = {}
 ---     Opponent-side locations to search for materials before they are selected.
 
 
---- Add LOCATION_EXTRA to EFFECT_EXTRA_FUSION_MATERIAL list, remove once core updated
+--- Add LOCATION_EXTRA and oppoent mzone to EFFECT_EXTRA_FUSION_MATERIAL list, remove once core updated
 function FusionSpell.GetFusionMaterial(tp,locations)
 	local res=Duel.GetFusionMaterial(tp,locations)
-	local g=Duel.GetMatchingGroup(Card.IsHasEffect,tp,LOCATION_EXTRA,0,nil,EFFECT_EXTRA_FUSION_MATERIAL)
-	if #g>0 then
-		res:Merge(g)
+	local g_from_extra=Duel.GetMatchingGroup(Card.IsHasEffect,tp,LOCATION_EXTRA,0,nil,EFFECT_EXTRA_FUSION_MATERIAL)
+	if #g_from_extra>0 then
+		res:Merge(g_from_extra)
+	end
+	local g_from_opponent_field=Duel.GetMatchingGroup(Card.IsHasEffect,tp,0,LOCATION_ONFIELD,nil,EFFECT_EXTRA_FUSION_MATERIAL)
+	if #g_from_opponent_field>0 then
+		res:Merge(g_from_opponent_field)
 	end
 	return res
 end
@@ -2450,8 +2454,8 @@ function FusionSpell.CreateSummonEffect(c,opts)
 	local pre_select_mat_location=opts.pre_select_mat_location or (LOCATION_HAND|LOCATION_MZONE)
 	local mat_operation_code_map=opts.mat_operation_code_map or {}
 	local post_select_mat_location=opts.post_select_mat_location
-	local additional_fcheck=opts.additional_fcheck
-	local additional_gcheck=opts.additional_gcheck
+	local additional_fcheck=opts.additional_fcheck or aux.TRUE
+	local additional_gcheck=opts.additional_gcheck or aux.TRUE
 	local fuslocation=opts.fuslocation or LOCATION_EXTRA
 	local sumtype=opts.sumtype or SUMMON_TYPE_FUSION
 	local sumpos=opts.sumpos or POS_FACEUP
@@ -2505,8 +2509,8 @@ end
 ---@param pre_select_mat_location integer|FUSION_SPELL_PRE_SELECT_MAT_LOCATION_FUNCTION location where to find the materials before known the materials
 ---@param mat_operation_code_map {[integer]:FUSION_OPERATION_CODE}[] operation code to do for the materials, it will be check in order
 ---@param post_select_mat_location integer? location where to find the materials after known the materials
----@param additional_fcheck FUSION_FGCHECK_FUNCTION? function to check the final material group fits the requirement
----@param additional_gcheck FUSION_FGCHECK_FUNCTION? function to check the part of potiential material group fits the requirement to improve performance
+---@param additional_fcheck FUSION_FGCHECK_FUNCTION function to check the final material group fits the requirement
+---@param additional_gcheck FUSION_FGCHECK_FUNCTION function to check the part of potiential material group fits the requirement to improve performance
 ---@param fuslocation integer location where to summon fusion monsters from (default LOCATION_EXTRA), use it on Clock Lizard
 ---@param sumtype integer summon type
 ---@param sumpos integer summon position
@@ -2556,8 +2560,8 @@ end
 ---@param pre_select_mat_location integer|FUSION_SPELL_PRE_SELECT_MAT_LOCATION_FUNCTION location where to find the materials before known the materials
 ---@param mat_operation_code_map {[integer]:FUSION_OPERATION_CODE}[] operation code to do for the materials, it will be check in order
 ---@param post_select_mat_location integer? location where to find the materials after known the materials
----@param additional_fcheck function? function to check the final material group fits the requirement
----@param additional_gcheck function? function to check the part of potiential material group fits the requirement to improve performance
+---@param additional_fcheck function function to check the final material group fits the requirement
+---@param additional_gcheck function function to check the part of potiential material group fits the requirement to improve performance
 ---@param fuslocation integer location where to summon fusion monsters from, use it on Clock Lizard
 ---@param sumtype integer summon type
 ---@param sumpos integer summon position
@@ -2634,9 +2638,7 @@ function FusionSpell.GetSummonOperation(
 							mat_operation_code_map,
 							post_select_mat_location,
 							pre_select_mat_opponent_location)
-					if additional_fcheck~=nil then
-						aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunction(additional_fcheck,tp,tc)
-					end
+					aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunction(additional_fcheck,tp,tc,pre_select_mat_location,post_select_mat_location,pre_select_mat_opponent_location)
 					materials=Duel.SelectFusionMaterial(tp,tc,mg,nil,tp)
 					aux.FCheckAdditional=nil
 				else
@@ -2645,9 +2647,7 @@ function FusionSpell.GetSummonOperation(
 					local chain_material_filter=fusion_effect:GetTarget()
 					local chain_mg=chain_material_filter(fusion_effect,e,tp)
 					assert(#chain_mg>0, "we are trying to apply a chain material, but it has no possible material")
-					if additional_fcheck~=nil then
 					aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunctionForChainMaterial(additional_fcheck)
-					end
 					materials=Duel.SelectFusionMaterial(tp,tc,chain_mg)
 					aux.FCheckAdditional=nil
 				end
@@ -2665,17 +2665,22 @@ function FusionSpell.GetSummonOperation(
 					local applied_extra_effects={}
 					---@type {[FUSION_OPERATION_FUNCTION]:Group}
 					local material_grouped_by_op={}
-					local materials_with_one_material_effect=materials:Filter(function(mc) return (#FusionSpell.GetMaterialEffects(mc,tc,all_locations,materials))==1 end,nil)
+					local materials_with_one_material_effect=materials:Filter(function(mc) return (#FusionSpell.GetMaterialEffects(mc,tp,tc,all_locations,pre_select_mat_opponent_location))==1 end,nil)
 					for material in aux.Next(materials_with_one_material_effect) do
 						--For material that can be material only by 1 effect, either fusion spell or extra material effect, do the operation on it.
 						local fusion_operation=nil
-						local material_effect=FusionSpell.GetMaterialEffects(material,tc,all_locations,materials)[1]
+						local material_effect=FusionSpell.GetMaterialEffects(material,tp,tc,all_locations,pre_select_mat_opponent_location)[1]
 
 						if material_effect==true then
 							local fusion_operation_code=FusionSpell.GetOperationCodeByMaterialLocation(material:GetLocation(),mat_operation_code_map)
 							fusion_operation=FusionSpell.GetFusionOperationByCode(fusion_operation_code)
 						else
 							-- extra material effects
+							--- pay the operation cost, only valid in 影牢の呪縛 as of 2025 May
+							local material_cost=material_effect:GetCost()
+							if material_cost~=nil then
+								material_cost(material_effect,tp,eg,ep,ev,re,r,rp)
+							end
 							local fusion_operation_code=material_effect:GetOperation()()
 							fusion_operation=FusionSpell.GetFusionOperationByCode(fusion_operation_code,material:GetLocation(),mat_operation_code_map)
 							applied_extra_effects[material_effect]=true
@@ -2685,9 +2690,11 @@ function FusionSpell.GetSummonOperation(
 						material_grouped_by_op[fusion_operation]=material_grouped_by_op[fusion_operation] or Group.CreateGroup()
 						material_grouped_by_op[fusion_operation]:AddCard(material)
 					end
-					local materials_with_two_material_effect=materials:Filter(function(mc) return (#FusionSpell.GetMaterialEffects(mc,tc,all_locations,materials))==2 end,nil)
+					local materials_with_two_material_effect=materials:Filter(function(mc) return (#FusionSpell.GetMaterialEffects(mc,tp,tc,all_locations,pre_select_mat_opponent_location))==2 end,nil)
 					assert(#materials_with_one_material_effect+#materials_with_two_material_effect==#materials, "We can not have one material have zero/3+ material effect yet")
 					--For material that can be material by multiple effect, ask user which to apply.
+					--As of 2025 May, if a material could be used as extra material, it must be able to be used as fusion spell material. The code below is based on this assumption.
+					--   If we have Aiラブ融合 + 影牢の呪縛 or 多層融合 + アマゾネスの秘術 in same archetype, is code would fail in some scenario.
 					--First, group them by extra_material_effect
 					---@type {[Effect]:Group}
 					local material_grouped_by_extra_material_effect={}
@@ -2698,10 +2705,12 @@ function FusionSpell.GetSummonOperation(
 						material_grouped_by_extra_material_effect[material_effect]:AddCard(material)
 					end
 
-					--For each group, let user select the material that apply the extra material effect
+					---For each group, let user select the material that apply the extra material effect.
 					for material_effect,grouped_materials in pairs(material_grouped_by_extra_material_effect) do
 						Duel.Hint(HINT_SELECTMSG,tp,material_effect:GetDescription())
-						local materials_to_apply=grouped_materials:Select(tp,0,#grouped_materials,nil)
+						--- in case of アマゾネスの秘術 or 影牢の呪縛, limit the maximuim number to choose
+						local extra_material_limit=material_effect:GetLabel() or #grouped_materials
+						local materials_to_apply=grouped_materials:Select(tp,0,extra_material_limit,nil)
 						local rest_materials=grouped_materials-materials_to_apply
 						if #rest_materials>0 then
 							for material in aux.Next(rest_materials) do
@@ -2717,6 +2726,11 @@ function FusionSpell.GetSummonOperation(
 							for material in aux.Next(materials_to_apply) do
 								local fusion_operation=FusionSpell.GetFusionOperationByCode(fusion_operation_code,material:GetLocation(),mat_operation_code_map)
 								assert(fusion_operation~=nil)
+								--- pay the operation cost, only valid in 影牢の呪縛 as of 2025 May
+								local material_cost=material_effect:GetCost()
+								if material_cost~=nil then
+									material_cost(material_effect,tp,eg,ep,ev,re,r,rp)
+								end
 								material_grouped_by_op[fusion_operation]=material_grouped_by_op[fusion_operation] or Group.CreateGroup()
 								material_grouped_by_op[fusion_operation]:AddCard(material)
 							end
@@ -2741,7 +2755,7 @@ function FusionSpell.GetSummonOperation(
 				else
 					--- fusion with chain material
 					fusion_effect:GetOperation()(e,e,tp,tc,materials,sumtype,sumpos)
-					--- use the chain material effect, reset if exhaused
+					--- use the chain material effect, reset if exhausted
 					fusion_effect:UseCountLimit(tp)
 					if fusion_effect:CheckCountLimit(tp)==false then
 						fusion_effect:Reset()
@@ -2813,6 +2827,7 @@ function FusionSpell.GetMaterialsGroupForTargetCard(
 	--- workaround until core fixes
 	mg=mg:Filter(FusionSpell.IsCanBeFusionMaterial,tc,sumtype)
 	--- in order to be qualified for being material, it need to be able to perform the operation.
+	--- @param mc Card
 	mg=mg:Filter(function(mc)
 		local can_be_fusion_spell_material=false
 		if mc:IsLocation(all_locations) then
@@ -2860,9 +2875,7 @@ function FusionSpell.SummonTargetFilter(c,fusfilter,matfilter,e,tp,pre_select_ma
 		return false
 	end
 	local mg=FusionSpell.GetMaterialsGroupForTargetCard(c,tp,e,matfilter,pre_select_mat_location,mat_operation_code_map,post_select_mat_location,sumtype,pre_select_mat_opponent_location)
-	if additional_fcheck~=nil then
-		aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunction(additional_fcheck,tp,c)
-	end
+	aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunction(additional_fcheck,tp,c,pre_select_mat_location,post_select_mat_location,pre_select_mat_opponent_location)
 	res=c:CheckFusionMaterial(mg,nil,tp)
 	aux.FCheckAdditional=nil
 	return res
@@ -2914,9 +2927,7 @@ function FusionSpell.ChainMaterialSummonTargetFilter(c,fusfilter,e,tp,mg,additio
 	if res==false then
 		return false
 	end
-	if additional_fcheck~=nil then
 	aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunctionForChainMaterial(additional_fcheck)
-	end
 	res=c:CheckFusionMaterial(mg,nil,tp)
 	aux.FCheckAdditional=nil
 	return res
@@ -2960,7 +2971,7 @@ function FusionSpell.GetFusionOperationByCode(code,matlocation,fusion_spell_oper
 			assert(false, "we have a material that inhreits, but operation can be inhreited")
 			return FusionSpell.GraveMaterial
 		end
-		return FusionSpell.GetFusionOperationByCode(fusion_spell_operation_code_map[matlocation])
+		return FusionSpell.GetFusionOperationByCode(FusionSpell.GetOperationCodeByMaterialLocation(matlocation,fusion_spell_operation_code_map))
 	end
 end
 
@@ -2984,7 +2995,7 @@ function FusionSpell.GetFusionFilterByCode(code,matlocation,fusion_spell_operati
 			assert(false, "we have a material that inhreits, but operation can be inhreited")
 			return FusionSpell.GraveMaterialFilter
 		end
-		return FusionSpell.GetFusionFilterByCode(fusion_spell_operation_code_map[matlocation])
+		return FusionSpell.GetFusionFilterByCode(FusionSpell.GetOperationCodeByMaterialLocation(matlocation,fusion_spell_operation_code_map))
 	end
 end
 
@@ -3054,10 +3065,20 @@ end
 
 --Returns a list of effect, if element is the EFFECT_EXTRA_FUSION_MATERIAL, stands for it can be included by that extra material effect.
 --if element is true, stands for it can be included by the fusion effect itself.
+---@param pre_select_mat_opponent_location integer|FUSION_SPELL_PRE_SELECT_MAT_LOCATION_FUNCTION? location where to find the materials before known the materials on opponent location
 ---@return (true|Effect)[]
-function FusionSpell.GetMaterialEffects(c,summon_card,matlocation,materials)
+function FusionSpell.GetMaterialEffects(c,tp,summon_card,matlocation,pre_select_mat_opponent_location)
 	local res={}
-	if c:IsLocation(matlocation) then
+	if pre_select_mat_opponent_location~=nil then
+	 	if type(pre_select_mat_opponent_location)=="function" then
+			pre_select_mat_opponent_location=pre_select_mat_opponent_location(summon_card,tp)
+		end
+	else
+		pre_select_mat_opponent_location=0
+	end
+	if c:IsControler(tp) and c:IsLocation(matlocation) then
+		table.insert(res,true)
+	elseif c:IsControler(1-tp) and c:IsLocation(pre_select_mat_opponent_location) then
 		table.insert(res,true)
 	end
 	local extra_effs={c:IsHasEffect(EFFECT_EXTRA_FUSION_MATERIAL)}
@@ -3121,9 +3142,38 @@ function FusionSpell.MultiMaterialEffectPrompt(effects,tp,e)
 end
 
 --- filter out materials that does not necessary come from fusion spell and pass to the gcheck of fusion spell
+--- for each extra material effect, check the maximuim size is not exceeded.
+--As of 2025 May, if a material could be used as extra material, it must be able to be used as fusion spell material. The code below is based on this assumption.
+--   If we have Aiラブ融合 + 影牢の呪縛 or 多層融合 + アマゾネスの秘術 in same archetype, is code would fail in some scenario.
 --- @param fusion_spell_additional_fcheck_function FUSION_FGCHECK_FUNCTION
-function FusionSpell.GetFusionSpellFCheckAdditionalFunction(fusion_spell_additional_fcheck_function,tp,tc)
+function FusionSpell.GetFusionSpellFCheckAdditionalFunction(fusion_spell_additional_fcheck_function,tp,tc,pre_select_mat_location,post_select_mat_oppoent_location,pre_select_mat_oppoent_location)
+	---@param mg Group
 	return (function(f_tp,mg,fc)
+		--- filter out materials that can only be added by extra material effects, and check the count limit
+		local mandartory_extra_mg=mg:Filter(function (mc)
+			local material_effects=FusionSpell.GetMaterialEffects(mc,tp,tc,FusionSpell.GetAllLocationsForTargetCard(tc,tp,pre_select_mat_location,post_select_mat_oppoent_location),pre_select_mat_oppoent_location)
+			if (#material_effects)==1 and material_effects[1]~=true then
+				return true
+			end
+			return false
+		end,nil)
+		--- group by extra material effect
+		---@type {[Effect]:Group}
+		local material_grouped_by_extra_material_effect={}
+		for material in aux.Next(mandartory_extra_mg) do
+			local material_effect=FusionSpell.GetExtraMaterialEffect(material,tp,tc)
+			material_grouped_by_extra_material_effect[material_effect]=material_grouped_by_extra_material_effect[material_effect] or Group.CreateGroup()
+			material_grouped_by_extra_material_effect[material_effect]:AddCard(material)
+		end
+		--- check count limit for each effect
+		for extra_material_effect,materials in pairs(material_grouped_by_extra_material_effect) do
+			if extra_material_effect:GetLabel()~=nil then
+				if #materials>extra_material_effect:GetLabel() then
+					return false
+				end
+			end
+		end
+		
 		local extra_mg=mg:Filter(FusionSpell.GetExtraMaterialEffect,nil,tp,tc)
 		return fusion_spell_additional_fcheck_function(f_tp,mg-extra_mg,fc,mg)
 	end)