byd

expansions/script/c81061003.lua

@@ -31,11 +31,8 @@ function cm.atkval(e,c)
 	local val=math.max(c:GetBaseAttack(),0)
 	return val*-1
 end
-function cm.thfilter(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
-end
 function cm.cfilter(c)
-	return c:IsFaceup() and c:GetBaseAttack()==0
+	return c:IsFaceup() and c:GetBaseAttack()==0 and c:IsType(TYPE_MONSTER)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ct=Duel.GetMatchingGroupCount(cm.cfilter,tp,LOCATION_MZONE,0,nil)
@@ -43,20 +40,22 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.GetDecktopGroup(tp,ct):IsExists(Card.IsAbleToHand,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
+function cm.thfilter(c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
+end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local ct=Duel.GetMatchingGroupCount(cm.cfilter,tp,LOCATION_MZONE,0,nil)
 	Duel.ConfirmDecktop(tp,ct)
 	local g=Duel.GetDecktopGroup(tp,ct)
 	if #g>0 then
 		Duel.DisableShuffleCheck()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		local sc=g:FilterSelect(tp,cm.thfilter,1,1,nil):GetFirst()
-		if sc:IsAbleToHand() then
-			Duel.SendtoHand(sc,nil,REASON_EFFECT)
-			Duel.ConfirmCards(1-tp,sc)
+		if g:IsExists(cm.thfilter,1,nil) then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+			local sg=g:FilterSelect(tp,cm.thfilter,1,1,nil)
+			Duel.SendtoHand(sg,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,sg)
 			Duel.ShuffleHand(tp)
-		else
-			Duel.SendtoGrave(sc,REASON_RULE)
+			g:Sub(sg)
 		end
 	end
 	if #g>1 then