From 029420a9a8eeafff24e7c7ddcd83d9be051e72ff Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 1 Sep 2017 09:57:11 -0400 Subject: [PATCH] fixed enrage text --- Mage.Sets/src/mage/cards/r/RipjawRaptor.java | 4 +--- .../src/mage/cards/s/SunCrownedHunters.java | 6 ++---- .../DealtDamageToSourceTriggeredAbility.java | 16 +++++++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/cards/r/RipjawRaptor.java b/Mage.Sets/src/mage/cards/r/RipjawRaptor.java index 8c8d6311ef..394fdaf61a 100644 --- a/Mage.Sets/src/mage/cards/r/RipjawRaptor.java +++ b/Mage.Sets/src/mage/cards/r/RipjawRaptor.java @@ -34,7 +34,6 @@ import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; @@ -52,8 +51,7 @@ public class RipjawRaptor extends CardImpl { this.toughness = new MageInt(5); // Enrage — Whenever Ripjaw Raptor is dealt damage, draw a card. - Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), false); - ability.setAbilityWord(AbilityWord.ENRAGE); + Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), false, true); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunCrownedHunters.java b/Mage.Sets/src/mage/cards/s/SunCrownedHunters.java index 030b5d800a..3c91d68564 100644 --- a/Mage.Sets/src/mage/cards/s/SunCrownedHunters.java +++ b/Mage.Sets/src/mage/cards/s/SunCrownedHunters.java @@ -34,7 +34,6 @@ import mage.abilities.common.DealtDamageToSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; import mage.target.common.TargetOpponent; @@ -47,15 +46,14 @@ public class SunCrownedHunters extends CardImpl { public SunCrownedHunters(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); - + this.subtype.add("Dinosaur"); this.power = new MageInt(5); this.toughness = new MageInt(4); // Enrage — Whenever Sun-Crowned Hunters is dealt damage, it deals 3 damage to target opponent. - Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), false); + Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), false, true); ability.addTarget(new TargetOpponent()); - ability.setAbilityWord(AbilityWord.ENRAGE); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java index d421a58078..2ecae0c7a2 100644 --- a/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java @@ -1,4 +1,4 @@ - /* +/* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are @@ -25,7 +25,6 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.abilities.common; import mage.constants.Zone; @@ -38,15 +37,22 @@ import mage.game.events.GameEvent; * * @author LevelX2 */ - public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl { + private boolean enrage; + public DealtDamageToSourceTriggeredAbility(Zone zone, Effect effect, boolean optional) { + this(zone, effect, optional, false); + } + + public DealtDamageToSourceTriggeredAbility(Zone zone, Effect effect, boolean optional, boolean enrage) { super(zone, effect, optional); + this.enrage = enrage; } public DealtDamageToSourceTriggeredAbility(final DealtDamageToSourceTriggeredAbility ability) { super(ability); + this.enrage = ability.enrage; } @Override @@ -63,7 +69,7 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(getSourceId())) { for (Effect effect : this.getEffects()) { - effect.setValue("damage", event.getAmount()); + effect.setValue("damage", event.getAmount()); } return true; } @@ -72,6 +78,6 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} is dealt damage, " + super.getRule(); + return (enrage ? "Enrage - " : "") + "Whenever {this} is dealt damage, " + super.getRule(); } }