Merge branch 'master' into 'master'

Fix 7031&7032

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

script/c101207031.lua

@@ -4,7 +4,7 @@ function s.initial_effect(c)
 	aux.AddCodeList(c,94820406,89943723)
 	--material
 	aux.AddMaterialCodeList(c,89943723)
-	aux.AddFusionProcFun2(c,s.matfilter1,s.matfilter2,true)
+	aux.AddFusionProcCodeFun(c,{89943723,s.matfilter1},s.matfilter2,1,true,true)
 	c:EnableReviveLimit()
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
@@ -51,7 +51,7 @@ end
 s.dark_calling=true
 s.material_setcode=0x8
 function s.matfilter1(c)
-	return c:IsFusionCode(89943723) or aux.IsCodeListed(c,89943723) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)
+	return aux.IsCodeListed(c,89943723)
 end
 function s.matfilter2(c)
 	return c:IsFusionType(TYPE_EFFECT) and c:IsLocation(LOCATION_ONFIELD)

script/c101207032.lua

@@ -4,7 +4,7 @@ function s.initial_effect(c)
 	aux.AddCodeList(c,94820406,21844576,58932615)
 	--material
 	aux.AddMaterialCodeList(c,21844576,58932615)
-	aux.AddFusionProcFun2(c,s.matfilter1,s.matfilter2,true)
+	aux.AddFusionProcCodeFun(c,{21844576,58932615},aux.FilterBoolFunction(Card.IsFusionSetCard,0x08),1,true,true)
 	c:EnableReviveLimit()
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)