Merge branch 'new-fusion' into 'master'

Add 神炎竜ルベリオン アマゾネスの秘術 影牢の呪縛 to new fusion

See merge request mycard/pre-release-database-cdb!196

script/c48130397.lua

@@ -16,6 +16,9 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function s.extra_target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		return true
+	end
 	if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
 		Duel.SetChainLimit(aux.FALSE)
 	end

script/c70534340.lua

+--神炎竜ルベリオン
+local s,id,o=GetID()
+function s.initial_effect(c)
+	--fusion material
+	c:EnableReviveLimit()
+	aux.AddFusionProcCodeFun(c,68468459,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),1,true,true)
+	--spsummon
+	local e1=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=LOCATION_GRAVE|LOCATION_ONFIELD|LOCATION_REMOVED,
+		mat_operation_code_map={
+			{ [LOCATION_DECK] = FusionSpell.FUSION_OPERATION_GRAVE },
+			{ [0xff] = FusionSpell.FUSION_OPERATION_SHUFFLE }
+		},
+		extra_target=s.extra_target
+	})
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1,id)
+	e1:SetCondition(s.spcon)
+	e1:SetCost(s.spcost)
+	c:RegisterEffect(e1)
+end
+
+function s.branded_fusion_check(tp,sg,fc)
+	return aux.gffcheck(sg,Card.IsFusionCode,68468459,function(c) return c:IsFusionAttribute(ATTRIBUTE_DARK) and (not c:IsHasEffect(6205579)) end)
+end
+
+function s.spcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
+end
+
+---@param c Card
+function s.fusfilter(c)
+	return (not c:IsCode(id)) and c:IsLevelBelow(8)
+end
+
+function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
+	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
+end
+
+function s.extra_target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		return true
+	end
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED)
+end

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)
+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/c86758746.lua

+--アマゾネスの秘術
+local s,id,o=GetID()
+function s.initial_effect(c)
+	--Activate
+	local e1=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter
+	})
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetHintTiming(0,TIMING_END_PHASE)
+	e1:SetCountLimit(1,id)
+	c:RegisterEffect(e1)
+	--to hand
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetRange(LOCATION_GRAVE)
+	e2:SetCountLimit(1,id)
+	e2:SetCost(aux.bfgcost)
+	e2:SetOperation(s.fusop)
+	c:RegisterEffect(e2)
+end
+function s.fusfilter(c)
+	return c:IsSetCard(0x4)
+end
+function s.fusop(e,tp,eg,ep,ev,re,r,rp)
+	--Once this turn, if you Fusion Summon an "Amazoness" Fusion Monster this turn, you can also send 1 "Amazoness" monster from your Extra Deck to the GY as material.
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_EXTRA_FUSION_MATERIAL)
+	e1:SetCountLimit(1)
+	e1:SetTargetRange(LOCATION_EXTRA,0)
+	e1:SetTarget(function(_,c) return c:IsAbleToGrave() and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x4) end)
+	e1:SetOperation(function() return FusionSpell.FUSION_OPERATION_GRAVE end)
+	e1:SetValue(function(fusion_effect,c) return c and c:IsSetCard(0x4) and c:IsControler(fusion_effect:GetHandlerPlayer()) end)
+	e1:SetLabel(1)  --- at most 1 material per fusion effect
+	e1:SetReset(RESET_PHASE|PHASE_END)
+	Duel.RegisterEffect(e1,tp)
+end

script/procedure.lua

@@ -967,7 +967,7 @@ function Auxiliary.FOperationMix(insf,sub,...)
 end
 function Auxiliary.FConditionFilterMix(c,fc,sub,notfusion,...)
 	local check_type=notfusion and SUMMON_TYPE_SPECIAL or SUMMON_TYPE_FUSION
-	if not c:IsCanBeFusionMaterial(fc,check_type) then return false end
+	if not FusionSpell.IsCanBeFusionMaterial(c,fc,check_type) then return false end
 	for i,f in ipairs({...}) do
 		if f(c,fc,sub) then return true end
 	end
@@ -1369,7 +1369,7 @@ function Auxiliary.AddFusionProcShaddoll(c,attr)
 	c:RegisterEffect(e1)
 end
 function Auxiliary.FShaddollFilter(c,fc,attr)
-	return (Auxiliary.FShaddollFilter1(c) or Auxiliary.FShaddollFilter2(c,attr)) and c:IsCanBeFusionMaterial(fc) and not c:IsHasEffect(6205579)
+	return (Auxiliary.FShaddollFilter1(c) or Auxiliary.FShaddollFilter2(c,attr)) and FusionSpell.IsCanBeFusionMaterial(c,fc) and not c:IsHasEffect(6205579)
 end
 function Auxiliary.FShaddollExFilter(c,fc,attr,fe)
 	return c:IsFaceup() and not c:IsImmuneToEffect(fe) and Auxiliary.FShaddollFilter(c,fc,attr)
