888

expansions/script/c12001015.lua

@@ -35,7 +35,7 @@ function c12001015.splimit(e,c)
 	return not c:IsSetCard(0xfb0)
 end
 function c12001015.filter(c,e,tp)
-	return c:IsSetCard(0xfb0) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xfb0) and c:IsType(TYPE_PENDULUM) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c12001015.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c12001015.filter(chkc,e,tp) end

expansions/script/c12001025.lua

@@ -19,10 +19,9 @@ function c12001025.initial_effect(c)
 	e2:SetDescription(aux.Stringid(12001025,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_TO_GRAVE)
-        e2:SetCountLimit(1,12001025)
-	e2:SetCondition(c12001025.spcon)
+	e2:SetCountLimit(1,12001025)
 	e2:SetTarget(c12001025.sptg)
 	e2:SetOperation(c12001025.spop)
 	c:RegisterEffect(e2)
@@ -58,10 +57,6 @@ end
 function c12001025.rcon(e)
 	return e:GetOwner():IsHasCardTarget(e:GetHandler())
 end
-function c12001025.spcon(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return c:IsPreviousLocation(LOCATION_MZONE) 
-end
 function c12001025.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
@@ -72,7 +67,7 @@ function c12001025.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,rec)
 end
 function c12001025.tfilter(c)
-	return c:IsSetCard(0xfb0) and  c:IsFaceup()
+	return c:IsSetCard(0xfb0) and c:IsFaceup()
 end
 function c12001025.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -80,6 +75,6 @@ function c12001025.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
 		local g=Duel.SelectMatchingCard(tp,c12001025.tfilter,tp,LOCATION_EXTRA,0,1,1,nil)
-		   Duel.Overlay(c,Group.FromCards(g:GetFirst()))
+		Duel.Overlay(c,Group.FromCards(g:GetFirst()))
 	end
 end