From c8fcbca9f9c7a4d4c9628207c75388e9ecd129e8 Mon Sep 17 00:00:00 2001 From: poixen Date: Sat, 21 Nov 2015 12:20:14 +0100 Subject: [PATCH] Renamed addXXX to increaseXXX + add implies a variable addition rather than an increment. --- .../src/mage/sets/dragonsmaze/PlasmCapture.java | 10 +++++----- .../mage/sets/dragonsoftarkir/SarkhanUnbroken.java | 10 +++++----- Mage.Sets/src/mage/sets/eventide/BloomTender.java | 10 +++++----- .../src/mage/sets/fifthdawn/DawnsReflection.java | 10 +++++----- .../src/mage/sets/futuresight/CoalitionRelic.java | 10 +++++----- .../mage/sets/heroesvsmonsters/OrcishLumberjack.java | 4 ++-- .../src/mage/sets/journeyintonyx/MarketFestival.java | 10 +++++----- .../src/mage/sets/legions/GoblinClearcutter.java | 11 ++--------- .../saviorsofkamigawa/SasayaOrochiAscendant.java | 12 ++++++------ .../src/mage/sets/shadowmoor/ManaforgeCinder.java | 4 ++-- .../src/mage/sets/theros/XenagosTheReveler.java | 4 ++-- 11 files changed, 44 insertions(+), 51 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java b/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java index cf82ebbf9e..ae7f5f64f0 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PlasmCapture.java @@ -141,15 +141,15 @@ class PlasmCaptureManaEffect extends ManaEffect { } if (choiceColor.getColor().isBlack()) { - mana.addBlack(); + mana.increaseBlack(); } else if (choiceColor.getColor().isBlue()) { - mana.addBlue(); + mana.increaseBlue(); } else if (choiceColor.getColor().isRed()) { - mana.addRed(); + mana.increaseRed(); } else if (choiceColor.getColor().isGreen()) { - mana.addGreen(); + mana.increaseGreen(); } else if (choiceColor.getColor().isWhite()) { - mana.addWhite(); + mana.increaseWhite(); } } diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SarkhanUnbroken.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SarkhanUnbroken.java index ccd28a1c47..daf2b76935 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/SarkhanUnbroken.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SarkhanUnbroken.java @@ -132,19 +132,19 @@ class SarkhanUnbrokenAbility1 extends OneShotEffect { switch (manaChoice.getChoice()) { case "White": - mana.addWhite(); + mana.increaseWhite(); break; case "Blue": - mana.addBlue(); + mana.increaseBlue(); break; case "Black": - mana.addBlack(); + mana.increaseBlack(); break; case "Red": - mana.addRed(); + mana.increaseRed(); break; case "Green": - mana.addGreen(); + mana.increaseGreen(); break; } diff --git a/Mage.Sets/src/mage/sets/eventide/BloomTender.java b/Mage.Sets/src/mage/sets/eventide/BloomTender.java index f4544ddc23..ecadab68f7 100644 --- a/Mage.Sets/src/mage/sets/eventide/BloomTender.java +++ b/Mage.Sets/src/mage/sets/eventide/BloomTender.java @@ -107,19 +107,19 @@ class BloomTenderEffect extends ManaEffect { Mana mana = new Mana(); for (Permanent permanent : game.getBattlefield().getAllActivePermanents(controller.getId())) { if (mana.getBlack() == 0 && permanent.getColor(game).isBlack()) { - mana.addBlack(); + mana.increaseBlack(); } if (mana.getBlue() == 0 && permanent.getColor(game).isBlue()) { - mana.addBlue(); + mana.increaseBlue(); } if (mana.getRed() == 0 && permanent.getColor(game).isRed()) { - mana.addRed(); + mana.increaseRed(); } if (mana.getGreen() == 0 && permanent.getColor(game).isGreen()) { - mana.addGreen(); + mana.increaseGreen(); } if (mana.getWhite() == 0 && permanent.getColor(game).isWhite()) { - mana.addWhite(); + mana.increaseWhite(); } } return mana; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java b/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java index 417381b270..e511ed5586 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/DawnsReflection.java @@ -142,15 +142,15 @@ class DawnsReflectionManaEffect extends ManaEffect { } if (choiceColor.getColor().isBlack()) { - mana.addBlack(); + mana.increaseBlack(); } else if (choiceColor.getColor().isBlue()) { - mana.addBlue(); + mana.increaseBlue(); } else if (choiceColor.getColor().isRed()) { - mana.addRed(); + mana.increaseRed(); } else if (choiceColor.getColor().isGreen()) { - mana.addGreen(); + mana.increaseGreen(); } else if (choiceColor.getColor().isWhite()) { - mana.addWhite(); + mana.increaseWhite(); } } diff --git a/Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java b/Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java index 1c7ec71523..3c2b480ecb 100644 --- a/Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java +++ b/Mage.Sets/src/mage/sets/futuresight/CoalitionRelic.java @@ -109,15 +109,15 @@ class CoalitionRelicEffect extends OneShotEffect { player.choose(outcome, choice, game); } if (choice.getColor().isBlack()) { - mana.addBlack(); + mana.increaseBlack(); } else if (choice.getColor().isBlue()) { - mana.addBlue(); + mana.increaseBlue(); } else if (choice.getColor().isRed()) { - mana.addRed(); + mana.increaseRed(); } else if (choice.getColor().isGreen()) { - mana.addGreen(); + mana.increaseGreen(); } else if (choice.getColor().isWhite()) { - mana.addWhite(); + mana.increaseWhite(); } choice.clearChoice(); } diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java index 93277aa22f..3a06eafc05 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/OrcishLumberjack.java @@ -123,10 +123,10 @@ class OrcishLumberjackManaEffect extends ManaEffect { } switch (manaChoice.getChoice()) { case "Green": - mana.addGreen(); + mana.increaseGreen(); break; case "Red": - mana.addRed(); + mana.increaseRed(); break; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java b/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java index affa7e15e9..daa67c1397 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MarketFestival.java @@ -154,15 +154,15 @@ class MarketFestivalManaEffect extends ManaEffect { } if (choiceColor.getColor().isBlack()) { - mana.addBlack(); + mana.increaseBlack(); } else if (choiceColor.getColor().isBlue()) { - mana.addBlue(); + mana.increaseBlue(); } else if (choiceColor.getColor().isRed()) { - mana.addRed(); + mana.increaseRed(); } else if (choiceColor.getColor().isGreen()) { - mana.addGreen(); + mana.increaseGreen(); } else if (choiceColor.getColor().isWhite()) { - mana.addWhite(); + mana.increaseWhite(); } } checkToFirePossibleEvents(mana, game, source); diff --git a/Mage.Sets/src/mage/sets/legions/GoblinClearcutter.java b/Mage.Sets/src/mage/sets/legions/GoblinClearcutter.java index 20a5279fbb..bce8de7308 100644 --- a/Mage.Sets/src/mage/sets/legions/GoblinClearcutter.java +++ b/Mage.Sets/src/mage/sets/legions/GoblinClearcutter.java @@ -32,15 +32,11 @@ import java.util.Set; import java.util.UUID; import mage.MageInt; import mage.Mana; -import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.choices.Choice; import mage.choices.ChoiceImpl; @@ -48,14 +44,11 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; /** * @author BursegSardaukar @@ -132,10 +125,10 @@ class GoblinClearCutterEffect extends OneShotEffect { } switch (manaChoice.getChoice()) { case "Green": - mana.addGreen(); + mana.increaseGreen(); break; case "Red": - mana.addRed(); + mana.increaseRed(); break; } player.getManaPool().addMana(mana, game, source); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SasayaOrochiAscendant.java index 3bc2a38c37..3804d61c11 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SasayaOrochiAscendant.java @@ -202,22 +202,22 @@ class SasayasEssenceManaEffectEffect extends ManaEffect { } switch (choice.getChoice()) { case "Black": - newMana.addBlack(); + newMana.increaseBlack(); break; case "Blue": - newMana.addBlue(); + newMana.increaseBlue(); break; case "Red": - newMana.addRed(); + newMana.increaseRed(); break; case "Green": - newMana.addGreen(); + newMana.increaseGreen(); break; case "White": - newMana.addWhite(); + newMana.increaseWhite(); break; case "Colorless": - newMana.addColorless(); + newMana.increaseColorless(); break; } } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ManaforgeCinder.java b/Mage.Sets/src/mage/sets/shadowmoor/ManaforgeCinder.java index c650a49008..5501ab9ade 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ManaforgeCinder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ManaforgeCinder.java @@ -114,10 +114,10 @@ class ManaforgeCinderManaEffect extends OneShotEffect { } switch (manaChoice.getChoice()) { case "Black": - mana.addBlack(); + mana.increaseBlack(); break; case "Red": - mana.addRed(); + mana.increaseRed(); break; } controller.getManaPool().addMana(mana, game, source); diff --git a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java index 8dca641395..781fe57fdb 100644 --- a/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/sets/theros/XenagosTheReveler.java @@ -130,10 +130,10 @@ class XenagosManaEffect extends OneShotEffect { } switch (manaChoice.getChoice()) { case "Green": - mana.addGreen(); + mana.increaseGreen(); break; case "Red": - mana.addRed(); + mana.increaseRed(); break; } player.getManaPool().addMana(mana, game, source);