diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index b8c474a2d53..fb291b7f9a5 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1988,7 +1988,7 @@ public class Card extends GameEntity implements Comparable { StringBuilder replacementEffects = new StringBuilder(); for (final ReplacementEffect replacementEffect : state.getReplacementEffects()) { if (!replacementEffect.isSecondary()) { - String text = replacementEffect.toString(); + String text = replacementEffect.getDescription(); if (text.contains("enters the battlefield")) { sb.append(text).append("\r\n"); } else { @@ -2349,7 +2349,7 @@ public class Card extends GameEntity implements Comparable { // Replacement effects for (final ReplacementEffect replacementEffect : state.getReplacementEffects()) { if (!replacementEffect.isSecondary()) { - sb.append(replacementEffect.toString()).append("\r\n"); + sb.append(replacementEffect.getDescription()).append("\r\n"); } } diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java index 2ff6a07d9ec..3e96fd46275 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java @@ -210,13 +210,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { this.layer = layer0; } - /** - * To string. - * - * @return a String - */ - @Override - public String toString() { + public String getDescription() { if (hasParam("Description") && !this.isSuppressed()) { String desc = AbilityUtils.applyDescriptionTextChangeEffects(getParam("Description"), this); if (desc.contains("CARDNAME")) { @@ -228,6 +222,16 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { } } + /** + * To string. + * + * @return a String + */ + @Override + public String toString() { + return getHostCard().toString() + " - " + getDescription(); + } + /** {@inheritDoc} */ @Override public final Object clone() { 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 fb9be6b94f2..ba037dd2d2e 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -260,7 +260,7 @@ public class ReplacementHandler { chosenRE.setHasRun(false); hasRun.remove(chosenRE); chosenRE.setOtherChoices(null); - String message = chosenRE.toString(); + String message = chosenRE.getDescription(); if ( !StringUtils.isEmpty(message)) if (chosenRE.getHostCard() != null) { message = TextUtil.fastReplace(message, "CARDNAME", chosenRE.getHostCard().getName()); @@ -336,7 +336,7 @@ public class ReplacementHandler { } Card cardForUi = host.getCardForUi(); - String effectDesc = TextUtil.fastReplace(replacementEffect.toString(), "CARDNAME", CardTranslation.getTranslatedName(cardForUi.getName())); + String effectDesc = TextUtil.fastReplace(replacementEffect.getDescription(), "CARDNAME", CardTranslation.getTranslatedName(cardForUi.getName())); final String question = replacementEffect instanceof ReplaceDiscard ? Localizer.getInstance().getMessage("lblApplyCardReplacementEffectToCardConfirm", CardTranslation.getTranslatedName(cardForUi.getName()), runParams.get(AbilityKey.Card).toString(), effectDesc) : Localizer.getInstance().getMessage("lblApplyReplacementEffectOfCardConfirm", CardTranslation.getTranslatedName(cardForUi.getName()), effectDesc);