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

- Some improvements to alternate destination support in ChangeZone (also support library position override from known zones).

Browse Source
This commit is contained in:
Agetian
2015-09-20 18:38:06 +00:00
parent e0025dfe91
commit 984f567054
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,16 +377,18 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination")); ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
final List<ZoneType> origin = ZoneType.listValueOf(sa.getParam("Origin")); final List<ZoneType> origin = ZoneType.listValueOf(sa.getParam("Origin"));
// changing zones for spells on the stack boolean altDest = false;
if (sa.hasParam("DestinationAlternative")) { if (sa.hasParam("DestinationAlternative")) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(sa.getParam("AlternativeDestinationMessage")); sb.append(sa.getParam("AlternativeDestinationMessage"));
if (!player.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString())) { if (!player.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString())) {
destination = ZoneType.smartValueOf(sa.getParam("DestinationAlternative")); destination = ZoneType.smartValueOf(sa.getParam("DestinationAlternative"));
altDest = true;
} }
} }
// changing zones for spells on the stack
for (final SpellAbility tgtSA : getTargetSpells(sa)) { for (final SpellAbility tgtSA : getTargetSpells(sa)) {
if (!tgtSA.isSpell()) { // Catch any abilities or triggers that slip through somehow if (!tgtSA.isSpell()) { // Catch any abilities or triggers that slip through somehow
continue; continue;
@@ -439,7 +441,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (destination.equals(ZoneType.Library)) { if (destination.equals(ZoneType.Library)) {
// library position is zero indexed // library position is zero indexed
final int libraryPosition = sa.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(hostCard, sa.getParam("LibraryPosition"), sa) : 0; int libraryPosition = 0;
if (!altDest) {
libraryPosition = sa.hasParam("LibraryPosition") ? AbilityUtils.calculateAmount(hostCard, sa.getParam("LibraryPosition"), sa) : 0;
} else {
libraryPosition = sa.hasParam("LibraryPositionAlternative") ? Integer.parseInt(sa.getParam("LibraryPositionAlternative")) : 0;
}
movedCard = game.getAction().moveToLibrary(tgtC, libraryPosition); movedCard = game.getAction().moveToLibrary(tgtC, libraryPosition);