From 5a8ca36916f5b56764f4e6d5eebae12125d5e756 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 20 Sep 2015 09:25:25 +0200 Subject: [PATCH] * Ondu Rising - Fixed that the attacking creatures did not get lifelink. --- .../sets/battleforzendikar/OnduRising.java | 4 +- .../triggers/delayed/OnduRisingTest.java | 71 +++++++++++++++++++ Mage/src/mage/game/combat/Combat.java | 8 +-- Mage/src/mage/game/events/GameEvent.java | 6 ++ 4 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/OnduRisingTest.java diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/OnduRising.java b/Mage.Sets/src/mage/sets/battleforzendikar/OnduRising.java index d10af4706c..5e8d6d4def 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/OnduRising.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/OnduRising.java @@ -83,12 +83,12 @@ class OnduRisingTriggeredAbility extends DelayedTriggeredAbility { @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == EventType.DECLARE_ATTACKER; + return event.getType() == EventType.ATTACKER_DECLARED; } @Override public boolean checkTrigger(GameEvent event, Game game) { - Permanent permanent = game.getPermanent(event.getTargetId()); + Permanent permanent = game.getPermanent(event.getSourceId()); if (permanent != null) { for (Effect effect : getEffects()) { effect.setTargetPointer(new FixedTarget(permanent, game)); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/OnduRisingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/OnduRisingTest.java new file mode 100644 index 0000000000..d6b92fe2fe --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/OnduRisingTest.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.triggers.delayed; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ +public class OnduRisingTest extends CardTestPlayerBase { + + @Test + public void testLiflinkGained() { + addCard(Zone.BATTLEFIELD, playerB, "Plains", 5); + addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); + // Whenever a creature attacks this turn, it gains lifelink until end of turn. + // Awaken 4—{4}{W} + addCard(Zone.HAND, playerB, "Ondu Rising", 1); + + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {W}"); + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {W}"); + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {W}"); + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {W}"); + activateManaAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Add {W}"); + + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Ondu Rising with awaken"); + + attack(2, playerB, "Silvercoat Lion"); + attack(2, playerB, "Mountain"); + + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertGraveyardCount(playerB, "Ondu Rising", 1); + assertPowerToughness(playerB, "Mountain", 4, 4); + + assertLife(playerA, 14); + assertLife(playerB, 26); + } + +} diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java index aeb50cd880..d8d815e94e 100644 --- a/Mage/src/mage/game/combat/Combat.java +++ b/Mage/src/mage/game/combat/Combat.java @@ -927,15 +927,15 @@ public class Combat implements Serializable, Copyable { } } - public boolean declareAttacker(UUID attackerId, UUID defenderId, UUID playerId, Game game) { - Permanent attacker = game.getPermanent(attackerId); + public boolean declareAttacker(UUID creatureId, UUID defenderId, UUID playerId, Game game) { + Permanent attacker = game.getPermanent(creatureId); if (!attacker.getAbilities().containsKey(VigilanceAbility.getInstance().getId())) { if (!attacker.isTapped()) { attacker.tap(game); } } - if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.DECLARE_ATTACKER, defenderId, attackerId, playerId))) { - return addAttackerToCombat(attackerId, defenderId, game); + if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.DECLARE_ATTACKER, defenderId, creatureId, playerId))) { + return addAttackerToCombat(creatureId, defenderId, game); } return false; } diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index fcabb52c61..93d4cef024 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -154,6 +154,12 @@ public class GameEvent implements Serializable { COUNTER, COUNTERED, DECLARING_ATTACKERS, DECLARED_ATTACKERS, + /* DECLARE_ATTACKER + REPLACE EVENT - can be used to replace attack declaration + targetId id of the defending player or planeswalker attacked + sourceId id of the attacking creature + playerId player defining the attacking creatures + */ DECLARE_ATTACKER, /* ATTACKER_DECLARED targetId id of the defending player or planeswalker attacked