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

- Fixed Time Vault not untapping when skipping a turn, and allowing you to untap any of your tapped Time Vaults not just the first one

Browse Source
This commit is contained in:
Sol
2014-03-30 19:49:13 +00:00
parent 01e88e1047
commit 8516ca6e03
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -760,11 +760,19 @@ public class PhaseHandler implements java.io.Serializable {
return getNextActivePlayer(); return getNextActivePlayer();
} }
// TODO: This shouldn't filter by Time Vault, just in case Time Vault doesn't have it's normal ability.
List<Card> vaults = CardLists.filter(nextPlayer.getCardsIn(ZoneType.Battlefield, "Time Vault"), Presets.TAPPED); List<Card> vaults = CardLists.filter(nextPlayer.getCardsIn(ZoneType.Battlefield, "Time Vault"), Presets.TAPPED);
if(!vaults.isEmpty()) { if(!vaults.isEmpty()) {
final Card crd = vaults.get(0); Card crd = vaults.get(0);
boolean untapTimeVault = nextPlayer.getController().chooseBinary(new SpellAbility.EmptySa(crd, nextPlayer), "Untap " + crd + "?", BinaryChoiceType.UntapTimeVault, false); SpellAbility fakeSA = new SpellAbility.EmptySa(crd, nextPlayer);
boolean untapTimeVault = nextPlayer.getController().chooseBinary(fakeSA, "Skip a turn to untap a Time Vault?", BinaryChoiceType.UntapTimeVault, false);
if (untapTimeVault) { if (untapTimeVault) {
if (vaults.size() > 1) {
Card c = nextPlayer.getController().chooseSingleEntityForEffect(vaults, fakeSA, "Which Time Vault do you want to Untap?");
if (c != null)
crd = c;
}
crd.untap();
if( null == extraTurn ) if( null == extraTurn )
this.setPlayerTurn(nextPlayer); this.setPlayerTurn(nextPlayer);
return getNextActivePlayer(); return getNextActivePlayer();