From cd2842d457a33b6958e5cd04e8e22e4a40ca7af7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 19 Sep 2015 13:09:27 +0200 Subject: [PATCH] XMage 1.4.4v4 --- Mage.Common/src/mage/utils/MageVersion.java | 2 +- .../battleforzendikar/RoilmagesTrick.java | 7 +++--- .../zendikarvseldrazi/VeteranWarleader.java | 9 ++++---- .../abilities/costs/common/TapTargetCost.java | 22 +++++++++---------- .../effects/common/DestroyAllEffect.java | 9 ++++---- .../mage/cards/repository/CardRepository.java | 2 +- Utils/release/getting_implemented_cards.txt | 5 ++++- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 57351660d5..b1adde18b0 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 4; - public final static String MAGE_VERSION_MINOR_PATCH = "v3"; + public final static String MAGE_VERSION_MINOR_PATCH = "v4"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/RoilmagesTrick.java b/Mage.Sets/src/mage/sets/battleforzendikar/RoilmagesTrick.java index 5692d5a6cf..de6e77d02c 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/RoilmagesTrick.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/RoilmagesTrick.java @@ -31,7 +31,6 @@ import java.util.UUID; import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -61,9 +60,9 @@ public class RoilmagesTrick extends CardImpl { // Converge — Creatures your opponents control get -X/-0 until end of turn, where X is the number of colors of mana spent to cast Roilmage's Trick. this.getSpellAbility().setAbilityWord(AbilityWord.CONVERGE); - Effect effect = new BoostAllEffect(new SignInversionDynamicValue(ColorsOfManaSpentToCastCount.getInstance()), new StaticValue(-0), Duration.EndOfTurn, filter, false); - effect.setText("Creatures your opponents control get -X/-0 until end of turn, where X is the number of colors of mana spent to cast {this}.
"); - this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new BoostAllEffect( + new SignInversionDynamicValue(ColorsOfManaSpentToCastCount.getInstance()), new StaticValue(-0), Duration.EndOfTurn, filter, false, + "Creatures your opponents control get -X/-0 until end of turn, where X is the number of colors of mana spent to cast {this}.
", true)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/zendikarvseldrazi/VeteranWarleader.java b/Mage.Sets/src/mage/sets/zendikarvseldrazi/VeteranWarleader.java index 234e3e4a15..7da3274afa 100644 --- a/Mage.Sets/src/mage/sets/zendikarvseldrazi/VeteranWarleader.java +++ b/Mage.Sets/src/mage/sets/zendikarvseldrazi/VeteranWarleader.java @@ -64,8 +64,8 @@ import mage.target.common.TargetControlledPermanent; * @author fireshoes */ public class VeteranWarleader extends CardImpl { - - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another untapped Ally"); + + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another untapped Ally you control"); static { filter.add(new AnotherPredicate()); @@ -84,9 +84,9 @@ public class VeteranWarleader extends CardImpl { // Veteran Warleader's power and toughness are each equal to the number of creatures you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect( new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Duration.EndOfGame))); - + // Tap another untapped Ally you control: Veteran Warleader gains your choice of first strike, vigilance, or trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new VeteranWarleaderEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true)))); } @@ -101,6 +101,7 @@ public class VeteranWarleader extends CardImpl { } class VeteranWarleaderEffect extends OneShotEffect { + VeteranWarleaderEffect() { super(Outcome.AddAbility); staticText = "{this} gains your choice of first strike, vigilance, or trample until end of turn"; diff --git a/Mage/src/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/mage/abilities/costs/common/TapTargetCost.java index a793bd6e3b..749eea7aff 100644 --- a/Mage/src/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/mage/abilities/costs/common/TapTargetCost.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,12 +20,11 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * 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.costs.common; import java.util.List; @@ -49,10 +48,10 @@ public class TapTargetCost extends CostImpl { public TapTargetCost(TargetControlledPermanent target) { this.target = target; this.target.setNotTarget(true); // costs are never targeted - this.text = - new StringBuilder("Tap ") - .append(target.getTargetName().startsWith("a ") || target.getTargetName().startsWith("an ") ? "":CardUtil.numberToText(target.getMaxNumberOfTargets())) - .append(" ") + this.text + = new StringBuilder("Tap ") + .append((target.getTargetName().startsWith("a ") || target.getTargetName().startsWith("an ") || target.getTargetName().startsWith("another")) + ? "" : CardUtil.numberToText(target.getMaxNumberOfTargets()) + " ") .append(target.getTargetName()).toString(); } @@ -64,7 +63,7 @@ public class TapTargetCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) { if (target.choose(Outcome.Tap, controllerId, sourceId, game)) { - for (UUID targetId: (List)target.getTargets()) { + for (UUID targetId : (List) target.getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent == null) { return false; @@ -85,5 +84,4 @@ public class TapTargetCost extends CostImpl { return new TapTargetCost(this); } - } diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java b/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java index 6546b17f8a..51331c4e81 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java @@ -42,6 +42,10 @@ public class DestroyAllEffect extends OneShotEffect { private FilterPermanent filter; private boolean noRegen; + public DestroyAllEffect(FilterPermanent filter) { + this(filter, false); + } + public DestroyAllEffect(FilterPermanent filter, boolean noRegen) { super(Outcome.DestroyPermanent); this.filter = filter; @@ -53,10 +57,6 @@ public class DestroyAllEffect extends OneShotEffect { } } - public DestroyAllEffect(FilterPermanent filter) { - this(filter, false); - } - public DestroyAllEffect(final DestroyAllEffect effect) { super(effect); this.filter = effect.filter.copy(); @@ -70,7 +70,6 @@ public class DestroyAllEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { permanent.destroy(source.getSourceId(), game, noRegen); } diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java index 6cd148fbe9..4691eaa4f6 100644 --- a/Mage/src/mage/cards/repository/CardRepository.java +++ b/Mage/src/mage/cards/repository/CardRepository.java @@ -63,7 +63,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 41; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 36; + private static final long CARD_CONTENT_VERSION = 37; private final Random random = new Random(); private Dao cardDao; diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index e8cb6d2f32..a8e576fdfe 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -25,7 +25,10 @@ since 1.4.4.v0 git log 0a458707ddaaa5e7e82ab06d17633084f67077c1..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt since 1.4.4.v3 -git log 3d8494edb5c0fddcb972758f7d983b8b66a9651e..0a458707ddaaa5e7e82ab06d17633084f67077c1 --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +git log 3d8494edb5c0fddcb972758f7d983b8b66a9651e..head --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt + +since 1.4.4.v4 +git log 513a574ae98aff3d7820e5411a8e5f2a6506e69c..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: