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

Prevent prompting for X if user can't control what X is

Browse Source
This commit is contained in:
drdev
2014-09-14 14:49:34 +00:00
parent d7f31fdda6
commit 7cd2081cec
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -228,19 +228,22 @@ public class HumanPlaySpellAbility {
} }
if (needX && manaCost != null && manaCost.getAmountOfX() > 0) { if (needX && manaCost != null && manaCost.getAmountOfX() > 0) {
Integer value = controller.announceRequirements(ability, "X", allowZero && manaCost.canXbe0()); String sVar = ability.getSVar("X"); //only prompt for new X value if card doesn't determine it another way
if (value == null) { if ("Count$xPaid".equals(sVar) || StringUtils.isNumeric(sVar)) {
return false; Integer value = controller.announceRequirements(ability, "X", allowZero && manaCost.canXbe0());
if (value == null) {
return false;
}
ability.setSVar("X", value.toString());
card.setSVar("X", value.toString());
// announce to sub-abilities
SpellAbility sub = ability;
while ((sub = sub.getSubAbility()) != null) {
sub.setSVar("X", value.toString());
}
} }
ability.setSVar("X", value.toString());
card.setSVar("X", value.toString());
// announce to subabilities
SpellAbility sub = ability;
while ((sub = sub.getSubAbility()) != null) {
sub.setSVar("X", value.toString());
};
} }
return true; return true;
} }