From 48dfdafe1e23003ac01aadca3be8c20a5420d52b Mon Sep 17 00:00:00 2001 From: Timothy Rogers Date: Fri, 5 Aug 2016 17:10:25 -0500 Subject: [PATCH 1/5] Implemented Celestial Sword from Iceage and ME4 --- .../src/mage/sets/iceage/CelestialSword.java | 74 +++++++++++++++++++ .../sets/masterseditioniv/CelestialSword.java | 54 ++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/iceage/CelestialSword.java create mode 100644 Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java diff --git a/Mage.Sets/src/mage/sets/iceage/CelestialSword.java b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java new file mode 100644 index 0000000000..3c96903178 --- /dev/null +++ b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java @@ -0,0 +1,74 @@ +/* + * 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.iceage; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.common.OnEventTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.events.GameEvent; +import mage.target.common.TargetControlledCreaturePermanent; + +/** + * + * @author anonymous + */ +public class CelestialSword extends CardImpl { + + public CelestialSword(UUID ownerId) { + super(ownerId, 289, "Celestial Sword", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{6}"); + this.expansionSetCode = "ICE"; + + // {3}, {tap}: Target creature you control gets +3/+3 until end of turn. Its controller sacrifices it at the beginning of the next end step. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new GenericManaCost(3)); + ability.addCost(new TapSourceCost()); + ability.addTarget(new TargetControlledCreaturePermanent()); + ability.addEffect(new GainAbilityTargetEffect(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()),Duration.EndOfTurn)); + this.addAbility(ability); + } + + public CelestialSword(final CelestialSword card) { + super(card); + } + + @Override + public CelestialSword copy() { + return new CelestialSword(this); + } +} diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java b/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java new file mode 100644 index 0000000000..930f5e818a --- /dev/null +++ b/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java @@ -0,0 +1,54 @@ +/* + * 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.masterseditioniv; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author anonymous + */ +public class CelestialSword extends mage.sets.iceage.CelestialSword { + + public CelestialSword(UUID ownerId) { + super(ownerId); + this.cardNumber = "188"; + this.expansionSetCode = "ME4"; + this.rarity = Rarity.UNCOMMON; + } + + public CelestialSword(final CelestialSword card) { + super(card); + } + + @Override + public CelestialSword copy() { + return new CelestialSword(this); + } +} From cb591e10ef1a2f884e4c61162b2390796a86b171 Mon Sep 17 00:00:00 2001 From: Timothy Rogers Date: Fri, 5 Aug 2016 17:11:27 -0500 Subject: [PATCH 2/5] Fixed author comment --- Mage.Sets/src/mage/sets/iceage/CelestialSword.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/iceage/CelestialSword.java b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java index 3c96903178..9acf2d7d88 100644 --- a/Mage.Sets/src/mage/sets/iceage/CelestialSword.java +++ b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java @@ -47,7 +47,7 @@ import mage.target.common.TargetControlledCreaturePermanent; /** * - * @author anonymous + * @author choiseul11 */ public class CelestialSword extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java b/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java index 930f5e818a..7b6cede212 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/CelestialSword.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author choiseul11 */ public class CelestialSword extends mage.sets.iceage.CelestialSword { From 33e0f2cdde8b633bb1b51036617e216ef77c0bf6 Mon Sep 17 00:00:00 2001 From: Timothy Rogers Date: Fri, 5 Aug 2016 20:52:11 -0500 Subject: [PATCH 3/5] Implemented Murderous Betrayal --- .../sets/eighthedition/MurderousBetrayal.java | 121 ++++++++++++++++++ .../mage/sets/nemesis/MurderousBetrayal.java | 52 ++++++++ 2 files changed, 173 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java create mode 100644 Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java diff --git a/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java b/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java new file mode 100644 index 0000000000..157365df20 --- /dev/null +++ b/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java @@ -0,0 +1,121 @@ +/* + * 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.eighthedition; + +import java.util.UUID; + +import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.Cost; +import mage.abilities.costs.CostImpl; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.game.Game; +import mage.players.Player; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author anonymous + */ +public class MurderousBetrayal extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature"); + + static { + filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); + } + + public MurderousBetrayal(UUID ownerId) { + super(ownerId, 147, "Murderous Betrayal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); + this.expansionSetCode = "8ED"; + + // {B}{B}, Pay half your life, rounded up: Destroy target nonblack creature. It can't be regenerated. + Effect effect = new DestroyTargetEffect(true); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new MurderousBetrayalCost()); + ability.addCost(new ManaCostsImpl("{B}{B}")); + ability.addTarget(new TargetCreaturePermanent(filter)); + this.addAbility(ability); + } + + public MurderousBetrayal(final MurderousBetrayal card) { + super(card); + } + + @Override + public MurderousBetrayal copy() { + return new MurderousBetrayal(this); + } +} + +class MurderousBetrayalCost extends CostImpl { + + MurderousBetrayalCost() { + this.text = "Pay half your life, rounded up"; + } + + MurderousBetrayalCost(MurderousBetrayalCost cost) { + super(cost); + } + + @Override + public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { + Player controller = game.getPlayer(controllerId); + return controller != null && !(controller.getLife() > 0 && !controller.canPayLifeCost()); + } + + @Override + public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) { + Player controller = game.getPlayer(controllerId); + if (controller != null) { + int currentLife = controller.getLife(); + int lifeToPay = (currentLife + currentLife % 2) / 2; // Divide by two and round up. + if (lifeToPay < 0) { + this.paid = true; + } else { + this.paid = (controller.loseLife(lifeToPay, game) == lifeToPay); + } + return this.paid; + } + return false; + } + + @Override + public MurderousBetrayalCost copy() { + return new MurderousBetrayalCost(this); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java b/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java new file mode 100644 index 0000000000..807a023430 --- /dev/null +++ b/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.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.nemesis; + +import java.util.UUID; + +/** + * + * @author anonymous + */ +public class MurderousBetrayal extends mage.sets.eighthedition.MurderousBetrayal { + + public MurderousBetrayal(UUID ownerId) { + super(ownerId); + this.cardNumber = "61"; + this.expansionSetCode = "NEM"; + } + + public MurderousBetrayal(final MurderousBetrayal card) { + super(card); + } + + @Override + public MurderousBetrayal copy() { + return new MurderousBetrayal(this); + } +} From adf6575eb2bce603c944fdb6ad4007053e9dd52d Mon Sep 17 00:00:00 2001 From: Timothy Rogers Date: Fri, 5 Aug 2016 22:02:56 -0500 Subject: [PATCH 4/5] Fixed author comment on Murderous Betrayal --- Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java | 2 +- Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java b/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java index 157365df20..c9b1f66b85 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java +++ b/Mage.Sets/src/mage/sets/eighthedition/MurderousBetrayal.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author choiseul11 */ public class MurderousBetrayal extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java b/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java index 807a023430..0b29c06779 100644 --- a/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java +++ b/Mage.Sets/src/mage/sets/nemesis/MurderousBetrayal.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author choiseul11 */ public class MurderousBetrayal extends mage.sets.eighthedition.MurderousBetrayal { From 32d70cb069f6761e13ea131a594f8fca5b6dc5ed Mon Sep 17 00:00:00 2001 From: Timothy Rogers Date: Sat, 6 Aug 2016 17:00:50 -0500 Subject: [PATCH 5/5] Changed Celestial Sword sacrifice trigger to use CreateDelayedTriggeredAbilityEffect and AtTheBeginOfNextEndStepDelayedTriggeredAbility --- Mage.Sets/src/mage/sets/iceage/CelestialSword.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/iceage/CelestialSword.java b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java index 9acf2d7d88..cc80028aff 100644 --- a/Mage.Sets/src/mage/sets/iceage/CelestialSword.java +++ b/Mage.Sets/src/mage/sets/iceage/CelestialSword.java @@ -32,9 +32,12 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.abilities.effects.common.SacrificeTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.cards.CardImpl; @@ -59,7 +62,7 @@ public class CelestialSword extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); - ability.addEffect(new GainAbilityTargetEffect(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()),Duration.EndOfTurn)); + ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeTargetEffect()))); this.addAbility(ability); }