From 05d42d95181517966bf478722401af19957f9508 Mon Sep 17 00:00:00 2001 From: Indigo Dragon Date: Sat, 16 Sep 2017 06:56:28 +0000 Subject: [PATCH] =?UTF-8?q?Replace=20many=20"=20-=20"=20with=20"=E2=80=94"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forge-game/src/main/java/forge/game/card/Card.java | 7 +++++-- .../main/java/forge/game/card/CardFactoryUtil.java | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) 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 78e327323f9..b85068948db 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1444,9 +1444,12 @@ public class Card extends GameEntity implements Comparable { if (k.length > 1) { final Cost mCost = new Cost(k[1], true); if (!mCost.isOnlyManaCost()) { - sbLong.append(" -"); + sbLong.append("—"); } - sbLong.append(" ").append(mCost.toString()).delete(sbLong.length() - 2, sbLong.length()); + if (mCost.isOnlyManaCost()) { + sb.append(" "); + } + sbLong.append(mCost.toString()).delete(sbLong.length() - 2, sbLong.length()); if (!mCost.isOnlyManaCost()) { sbLong.append("."); } diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 101995311cb..36c67ec9621 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -138,7 +138,7 @@ public class CardFactoryUtil { costDesc = costDesc.substring(0, costDesc.length() - 2); if (!cost.isOnlyManaCost()) { - costDesc = "- " + costDesc; + costDesc = "—" + costDesc; } String ab = "ST$ SetState | Cost$ " + costStr + " | CostDesc$ Morph " + costDesc @@ -2325,7 +2325,7 @@ public class CardFactoryUtil { abilityStr.append("| PrecostDesc$ Fortify "); Cost cost = new Cost(equipCost, true); if (!cost.isOnlyManaCost()) { //Something other than a mana cost - abilityStr.append("- "); + abilityStr.append("—"); } abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| SpellDescription$ (" + cost.toSimpleString() + ": Attach to target land you control. Fortify only as a sorcery.)"); @@ -2604,7 +2604,7 @@ public class CardFactoryUtil { String costDesc = cost.toSimpleString(); if (!cost.isOnlyManaCost()) { - costDesc = "- " + costDesc; + costDesc = "—" + costDesc; } String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield " + @@ -3773,7 +3773,7 @@ public class CardFactoryUtil { abilityStr.append("| PrecostDesc$ Equip "); Cost cost = new Cost(equipCost, true); if (!cost.isOnlyManaCost()) { //Something other than a mana cost - abilityStr.append("- "); + abilityStr.append("—"); } abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| SpellDescription$ (" + cost.toSimpleString() + ": Attach to target creature you control. Equip only as a sorcery.)"); @@ -3798,7 +3798,7 @@ public class CardFactoryUtil { sb.append(" | PrecostDesc$ Eternalize "); if (!cost.isOnlyManaCost()) { //Something other than a mana cost - sb.append("- "); + sb.append("—"); } // don't use SimpleString there because it does has "and" between cost i dont want that costStr = cost.toString(); @@ -3958,7 +3958,7 @@ public class CardFactoryUtil { abilityStr.append("| PrecostDesc$ Outlast "); Cost cost = new Cost(manacost, true); if (!cost.isOnlyManaCost()) { //Something other than a mana cost - abilityStr.append("- "); + abilityStr.append("—"); } abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| SpellDescription$ (" + Keyword.getInstance(keyword).getReminderText() + ")"); @@ -4200,7 +4200,7 @@ public class CardFactoryUtil { StringBuilder sb = new StringBuilder("Escalate "); if (!cost.isOnlyManaCost()) { - sb.append("- "); + sb.append("—"); } sb.append(cost.toSimpleString());