foo foo

expansions/script/c81000013.lua

@@ -83,7 +83,7 @@ function cm.ctfilter(c)
 	return c:IsFaceup() and c:IsCode(26807000,81000000,81011000)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local g=Duel.GetMatchingGroup(cm.ctfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.ctfilter,tp,LOCATION_ONFIELD,0,nil)
 	local ct=g:GetClassCount(Card.GetCode)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp)
 		and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_HAND,0,1,e:GetHandler()) and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=ct end
@@ -94,14 +94,14 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
 	Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
 	local cg=Duel.SelectMatchingCard(p,Card.IsAbleToDeck,p,LOCATION_HAND,0,1,63,nil)
-	local g=Duel.GetMatchingGroup(cm.cfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.ctfilter,tp,LOCATION_ONFIELD,0,nil)
 	local ct=g:GetClassCount(Card.GetCode)
-	local sg=cg:GetCount()
+	local sg=cg:GetCount()+ct
 	if cg==0 then return end
 	Duel.SendtoDeck(cg,nil,2,REASON_EFFECT)
 	Duel.ShuffleDeck(p)
 	Duel.BreakEffect()
-	Duel.Draw(p,sg+ct,REASON_EFFECT)
+	Duel.Draw(p,sg,REASON_EFFECT)
 end
 function cm.efilter(c)
 	return c:IsFaceup() and c:IsCode(26808000)