diff --git a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java index 4de2e86182e..10636235f90 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java +++ b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java @@ -70,7 +70,7 @@ public class MassMutiny extends CardImpl { Player opponent = game.getPlayer(opponentId); if (opponent != null) { ability.getTargets().clear(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getLogName()); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getName()); filter.add(new ControllerIdPredicate(opponentId)); TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java b/Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java index 37a7101ebc0..329d22376d9 100644 --- a/Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java +++ b/Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java @@ -75,7 +75,7 @@ public class NykthosShrineToNyx extends CardImpl { } class NykthosShrineToNyxManaAbility extends ManaAbility { - + public NykthosShrineToNyxManaAbility() { super(Zone.BATTLEFIELD, new NykthosDynamicManaEffect(), new GenericManaCost(2)); this.addCost(new TapSourceCost()); @@ -94,15 +94,14 @@ class NykthosShrineToNyxManaAbility extends ManaAbility { public List getNetMana(Game game) { netMana.clear(); if (game != null) { - for (String colorChoice :ChoiceColor.colorChoices) { - netMana.add(((NykthosDynamicManaEffect)this.getEffects().get(0)).computeMana(colorChoice, game, this)); + for (String colorChoice : ChoiceColor.colorChoices) { + netMana.add(((NykthosDynamicManaEffect) this.getEffects().get(0)).computeMana(colorChoice, game, this)); } } return netMana; } } - class NykthosDynamicManaEffect extends ManaEffect { private final Mana computedMana; @@ -132,7 +131,7 @@ class NykthosDynamicManaEffect extends ManaEffect { if (controller.choose(outcome, choice, game)) { computeMana(choice.getChoice(), game, source); checkToFirePossibleEvents(computedMana, game, source); - game.getPlayer(source.getControllerId()).getManaPool().addMana(computedMana, game, source); + controller.getManaPool().addMana(computedMana, game, source); return true; } } @@ -145,10 +144,9 @@ class NykthosDynamicManaEffect extends ManaEffect { return null; } - - public Mana computeMana(String color, Game game, Ability source){ + public Mana computeMana(String color, Game game, Ability source) { this.computedMana.clear(); - if (color !=null && !color.isEmpty()) { + if (color != null && !color.isEmpty()) { switch (color) { case "Red": computedMana.setRed(new DevotionCount(ColoredManaSymbol.R).calculate(game, source, this)); diff --git a/Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java index 70174e951f1..df8de81d5e8 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java @@ -24,15 +24,13 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.abilities.condition.common; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; - /** * Checks if permanent was paid tribute to as it entered the battlefield * @@ -42,7 +40,8 @@ public class TributeNotPaidCondition implements Condition { private static TributeNotPaidCondition fInstance = null; - private TributeNotPaidCondition() {} + private TributeNotPaidCondition() { + } public static Condition getInstance() { if (fInstance == null) { @@ -53,9 +52,9 @@ public class TributeNotPaidCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - Object tribute = game.getState().getValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString()); + Object tribute = game.getState().getValue("tributeValue" + source.getSourceId()); if (tribute != null) { - return ((String)tribute).equals("no"); + return ((String) tribute).equals("no"); } return false; } diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 5475713d002..f44443e7eb2 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -93,6 +93,9 @@ git log 80f4ab770b78b7a7211490ff961ee90998bdc01c..head --diff-filter=A --name-st since 1.4.13v3 git log 7c2eaf9510b1b49fecc28f5c8e68d5377c7a7e3e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.4.14v0 +git log 7c2eaf9510b1b49fecc28f5c8e68d5377c7a7e3e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt + 3. Copy added_cards.txt to trunk\Utils folder 4. Run script: > perl extract_in_wiki_format.perl