external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace many " - " with "—"

Browse Source
This commit is contained in:
Indigo Dragon
2017-09-16 06:56:28 +00:00
parent 19a6236fa9
commit 05d42d9518
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1444,9 +1444,12 @@ public class Card extends GameEntity implements Comparable<Card> {
if (k.length > 1) { if (k.length > 1) {
final Cost mCost = new Cost(k[1], true); final Cost mCost = new Cost(k[1], true);
if (!mCost.isOnlyManaCost()) { 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()) { if (!mCost.isOnlyManaCost()) {
sbLong.append("."); sbLong.append(".");
} }

14
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -138,7 +138,7 @@ public class CardFactoryUtil {
costDesc = costDesc.substring(0, costDesc.length() - 2); costDesc = costDesc.substring(0, costDesc.length() - 2);
if (!cost.isOnlyManaCost()) { if (!cost.isOnlyManaCost()) {
costDesc = "- " + costDesc; costDesc = "—" + costDesc;
} }
String ab = "ST$ SetState | Cost$ " + costStr + " | CostDesc$ Morph " + costDesc String ab = "ST$ SetState | Cost$ " + costStr + " | CostDesc$ Morph " + costDesc
@@ -2325,7 +2325,7 @@ public class CardFactoryUtil {
abilityStr.append("| PrecostDesc$ Fortify "); abilityStr.append("| PrecostDesc$ Fortify ");
Cost cost = new Cost(equipCost, true); Cost cost = new Cost(equipCost, true);
if (!cost.isOnlyManaCost()) { //Something other than a mana cost if (!cost.isOnlyManaCost()) { //Something other than a mana cost
abilityStr.append("- "); abilityStr.append("—");
} }
abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " ");
abilityStr.append("| SpellDescription$ (" + cost.toSimpleString() + ": Attach to target land you control. Fortify only as a sorcery.)"); 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(); String costDesc = cost.toSimpleString();
if (!cost.isOnlyManaCost()) { if (!cost.isOnlyManaCost()) {
costDesc = "- " + costDesc; costDesc = "—" + costDesc;
} }
String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield " + String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield " +
@@ -3773,7 +3773,7 @@ public class CardFactoryUtil {
abilityStr.append("| PrecostDesc$ Equip "); abilityStr.append("| PrecostDesc$ Equip ");
Cost cost = new Cost(equipCost, true); Cost cost = new Cost(equipCost, true);
if (!cost.isOnlyManaCost()) { //Something other than a mana cost if (!cost.isOnlyManaCost()) { //Something other than a mana cost
abilityStr.append("- "); abilityStr.append("—");
} }
abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " ");
abilityStr.append("| SpellDescription$ (" + cost.toSimpleString() + ": Attach to target creature you control. Equip only as a sorcery.)"); 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 "); sb.append(" | PrecostDesc$ Eternalize ");
if (!cost.isOnlyManaCost()) { //Something other than a mana cost 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 // don't use SimpleString there because it does has "and" between cost i dont want that
costStr = cost.toString(); costStr = cost.toString();
@@ -3958,7 +3958,7 @@ public class CardFactoryUtil {
abilityStr.append("| PrecostDesc$ Outlast "); abilityStr.append("| PrecostDesc$ Outlast ");
Cost cost = new Cost(manacost, true); Cost cost = new Cost(manacost, true);
if (!cost.isOnlyManaCost()) { //Something other than a mana cost if (!cost.isOnlyManaCost()) { //Something other than a mana cost
abilityStr.append("- "); abilityStr.append("—");
} }
abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " "); abilityStr.append("| CostDesc$ " + cost.toSimpleString() + " ");
abilityStr.append("| SpellDescription$ (" + Keyword.getInstance(keyword).getReminderText() + ")"); abilityStr.append("| SpellDescription$ (" + Keyword.getInstance(keyword).getReminderText() + ")");
@@ -4200,7 +4200,7 @@ public class CardFactoryUtil {
StringBuilder sb = new StringBuilder("Escalate "); StringBuilder sb = new StringBuilder("Escalate ");
if (!cost.isOnlyManaCost()) { if (!cost.isOnlyManaCost()) {
sb.append("- "); sb.append("—");
} }
sb.append(cost.toSimpleString()); sb.append(cost.toSimpleString());