From 963ef386e643b9e9a43c118b0c1737aa413bb302 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:59:56 +0000 Subject: [PATCH] fix many instances of subtractLife when it should be addDamage (CardFactory_PlanesWalkers.java) --- src/forge/CardFactory_Planeswalkers.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java index 26ab3488399..3bed016fcae 100644 --- a/src/forge/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -554,8 +554,9 @@ class CardFactory_Planeswalkers { PlayerZone play = AllZone.getZone(Constant.Zone.Play, opponent); CardList oppPerms = new CardList(play.getCards()); - PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); - life.subtractLife(7,card2); + //PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); + //life.subtractLife(7,card2); + AllZone.GameAction.addDamage(opponent, card2, 7); for(int j = 0; j < 7; j++) { //will not actually let human choose which cards to discard @@ -1344,8 +1345,9 @@ class CardFactory_Planeswalkers { } else { - PlayerLife life = AllZone.GameAction.getPlayerLife(getTargetPlayer()); - life.subtractLife(1,card2); + //PlayerLife life = AllZone.GameAction.getPlayerLife(getTargetPlayer()); + //life.subtractLife(1,card2); + AllZone.GameAction.addDamage(getTargetPlayer(), card2, 1); } } @@ -1504,8 +1506,10 @@ class CardFactory_Planeswalkers { card2.subtractCounter(Counters.LOYALTY, 8); turn[0] = AllZone.Phase.getTurn(); - PlayerLife life = AllZone.GameAction.getPlayerLife(getTargetPlayer()); - life.subtractLife(10,card2); + //PlayerLife life = AllZone.GameAction.getPlayerLife(getTargetPlayer()); + //life.subtractLife(10,card2); + + AllZone.GameAction.addDamage(getTargetPlayer(), card2, 10); PlayerZone play = AllZone.getZone(Constant.Zone.Play, getTargetPlayer()); CardList list = new CardList(play.getCards()); @@ -2096,7 +2100,7 @@ class CardFactory_Planeswalkers { } } else - AllZone.GameAction.getPlayerLife(getTargetPlayer()).subtractLife(damage,card2); + AllZone.GameAction.addDamage(getTargetPlayer(), card2, damage); AllZone.GameAction.gainLife(card2.getController(), 3); }