ndyd

expansions/script/c1000409.lua

@@ -20,7 +20,7 @@ function c1000409.initial_effect(c)
 	--grave
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(1000409,1))
-	e3:SetCategory(CATEGORY_DRAW)
+	e3:SetCategory(CATEGORY_DRAW+CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetCountLimit(1,1000409)
@@ -60,18 +60,16 @@ function c1000409.spfilter(c,e,tp)
 	return c:IsSetCard(0xa201) and c:IsAbleToRemove()
 end
 function c1000409.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chkc then return chkc:IsLocation(0x11) and chkc:IsControler(tp) and c1000409.spfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c1000409.spfilter,tp,LOCATION_HAND,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectTarget(tp,c1000409.spfilter,tp,LOCATION_HAND,0,1,3,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
+	if chk==0 then return Duel.IsExistingMatchingCard(c1000409.spfilter,tp,LOCATION_HAND,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,1,0,0)
 end
 function c1000409.spop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-	local sg=g:Filter(Card.IsRelateToEffect,nil,e,0,tp,false,false)
-	Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
-	local ct=sg:GetCount()
-	Duel.Draw(tp,ct+1,REASON_EFFECT)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,c1000409.spfilter,tp,LOCATION_HAND,0,1,3,nil)
+	if g:GetCount()<1 then return end
+	local num=Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
+	Duel.Draw(tp,num+1,REASON_EFFECT)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)