From 5f605da93918a495e04249d1feaf4b10db487ef0 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:27:30 +0000 Subject: [PATCH] more removeFromGame -> Exile --- src/forge/Card.java | 2 +- src/forge/CardFactory.java | 6 +++--- src/forge/CardFactory_Creatures.java | 10 +++++----- src/forge/CardFactory_Planeswalkers.java | 2 +- src/forge/GameAction.java | 4 ++-- src/forge/Input_StackNotEmpty.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/forge/Card.java b/src/forge/Card.java index ac0427568e1..8eb8458fa58 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -396,7 +396,7 @@ public class Card extends MyObservable { if(hasVanish && AllZone.GameAction.isCardInPlay(this)) AllZone.GameAction.sacrifice(this); - if(hasSuspend() && AllZone.GameAction.isCardRemovedFromGame(this)) + if(hasSuspend() && AllZone.GameAction.isCardExiled(this)) { final Card c = this; diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 238c48903b4..f7f59f168bb 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -7105,7 +7105,7 @@ public class CardFactory implements NewConstants { public void execute() { Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -7228,7 +7228,7 @@ public class CardFactory implements NewConstants { public void execute() { Object o = enchantment.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -10784,7 +10784,7 @@ public class CardFactory implements NewConstants { public void execute() { Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 004358b0c91..439c12e9c7b 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -4484,7 +4484,7 @@ public class CardFactory_Creatures { //System.out.println(abilityComes.getTargetCard().getName()); Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -4612,7 +4612,7 @@ public class CardFactory_Creatures { //System.out.println(abilityComes.getTargetCard().getName()); Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -4740,7 +4740,7 @@ public class CardFactory_Creatures { //System.out.println(abilityComes.getTargetCard().getName()); Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -4905,7 +4905,7 @@ public class CardFactory_Creatures { //System.out.println(abilityComes.getTargetCard().getName()); Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override @@ -5035,7 +5035,7 @@ public class CardFactory_Creatures { //System.out.println(abilityComes.getTargetCard().getName()); Object o = abilityComes.getTargetCard(); - if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardRemovedFromGame((Card) o)) return; + if(o == null || ((Card) o).isToken() || !AllZone.GameAction.isCardExiled((Card) o)) return; SpellAbility ability = new Ability(card, "0") { @Override diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java index 1e18e69fa7d..dc83424b851 100644 --- a/src/forge/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -3668,7 +3668,7 @@ class CardFactory_Planeswalkers { private static final long serialVersionUID = -947355314271308770L; public void execute() { - if(AllZone.GameAction.isCardRemovedFromGame(c)) { + if(AllZone.GameAction.isCardExiled(c)) { PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getOwner()); AllZone.GameAction.moveTo(play, c); } diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index b468ddd37ec..49b15bbed75 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -2438,7 +2438,7 @@ public class GameAction { */ public void exile(Card c) { //removeFromGame(c); - if(AllZone.GameAction.isCardRemovedFromGame(c)) return; + if(AllZone.GameAction.isCardExiled(c)) return; PlayerZone zone = AllZone.getZone(c); //could be hand, grave, play, ... PlayerZone removed = AllZone.getZone(Constant.Zone.Removed_From_Play, c.getOwner()); @@ -2575,7 +2575,7 @@ public class GameAction { || PlayerZoneUtil.isCardInZone(AllZone.Human_Graveyard, c); } - public boolean isCardRemovedFromGame(Card c) { + public boolean isCardExiled(Card c) { return PlayerZoneUtil.isCardInZone(AllZone.Computer_Removed, c) || PlayerZoneUtil.isCardInZone(AllZone.Human_Removed, c); } diff --git a/src/forge/Input_StackNotEmpty.java b/src/forge/Input_StackNotEmpty.java index 685e56a4381..c6cf85a6b1b 100644 --- a/src/forge/Input_StackNotEmpty.java +++ b/src/forge/Input_StackNotEmpty.java @@ -84,7 +84,7 @@ public class Input_StackNotEmpty extends Input implements java.io.Serializable { //special consideration for "Beacon of Unrest" and other "Beacon" cards if((c.isInstant() || c.isSorcery() || (c.isAura() && fizzle)) && (!c.getName().startsWith("Beacon")) - && (!c.getName().startsWith("Pulse")) && !AllZone.GameAction.isCardRemovedFromGame(c)) //hack to make flashback work + && (!c.getName().startsWith("Pulse")) && !AllZone.GameAction.isCardExiled(c)) //hack to make flashback work { if(c.getReplaceMoveToGraveyard().size() == 0) AllZone.GameAction.moveToGraveyard(c); else c.replaceMoveToGraveyard();