From 096efc895113678a48a5fca0279f0ed24690e15b Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Mon, 20 Mar 2017 18:55:49 -0300 Subject: [PATCH 1/4] Implement Citadel of Pain --- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 104 ++++++++++++++++++ Mage.Sets/src/mage/sets/Prophecy.java | 1 + 2 files changed, 105 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/c/CitadelOfPain.java diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java new file mode 100644 index 0000000000..c4285892fc --- /dev/null +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -0,0 +1,104 @@ +/* + * 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.c; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.TriggeredAbility; +import mage.abilities.common.OnEventTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledLandPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.permanent.TappedPredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.players.Player; + +/** + * + * @author Alexsandr0x + */ +public class CitadelOfPain extends CardImpl { + + public CitadelOfPain(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); + + TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, + new CitadelOfPainEffect()); + // At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls. + } + + public CitadelOfPain(final CitadelOfPain card) { + super(card); + } + + @Override + public CitadelOfPain copy() { + return new CitadelOfPain(this); + } +} + +class CitadelOfPainEffect extends OneShotEffect { + + private static final FilterPermanent filter = new FilterControlledLandPermanent(); + + static { + filter.add(Predicates.not(new TappedPredicate())); + } + + public CitadelOfPainEffect() { + super(Outcome.Damage); + } + + public CitadelOfPainEffect(Outcome outcome) { + super(outcome); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(targetPointer.getFirst(game, source)); + if (player != null) { + int damage = game.getBattlefield().countAll(filter, game.getActivePlayerId(), game); + player.damage(damage, source.getSourceId(), game, false, true); + return true; + } + return false; + } + + @Override + public Effect copy() { + return new CitadelOfPainEffect(); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/Prophecy.java b/Mage.Sets/src/mage/sets/Prophecy.java index 601b124548..34cfc2e6ae 100644 --- a/Mage.Sets/src/mage/sets/Prophecy.java +++ b/Mage.Sets/src/mage/sets/Prophecy.java @@ -71,6 +71,7 @@ public class Prophecy extends ExpansionSet { cards.add(new SetCardInfo("Calming Verse", 110, Rarity.COMMON, mage.cards.c.CalmingVerse.class)); cards.add(new SetCardInfo("Chilling Apparition", 59, Rarity.UNCOMMON, mage.cards.c.ChillingApparition.class)); cards.add(new SetCardInfo("Chimeric Idol", 136, Rarity.UNCOMMON, mage.cards.c.ChimericIdol.class)); + cards.add(new SetCardInfo("Citadel of Pain", 86, Rarity.UNCOMMON, mage.cards.c.CitadelOfPain.class)); cards.add(new SetCardInfo("Coastal Hornclaw", 31, Rarity.COMMON, mage.cards.c.CoastalHornclaw.class)); cards.add(new SetCardInfo("Darba", 111, Rarity.UNCOMMON, mage.cards.d.Darba.class)); cards.add(new SetCardInfo("Denying Wind", 32, Rarity.RARE, mage.cards.d.DenyingWind.class)); From a6e1c1a37d54bed67727aaf2b02fcfe837fa6971 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Mon, 20 Mar 2017 19:03:12 -0300 Subject: [PATCH 2/4] Add ability to cast --- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index c4285892fc..86c9ece906 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -58,6 +58,7 @@ public class CitadelOfPain extends CardImpl { TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new CitadelOfPainEffect()); // At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls. + this.addAbility(triggered); } public CitadelOfPain(final CitadelOfPain card) { From bfb2b07ba62b40a9161224e68d54391a03b81406 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 22 Mar 2017 13:09:49 -0300 Subject: [PATCH 3/4] Create unit tests --- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 11 ++++++-- .../oneshot/damage/CitadelOfPainTest.java | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index 86c9ece906..8d03fc18e8 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -30,6 +30,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; +import mage.abilities.Mode; import mage.abilities.TriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.effects.Effect; @@ -55,7 +56,8 @@ public class CitadelOfPain extends CardImpl { public CitadelOfPain(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); - TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, + TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, + "beginning of the end step", true, new CitadelOfPainEffect()); // At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls. this.addAbility(triggered); @@ -75,6 +77,11 @@ class CitadelOfPainEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledLandPermanent(); + @Override + public String getText(Mode mode) { + return "{this} deals X damage to that player, where X is the number of untapped lands he or she controls."; + } + static { filter.add(Predicates.not(new TappedPredicate())); } @@ -89,7 +96,7 @@ class CitadelOfPainEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(targetPointer.getFirst(game, source)); + Player player = game.getPlayer(game.getActivePlayerId()); if (player != null) { int damage = game.getBattlefield().countAll(filter, game.getActivePlayerId(), game); player.damage(damage, source.getSourceId(), game, false, true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java new file mode 100644 index 0000000000..cf972d5a93 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java @@ -0,0 +1,25 @@ +package org.mage.test.cards.abilities.oneshot.damage; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * Created by Alexsandr0x. + */ +public class CitadelOfPainTest extends CardTestPlayerBase { + + @Test + public void testDamage() { + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); + // At the beginning of each player's end step, Citadel of Pain deals X damage to that + // player, where X is the number of untapped lands he or she controls. + addCard(Zone.BATTLEFIELD, playerA, "Citadel of Pain"); + + setStopAt(3, PhaseStep.END_TURN); + execute(); + + assertLife(playerA, 17); + } +} From 0d0bba7f5785bc724c96ab6a83248d9d94e453bd Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 22 Mar 2017 13:14:15 -0300 Subject: [PATCH 4/4] Fiz turns to pass in unit test --- .../test/cards/abilities/oneshot/damage/CitadelOfPainTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java index cf972d5a93..a342278eed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/CitadelOfPainTest.java @@ -17,7 +17,7 @@ public class CitadelOfPainTest extends CardTestPlayerBase { // player, where X is the number of untapped lands he or she controls. addCard(Zone.BATTLEFIELD, playerA, "Citadel of Pain"); - setStopAt(3, PhaseStep.END_TURN); + setStopAt(1, PhaseStep.END_TURN); execute(); assertLife(playerA, 17);