From 77618b7ef576f7559d07bcfa66e28db916138f57 Mon Sep 17 00:00:00 2001 From: ThomasLerner Date: Sun, 9 Apr 2017 06:30:54 -0400 Subject: [PATCH 1/5] Create IceCave.java --- Mage.Sets/src/mage/cards/i/IceCave.java | 116 ++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/i/IceCave.java diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java new file mode 100644 index 0000000000..916a278e08 --- /dev/null +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -0,0 +1,116 @@ +/* + * 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.i; + +import mage.abilities.Ability; +import mage.abilities.common.SpellCastAllTriggeredAbility; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SetTargetPointer; +import mage.constants.Zone; +import mage.filter.FilterSpell; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.game.stack.Spell; +import mage.players.Player; +import mage.util.CardUtil; + +import java.util.UUID; +import mage.abilities.costs.Cost; +import mage.abilities.costs.mana.ManaCostsImpl; + +/** + * + * @author jeffwadsworth + */ +public class IceCave extends CardImpl { + + public IceCave(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}{U}"); + + + // Whenever a player casts a spell, any other player may pay that spell's mana cost. If a player does, counter the spell. (Mana cost includes color.) + this.addAbility(new SpellCastAllTriggeredAbility(Zone.BATTLEFIELD, new IceCaveEffect(), new FilterSpell(), false, SetTargetPointer.SPELL)); + } + + public IceCave(final IceCave card) { + super(card); + } + + @Override + public IceCave copy() { + return new IceCave(this); + } +} + +class IceCaveEffect extends OneShotEffect { + + public IceCaveEffect() { + super(Outcome.AIDontUseIt); + this.staticText = "any other player may pay that spell's mana cost. If a player does, counter the spell"; + } + + public IceCaveEffect(final IceCaveEffect effect) { + super(effect); + } + + @Override + public IceCaveEffect copy() { + return new IceCaveEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); + Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source)); + if(sourcePermanent != null && spell != null) { + Cost cost = new ManaCostsImpl(spell.getSpellAbility().getManaCosts().getText()); + for (UUID playerId : game.getState().getPlayerList(source.getControllerId())) { + Player player = game.getPlayer(playerId); + if(player.getId() != spell.getControllerId()) { + cost.clearPaid(); + if (cost.canPay(source, source.getSourceId(), player.getId(), game) + && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) { + if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) { + game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.'); + game.getStack().counter(spell.getId(), source.getSourceId(), game); + } + } + } + } + } + return true; + } +} + From 7a0a7d9a2fb95f8d6ea3699acaf156dbe8faedb8 Mon Sep 17 00:00:00 2001 From: ThomasLerner Date: Sun, 9 Apr 2017 06:32:43 -0400 Subject: [PATCH 2/5] Update Apocalypse.java Added Ice Cave entry --- Mage.Sets/src/mage/sets/Apocalypse.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java index cab2812e69..8dd861e76e 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -72,6 +72,7 @@ public class Apocalypse extends ExpansionSet { cards.add(new SetCardInfo("Grave Defiler", 40, Rarity.UNCOMMON, mage.cards.g.GraveDefiler.class)); cards.add(new SetCardInfo("Haunted Angel", 12, Rarity.UNCOMMON, mage.cards.h.HauntedAngel.class)); cards.add(new SetCardInfo("Helionaut", 13, Rarity.COMMON, mage.cards.h.Helionaut.class)); + cards.add(new SetCardInfo("Ice Cave", 24, Rarity.RARE, mage.cards.i.IceCave.class)); cards.add(new SetCardInfo("Illuminate", 63, Rarity.UNCOMMON, mage.cards.i.Illuminate.class)); cards.add(new SetCardInfo("Illusion // Reality", 129, Rarity.UNCOMMON, mage.cards.i.IllusionReality.class)); cards.add(new SetCardInfo("Index", 25, Rarity.COMMON, mage.cards.i.Index.class)); From d510651bac5573927e53b2875e886c7b3ddb560c Mon Sep 17 00:00:00 2001 From: ThomasLerner Date: Sun, 9 Apr 2017 06:34:37 -0400 Subject: [PATCH 3/5] Update IceCave.java --- Mage.Sets/src/mage/cards/i/IceCave.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java index 916a278e08..81770bbbe9 100644 --- a/Mage.Sets/src/mage/cards/i/IceCave.java +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -51,7 +51,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; /** * - * @author jeffwadsworth + * @author ThomasLerner */ public class IceCave extends CardImpl { From 57b50857cc9733dd96975822906f5cbb5d53b90e Mon Sep 17 00:00:00 2001 From: ThomasLerner Date: Sun, 9 Apr 2017 18:23:34 -0400 Subject: [PATCH 4/5] Update IceCave.java I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it. --- Mage.Sets/src/mage/cards/i/IceCave.java | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java index 81770bbbe9..e6474dd0f7 100644 --- a/Mage.Sets/src/mage/cards/i/IceCave.java +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -94,19 +94,23 @@ class IceCaveEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source)); - if(sourcePermanent != null && spell != null) { + if(sourcePermanent != null && spell != null && controller != null) { + Player spellController = game.getPlayer(spell.getControllerId()); Cost cost = new ManaCostsImpl(spell.getSpellAbility().getManaCosts().getText()); - for (UUID playerId : game.getState().getPlayerList(source.getControllerId())) { - Player player = game.getPlayer(playerId); - if(player.getId() != spell.getControllerId()) { - cost.clearPaid(); - if (cost.canPay(source, source.getSourceId(), player.getId(), game) - && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) { - if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) { - game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.'); - game.getStack().counter(spell.getId(), source.getSourceId(), game); + if (spellController != null) { + for (UUID playerId : game.getOpponents(spell.getControllerId())) { + Player player = game.getPlayer(playerId); + if (player != null) { + cost.clearPaid(); + if (cost.canPay(source, source.getSourceId(), player.getId(), game) + && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) { + if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) { + game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.'); + game.getStack().counter(spell.getId(), source.getSourceId(), game); + return true; + } } - } + } } } } From 7a48387635b38b3f36f1489ecf8492edc8a395e6 Mon Sep 17 00:00:00 2001 From: ThomasLerner Date: Mon, 10 Apr 2017 04:39:10 -0400 Subject: [PATCH 5/5] Fixed not giving counter option to non-opponent players that are not the spell's controller This update brings to code to compliance with LevelX2's reccomendation by using getPlayersInRange(source.getControllerId(), game) and checking manually that the player is not the spell's controller. --- Mage.Sets/src/mage/cards/i/IceCave.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java index e6474dd0f7..228e2d6d4d 100644 --- a/Mage.Sets/src/mage/cards/i/IceCave.java +++ b/Mage.Sets/src/mage/cards/i/IceCave.java @@ -30,10 +30,8 @@ package mage.cards.i; import mage.abilities.Ability; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SetTargetPointer; @@ -43,12 +41,11 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.util.CardUtil; - -import java.util.UUID; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; +import java.util.UUID; + /** * * @author ThomasLerner @@ -97,14 +94,14 @@ class IceCaveEffect extends OneShotEffect { if(sourcePermanent != null && spell != null && controller != null) { Player spellController = game.getPlayer(spell.getControllerId()); Cost cost = new ManaCostsImpl(spell.getSpellAbility().getManaCosts().getText()); - if (spellController != null) { - for (UUID playerId : game.getOpponents(spell.getControllerId())) { + if(spellController != null) { + for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); - if (player != null) { + if(player != null && player != spellController) { cost.clearPaid(); - if (cost.canPay(source, source.getSourceId(), player.getId(), game) + if(cost.canPay(source, source.getSourceId(), player.getId(), game) && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) { - if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) { + if(cost.pay(source, game, source.getSourceId(), playerId, false, null)) { game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.'); game.getStack().counter(spell.getId(), source.getSourceId(), game); return true; @@ -117,4 +114,3 @@ class IceCaveEffect extends OneShotEffect { return true; } } -