external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multi-select' into 'master'

Browse Source 
properly message and limit human multi-select

See merge request core-developers/forge!882
This commit is contained in:
Michael Kamensky
2018-08-27 16:39:44 +00:00
parent 42acde1ba0 5f6ea460dd
commit db7ab85f26
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -870,7 +870,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final boolean champion = sa.hasParam("Champion"); final boolean champion = sa.hasParam("Champion");
final boolean forget = sa.hasParam("ForgetChanged"); final boolean forget = sa.hasParam("ForgetChanged");
final boolean imprint = sa.hasParam("Imprint"); final boolean imprint = sa.hasParam("Imprint");
final String selectPrompt = sa.hasParam("SelectPrompt") ? sa.getParam("SelectPrompt") : MessageUtil.formatMessage("Select a card from {player's} " + Lang.joinHomogenous(origin).toLowerCase(), decider, player); String selectPrompt = sa.hasParam("SelectPrompt") ? sa.getParam("SelectPrompt") : MessageUtil.formatMessage("Select a card from {player's} " + Lang.joinHomogenous(origin).toLowerCase(), decider, player);
final String totalcmc = sa.getParam("WithTotalCMC"); final String totalcmc = sa.getParam("WithTotalCMC");
int totcmc = AbilityUtils.calculateAmount(source, totalcmc, sa); int totcmc = AbilityUtils.calculateAmount(source, totalcmc, sa);
@@ -879,7 +879,20 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
CardCollection chosenCards = new CardCollection(); CardCollection chosenCards = new CardCollection();
// only multi-select if player can select more than one // only multi-select if player can select more than one
if (changeNum > 1 && allowMultiSelect(decider, sa)) { if (changeNum > 1 && allowMultiSelect(decider, sa)) {
for (Card card : decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider)) { List<Card> selectedCards;
if (! sa.hasParam("SelectPrompt")) {
// new default messaging for multi select
if (fetchList.size() > changeNum) {
selectPrompt = MessageUtil.formatMessage("Select up to " + changeNum + "cards from {player's} " + Lang.joinHomogenous(origin).toLowerCase(), decider, player);
} else {
selectPrompt = MessageUtil.formatMessage("Select cards from {player's} " + Lang.joinHomogenous(origin).toLowerCase(), decider, player);
}
}
// ensure that selection is within maximum allowed changeNum
do {
selectedCards = decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider);
} while (selectedCards.size() > changeNum);
for (Card card : selectedCards) {
chosenCards.add(card); chosenCards.add(card);
}; };
// maybe prompt the user if they selected fewer than the maximum possible? // maybe prompt the user if they selected fewer than the maximum possible?