From 465a862070c96eef007f0b6892e88eb18b42944b Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 11 Apr 2013 20:25:57 +0000 Subject: [PATCH] removed an unreferenced method and renamed another method --- src/main/java/forge/Card.java | 22 +++++-------------- .../forge/card/ability/ai/CountersPutAi.java | 2 +- .../ability/effects/CountersMoveEffect.java | 2 +- .../java/forge/card/cost/CostPutCounter.java | 2 +- src/main/java/forge/game/GameActionUtil.java | 2 +- .../forge/game/ai/ComputerUtilCombat.java | 8 +++---- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 7af67cf8f38..83c389367a1 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1078,18 +1078,6 @@ public class Card extends GameEntity implements Comparable { this.clones.add(c); } - /** - *

- * addClones. - *

- * - * @param c - * a {@link java.util.ArrayList} object. - */ - public final void addClones(final ArrayList c) { - this.clones.addAll(c); - } - /** *

* clearClones. @@ -1169,15 +1157,15 @@ public class Card extends GameEntity implements Comparable { /** * Can have counters placed on it. * - * @param counterName + * @param type * the counter name * @return true, if successful */ - public final boolean canHaveCountersPlacedOnIt(final CounterType counterName) { + public final boolean canReceiveCounters(final CounterType type) { if (this.hasKeyword("CARDNAME can't have counters placed on it.")) { return false; } - if (this.isCreature() && counterName == CounterType.M1M1) { + if (this.isCreature() && type == CounterType.M1M1) { for (final Card c : this.getController().getCreaturesInPlay()) { // look for Melira, Sylvok Outcast if (c.hasKeyword("Creatures you control can't have -1/-1 counters placed on them.")) { return false; @@ -1188,7 +1176,7 @@ public class Card extends GameEntity implements Comparable { } public final int getTotalCountersToAdd(final CounterType counterType, final int baseAmount, final boolean applyMultiplier) { - if (!this.canHaveCountersPlacedOnIt(counterType)) { + if (!this.canReceiveCounters(counterType)) { return 0; } final int multiplier = applyMultiplier ? this.getController().getCounterDoublersMagnitude(counterType) : 1; @@ -1197,7 +1185,7 @@ public class Card extends GameEntity implements Comparable { } public final void addCounter(final CounterType counterType, final int n, final boolean applyMultiplier) { - if (!this.canHaveCountersPlacedOnIt(counterType)) { + if (!this.canReceiveCounters(counterType)) { return; } final int multiplier = applyMultiplier ? this.getController().getCounterDoublersMagnitude(counterType) : 1; diff --git a/src/main/java/forge/card/ability/ai/CountersPutAi.java b/src/main/java/forge/card/ability/ai/CountersPutAi.java index 0fcc4087c96..f8c2fafc313 100644 --- a/src/main/java/forge/card/ability/ai/CountersPutAi.java +++ b/src/main/java/forge/card/ability/ai/CountersPutAi.java @@ -49,7 +49,7 @@ public class CountersPutAi extends SpellAbilityAi { list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), new Predicate() { @Override public boolean apply(final Card c) { - return c.canBeTargetedBy(sa) && c.canHaveCountersPlacedOnIt(CounterType.valueOf(type)); + return c.canBeTargetedBy(sa) && c.canReceiveCounters(CounterType.valueOf(type)); } }); diff --git a/src/main/java/forge/card/ability/effects/CountersMoveEffect.java b/src/main/java/forge/card/ability/effects/CountersMoveEffect.java index dd41e4f22cc..4d4878f4bbe 100644 --- a/src/main/java/forge/card/ability/effects/CountersMoveEffect.java +++ b/src/main/java/forge/card/ability/effects/CountersMoveEffect.java @@ -97,7 +97,7 @@ public class CountersMoveEffect extends SpellAbilityEffect { for (final Card dest : tgtCards) { if ((null != source) && (null != dest)) { if (!"Any".matches(counterName)) { - if (dest.canHaveCountersPlacedOnIt(cType) + if (dest.canReceiveCounters(cType) && source.getCounters(cType) >= amount) { dest.addCounter(cType, amount, true); source.subtractCounter(cType, amount); diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index 4b22bc31d4e..412e40813f6 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -193,7 +193,7 @@ public class CostPutCounter extends CostPartWithList { final Player activator = ability.getActivatingPlayer(); final Card source = ability.getSourceCard(); if (this.payCostFromSource()) { - if (!source.canHaveCountersPlacedOnIt(this.counter)) { + if (!source.canReceiveCounters(this.counter)) { return false; } } else { diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index 62cd5e7341a..b84be2dd354 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -457,7 +457,7 @@ public final class GameActionUtil { CounterType counterType = ((CostPutCounter) part).getCounter(); int amount = getAmountFromPartX(part, source, sourceAbility); - if (false == source.canHaveCountersPlacedOnIt(counterType)) { + if (false == source.canReceiveCounters(counterType)) { String message = String.format("Won't be able to pay upkeep for %s but it can't have %s counters put on it.", source, counterType.getName()); p.getGame().getGameLog().add("ResolveStack", message, 2); return false; diff --git a/src/main/java/forge/game/ai/ComputerUtilCombat.java b/src/main/java/forge/game/ai/ComputerUtilCombat.java index df536ac53a4..b7b95a1e678 100644 --- a/src/main/java/forge/game/ai/ComputerUtilCombat.java +++ b/src/main/java/forge/game/ai/ComputerUtilCombat.java @@ -1384,9 +1384,9 @@ public class ComputerUtilCombat { if (((attacker.hasKeyword("Indestructible") || (ComputerUtil.canRegenerate(ai, attacker) && !withoutAbilities)) && !(defender .hasKeyword("Wither") || defender.hasKeyword("Infect"))) - || (attacker.hasKeyword("Persist") && !attacker.canHaveCountersPlacedOnIt(CounterType.M1M1) && (attacker + || (attacker.hasKeyword("Persist") && !attacker.canReceiveCounters(CounterType.M1M1) && (attacker .getCounters(CounterType.M1M1) == 0)) - || (attacker.hasKeyword("Undying") && !attacker.canHaveCountersPlacedOnIt(CounterType.P1P1) && (attacker + || (attacker.hasKeyword("Undying") && !attacker.canReceiveCounters(CounterType.P1P1) && (attacker .getCounters(CounterType.P1P1) == 0))) { return false; } @@ -1533,9 +1533,9 @@ public class ComputerUtilCombat { if (((defender.hasKeyword("Indestructible") || (ComputerUtil.canRegenerate(ai, defender) && !withoutAbilities)) && !(attacker .hasKeyword("Wither") || attacker.hasKeyword("Infect"))) - || (defender.hasKeyword("Persist") && !defender.canHaveCountersPlacedOnIt(CounterType.M1M1) && (defender + || (defender.hasKeyword("Persist") && !defender.canReceiveCounters(CounterType.M1M1) && (defender .getCounters(CounterType.M1M1) == 0)) - || (defender.hasKeyword("Undying") && !defender.canHaveCountersPlacedOnIt(CounterType.P1P1) && (defender + || (defender.hasKeyword("Undying") && !defender.canReceiveCounters(CounterType.P1P1) && (defender .getCounters(CounterType.P1P1) == 0))) { return false; }