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

Autoyield on effect on a card not overall; Add new method to generate the autoyield key to prepare for fix of effect ordering

Browse Source
This commit is contained in:
pfps
2017-01-07 15:52:24 +00:00
parent e90c0255e1
commit 5da185263e
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -911,7 +911,7 @@ public class PlayerControllerHuman
}
} else {
final SpellAbility ability = stack.peekAbility();
if (ability != null && ability.isAbility() && getGui().shouldAutoYield(ability.toUnsuppressedString())) {
if (ability != null && ability.isAbility() && getGui().shouldAutoYield(ability.yieldKey())) {
//avoid prompt for input if top ability of stack is set to auto-yield
try {
Thread.sleep(FControlGamePlayback.resolveDelay);
@@ -1236,7 +1236,7 @@ public class PlayerControllerHuman
if (savedOrder == null || !sameOrder) { //prompt if no saved order for the current set of abilities or if the player wants to change the order
orderedSAs = getGui().order("Select order for simultaneous abilities", "Resolve first", activePlayerSAs, null);
//save order to avoid needing to prompt a second time to order the same abilties
//save order to avoid needing to prompt a second time to order the same abilities
savedOrder = new ArrayList<Integer>(activePlayerSAs.size());
for (SpellAbility sa : orderedSAs) {
savedOrder.add(activePlayerSAs.indexOf(sa));