fbk

expansions/script/c60151621.lua

@@ -39,18 +39,22 @@ function c60151621.activate(e,tp,eg,ep,ev,re,r,rp)
 	local rk=tc:GetOriginalRank()
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
 		Duel.Destroy(tc,REASON_EFFECT)
-		local ct=0
-		if Duel.CheckLocation(tp,LOCATION_PZONE,0) then ct=ct+1 end
-		if Duel.CheckLocation(tp,LOCATION_PZONE,1) then ct=ct+1 end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
-		local g=Duel.SelectMatchingCard(tp,c60151621.pcfilter,tp,LOCATION_DECK,0,1,ct,nil,lv,rk)
+		local g=Duel.SelectMatchingCard(tp,c60151621.pcfilter,tp,LOCATION_DECK,0,1,2,nil,lv,rk)
 		local pc=g:GetFirst()
 		while pc do
-			if pc:IsAbleToHand() and Duel.SelectYesNo(tp,aux.Stringid(60151621,0)) then
+			if pc:IsAbleToHand() and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
+				if Duel.SelectYesNo(tp,aux.Stringid(60151621,0)) then
+					Duel.SendtoHand(pc,nil,REASON_EFFECT)
+					Duel.ConfirmCards(1-tp,pc)
+				else
+					Duel.MoveToField(pc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+				end
+			elseif pc:IsAbleToHand() and not (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
 				Duel.SendtoHand(pc,nil,REASON_EFFECT)
 				Duel.ConfirmCards(1-tp,pc)
 			else
-				Duel.MoveToField(pc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+				Duel.MoveToField(pc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 			end
 			pc=g:GetNext()
 		end