From 368036f890238f84ec091dd28c06251e5dbaec0f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 22 Sep 2020 07:14:33 +0800 Subject: [PATCH] update description --- forge-core/src/main/java/forge/util/TextUtil.java | 5 +++-- .../src/main/java/forge/game/ability/effects/ManaEffect.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-core/src/main/java/forge/util/TextUtil.java b/forge-core/src/main/java/forge/util/TextUtil.java index 4f5cc47eb44..c1479a43c86 100644 --- a/forge-core/src/main/java/forge/util/TextUtil.java +++ b/forge-core/src/main/java/forge/util/TextUtil.java @@ -302,7 +302,8 @@ public class TextUtil { } //Convert to Mana String public static String toManaString(String ManaProduced){ - String convertedMana = "{"+TextUtil.fastReplace(ManaProduced," ","}{")+"}"; - return TextUtil.fastReplace(convertedMana,"{Combo}{Any}", "X mana in any combination"); //Fix manamorphose stack descrition, todo: better/alternative method.. + if (ManaProduced == "mana"|| ManaProduced.contains("Combo")|| ManaProduced.contains("Any")) + return "mana";//fix manamorphose stack description and probably others.. + return "{"+TextUtil.fastReplace(ManaProduced," ","}{")+"}"; } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index 8ecbbe1d982..56ad0850a19 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -254,7 +254,7 @@ public class ManaEffect extends SpellAbilityEffect { final StringBuilder sb = new StringBuilder(); String mana = !sa.hasParam("Amount") || StringUtils.isNumeric(sa.getParam("Amount")) ? GameActionUtil.generatedMana(sa) : "mana"; - sb.append("Add ").append(mana == "mana" ? mana : toManaString(mana)).append("."); + sb.append("Add ").append(toManaString(mana)).append("."); return sb.toString(); } }