From 32b7c592c836b7e6d45098569c17ac969df3a081 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 25 Jul 2020 17:26:10 +0400 Subject: [PATCH] * Sanguine Indulgence - fixed rollback error on play, fixed card text (#6643); --- Mage.Sets/src/mage/cards/a/AngelicAccord.java | 8 ++++---- Mage.Sets/src/mage/cards/s/SanguineIndulgence.java | 6 ++++-- .../condition/common/YouGainedLifeCondition.java | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AngelicAccord.java b/Mage.Sets/src/mage/cards/a/AngelicAccord.java index afe279414a6..e618a780c86 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicAccord.java +++ b/Mage.Sets/src/mage/cards/a/AngelicAccord.java @@ -1,7 +1,5 @@ - package mage.cards.a; -import java.util.UUID; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -14,8 +12,9 @@ import mage.constants.Zone; import mage.game.permanent.token.AngelToken; import mage.watchers.common.PlayerGainedLifeWatcher; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class AngelicAccord extends CardImpl { @@ -25,7 +24,8 @@ public final class AngelicAccord extends CardImpl { // At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3), false), new PlayerGainedLifeWatcher()); + new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3), false), + new PlayerGainedLifeWatcher()); } public AngelicAccord(final AngelicAccord card) { diff --git a/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java b/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java index d81bac3e947..1b17df6ac34 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java +++ b/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java @@ -14,6 +14,7 @@ import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetCardInYourGraveyard; +import mage.watchers.common.PlayerGainedLifeWatcher; import java.util.UUID; @@ -30,8 +31,9 @@ public final class SanguineIndulgence extends CardImpl { // This spell costs {3} less to cast if you've gained 3 or more life this turn. this.addAbility(new SimpleStaticAbility( - Zone.ALL, new SpellCostReductionSourceEffect(3, condition) - ).addHint(hint)); + Zone.ALL, new SpellCostReductionSourceEffect(3, condition) + ).addHint(hint).setRuleAtTheTop(true), + new PlayerGainedLifeWatcher()); // Return up to two target creature cards from your graveyard to your hand. this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java index d8ab4297193..48c0ae17a6b 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java @@ -1,8 +1,8 @@ package mage.abilities.condition.common; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.condition.IntCompareCondition; +import mage.constants.ComparisonType; import mage.game.Game; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -27,6 +27,6 @@ public class YouGainedLifeCondition extends IntCompareCondition { @Override public String toString() { - return String.format("if you gained %s or more life this turn ", value + 1); + return String.format("if you gained %s or more life this turn", value + 1); } }