diff --git a/Mage.Sets/src/mage/sets/knightsvsdragons/PaladinOfPrahv.java b/Mage.Sets/src/mage/sets/knightsvsdragons/PaladinOfPrahv.java index f9fd2d319e1..ec1d60c52da 100644 --- a/Mage.Sets/src/mage/sets/knightsvsdragons/PaladinOfPrahv.java +++ b/Mage.Sets/src/mage/sets/knightsvsdragons/PaladinOfPrahv.java @@ -99,24 +99,31 @@ class PaladinOfPrahvTriggeredAbility extends DelayedTriggeredAbility { } @Override - public boolean checkTrigger(GameEvent event, Game game) { - if(event.getType().equals(GameEvent.EventType.DAMAGED_CREATURE) - || event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER) - || event.getType().equals(GameEvent.EventType.DAMAGED_PLANESWALKER)) { - Permanent target = game.getPermanent(this.getFirstTarget()); - if (target != null && event.getSourceId().equals(target.getId())) { - for (Effect effect : this.getEffects()) { - effect.setValue("damage", event.getAmount()); - } + public boolean checkEventType(GameEvent event, Game game) { + switch(event.getType()) { + case DAMAGED_CREATURE: + case DAMAGED_PLAYER: + case DAMAGED_PLANESWALKER: return true; + } + return false; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Permanent target = game.getPermanent(this.getFirstTarget()); + if (target != null && event.getSourceId().equals(target.getId())) { + for (Effect effect : this.getEffects()) { + effect.setValue("damage", event.getAmount()); } + return true; } return false; } @Override public String getRule() { - return "Whenever target creature deals damage, " + super.getRule(); + return "Whenever target creature deals damage this turn, " + super.getRule(); } } @@ -138,13 +145,14 @@ class PaladinOfPrahvEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - int amount = (Integer) getValue("damage"); - if (amount > 0) { - Player controller = game.getPlayer(source.getControllerId()); - if (controller != null) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + int amount = (Integer) getValue("damage"); + if (amount > 0) { controller.gainLife(amount, game); return true; } + return true; } return false; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java new file mode 100644 index 00000000000..6f5bdc45c87 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java @@ -0,0 +1,82 @@ +/* + * 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.abilities.keywords; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import mage.counters.CounterType; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class ForecastTest extends CardTestPlayerBase { + + /** + * 702.56. Forecast 702.56a A forecast ability is a special kind of activated + * ability that can be activated only from a player's hand. It's written + * "Forecast - [Activated ability]." + * + * 702.56b A forecast ability may be activated only during the upkeep step of + * the card's owner and only once each turn. The controller of the forecast + * ability reveals the card with that ability from his or her hand as the + * ability is activated. That player plays with that card revealed in his or her + * hand until it leaves the player's hand or until a step or phase that isn't an + * upkeep step begins, whichever comes first. + * + */ + + @Test + public void testPaladinOfPrahv() { + addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); + addCard(Zone.HAND, playerA, "Silvercoat Lion"); + addCard(Zone.HAND, playerA, "Paladin of Prahv"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Silvercoat Lion"); + + activateAbility(3, PhaseStep.UPKEEP, playerA, "Forecast"); + addTarget(playerA, "Silvercoat Lion"); + + attack(3, playerA, "Silvercoat Lion"); + + setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertPermanentCount(playerA, "Silvercoat Lion", 1); + assertHandCount(playerA, "Paladin of Prahv", 1); + + assertLife(playerA, 22); + assertLife(playerB, 18); + + } + + +} diff --git a/Mage/src/mage/abilities/keyword/ForecastAbility.java b/Mage/src/mage/abilities/keyword/ForecastAbility.java index 70aab4f93b0..eba53827b62 100644 --- a/Mage/src/mage/abilities/keyword/ForecastAbility.java +++ b/Mage/src/mage/abilities/keyword/ForecastAbility.java @@ -78,7 +78,7 @@ public class ForecastAbility extends LimitedTimesPerTurnActivatedAbility { @Override public String getRule() { - StringBuilder sb = new StringBuilder("Forecast - "); + StringBuilder sb = new StringBuilder("Forecast — "); sb.append(super.getRule()).append(" Activate this ability only during your upkeep."); return sb.toString(); }