From 95e77eb40e8a859d3e90041a0c1298446dacd620 Mon Sep 17 00:00:00 2001 From: Sol Date: Sun, 1 Jun 2014 17:16:05 +0000 Subject: [PATCH] - Improve the dialogs related to damage replacement when controlling multiple planeswalkers. --- forge-game/src/main/java/forge/game/card/CardFactory.java | 2 +- .../main/java/forge/game/replacement/ReplacementHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index 2b97a841e5e..03f77d479b4 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -369,7 +369,7 @@ public class CardFactory { //Planeswalker damage redirection String replacement = "Event$ DamageDone | ActiveZones$ Battlefield | IsCombat$ False | ValidSource$ Card.OppCtrl" + " | ValidTarget$ You | Optional$ True | OptionalDecider$ Opponent | ReplaceWith$ ChooseDmgPW | Secondary$ True" - + " | AICheckSVar$ DamagePWAI | AISVarCompare$ GT4 | Description$ Redirect damage to a planeswalker you control" ; + + " | AICheckSVar$ DamagePWAI | AISVarCompare$ GT4 | Description$ Redirect damage to " + card.toString(); card.addReplacementEffect(ReplacementHandler.parseReplacement(replacement, card, true)); card.setSVar("ChooseDmgPW", "AB$ ChooseCard | Cost$ 0 | Defined$ ReplacedSourceController | Choices$ Planeswalker.YouCtrl" + " | ChoiceZone$ Battlefield | Mandatory$ True | SubAbility$ DamagePW | ChoiceTitle$ Choose a planeswalker to redirect damage"); diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index 7f2b6e35831..7074417cee2 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -129,7 +129,7 @@ public class ReplacementHandler { return ReplacementResult.NotReplaced; } - ReplacementEffect chosenRE = decider.getController().chooseSingleReplacementEffect("Choose which replacement effect to apply.", possibleReplacers, runParams); + ReplacementEffect chosenRE = decider.getController().chooseSingleReplacementEffect("Choose a replacement effect to apply first.", possibleReplacers, runParams); possibleReplacers.remove(chosenRE);