@@ -1449,7 +1449,7 @@ end
 
 --Fusion Summon Effect
 function Auxiliary.FMaterialFilter(c,e,tp)
-	return c:IsCanBeFusionMaterial()
+	return FusionSpell.IsCanBeFusionMaterial(c)
 end
 function Auxiliary.FMaterialRemoveFilter(c,e,tp)
 	return c:IsAbleToRemove()
@@ -1720,7 +1720,7 @@ function Auxiliary.AddContactFusionProcedure(c,filter,self_location,opponent_loc
 	return e2
 end
 function Auxiliary.ContactFusionMaterialFilter(c,fc,filter)
-	return c:IsCanBeFusionMaterial(fc,SUMMON_TYPE_SPECIAL) and (not filter or filter(c,fc))
+	return FusionSpell.IsCanBeFusionMaterial(c,fc,SUMMON_TYPE_SPECIAL) and (not filter or filter(c,fc))
 end
 function Auxiliary.ContactFusionCondition(filter,self_location,opponent_location)
 	return	function(e,c)
@@ -2368,7 +2368,7 @@ FusionSpell = {}
 ---         { [0xff] = FusionSpell.FUSION_OPERATION_GRAVE }
 ---     }
 ---     ```
---- @field post_select_mat_location? integer|nil
+--- @field post_select_mat_location? integer
 ---     Location(s) to look for materials after they've been selected.
 --- @field additional_fcheck? FUSION_FGCHECK_FUNCTION
 ---     Optional final check to validate the selected material group.
@@ -2389,16 +2389,45 @@ 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 opponent 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
 
+--- Workaround for IsCanBeFusionMaterial, remove once core fixes
+--- @param c Card
+--- @param tc Card
+--- @param sumtype? integer
+function FusionSpell.IsCanBeFusionMaterial(c,tc,sumtype)
+	sumtype=sumtype or SUMMON_TYPE_FUSION
+	--- Prohibition will prevent card to be fusion material
+	if c:IsForbidden()==true then
+		return false
+	end
+	local can_not_be_fusion_material_effects={c:IsHasEffect(EFFECT_CANNOT_BE_FUSION_MATERIAL)}
+	for _,effect in ipairs(can_not_be_fusion_material_effects) do
+		local value=effect:GetValue()
+		if value~=nil then
+			if type(value)=='function' and value(effect,tc,sumtype)==true then
+				return false
+			elseif value==1 or value==true then
+				return false
+			end
+		end
+	end
+	return true
+end
+
 --- Get possible materials from opponent locations, must be face-up
 function FusionSpell.GetFusionMaterialFromOpponentLocation(tp,locations)
 	return Duel.GetMatchingGroup(Card.IsFaceup,tp,0,locations,nil)
@@ -2406,7 +2435,7 @@ end
 
 --- Registers a Fusion Summon effect to a card.
 --- @param c Card                         -- The card to register the effect to.
---- @param opts FusionEffectParams
+--- @param opts? FusionEffectParams
 --- @return Effect                        -- The registered effect object.
 function FusionSpell.RegisterSummonEffect(c,opts)
 	local e1 = FusionSpell.CreateSummonEffect(c,opts)
@@ -2421,19 +2450,19 @@ end
 --- @return Effect The created and configured `Effect` object.
 function FusionSpell.CreateSummonEffect(c,opts)
 	opts=opts or {}
-    local fusfilter=opts.fusfilter
+	local fusfilter=opts.fusfilter or aux.TRUE
 	local matfilter=opts.matfilter or aux.TRUE
-    local pre_select_mat_location=opts.pre_select_mat_location or (LOCATION_HAND | LOCATION_MZONE)
+	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
 	local stage_x_operation=opts.stage_x_operation or aux.TRUE
-    local extra_target=opts.extra_target
-    local pre_select_mat_opponent_location=opts.pre_select_mat_opponent_location
+	local extra_target=opts.extra_target or aux.TRUE
+	local pre_select_mat_opponent_location=opts.pre_select_mat_opponent_location or 0
 
 	-- Ensure material operation fallbacks are present
 	table.insert(mat_operation_code_map,{ [LOCATION_GRAVE] = FusionSpell.FUSION_OPERATION_BANISH })
@@ -2476,18 +2505,18 @@ function FusionSpell.CreateSummonEffect(c,opts)
 	return e1
 end
 
----@param fusfilter (fun(c:Card):boolean)? filter for the monster to be Fusion Summoned
----@param matfilter (fun(c:Card):boolean)? filter for the materials, use it only under very strong limitation like D-Fusion.
----@param pre_select_mat_location (integer|FUSION_SPELL_PRE_SELECT_MAT_LOCATION_FUNCTION)? location where to find the materials before known the materials
+---@param fusfilter fun(c:Card):boolean filter for the monster to be Fusion Summoned
+---@param matfilter fun(c:Card):boolean filter for the materials, use it only under very strong limitation like D-Fusion.
+---@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 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
----@param extra_target function? extra target function to add opration info etc
----@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
+---@param extra_target fun(e:Effect, tp:integer, eg:Group, ep:integer, ev:integer, re:Effect, r:integer, rp:integer, chk:integer):nil extra target function to add opration info etc
+---@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
 function FusionSpell.GetSummonTarget(
 		fusfilter,
 		matfilter,
@@ -2503,6 +2532,9 @@ function FusionSpell.GetSummonTarget(
 		pre_select_mat_opponent_location)
 	return function(e,tp,eg,ep,ev,re,r,rp,chk)
 		if chk==0 then
+			if extra_target(e,tp,eg,ep,ev,re,r,rp,chk)==false then
+				return false
+			end
 			local sg=Duel.IsExistingMatchingCard(
 					FusionSpell.SummonTargetFilter,tp,fuslocation,0,1,nil,
 					--- FusionSpell.SummonTargetFilter param
@@ -2520,10 +2552,8 @@ function FusionSpell.GetSummonTarget(
 			return false
 		end
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,fuslocation)
-		if extra_target~=nil then
 		extra_target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
-    end
 end
 
 ---@param fusfilter fun(c:Card):boolean filter for the monster to be Fusion Summoned
@@ -2531,13 +2561,13 @@ 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
 ---@param stage_x_operation function callback function when special summon is in progress. will be called with different stage name
----@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
+---@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
 function FusionSpell.GetSummonOperation(
 		fusfilter,
 		matfilter,
@@ -2608,10 +2638,9 @@ function FusionSpell.GetSummonOperation(
 							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,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
@@ -2620,9 +2649,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,tp,c)
-					end
+					aux.FCheckAdditional=FusionSpell.GetFusionSpellFCheckAdditionalFunctionForChainMaterial(additional_fcheck)
 					materials=Duel.SelectFusionMaterial(tp,tc,chain_mg)
 					aux.FCheckAdditional=nil
 				end
@@ -2636,39 +2663,79 @@ function FusionSpell.GetSummonOperation(
 					--- fusion with fusion spell
 					tc:SetMaterial(materials)
 					local all_locations=FusionSpell.GetAllLocationsForTargetCard(tc,tp,pre_select_mat_location,post_select_mat_location)
-					---@type Effect[]
+					---@type {[Effect]:true}
 					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,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.
-					--For material that can be material by multiple effect, ask user which to apply.
-					for material in aux.Next(materials) do
-						local material_effects=FusionSpell.GetMaterialEffects(material,tc,all_locations,materials)
-						if material_effects~=nil and #material_effects>0 then
-							local material_effect=nil
-							if #material_effects==1 then
-								material_effect=material_effects[1]
-							else
-								-- more than one effect. ask player to choose from one.
-								-- TODO: let user select them in group
-								material_effect=FusionSpell.MultiMaterialEffectPrompt(material_effects,tp,e)
-							end
 						local fusion_operation=nil
+						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)
-								table.insert(applied_extra_effects,material_effect)
+							applied_extra_effects[material_effect]=true
 						end
+
 						assert(fusion_operation~=nil)
 						material_grouped_by_op[fusion_operation]=material_grouped_by_op[fusion_operation] or Group.CreateGroup()
 						material_grouped_by_op[fusion_operation]:AddCard(material)
-						else
-							--else we are in trouble
-							assert(false,string.format("card %d has no material effect",material:GetCode()))
+					end
+					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={}
+					for material in aux.Next(materials_with_two_material_effect) do
+						local material_effect=FusionSpell.GetExtraMaterialEffect(material,tp,tc)
+						assert(material_effect~=nil, "We can not have a material w/o extra material effect when it has 2 options")
+						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
+
+					---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())
+						--- 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
+								local fusion_operation_code=FusionSpell.GetOperationCodeByMaterialLocation(material:GetLocation(),mat_operation_code_map)
+								local fusion_operation=FusionSpell.GetFusionOperationByCode(fusion_operation_code)
+								material_grouped_by_op[fusion_operation]=material_grouped_by_op[fusion_operation] or Group.CreateGroup()
+								material_grouped_by_op[fusion_operation]:AddCard(material)
+							end
+						end
+						if #materials_to_apply>0 then
+							applied_extra_effects[material_effect]=true
+							local fusion_operation_code=material_effect:GetOperation()()
+							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
 						end
 					end
 
@@ -2678,7 +2745,7 @@ function FusionSpell.GetSummonOperation(
 					end
 
 					-- mark effect as used once. if count limit reached, reset the effect
-					for _,effect in ipairs(applied_extra_effects) do
+					for effect,_ in pairs(applied_extra_effects) do
 						effect:UseCountLimit(tp)
 						if effect:CheckCountLimit(tp)==false then
 							effect:Reset()
@@ -2690,7 +2757,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()
@@ -2712,12 +2779,13 @@ end
 ---@return integer locations all possible locations of the material
 function FusionSpell.GetAllLocationsForTargetCard(tc,tp,pre_select_mat_location,post_select_mat_location)
 	local all_locations=0
+	if pre_select_mat_location~=nil then
 		if type(pre_select_mat_location)=="function" then
 			all_locations=all_locations|pre_select_mat_location(tc,tp)
 		else
-		assert(pre_select_mat_location~=nil, "pre_select_mat_location is nil")
 			all_locations=all_locations|pre_select_mat_location
 		end
+	end
 	if post_select_mat_location~=nil then
 		all_locations=all_locations|post_select_mat_location
 	end
@@ -2726,7 +2794,7 @@ end
 
 ---@param matfilter	fun(c:Card):boolean filter for the materials, use it only under very strong limitation like D-Fusion.
 ---@param pre_select_mat_location integer|function location where to find the materials before known the materials
----@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
+---@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
 function FusionSpell.GetMaterialsGroupForTargetCard(
 		tc,
 		tp,
@@ -2735,27 +2803,33 @@ function FusionSpell.GetMaterialsGroupForTargetCard(
 		pre_select_mat_location,
 		mat_operation_code_map,
 		post_select_mat_location,
-		pre_select_mat_opponent_location)
+		sumtype,
+		pre_select_mat_opponent_location
+	)
 	local all_locations=FusionSpell.GetAllLocationsForTargetCard(tc,tp,pre_select_mat_location,post_select_mat_location)
 	local mg=FusionSpell.GetFusionMaterial(tp,all_locations)
-
-	if pre_select_mat_opponent_location~=nil then
+	local calculated_mat_opponent_location=0
 	if type(pre_select_mat_opponent_location)=="function" then
-			pre_select_mat_opponent_location=pre_select_mat_opponent_location(tc,tp)
+		calculated_mat_opponent_location=pre_select_mat_opponent_location(tc,tp)
+	else
+		calculated_mat_opponent_location=pre_select_mat_opponent_location
 	end
-		local opponent_mg=FusionSpell.GetFusionMaterialFromOpponentLocation(tp,pre_select_mat_opponent_location)
+	local opponent_mg=FusionSpell.GetFusionMaterialFromOpponentLocation(tp,calculated_mat_opponent_location)
 	if #opponent_mg>0 then
 		mg:Merge(opponent_mg)
 	end
-	end
 
 	-- filter by the strong material filter, target card can not be fusion material of itself
 	mg=mg:Filter(matfilter,tc)
 	--- filter out card can not be affected by effect
 	mg=mg:Filter(aux.NOT(Card.IsImmuneToEffect),nil,e)
 	--- filter out card can not be material
-	mg=mg:Filter(Card.IsCanBeFusionMaterial,nil,tc)
+	--- comment out, currently core can not return correct value if affected by EFFECT_EXTRA_FUSION_MATERIAL.
+	--mg=mg:Filter(Card.IsCanBeFusionMaterial,tc)
+	--- 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
@@ -2782,7 +2856,7 @@ function FusionSpell.GetMaterialsGroupForTargetCard(
 end
 
 ---@param location integer
----@param mat_operation_code_map {[integer]:FUSION_OPERATION_CODE}[]? operation code to do for the materials, it will be check in order
+---@param mat_operation_code_map {[integer]:FUSION_OPERATION_CODE}[] operation code to do for the materials, it will be check in order
 function FusionSpell.GetOperationCodeByMaterialLocation(location,mat_operation_code_map)
 	for _,map in ipairs(mat_operation_code_map) do
 		for key,value in pairs(map) do
@@ -2798,14 +2872,12 @@ end
 ---@param pre_select_mat_location integer|function location where to find the materials before known the materials (default LOCATION_HAND|LOCATION_MZONE)
 ---@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
 function FusionSpell.SummonTargetFilter(c,fusfilter,matfilter,e,tp,pre_select_mat_location,mat_operation_code_map,post_select_mat_location,additional_fcheck,sumtype,sumpos,pre_select_mat_opponent_location)
-	local res=c:IsType(TYPE_FUSION) and (not fusfilter or fusfilter(c,tp)) and c:IsCanBeSpecialSummoned(e,sumtype,tp,false,false,sumpos)
+	local res=c:IsType(TYPE_FUSION) and fusfilter(c,tp) and c:IsCanBeSpecialSummoned(e,sumtype,tp,false,false,sumpos)
 	if res==false then
 		return false
 	end
-	local mg=FusionSpell.GetMaterialsGroupForTargetCard(c,tp,e,matfilter,pre_select_mat_location,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,c)
-	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)
+	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
@@ -2851,14 +2923,13 @@ function FusionSpell.IsExistsChainMaterialSummonTargets(e,tp,fusfilter,additiona
 end
 
 ---@param c Card
+---@return boolean result Whether c could be fusion summoned by this chain material effect
 function FusionSpell.ChainMaterialSummonTargetFilter(c,fusfilter,e,tp,mg,additional_fcheck,sumtype,sumpos)
 	local res=c:IsType(TYPE_FUSION) and (not fusfilter or fusfilter(c,tp)) and c:IsCanBeSpecialSummoned(e,sumtype,tp,false,false,sumpos)
 	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
@@ -2899,10 +2970,10 @@ function FusionSpell.GetFusionOperationByCode(code,matlocation,fusion_spell_oper
 	elseif code==FusionSpell.FUSION_OPERATION_INHERIT then
 		if matlocation==nil or fusion_spell_operation_code_map==nil then
 			-- we are in trouble
-			assert(false, "we have an material that inhreits, but operation can be inhreited")
+			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
 
@@ -2923,9 +2994,10 @@ function FusionSpell.GetFusionFilterByCode(code,matlocation,fusion_spell_operati
 	elseif code==FusionSpell.FUSION_OPERATION_INHERIT then
 		if matlocation==nil or fusion_spell_operation_code_map==nil then
 			-- we are in trouble
-			return nil
+			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
 
@@ -2995,10 +3067,19 @@ 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
+	local calculated_mat_opponent_location=0
+	if type(pre_select_mat_opponent_location)=="function" then
+		calculated_mat_opponent_location=pre_select_mat_opponent_location(summon_card,tp)
+	else
+		calculated_mat_opponent_location=pre_select_mat_opponent_location
+	end
+	if c:IsControler(tp) and c:IsLocation(matlocation) then
+		table.insert(res,true)
+	elseif c:IsControler(1-tp) and c:IsLocation(calculated_mat_opponent_location) then
 		table.insert(res,true)
 	end
 	local extra_effs={c:IsHasEffect(EFFECT_EXTRA_FUSION_MATERIAL)}
@@ -3062,17 +3143,51 @@ 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
---- @param fusion_spell_additional_fcheck_function FUSION_FGCHECK_FUNCTION
-function FusionSpell.GetFusionSpellFCheckAdditionalFunction(fusion_spell_additional_fcheck_function,tp,tc)
+--- 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
+---@param tp integer
+---@param tc Card
+---@param pre_select_mat_location integer|function location where to find the materials before known the materials (default LOCATION_HAND|LOCATION_MZONE)
+---@param post_select_mat_location integer?
+---@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
+function FusionSpell.GetFusionSpellFCheckAdditionalFunction(fusion_spell_additional_fcheck_function,tp,tc,pre_select_mat_location,post_select_mat_location,pre_select_mat_opponent_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_location),pre_select_mat_opponent_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)
 end
 
---- all material must come from chain material, only pass all and pass to the gcheck of fusion spell
+--- all material must come from chain material, only pass all material group to the gcheck of fusion spell
 --- @param fusion_spell_additional_fcheck_function FUSION_FGCHECK_FUNCTION
-function FusionSpell.GetFusionSpellFCheckAdditionalFunctionForChainMaterial(fusion_spell_additional_fcheck_function,tp,c)
+function FusionSpell.GetFusionSpellFCheckAdditionalFunctionForChainMaterial(fusion_spell_additional_fcheck_function)
 	return (function(f_tp,mg,fc)
 		return fusion_spell_additional_fcheck_function(f_tp,Group.CreateGroup(),fc,mg)
 	end)