Merge branch 'new-fusion-Vision-Fusion' into 'master'

Add 幻影融合 to new fusion + add fusion_spell_matfilter to FusionSpell opts + add LOCATION to 捕食植物トリアンティス

See merge request !15

c17825378.lua

@@ -11,7 +11,7 @@ function s.initial_effect(c)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetTargetRange(LOCATION_PZONE,0)
 	e1:SetValue(s.mtval)
-	e1:SetOperation(function() return FusionSpell.FUSION_OPERATION_INHERIT end)
+	e1:SetOperation(function() return FusionSpell.FUSION_OPERATION_INHERIT|LOCATION_MZONE end)
 	-- as of 2025 May, there is no card can add LOCATION_MZONE base on material group. So we can just check pre_select_mat_location.
 	e1:SetLabel(0,LOCATION_MZONE) ---  only avaliable when pre_select_mat_location contains LOCATION_MZONE, 1st number is limitaion of count materials, set 0 as infinity
 	c:RegisterEffect(e1)

c57425061.lua

 --幻影融合
-function c57425061.initial_effect(c)
+local s,id,o=GetID()
+function s.initial_effect(c)
 	--Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCountLimit(1,57425061+EFFECT_COUNT_CODE_OATH)
-	e1:SetTarget(c57425061.target)
-	e1:SetOperation(c57425061.activate)
+	local e1=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=LOCATION_HAND|LOCATION_MZONE|LOCATION_SZONE,
+		fusion_spell_matfilter=s.fusion_spell_matfilter,
+		mat_operation_code_map={
+			{ [LOCATION_SZONE]=FusionSpell.FUSION_OPERATION_BANISH },
+			{ [0xff]=FusionSpell.FUSION_OPERATION_GRAVE }
+		}
+	})
+	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(e1)
 end
-function c57425061.cfilter(c)
-	return c:IsFaceup() and c:GetSequence()<5
-		and c:IsType(TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:GetOriginalType()&TYPE_MONSTER==TYPE_MONSTER
+
+function s.fusfilter(c)
+	return c:IsSetCard(0x8)
 end
-function c57425061.filter1(c,e)
-	return c:IsAbleToGrave() and not c:IsImmuneToEffect(e)
-end
-function c57425061.exfilter0(c)
-	return c57425061.cfilter(c) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
-end
-function c57425061.exfilter1(c,e)
-	return c57425061.cfilter(c) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
-end
-function c57425061.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x8) and (not f or f(c))
-		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
-end
-function c57425061.fcheck(tp,sg,fc)
-	return sg:FilterCount(Card.IsLocation,nil,LOCATION_SZONE)<=2
-end
-function c57425061.gcheck(sg)
-	return sg:FilterCount(Card.IsLocation,nil,LOCATION_SZONE)<=2
-end
-function c57425061.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		local chkf=tp
-		local mg1=Duel.GetFusionMaterial(tp):Filter(Card.IsAbleToGrave,nil)
-		if Duel.IsExistingMatchingCard(c57425061.cfilter,tp,LOCATION_SZONE,0,1,nil) then
-			local sg=Duel.GetMatchingGroup(c57425061.exfilter0,tp,LOCATION_SZONE,0,nil)
-			if sg:GetCount()>0 then
-				mg1:Merge(sg)
-				aux.FCheckAdditional=c57425061.fcheck
-				aux.GCheckAdditional=c57425061.gcheck
-			end
-		end
-		local res=Duel.IsExistingMatchingCard(c57425061.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
-		aux.FCheckAdditional=nil
-		aux.GCheckAdditional=nil
-		if not res then
-			local ce=Duel.GetChainMaterial(tp)
-			if ce~=nil then
-				local fgroup=ce:GetTarget()
-				local mg2=fgroup(ce,e,tp)
-				local mf=ce:GetValue()
-				res=Duel.IsExistingMatchingCard(c57425061.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg2,mf,chkf)
-			end
-		end
-		return res
-	end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
-end
-function c57425061.activate(e,tp,eg,ep,ev,re,r,rp)
-	local chkf=tp
-	local mg1=Duel.GetFusionMaterial(tp):Filter(c57425061.filter1,nil,e)
-	local exmat=false
-	if Duel.IsExistingMatchingCard(c57425061.cfilter,tp,LOCATION_SZONE,0,1,nil) then
-		local sg=Duel.GetMatchingGroup(c57425061.exfilter1,tp,LOCATION_SZONE,0,nil,e)
-		if sg:GetCount()>0 then
-			mg1:Merge(sg)
-			exmat=true
-		end
-	end
-	if exmat then
-		aux.FCheckAdditional=c57425061.fcheck
-		aux.GCheckAdditional=c57425061.gcheck
-	end
-	local sg1=Duel.GetMatchingGroup(c57425061.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
-	aux.FCheckAdditional=nil
-	aux.GCheckAdditional=nil
-	local mg2=nil
-	local sg2=nil
-	local ce=Duel.GetChainMaterial(tp)
-	if ce~=nil then
-		local fgroup=ce:GetTarget()
-		mg2=fgroup(ce,e,tp)
-		local mf=ce:GetValue()
-		sg2=Duel.GetMatchingGroup(c57425061.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg2,mf,chkf)
+
+function s.fusion_spell_matfilter(c)
+	if c:IsLocation(LOCATION_SZONE) and not c:IsAllTypes(TYPE_CONTINUOUS|TYPE_TRAP) then
+		return false
 	end
-	if sg1:GetCount()>0 or (sg2~=nil and sg2:GetCount()>0) then
-		local sg=sg1:Clone()
-		if sg2 then sg:Merge(sg2) end
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local tg=sg:Select(tp,1,1,nil)
-		local tc=tg:GetFirst()
-		mg1:RemoveCard(tc)
-		if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
-			if exmat then
-				aux.FCheckAdditional=c57425061.fcheck
-				aux.GCheckAdditional=c57425061.gcheck
-			end
-			local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
-			aux.FCheckAdditional=nil
-			aux.GCheckAdditional=nil
-			tc:SetMaterial(mat1)
-			local rg=mat1:Filter(Card.IsLocation,nil,LOCATION_SZONE)
-			mat1:Sub(rg)
-			Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-			Duel.Remove(rg,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-			Duel.BreakEffect()
-			Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
-		else
-			local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
-			local fop=ce:GetOperation()
-			fop(ce,e,tp,tc,mat2)
-		end
-		tc:CompleteProcedure()
+	return true
+end
+
+--- @type FUSION_FGCHECK_FUNCTION
+function s.fcheck(tp,mg,fc,mg_all)
+	local mg_szone=mg:Filter(function(c) return c:IsLocation(LOCATION_SZONE) end,nil)
+	--- no more than 2
+	if #mg_szone>2 then
+		return false
 	end
+	return true
 end