From ac9a3f4a3dac53d3caaef80963afaee9c8920f5c Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 11 Jan 2019 09:13:57 +0400 Subject: [PATCH 1/2] * Burning-Tree Shaman - fixed that damage was unpreventable; * Harsh Mentor - fixed that damage was unpreventable; * Immolation Shaman - fixed that damage was unpreventable; --- Mage.Sets/src/mage/cards/b/BurningTreeShaman.java | 9 ++++----- Mage.Sets/src/mage/cards/h/HarshMentor.java | 7 +++---- Mage.Sets/src/mage/cards/i/ImmolationShaman.java | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java b/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java index 52fd5e5c25c..18b29ddd9b7 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeShaman.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -19,14 +17,15 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.StackAbility; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author Loki */ public final class BurningTreeShaman extends CardImpl { public BurningTreeShaman(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}"); this.subtype.add(SubType.CENTAUR, SubType.SHAMAN); this.power = new MageInt(3); @@ -49,7 +48,7 @@ public final class BurningTreeShaman extends CardImpl { class BurningTreeShamanTriggeredAbility extends TriggeredAbilityImpl { BurningTreeShamanTriggeredAbility() { - super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), false, "that player", true)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), true, "that player", true)); } BurningTreeShamanTriggeredAbility(final BurningTreeShamanTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/h/HarshMentor.java b/Mage.Sets/src/mage/cards/h/HarshMentor.java index 44fe93aa0a0..7a01484d2a9 100644 --- a/Mage.Sets/src/mage/cards/h/HarshMentor.java +++ b/Mage.Sets/src/mage/cards/h/HarshMentor.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -20,8 +18,9 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.StackAbility; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author spjspj */ public final class HarshMentor extends CardImpl { @@ -51,7 +50,7 @@ public final class HarshMentor extends CardImpl { class HarshMentorTriggeredAbility extends TriggeredAbilityImpl { HarshMentorTriggeredAbility() { - super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(2), false, "that player", true)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(2), true, "that player", true)); } HarshMentorTriggeredAbility(final HarshMentorTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java index a15bb4e8967..7a9f275cf11 100644 --- a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java +++ b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java @@ -69,7 +69,7 @@ public final class ImmolationShaman extends CardImpl { class ImmolationShamanTriggeredAbility extends TriggeredAbilityImpl { ImmolationShamanTriggeredAbility() { - super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), false, "that player", true)); + super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), true, "that player", true)); } private ImmolationShamanTriggeredAbility(final ImmolationShamanTriggeredAbility ability) { From a6721613fabf4bd7e6f077fec23f684e36030261 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 11 Jan 2019 08:21:25 -0600 Subject: [PATCH 2/2] - Fixed #5508 --- .../src/mage/cards/t/TormentOfHailfire.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java b/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java index 11112392a28..244ba827947 100644 --- a/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java +++ b/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java @@ -1,4 +1,3 @@ - package mage.cards.t; import java.util.UUID; @@ -20,19 +19,19 @@ import mage.target.TargetPermanent; * @author LevelX2 */ public final class TormentOfHailfire extends CardImpl { - + public TormentOfHailfire(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); // Repeat the following process X times. Each opponent loses 3 life unless he or she sacrifices a nonland permanent or discards a card. this.getSpellAbility().addEffect(new TormentOfHailfireEffect()); - + } - + public TormentOfHailfire(final TormentOfHailfire card) { super(card); } - + @Override public TormentOfHailfire copy() { return new TormentOfHailfire(this); @@ -40,21 +39,21 @@ public final class TormentOfHailfire extends CardImpl { } class TormentOfHailfireEffect extends OneShotEffect { - + public TormentOfHailfireEffect() { super(Outcome.LoseLife); this.staticText = "Repeat the following process X times. Each opponent loses 3 life unless he or she sacrifices a nonland permanent or discards a card"; } - + public TormentOfHailfireEffect(final TormentOfHailfireEffect effect) { super(effect); } - + @Override public TormentOfHailfireEffect copy() { return new TormentOfHailfireEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); @@ -68,6 +67,7 @@ class TormentOfHailfireEffect extends OneShotEffect { if (permanents > 0 && opponent.chooseUse(outcome, "Sacrifices a nonland permanent? (Iteration " + i + " of " + repeat + ")", "Otherwise you have to discard a card or lose 3 life.", "Sacrifice", "Discard or life loss", source, game)) { Target target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND); + target.setNotTarget(true); if (opponent.choose(outcome, target, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { @@ -85,7 +85,7 @@ class TormentOfHailfireEffect extends OneShotEffect { opponent.loseLife(3, game, false); } } - + } return true; }