Merge branch 'master' into newcards

expansions/script/c37564765.lua

@@ -290,7 +290,7 @@ function cm.MustMaterialCheck(v,tp,code)
 	local ce={Duel.IsPlayerAffectedByEffect(tp,code)}
 	for _,te in ipairs(te) do
 		if (cm.GetValueType(v)=="Card" and v~=te:GetHandler())
-			or (cm.GetValueType(v)=="Group" and not v:IsExists(te:GetHandler()) then return false end
+			or (cm.GetValueType(v)=="Group" and not v:IsExists(te:GetHandler())) then return false end
 	end
 	return true
 end

expansions/script/c37564832.lua

@@ -16,7 +16,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function cm.tgfilter0(c,e,tp)
-	return c:IsFaceup() and Senya.check_set_3L(c)
+	return c:IsFaceup() and Senya.check_set_3L(c) and Senya.MustMaterialCheck(c,tp,EFFECT_MUST_BE_FMATERIAL)
 		and c:IsCanBeFusionMaterial() and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,c)
 end
 function cm.tgfilter(c,e,tp)