From dcb9a7122bd8009d2a821188df832fd49f7b0c2d Mon Sep 17 00:00:00 2001 From: drmDev Date: Tue, 1 Mar 2016 17:26:46 -0500 Subject: [PATCH 1/3] DreadCacodemon card with ConditionalTriggeredAbility --- .../mage/sets/commander/DreadCacodemon.java | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/commander/DreadCacodemon.java diff --git a/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java b/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java new file mode 100644 index 00000000000..3be7b9acf2c --- /dev/null +++ b/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java @@ -0,0 +1,86 @@ +/* + * 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.commander; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.TriggeredAbility; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.decorator.ConditionalTriggeredAbility; +import mage.abilities.effects.common.DestroyAllEffect; +import mage.abilities.effects.common.TapAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.permanent.ControllerPredicate; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) + */ +public class DreadCacodemon extends CardImpl { + + private static final FilterCreaturePermanent opponentsCreatures = new FilterCreaturePermanent("creatures your opponents control"); + static { + opponentsCreatures.add(new ControllerPredicate(TargetController.OPPONENT)); + } + + private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control"); + static { + otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU)); + otherCreaturesYouControl.add(new AnotherPredicate()); + } + + public DreadCacodemon(UUID ownerId) { + super(ownerId, 79, "Dread Cacodemon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{B}{B}{B}"); + this.expansionSetCode = "CMD"; + this.subtype.add("Demon"); + this.power = new MageInt(8); + this.toughness = new MageInt(8); + + // When Dread Cacodemon enters the battlefield, + // if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control. + TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyAllEffect(opponentsCreatures, false)); + ability.addEffect(new TapAllEffect(otherCreaturesYouControl)); + this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandCondition(), + " if you cast it from your hand, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control."), new CastFromHandWatcher()); + } + + public DreadCacodemon(final DreadCacodemon card) { + super(card); + } + + @Override + public DreadCacodemon copy() { + return new DreadCacodemon(this); + } +} \ No newline at end of file From a9214e6d351fc22b02870bf557b15d309d3edfc9 Mon Sep 17 00:00:00 2001 From: drmDev Date: Tue, 1 Mar 2016 18:45:21 -0500 Subject: [PATCH 2/3] unit tests for Dread Cacodemon Cast from hand and Not Cast from hand --- .../EntersTheBattlefieldTriggerTest.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java index 4f4fc2a62d1..1fe8be8bb1a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java @@ -130,5 +130,77 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { assertLife(playerA, 15); assertLife(playerB, 20); } + + /** + * Dread Cacodemon's abilities should only trigger when cast from hand. + * + * Testing when cast from hand abilities take effect. + * Cast from hand destroys opponents creatures and taps all other creatures owner controls. + */ + @Test + public void testDreadCacodemonConditionTrue() { + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 10); + + // When Dread Cacodemon enters the battlefield, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control. + addCard(Zone.HAND, playerA, "Dread Cacodemon", 1); // 8/8 - {7}{B}{B}{B} + + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); + + // Protection from white, first strike + addCard(Zone.BATTLEFIELD, playerA, "Black Knight", 2); // {B}{B} + // Deathtouch + addCard(Zone.BATTLEFIELD, playerB, "Typhoid Rats", 2); // {B} + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dread Cacodemon"); + setStopAt(1, PhaseStep.END_TURN); + + execute(); + + assertPermanentCount(playerB, "Typhoid Rats", 0); + + assertPermanentCount(playerA, "Dread Cacodemon", 1); + assertPermanentCount(playerA, "Black Knight", 2); + assertTappedCount("Black Knight", true, 2); + assertTapped("Dread Cacodemon", false); + } + + /** + * Dread Cacodemon's abilities should only trigger when cast from hand. + * + * Testing when card is not cast from hand, abilities do not take effect. + * All opponents creatures remain alive and owner's creatures are not tapped. + */ + @Test + public void testDreadCacodemonConditionFalse() { + addCard(Zone.BATTLEFIELD, playerA, "Swamp", 10); + + // When Dread Cacodemon enters the battlefield, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control. + addCard(Zone.GRAVEYARD, playerA, "Dread Cacodemon", 1); // 8/8 - {7}{B}{B}{B} + // Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost. + addCard(Zone.HAND, playerA, "Reanimate", 1); // {B} + + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2); + + // Protection from white, first strike + addCard(Zone.BATTLEFIELD, playerA, "Black Knight", 2); // {B}{B} + // Deathtouch + addCard(Zone.BATTLEFIELD, playerB, "Typhoid Rats", 2); // {B} + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Reanimate", "Dread Cacodemon"); + setStopAt(1, PhaseStep.END_TURN); + + execute(); + + assertPermanentCount(playerB, "Typhoid Rats", 2); + + assertGraveyardCount(playerA, "Reanimate", 1); + assertPermanentCount(playerA, "Dread Cacodemon", 1); + assertPermanentCount(playerA, "Black Knight", 2); + assertTappedCount("Black Knight", false, 2); + assertTapped("Dread Cacodemon", false); + + assertLife(playerA, 10); // loses 10 life from reanimating Dread Cacodemon at 10 CMC + assertLife(playerB, 20); + } } From ff0dbba539aeaa290d2b4072bb834170f2b8311d Mon Sep 17 00:00:00 2001 From: drmDev Date: Wed, 2 Mar 2016 07:46:02 -0500 Subject: [PATCH 3/3] tooltip change to include when {this} enters the battlefield --- .../mage/sets/commander/DreadCacodemon.java | 170 +++++++++--------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java b/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java index 3be7b9acf2c..0af6bfc333b 100644 --- a/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java +++ b/Mage.Sets/src/mage/sets/commander/DreadCacodemon.java @@ -1,86 +1,86 @@ -/* - * 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.commander; - -import java.util.UUID; -import mage.MageInt; -import mage.abilities.TriggeredAbility; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.condition.common.CastFromHandCondition; -import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.DestroyAllEffect; -import mage.abilities.effects.common.TapAllEffect; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.TargetController; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; -import mage.watchers.common.CastFromHandWatcher; - -/** - * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) - */ -public class DreadCacodemon extends CardImpl { - - private static final FilterCreaturePermanent opponentsCreatures = new FilterCreaturePermanent("creatures your opponents control"); - static { - opponentsCreatures.add(new ControllerPredicate(TargetController.OPPONENT)); - } - - private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control"); - static { - otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU)); - otherCreaturesYouControl.add(new AnotherPredicate()); - } - - public DreadCacodemon(UUID ownerId) { - super(ownerId, 79, "Dread Cacodemon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{B}{B}{B}"); - this.expansionSetCode = "CMD"; - this.subtype.add("Demon"); - this.power = new MageInt(8); - this.toughness = new MageInt(8); - - // When Dread Cacodemon enters the battlefield, - // if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control. - TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyAllEffect(opponentsCreatures, false)); - ability.addEffect(new TapAllEffect(otherCreaturesYouControl)); - this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandCondition(), - " if you cast it from your hand, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control."), new CastFromHandWatcher()); - } - - public DreadCacodemon(final DreadCacodemon card) { - super(card); - } - - @Override - public DreadCacodemon copy() { - return new DreadCacodemon(this); - } +/* + * 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.commander; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.TriggeredAbility; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.decorator.ConditionalTriggeredAbility; +import mage.abilities.effects.common.DestroyAllEffect; +import mage.abilities.effects.common.TapAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.AnotherPredicate; +import mage.filter.predicate.permanent.ControllerPredicate; +import mage.watchers.common.CastFromHandWatcher; + +/** + * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) + */ +public class DreadCacodemon extends CardImpl { + + private static final FilterCreaturePermanent opponentsCreatures = new FilterCreaturePermanent("creatures your opponents control"); + static { + opponentsCreatures.add(new ControllerPredicate(TargetController.OPPONENT)); + } + + private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control"); + static { + otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU)); + otherCreaturesYouControl.add(new AnotherPredicate()); + } + + public DreadCacodemon(UUID ownerId) { + super(ownerId, 79, "Dread Cacodemon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{B}{B}{B}"); + this.expansionSetCode = "CMD"; + this.subtype.add("Demon"); + this.power = new MageInt(8); + this.toughness = new MageInt(8); + + // When Dread Cacodemon enters the battlefield, + // if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control. + TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyAllEffect(opponentsCreatures, false)); + ability.addEffect(new TapAllEffect(otherCreaturesYouControl)); + this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandCondition(), + "When {this} enters the battlefield, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control."), new CastFromHandWatcher()); + } + + public DreadCacodemon(final DreadCacodemon card) { + super(card); + } + + @Override + public DreadCacodemon copy() { + return new DreadCacodemon(this); + } } \ No newline at end of file