tnndx

expansions/script/c12045011.lua

@@ -37,7 +37,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.thfilter(c)
-	return c:IsFaceup() and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
+	return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
 end
 function cm.thfilter1(c)
 	return c:IsSetCard(0x3fad) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()

expansions/script/c21520098.lua

@@ -57,7 +57,11 @@ function c21520098.initial_effect(c)
 	c:RegisterEffect(e3_3)
 end
 function c21520098.spfilter(c,xyzc)
-	return c:IsFaceup() and c:IsCanBeXyzMaterial(xyzc)
+	if c:IsHasEffect(EFFECT_CANNOT_BE_XYZ_MATERIAL) then 
+		return c:IsFaceup() and c:IsCanBeXyzMaterial(xyzc)
+	else
+		return c:IsFaceup() and c:IsCanOverlay()
+	end
 end
 function c21520098.sprgoal(sg,tp,spc)
 	return Duel.GetLocationCountFromEx(tp,tp,sg,spc)>0 and #sg>=2 and #sg<=Duel.GetTurnCount()