From f00001aca21e0aacfe9b77561775a9d8d3768fd4 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 28 Dec 2014 21:49:53 +0100 Subject: [PATCH] * Fixed a bug that abilities gained from enchantments (e.g. regen from Molting Snakeskin) to enchanted permanent did not work. --- .../sets/riseoftheeldrazi/HadaSpyPatrol.java | 19 +++-- .../sets/shardsofalara/KathariScreecher.java | 4 ++ .../cards/replacement/RegenerateTest.java | 71 +++++++++++++++++++ .../continious/GainAbilityAttachedEffect.java | 2 +- 4 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java index 0550d6e2b2..fe54df898f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HadaSpyPatrol.java @@ -27,8 +27,7 @@ */ package mage.sets.riseoftheeldrazi; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; @@ -39,8 +38,8 @@ import mage.abilities.keyword.LevelerCardBuilder; import mage.abilities.keyword.ShroudAbility; import mage.abilities.keyword.UnblockableAbility; import mage.cards.LevelerCard; - -import java.util.UUID; +import mage.constants.CardType; +import mage.constants.Rarity; /** * @@ -58,12 +57,20 @@ public class HadaSpyPatrol extends LevelerCard { this.power = new MageInt(1); this.toughness = new MageInt(1); + // Level up 2Blue ({U}{U}: Put a level counter on this. Level up only as a sorcery.) this.addAbility(new LevelUpAbility(new ManaCostsImpl("{2}{U}"))); - Abilities abilities1 = new AbilitiesImpl(); + // LEVEL 1-2 + // 2/2 + // Hada Spy Patrol can't be blocked. + Abilities abilities1 = new AbilitiesImpl<>(); abilities1.add(new UnblockableAbility()); - Abilities abilities2 = new AbilitiesImpl(); + // LEVEL 3+ + // 3/3 + // Shroud (This creature can't be the target of spells or abilities.) + // Hada Spy Patrol can't be blocked. + Abilities abilities2 = new AbilitiesImpl<>(); abilities2.add(ShroudAbility.getInstance()); abilities2.add(new UnblockableAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java index d4bce2ccbf..d4e274d327 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KathariScreecher.java @@ -51,7 +51,11 @@ public class KathariScreecher extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); + + // Flying this.addAbility(FlyingAbility.getInstance()); + + // Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.) this.addAbility(new UnearthAbility(new ManaCostsImpl("{2}{U}"))); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java new file mode 100644 index 0000000000..183a27dffa --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/RegenerateTest.java @@ -0,0 +1,71 @@ +/* + * 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 org.mage.test.cards.replacement; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.game.permanent.Permanent; +import org.junit.Assert; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class RegenerateTest extends CardTestPlayerBase { + + @Test + public void testRegenerateAbilityGainedByEnchantment() { + addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus"); + + addCard(Zone.BATTLEFIELD, playerB, "Sagu Archer"); + addCard(Zone.HAND, playerB, "Molting Snakeskin"); + addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4); + + + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Molting Snakeskin", "Sagu Archer"); + attack(2, playerB, "Sagu Archer"); + block(2, playerA, "Underworld Cerberus", "Sagu Archer"); + activateAbility(2, PhaseStep.DECLARE_BLOCKERS, playerB, "{2}{B}: Regenerate {this}."); + + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + // attacker has to regenerat because of damage + + assertPermanentCount(playerA, "Underworld Cerberus", 1); + assertPermanentCount(playerB, "Sagu Archer", 1); + assertPermanentCount(playerB, "Molting Snakeskin", 1); + + } +} diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java index befd967781..62191f928f 100644 --- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityAttachedEffect.java @@ -112,7 +112,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { } } if (creature != null) { - creature.addAbility(ability, source.getSourceId(), game); + creature.addAbility(ability, source.getSourceId(), game, false); } return true; }