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

more removeFromGame -> Exile

Browse Source
This commit is contained in:
jendave
2011-08-06 09:27:30 +00:00
parent 4d112ed03e
commit 5f605da939
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Card.java
View File

@@ -396,7 +396,7 @@ public class Card extends MyObservable {
if(hasVanish && AllZone.GameAction.isCardInPlay(this)) if(hasVanish && AllZone.GameAction.isCardInPlay(this))
AllZone.GameAction.sacrifice(this); AllZone.GameAction.sacrifice(this);
if(hasSuspend() && AllZone.GameAction.isCardRemovedFromGame(this)) if(hasSuspend() && AllZone.GameAction.isCardExiled(this))
{ {
final Card c = this; final Card c = this;

6
src/forge/CardFactory.java
View File

@@ -7105,7 +7105,7 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -7228,7 +7228,7 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
Object o = enchantment.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -10784,7 +10784,7 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {

10
src/forge/CardFactory_Creatures.java
View File

@@ -4484,7 +4484,7 @@ public class CardFactory_Creatures {
//System.out.println(abilityComes.getTargetCard().getName()); //System.out.println(abilityComes.getTargetCard().getName());
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -4612,7 +4612,7 @@ public class CardFactory_Creatures {
//System.out.println(abilityComes.getTargetCard().getName()); //System.out.println(abilityComes.getTargetCard().getName());
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -4740,7 +4740,7 @@ public class CardFactory_Creatures {
//System.out.println(abilityComes.getTargetCard().getName()); //System.out.println(abilityComes.getTargetCard().getName());
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -4905,7 +4905,7 @@ public class CardFactory_Creatures {
//System.out.println(abilityComes.getTargetCard().getName()); //System.out.println(abilityComes.getTargetCard().getName());
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override
@@ -5035,7 +5035,7 @@ public class CardFactory_Creatures {
//System.out.println(abilityComes.getTargetCard().getName()); //System.out.println(abilityComes.getTargetCard().getName());
Object o = abilityComes.getTargetCard(); 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") { SpellAbility ability = new Ability(card, "0") {
@Override @Override

2
src/forge/CardFactory_Planeswalkers.java
View File

@@ -3668,7 +3668,7 @@ class CardFactory_Planeswalkers {
private static final long serialVersionUID = -947355314271308770L; private static final long serialVersionUID = -947355314271308770L;
public void execute() { public void execute() {
if(AllZone.GameAction.isCardRemovedFromGame(c)) { if(AllZone.GameAction.isCardExiled(c)) {
PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getOwner()); PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getOwner());
AllZone.GameAction.moveTo(play, c); AllZone.GameAction.moveTo(play, c);
} }

4
src/forge/GameAction.java
View File

@@ -2438,7 +2438,7 @@ public class GameAction {
*/ */
public void exile(Card c) { public void exile(Card c) {
//removeFromGame(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 zone = AllZone.getZone(c); //could be hand, grave, play, ...
PlayerZone removed = AllZone.getZone(Constant.Zone.Removed_From_Play, c.getOwner()); PlayerZone removed = AllZone.getZone(Constant.Zone.Removed_From_Play, c.getOwner());
@@ -2575,7 +2575,7 @@ public class GameAction {
|| PlayerZoneUtil.isCardInZone(AllZone.Human_Graveyard, c); || PlayerZoneUtil.isCardInZone(AllZone.Human_Graveyard, c);
} }
public boolean isCardRemovedFromGame(Card c) { public boolean isCardExiled(Card c) {
return PlayerZoneUtil.isCardInZone(AllZone.Computer_Removed, c) return PlayerZoneUtil.isCardInZone(AllZone.Computer_Removed, c)
|| PlayerZoneUtil.isCardInZone(AllZone.Human_Removed, c); || PlayerZoneUtil.isCardInZone(AllZone.Human_Removed, c);
} }

2
src/forge/Input_StackNotEmpty.java
View File

@@ -84,7 +84,7 @@ public class Input_StackNotEmpty extends Input implements java.io.Serializable {
//special consideration for "Beacon of Unrest" and other "Beacon" cards //special consideration for "Beacon of Unrest" and other "Beacon" cards
if((c.isInstant() || c.isSorcery() || (c.isAura() && fizzle)) && (!c.getName().startsWith("Beacon")) 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); if(c.getReplaceMoveToGraveyard().size() == 0) AllZone.GameAction.moveToGraveyard(c);
else c.replaceMoveToGraveyard(); else c.replaceMoveToGraveyard();