eme

expansions/script/c33401201.lua

@@ -31,18 +31,19 @@ function c33401201.filter1(c,e,tp)
 		and ((c:IsSetCard(0x341) and  (Duel.IsExistingMatchingCard(c33401201.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2) or
 		Duel.IsExistingMatchingCard(c33401201.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+4)))
 		or (Duel.IsExistingMatchingCard(c33401201.filter22,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2) or
-		Duel.IsExistingMatchingCard(c33401201.filter22,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+4)))
-		and Duel.GetLocationCountFromEx(tp,tp,c)>0
+		Duel.IsExistingMatchingCard(c33401201.filter22,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+4)))		
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function c33401201.filter2(c,e,tp,mc,rk)
 	return c:IsRank(rk) and c:IsSetCard(0x341) and mc:IsCanBeXyzMaterial(c)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+   and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function c33401201.filter22(c,e,tp,mc,rk)
 	return c:IsRank(rk) and c:IsSetCard(0x341) and mc:IsCanBeXyzMaterial(c)
 	 and c:GetOriginalAttribute()==mc:GetOriginalAttribute() and c:GetOriginalRace()==mc:GetOriginalRace()
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+ and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function c33401201.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c33401201.filter1(chkc,e,tp) end
@@ -53,7 +54,7 @@ function c33401201.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c33401201.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if Duel.GetLocationCountFromEx(tp,tp,tc)<=0 or not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
+	if  not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
 	if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g1

expansions/script/c33405009.lua

@@ -34,7 +34,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.refil(c)
-	return c:IsAbleToRemoveAsCost() and c:IsSetCard(0x9da0)
+	return c:IsAbleToRemoveAsCost() and c:IsSetCard(0x6410)
 end
 function cm.sumcon(e,c)
 	if c==nil then return true end