From fd601859870866fa53b25ade71a61ffbc04cd09f Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 5 Mar 2016 20:46:09 +1100 Subject: [PATCH 1/2] index on master: 41af3e9 * Disrupting Shoal - Fixed that the converted mana costs of split cards were not handled correctly. From 1685e8eb820db72672b8ad05a929eae6fdae306b Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 5 Mar 2016 21:25:57 +1100 Subject: [PATCH 2/2] spjspj - Implement Divine Intervention (LEG & ME3) --- .../mage/sets/legends/DivineIntervention.java | 52 ++++++ .../masterseditioniii/DivineIntervention.java | 176 ++++++++++++++++++ .../main/java/mage/counters/CounterType.java | 1 + 3 files changed, 229 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/legends/DivineIntervention.java create mode 100644 Mage.Sets/src/mage/sets/masterseditioniii/DivineIntervention.java diff --git a/Mage.Sets/src/mage/sets/legends/DivineIntervention.java b/Mage.Sets/src/mage/sets/legends/DivineIntervention.java new file mode 100644 index 0000000000..b310d9167b --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/DivineIntervention.java @@ -0,0 +1,52 @@ +/* + * 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.sets.legends; + +import java.util.UUID; + +/** + * + * @author spjspj + */ +public class DivineIntervention extends mage.sets.masterseditioniii.DivineIntervention { + + public DivineIntervention(UUID ownerId) { + super(ownerId); + this.cardNumber = 177; + this.expansionSetCode = "LEG"; + } + + public DivineIntervention(final DivineIntervention card) { + super(card); + } + + @Override + public DivineIntervention copy() { + return new DivineIntervention(this); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/DivineIntervention.java b/Mage.Sets/src/mage/sets/masterseditioniii/DivineIntervention.java new file mode 100644 index 0000000000..2fec7ff9d3 --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditioniii/DivineIntervention.java @@ -0,0 +1,176 @@ +/* + * 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.sets.masterseditioniii; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.permanent.Permanent; +import mage.game.stack.StackObject; +import mage.players.Player; + +/** + * + * @author spjspj + */ +public class DivineIntervention extends CardImpl { + + public DivineIntervention(UUID ownerId) { + super(ownerId, 8, "Divine Intervention", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{6}{W}{W}"); + this.expansionSetCode = "ME3"; + + // Divine Intervention enters the battlefield with 2 intervention counters on it. + Effect effect = new AddCountersSourceEffect(CounterType.INTERVENTION.createInstance(2)); + this.addAbility(new EntersBattlefieldAbility(effect, "enters with 2 intervention counters")); + + // At the beginning of your upkeep, remove an intervention counter from Divine Intervention. + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.INTERVENTION.createInstance()), TargetController.YOU, false)); + + // Whenever a intervention counter is removed from Protean Hydra, put two intervention counters on it at the beginning of the next end step. + this.addAbility(new DivineInterventionAbility()); + } + + public DivineIntervention(final DivineIntervention card) { + super(card); + } + + @Override + public DivineIntervention copy() { + return new DivineIntervention(this); + } + + class DivineInterventionAbility extends TriggeredAbilityImpl { + + public DivineInterventionAbility() { + super(Zone.BATTLEFIELD, new DivineAbilityEffect2(), false); + } + + public DivineInterventionAbility(final DivineInterventionAbility ability) { + super(ability); + } + + @Override + public DivineInterventionAbility copy() { + return new DivineInterventionAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.COUNTER_REMOVED; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getData().equals(CounterType.INTERVENTION.getName()) && event.getTargetId().equals(this.getSourceId())) { + + boolean onlyYouOnStack = true; + boolean onlyOpponentOnStack = true; + UUID you = getControllerId(); + boolean firstOnStack = false; + + for (StackObject stackObject : game.getStack()) { + + if (stackObject.getControllerId() != null && !firstOnStack) { + if (you != stackObject.getControllerId()) { + onlyYouOnStack = false; + } else if (you == stackObject.getControllerId()) { + onlyOpponentOnStack = false; + } + + firstOnStack = true; + } + } + + if (onlyYouOnStack && !onlyOpponentOnStack) { + return true; + } else if (!onlyYouOnStack && onlyOpponentOnStack) { + return false; + } + } + return false; + } + + @Override + public String getRule() { + return "When you remove the last intervention counter from {this}, the game is drawn."; + } + } + + class DivineAbilityEffect2 extends OneShotEffect { + + public DivineAbilityEffect2() { + super(Outcome.Neutral); + this.staticText = "you draw the game"; + } + + public DivineAbilityEffect2(final DivineAbilityEffect2 effect) { + super(effect); + } + + @Override + public DivineAbilityEffect2 copy() { + return new DivineAbilityEffect2(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); + if (controller != null && sourcePermanent != null) { + if (game.getState().getZone(sourcePermanent.getId()) == Zone.BATTLEFIELD && sourcePermanent.getCounters().getCount(CounterType.INTERVENTION) == 0) { + game.setDraw(controller.getId()); + + for (UUID player : game.getOpponents(controller.getId())) { + Player opponent = game.getPlayer(player); + if (opponent != null) { + game.setDraw(player); + } + } + return true; + } + } + return false; + } + } +} \ No newline at end of file diff --git a/Mage/src/main/java/mage/counters/CounterType.java b/Mage/src/main/java/mage/counters/CounterType.java index d4dcbdb8bd..8e2ebf75ba 100644 --- a/Mage/src/main/java/mage/counters/CounterType.java +++ b/Mage/src/main/java/mage/counters/CounterType.java @@ -66,6 +66,7 @@ public enum CounterType { HEALING("healing"), HOOFPRINT("hoofprint"), ICE("ice"), + INTERVENTION("intervention"), JAVELIN("javelin"), KI("ki"), LEVEL("level"),