From 6e9810696fa7de476df581a4c5b1bb3c1240c536 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 23 Sep 2018 18:03:48 +0200 Subject: [PATCH] * Ludevic, Necro-Alchemist - Fixed tooltip text. --- .../src/mage/cards/l/LudevicNecroAlchemist.java | 12 ++++++------ .../common/BeginningOfEndStepTriggeredAbility.java | 4 +++- .../main/java/mage/constants/TargetController.java | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java index c813ab3c37f..9499bda49ec 100644 --- a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java +++ b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java @@ -1,4 +1,3 @@ - package mage.cards.l; import java.util.Objects; @@ -33,7 +32,8 @@ public final class LudevicNecroAlchemist extends CardImpl { this.toughness = new MageInt(4); // At the beginning of each player's end step, that player may draw a card if a player other than you lost life this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new LudevicNecroAlchemistEffect(), TargetController.ANY, new LudevicNecroAlchemistCondition(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, + new LudevicNecroAlchemistEffect(), TargetController.EACH_PLAYER, new LudevicNecroAlchemistCondition(), false)); // Partner this.addAbility(PartnerAbility.getInstance()); @@ -54,11 +54,10 @@ class LudevicNecroAlchemistCondition implements Condition { @Override public boolean apply(Game game, Ability source) { PlayerLostLifeWatcher watcher = (PlayerLostLifeWatcher) game.getState().getWatchers().get(PlayerLostLifeWatcher.class.getSimpleName()); - UUID player = game.getActivePlayerId(); PlayerList playerList = game.getState().getPlayerList().copy(); - Player currentPlayer = null; + Player currentPlayer; UUID sourcePlayerId = source.getControllerId(); - Player firstPlayer = null; + Player firstPlayer; if (playerList == null) { return false; } @@ -77,6 +76,7 @@ class LudevicNecroAlchemistCondition implements Condition { return false; } + @Override public String toString() { return "if a player other than you lost life this turn"; } @@ -86,7 +86,7 @@ class LudevicNecroAlchemistEffect extends OneShotEffect { public LudevicNecroAlchemistEffect() { super(Outcome.DrawCard); - staticText = "that player may draw a card if a player other than you lost life this turn"; + staticText = "that player may draw a card"; } public LudevicNecroAlchemistEffect(final LudevicNecroAlchemistEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index abbebcf05e3..3ece2bd9540 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -1,4 +1,3 @@ - package mage.abilities.common; import java.util.Locale; @@ -68,6 +67,7 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { } break; case ANY: + case EACH_PLAYER: case NEXT: if (getTargets().isEmpty()) { for (Effect effect : this.getEffects()) { @@ -123,6 +123,8 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { return sb.insert(0, generateConditionString()).insert(0, abilityWordRule + "At the beginning of each opponent's end step, ").toString(); case ANY: return sb.insert(0, generateConditionString()).insert(0, abilityWordRule + "At the beginning of each end step, ").toString(); + case EACH_PLAYER: + return sb.insert(0, generateConditionString()).insert(0, abilityWordRule + "At the beginning of each player's end step, ").toString(); case CONTROLLER_ATTACHED_TO: return sb.insert(0, generateConditionString()).insert(0, abilityWordRule + "At the beginning of the end step of enchanted permanent's controller, ").toString(); } diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 2236ebe4649..f1dd2e1b607 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -6,5 +6,5 @@ package mage.constants; */ public enum TargetController { - ACTIVE, ANY, YOU, NOT_YOU, OPPONENT, TEAM, OWNER, CONTROLLER_ATTACHED_TO, NEXT + ACTIVE, ANY, YOU, NOT_YOU, OPPONENT, TEAM, OWNER, CONTROLLER_ATTACHED_TO, NEXT, EACH_PLAYER }