0

expansions/script/c33400205.lua

@@ -52,30 +52,29 @@ function c33400205.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 end
-function c33400205.filter1(c,e,tp)
+function c33400205.spfilter1(c,e,tp)
 	local rk=c:GetRank()
-		return c:IsType(TYPE_XYZ) and c:IsFaceup() and c:IsSetCard(0x341)
-		and Duel.IsExistingMatchingCard(c33400205.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2)
-		and Duel.GetLocationCountFromEx(tp,tp,c)>0
+	return c:IsFaceup() and c:IsSetCard(0xba) and c:IsType(TYPE_XYZ)
+		and Duel.IsExistingMatchingCard(c33400205.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2)
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
-function c33400205.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)
+function c33400205.spfilter2(c,e,tp,mc,rk)
+	return c:IsRank(rk) and c:IsSetCard(0xba) and mc:IsCanBeXyzMaterial(c)
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function c33400205.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c33400205.filter1(chkc,e,tp) end
-	if chk==0 then return Duel.IsExistingTarget(c33400205.filter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c33400205.spfilter1(chkc,e,tp) end
+	if chk==0 then return Duel.IsExistingTarget(c33400205.spfilter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	Duel.SelectTarget(tp,c33400205.filter1,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
+	Duel.SelectTarget(tp,c33400205.spfilter1,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c33400205.spop2(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 g=Duel.SelectMatchingCard(tp,c33400205.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetRank()+2)
+	local g=Duel.SelectMatchingCard(tp,c33400205.spfilter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetRank()+2)
 	local sc=g:GetFirst()
 	if sc then
 		local mg=tc:GetOverlayGroup()