From 761e16a1be6982b6703765f70d4e2dd413e62686 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:23:04 +0000 Subject: [PATCH] - Fixed Pongify and Crib Swap (for real this time). - Removed "number of cards in {player} removed zone:{number}" console output. --- src/forge/CardFactory.java | 4 ++-- src/forge/EndOfTurn.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index de8708c8653..591f9dbd591 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -4681,7 +4681,7 @@ public class CardFactory implements NewConstants { { if(AllZone.GameAction.isCardInPlay(getTargetCard()) && CardFactoryUtil.canTarget(card,getTargetCard()) ) { - CardFactoryUtil.makeToken("Ape", "G 3 3 Ape", AllZone.GameAction.getOpponent(getTargetCard().getController()), "G", + CardFactoryUtil.makeToken("Ape", "G 3 3 Ape", getTargetCard().getController(), "G", new String[] {"Creature", "Ape"}, 3, 3, new String[] {""} ); AllZone.GameAction.destroyNoRegeneration(getTargetCard()); } @@ -6045,7 +6045,7 @@ public class CardFactory implements NewConstants { { if(AllZone.GameAction.isCardInPlay(getTargetCard()) && CardFactoryUtil.canTarget(card, getTargetCard()) ) { - CardFactoryUtil.makeToken("Shapeshifter", "C 1 1 Shapeshifter", AllZone.GameAction.getOpponent(getTargetCard().getController()), "", + CardFactoryUtil.makeToken("Shapeshifter", "C 1 1 Shapeshifter", getTargetCard().getController(), "", new String[] {"Creature", "Shapeshifter"}, 1, 1, new String[] {"Changeling"} ); //remove card from play AllZone.GameAction.removeFromGame(getTargetCard()); diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java index 8160c2082a0..8fc7f8f2640 100644 --- a/src/forge/EndOfTurn.java +++ b/src/forge/EndOfTurn.java @@ -38,6 +38,7 @@ public class EndOfTurn implements java.io.Serializable AllZone.StateBasedEffects.rePopulateStateBasedList(); + /* PlayerZone cz = AllZone.getZone(Constant.Zone.Removed_From_Play, Constant.Player.Computer); PlayerZone hz = AllZone.getZone(Constant.Zone.Removed_From_Play, Constant.Player.Human); @@ -46,6 +47,7 @@ public class EndOfTurn implements java.io.Serializable System.out.println("number of cards in compy removed zone: " + c.size()); System.out.println("number of cards in human removed zone: " + h.size()); + */ execute(at); }//executeAt()