From 993e460cbe7739f554aed98d010cf023a61fb226 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Mon, 1 Nov 2021 22:07:51 +0300 Subject: [PATCH] - Generalize SweepCreatures logic (By Invitation Only) --- forge-ai/src/main/java/forge/ai/AiController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 207a8a4ee30..d4635c8db54 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -1923,11 +1923,12 @@ public class AiController { } else if ("Vermin".equals(logic)) { return MyRandom.getRandom().nextInt(Math.max(player.getLife() - 5, 0)); } else if ("SweepCreatures".equals(logic)) { + int choiceLimit = AbilityUtils.calculateAmount(source, sa.getParam("Max"), sa); int maxCreatures = 0; for (Player opp : player.getOpponents()) { maxCreatures = Math.max(maxCreatures, opp.getCreaturesInPlay().size()); } - return Math.min(13, maxCreatures); + return Math.min(choiceLimit, maxCreatures); } return max; }