From 0ee3d6c6624ca4946450240ed5a652bb313c849c Mon Sep 17 00:00:00 2001 From: JOAC69 Date: Sat, 24 Sep 2016 23:51:42 -0500 Subject: [PATCH] Refactor - moved ChromaOutrageShamanCount to shared area --- .../mage/sets/eventide/HeartlashCinder.java | 1 + .../src/mage/sets/eventide/OutrageShaman.java | 33 +-------------- .../common/ChromaOutrageShamanCount.java | 40 +++++++++++++++++++ 3 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 Mage/src/main/java/mage/abilities/dynamicvalue/common/ChromaOutrageShamanCount.java diff --git a/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java b/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java index 7db66b5cefd..a909cb17362 100644 --- a/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java +++ b/Mage.Sets/src/mage/sets/eventide/HeartlashCinder.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.ChromaOutrageShamanCount; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; diff --git a/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java index 9a79e0a8fb0..f01c7638b8d 100644 --- a/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java +++ b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java @@ -31,15 +31,12 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.ChromaOutrageShamanCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.filter.common.FilterControlledPermanent; -import mage.game.Game; import mage.target.common.TargetCreaturePermanent; /** @@ -77,31 +74,3 @@ public class OutrageShaman extends CardImpl { } } -class ChromaOutrageShamanCount implements DynamicValue { - - private int chroma; - - @Override - public int calculate(Game game, Ability sourceAbility, Effect effect) { - chroma = 0; - for (Card card : game.getBattlefield().getAllActivePermanents(new FilterControlledPermanent(), sourceAbility.getControllerId(), game)) { - chroma += card.getManaCost().getMana().getRed(); - } - return chroma; - } - - @Override - public DynamicValue copy() { - return new ChromaOutrageShamanCount(); - } - - @Override - public String toString() { - return "1"; - } - - @Override - public String getMessage() { - return ""; - } -} diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ChromaOutrageShamanCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ChromaOutrageShamanCount.java new file mode 100644 index 00000000000..424b88fc14a --- /dev/null +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ChromaOutrageShamanCount.java @@ -0,0 +1,40 @@ +package mage.abilities.dynamicvalue.common; + +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.cards.Card; +import mage.filter.common.FilterControlledPermanent; +import mage.game.Game; + +/** + * Created by Eric on 9/24/2016. + */ +public class ChromaOutrageShamanCount implements DynamicValue { + + private int chroma; + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + chroma = 0; + for (Card card : game.getBattlefield().getAllActivePermanents(new FilterControlledPermanent(), sourceAbility.getControllerId(), game)) { + chroma += card.getManaCost().getMana().getRed(); + } + return chroma; + } + + @Override + public DynamicValue copy() { + return new ChromaOutrageShamanCount(); + } + + @Override + public String toString() { + return "1"; + } + + @Override + public String getMessage() { + return ""; + } +}