From a3908b3edb214ca260ee208649459ab974c10b9d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 22 Nov 2020 18:42:47 -0500 Subject: [PATCH] add XMaxLimit to announce --- .../src/main/java/forge/player/PlayerControllerHuman.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 7361cb6faa2..474390ac626 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -4,6 +4,7 @@ import java.io.*; import java.util.*; import java.util.Map.Entry; +import forge.game.ability.AbilityUtils; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -329,8 +330,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont public Integer announceRequirements(final SpellAbility ability, final String announce, final boolean canChooseZero) { final int min = canChooseZero ? 0 : 1; - return getGui().getInteger(localizer.getMessage("lblChooseAnnounceForCard", announce, CardTranslation.getTranslatedName(ability.getHostCard().getName())) , min, - Integer.MAX_VALUE, min + 9); + final int max = ability.hasParam("XMaxLimit") ? AbilityUtils.calculateAmount(ability.getHostCard(), + ability.getParam("XMaxLimit"), ability) : Integer.MAX_VALUE; + return getGui().getInteger(localizer.getMessage("lblChooseAnnounceForCard", announce, + CardTranslation.getTranslatedName(ability.getHostCard().getName())) , min, max, min + 9); } @Override