Add カオス・アンヘル－混沌の双翼－

c22850702.lua

@@ -3,6 +3,11 @@ function c22850702.initial_effect(c)
 	--synchro summon
 	c:EnableReviveLimit()
 	aux.AddSynchroMixProcedure(c,c22850702.matfilter1,nil,nil,c22850702.matfilter2,1,99)
+	Synchro.AddSynchroProcedure(c,{
+		tuner_filter=function(mc,tc) return mc:IsAttribute(ATTRIBUTE_DARK|ATTRIBUTE_LIGHT) and mc:IsLocation(LOCATION_MZONE) and mc:IsControler(tc:GetControler()) or Synchro.DefaultTunerFilter(mc,tc) end,
+		drop_default_tuner_filter=true,
+		non_tuner_filter=function(mc) return mc:IsAttribute(ATTRIBUTE_DARK|ATTRIBUTE_LIGHT) end,
+	})
 	--remove
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(22850702,2))

c38354937.lua

@@ -3,8 +3,8 @@ function c38354937.initial_effect(c)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x2),aux.NonTuner(Card.IsAttribute,ATTRIBUTE_DARK),1)
 	Synchro.AddSynchroProcedure(c,{
-		tuner_filter=function(mc,tc) return mc:IsSetCard(0x2) and Synchro.DefaultTunerFilter(mc,tc) end,
-		non_tuner_filter=function(mc,tc) return mc:IsAttribute(ATTRIBUTE_DARK) and Synchro.DefaultNonTunerFilter(mc,tc) end,
+		tuner_filter=function(mc,tc) return mc:IsSetCard(0x2) end,
+		non_tuner_filter=function(mc,tc) return mc:IsAttribute(ATTRIBUTE_DARK) end,
 	})
 	c:EnableReviveLimit()
 	--control

c821049.lua

@@ -8,6 +8,7 @@ function s.initial_effect(c)
 		tuner_max=Synchro.Infinite,
 		non_tuner_max=1,
 		non_tuner_filter=function(mc) return mc:IsAttribute(ATTRIBUTE_LIGHT) end,
+		drop_default_non_tuner_filter=true,
 	})
 	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)

procedure.lua

@@ -3389,9 +3389,9 @@ Synchro.Role={
 function Synchro.AddSynchroProcedure(c,params)
 	params=params or {}
 	local tuner_race=params.tuner_race or RACE_ALL
-	local tuner_filter=params.tuner_filter or Synchro.DefaultTunerFilter
+	local tuner_filter=params.tuner_filter or aux.TRUE
 	local non_tuner_race=params.non_tuner_race or RACE_ALL
-  	local non_tuner_filter=params.non_tuner_filter or Synchro.DefaultNonTunerFilter
+  	local non_tuner_filter=params.non_tuner_filter or aux.TRUE
 	local tuner_min=params.tuner_min or 1
 	local tuner_max=params.tuner_max or 1
 	local non_tuner_min=params.non_tuner_min or 1
@@ -3399,6 +3399,17 @@ function Synchro.AddSynchroProcedure(c,params)
 	local base_mapper=params.base_mapper or Synchro.DefaultLevelMapper
 	local scheck=params.scheck or aux.TRUE
 
+	local drop_default_tuner_filter=params.drop_default_tuner_filter or false
+	local drop_default_non_tuner_filter=params.drop_default_non_tuner_filter or false
+
+	if not drop_default_tuner_filter then
+		tuner_filter=aux.AND(Synchro.DefaultTunerFilter,tuner_filter)
+	end
+
+	if not drop_default_non_tuner_filter then
+		non_tuner_filter=aux.AND(Synchro.DefaultNonTunerFilter,non_tuner_filter)
+	end
+
 	local e1=Effect.CreateEffect(c)
 	-- e1:SetDescription(1164)
 	e1:SetDescription(1379) --- 启用扩展卡包调试模式
@@ -4285,13 +4296,6 @@ function Synchro.CanIncludeMaterial(mc,state,selected,tc,
 		level_prune_index=math.huge,
 	}
 	index=index or -1
-	-- build a temporary Group = already selected cards + this mc
-	local sg=Group.FromCards(table.unpack(selected))
-	sg:AddCard(mc)
-	-- if either check fails on this partial group, drop this branch
-	if (not scheck(sg)) or (aux.AdditionalSCheck and not aux.AdditionalSCheck(sg)) then
-		return false,nil
-	end
 
     -- global material‐limit check
     if not state.material_limit_filter(mc) then
@@ -4325,6 +4329,14 @@ function Synchro.CanIncludeMaterial(mc,state,selected,tc,
 		end
     end
 
+	-- build a temporary Group = already selected cards + this mc
+	local sg=Group.FromCards(table.unpack(selected))
+	sg:AddCard(mc)
+	-- if either check fails on this partial group, drop this branch
+	if (not scheck(sg)) or (aux.AdditionalSCheck and not aux.AdditionalSCheck(sg)) then
+		return false,nil
+	end
+
     return true,append_material_limit_filter
 end