From ed4abaed2d9c6d26e195e945a1786de9ad9de737 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:21:17 +0000 Subject: [PATCH] - Refactored AddCounterFromCostOrEffect -> addCounterFromNonEffect. --- src/forge/Card.java | 2 +- src/forge/CardFactory_Planeswalkers.java | 30 ++++++++++++------------ src/forge/GameAction.java | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/forge/Card.java b/src/forge/Card.java index a9e01ef7097..fee4484203b 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -188,7 +188,7 @@ public class Card extends MyObservable }; //for Planeswalker abilities and Effects (like Wither), Doubling Season gets ignored. - public void addCounterFromCostOrEffect(Counters counterName, int n) + public void addCounterFromNonEffect(Counters counterName, int n) { if(counters.containsKey(counterName)) { diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java index 306655cbced..5657c2d9372 100644 --- a/src/forge/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -36,7 +36,7 @@ class CardFactory_Planeswalkers { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); @@ -176,7 +176,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); CardFactoryUtil.makeToken("Soldier", "W 1 1 Soldier", card2, "W", new String[]{"Creature", "Soldier"}, 1, 1, new String[] {""}); @@ -267,7 +267,7 @@ class CardFactory_Planeswalkers { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); @@ -394,7 +394,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); if (card2.getController().equals(Constant.Player.Human)){ @@ -729,7 +729,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 3); + card2.addCounterFromNonEffect(Counters.LOYALTY, 3); turn[0] = AllZone.Phase.getTurn(); Card c = getTargetCard(); @@ -1000,7 +1000,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); @@ -1239,7 +1239,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); + card2.addCounterFromNonEffect(Counters.LOYALTY,1); turn[0] = AllZone.Phase.getTurn(); String s = getTargetPlayer(); @@ -1335,7 +1335,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); if(getTargetCard() != null) @@ -1602,7 +1602,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); @@ -1656,7 +1656,7 @@ class CardFactory_Planeswalkers { { count = 0; turn[0] = AllZone.Phase.getTurn(); - card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); + card2.addCounterFromNonEffect(Counters.LOYALTY,1); stop(); } }//selectCard() @@ -1850,7 +1850,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 2); + card2.addCounterFromNonEffect(Counters.LOYALTY, 2); turn[0] = AllZone.Phase.getTurn(); @@ -1988,7 +1988,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); Card c = getTargetCard(); @@ -2222,7 +2222,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); @@ -2276,7 +2276,7 @@ class CardFactory_Planeswalkers { { count = 0; turn[0] = AllZone.Phase.getTurn(); - card2.addCounterFromCostOrEffect(Counters.LOYALTY,1); + card2.addCounterFromNonEffect(Counters.LOYALTY,1); stop(); } }//selectCard() @@ -2532,7 +2532,7 @@ class CardFactory_Planeswalkers { { public void resolve() { - card2.addCounterFromCostOrEffect(Counters.LOYALTY, 1); + card2.addCounterFromNonEffect(Counters.LOYALTY, 1); turn[0] = AllZone.Phase.getTurn(); final int boost = 1; diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index 5c2cae6cdd1..6c3e75cc7a0 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -1514,7 +1514,7 @@ private int getDifferentLand(CardList list, String land) card.isCreature()) { damageToAdd = 0; - card.addCounterFromCostOrEffect(Counters.M1M1, damage); + card.addCounterFromNonEffect(Counters.M1M1, damage); } if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed")) { @@ -1552,7 +1552,7 @@ private int getDifferentLand(CardList list, String land) card.isCreature()) { damageToAdd = 0; - card.addCounterFromCostOrEffect(Counters.M1M1, damage); + card.addCounterFromNonEffect(Counters.M1M1, damage); } if (source.getName().equals("Spiritmonger") || source.getName().equals("Mirri the Cursed")) {