From 22c18ef2ff2fcfdd1ca3ca763889ea524c38bdbb Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 18 Jul 2017 09:16:05 -0500 Subject: [PATCH 1/4] - Added requested card War's Toll. --- Mage.Sets/src/mage/cards/w/WarsToll.java | 122 +++++++++++++++++++++++ Mage.Sets/src/mage/sets/Dissension.java | 1 + 2 files changed, 123 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/w/WarsToll.java diff --git a/Mage.Sets/src/mage/cards/w/WarsToll.java b/Mage.Sets/src/mage/cards/w/WarsToll.java new file mode 100644 index 0000000000..d34806a0a4 --- /dev/null +++ b/Mage.Sets/src/mage/cards/w/WarsToll.java @@ -0,0 +1,122 @@ +/* + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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.cards.w; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.AttacksAllTriggeredAbility; +import mage.abilities.common.TapForManaAllTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.TapAllEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SetTargetPointer; +import mage.constants.TargetController; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterLandPermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; +import mage.filter.predicate.permanent.ControllerPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; + +/** + * + * @author jeffwadsworth + */ +public class WarsToll extends CardImpl { + + private final static FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); + private final static FilterLandPermanent filterOpponentLand = new FilterLandPermanent("an opponent taps a land"); + + + static { + filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentLand.add(new ControllerPredicate(TargetController.OPPONENT)); + } + + public WarsToll(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); + + // Whenever an opponent taps a land for mana, tap all lands that player controls. + Effect effect = new TapAllEffect(filterOpponentLand); + effect.setText("tap all lands that player controls"); + this.addAbility(new TapForManaAllTriggeredAbility(effect, filterOpponentLand, SetTargetPointer.PLAYER)); + + // If a creature an opponent controls attacks, all creatures that opponent controls attack if able. + this.addAbility(new AttacksAllTriggeredAbility(new WarsTollEffect(), false, filterOpponentCreature, SetTargetPointer.PERMANENT, true)); + + } + + public WarsToll(final WarsToll card) { + super(card); + } + + @Override + public WarsToll copy() { + return new WarsToll(this); + } +} + +class WarsTollEffect extends OneShotEffect { + + private static final FilterCreaturePermanent filterOpponentCreatures = new FilterCreaturePermanent(); + + public WarsTollEffect() { + super(Outcome.Neutral); + staticText = "all creatures that opponent controls attack if able"; + } + + public WarsTollEffect(final WarsTollEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Player opponent = game.getPlayer(game.getPermanent(getTargetPointer().getFirst(game, source)).getControllerId()); + if (opponent != null) { + filterOpponentCreatures.add(new ControllerIdPredicate(opponent.getId())); + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(CardType.CREATURE)) { + if (filterOpponentCreatures.match(permanent, source.getSourceId(), source.getControllerId(), game)) { + //TODO: allow the player to choose between a planeswalker and player + opponent.declareAttacker(permanent.getId(), source.getControllerId(), game, false); + } + } + return true; + } + return false; + } + + @Override + public WarsTollEffect copy() { + return new WarsTollEffect(this); + } +} diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java index f1d9450fbf..eb5da37b7b 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -203,6 +203,7 @@ public class Dissension extends ExpansionSet { cards.add(new SetCardInfo("Voidslime", 137, Rarity.RARE, mage.cards.v.Voidslime.class)); cards.add(new SetCardInfo("Wakestone Gargoyle", 21, Rarity.RARE, mage.cards.w.WakestoneGargoyle.class)); cards.add(new SetCardInfo("Walking Archive", 169, Rarity.RARE, mage.cards.w.WalkingArchive.class)); + cards.add(new SetCardInfo("War's Toll", 77, Rarity.RARE, mage.cards.w.WarsToll.class)); cards.add(new SetCardInfo("Whiptail Moloch", 79, Rarity.COMMON, mage.cards.w.WhiptailMoloch.class)); cards.add(new SetCardInfo("Windreaver", 138, Rarity.RARE, mage.cards.w.Windreaver.class)); cards.add(new SetCardInfo("Wit's End", 58, Rarity.RARE, mage.cards.w.WitsEnd.class)); From c390862a8838683e26db28e2d4b0d32a573ccfa6 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 19 Jul 2017 11:25:19 -0500 Subject: [PATCH 2/4] - Added requested card Jeweled Amulet. --- Mage.Sets/src/mage/cards/j/JeweledAmulet.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/j/JeweledAmulet.java diff --git a/Mage.Sets/src/mage/cards/j/JeweledAmulet.java b/Mage.Sets/src/mage/cards/j/JeweledAmulet.java new file mode 100644 index 0000000000..da6cb14839 --- /dev/null +++ b/Mage.Sets/src/mage/cards/j/JeweledAmulet.java @@ -0,0 +1,159 @@ +/* + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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.cards.j; + +import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.condition.common.SourceHasCounterCondition; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.decorator.ConditionalActivatedAbility; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.ManaEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.mana.SimpleManaAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.util.CardUtil; + +/** + * + * @author jeffwadsworth + */ +public class JeweledAmulet extends CardImpl { + + private static final String rule = "Put a charge counter on {this}. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on {this}"; + + public JeweledAmulet(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); + + // {1}, {tap}: Put a charge counter on Jeweled Amulet. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Jeweled Amulet. + ConditionalActivatedAbility ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new JeweledAmuletAddCounterEffect(), new ManaCostsImpl("{1}"), new SourceHasCounterCondition(CounterType.CHARGE, 0), rule); + ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true)); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + + // {tap}, Remove a charge counter from Jeweled Amulet: Add one mana of Jeweled Amulet's last noted type to your mana pool. + Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new JeweledAmuletAddManaEffect(), new TapSourceCost()); + ability2.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); + this.addAbility(ability2); + + } + + public JeweledAmulet(final JeweledAmulet card) { + super(card); + } + + @Override + public JeweledAmulet copy() { + return new JeweledAmulet(this); + } +} + +class JeweledAmuletAddCounterEffect extends OneShotEffect { + + private static String manaUsedString; + + public JeweledAmuletAddCounterEffect() { + super(Outcome.Benefit); + this.staticText = "Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on {this}"; + } + + public JeweledAmuletAddCounterEffect(final JeweledAmuletAddCounterEffect effect) { + super(effect); + } + + @Override + public JeweledAmuletAddCounterEffect copy() { + return new JeweledAmuletAddCounterEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + Permanent jeweledAmulet = game.getPermanent(source.getSourceId()); + if (controller != null + && jeweledAmulet != null) { + game.getState().setValue("JeweledAmulet" + source.getSourceId().toString(), source.getManaCostsToPay().getUsedManaToPay()); //store the mana used to pay + manaUsedString = source.getManaCostsToPay().getUsedManaToPay().toString(); + jeweledAmulet.addInfo("MANA USED", CardUtil.addToolTipMarkTags("Mana used last: " + manaUsedString), game); + return true; + } + return false; + } +} + +class JeweledAmuletAddManaEffect extends ManaEffect { + + private static Mana storedMana; + + JeweledAmuletAddManaEffect() { + super(); + staticText = "Add one mana of {this}'s last noted type to your mana pool"; + } + + JeweledAmuletAddManaEffect(JeweledAmuletAddManaEffect effect) { + super(effect); + } + + @Override + public JeweledAmuletAddManaEffect copy() { + return new JeweledAmuletAddManaEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent jeweledAmulet = game.getPermanent(source.getSourceId()); + Player controller = game.getPlayer(source.getControllerId()); + if (jeweledAmulet != null + && controller != null) { + storedMana = (Mana) game.getState().getValue("JeweledAmulet" + source.getSourceId().toString()); + if (storedMana != null) { + checkToFirePossibleEvents(storedMana, game, source); + controller.getManaPool().addMana(storedMana, game, source); + return true; + } + } + return false; + } + + @Override + public Mana getMana(Game game, Ability source) { + return null; + } + +} From 1aadbf5b524258e8ac8668ef5f8d6cd53872d744 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 19 Jul 2017 16:17:52 -0500 Subject: [PATCH 3/4] - Commit changes to Sets files. --- Mage.Sets/src/mage/sets/IceAge.java | 1 + Mage.Sets/src/mage/sets/MastersEditionII.java | 1 + 2 files changed, 2 insertions(+) diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java index 672f7c76a9..5288cc1138 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -161,6 +161,7 @@ public class IceAge extends ExpansionSet { cards.add(new SetCardInfo("Island", 336, Rarity.LAND, mage.cards.basiclands.Island.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Jester's Cap", 299, Rarity.RARE, mage.cards.j.JestersCap.class)); cards.add(new SetCardInfo("Jester's Mask", 300, Rarity.RARE, mage.cards.j.JestersMask.class)); + cards.add(new SetCardInfo("Jeweled Amulet", 301, Rarity.UNCOMMON, mage.cards.j.JeweledAmulet.class)); cards.add(new SetCardInfo("Johtull Wurm", 138, Rarity.UNCOMMON, mage.cards.j.JohtullWurm.class)); cards.add(new SetCardInfo("Jokulhaups", 195, Rarity.RARE, mage.cards.j.Jokulhaups.class)); cards.add(new SetCardInfo("Juniper Order Druid", 139, Rarity.COMMON, mage.cards.j.JuniperOrderDruid.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEditionII.java b/Mage.Sets/src/mage/sets/MastersEditionII.java index c57ee4af00..72afb29326 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionII.java @@ -143,6 +143,7 @@ public class MastersEditionII extends ExpansionSet { cards.add(new SetCardInfo("Inheritance", 18, Rarity.UNCOMMON, mage.cards.i.Inheritance.class)); cards.add(new SetCardInfo("Ironclaw Orcs", 132, Rarity.COMMON, mage.cards.i.IronclawOrcs.class)); cards.add(new SetCardInfo("Jester's Mask", 211, Rarity.RARE, mage.cards.j.JestersMask.class)); + cards.add(new SetCardInfo("Jeweled Amulet", 212, Rarity.UNCOMMON, mage.cards.j.JeweledAmulet.class)); cards.add(new SetCardInfo("Johtull Wurm", 168, Rarity.UNCOMMON, mage.cards.j.JohtullWurm.class)); cards.add(new SetCardInfo("Juniper Order Advocate", 20, Rarity.UNCOMMON, mage.cards.j.JuniperOrderAdvocate.class)); cards.add(new SetCardInfo("Kaysa", 170, Rarity.RARE, mage.cards.k.Kaysa.class)); From 382476206c8e405092295b8d108de6e141a4db16 Mon Sep 17 00:00:00 2001 From: fireshoes Date: Wed, 19 Jul 2017 16:33:57 -0500 Subject: [PATCH 4/4] Restored inadvertently deleted line in DuelCommander.java --- .../Mage.Deck.Constructed/src/mage/deck/DuelCommander.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java index 7778a4fce2..b80bc63084 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java @@ -34,6 +34,7 @@ package mage.deck; public class DuelCommander extends Commander { public DuelCommander() { + super("Duel Commander"); banned.add("Ancestral Recall"); banned.add("Back to Basics"); banned.add("Black Lotus");