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

Updated display of charm-like spells in the card details panel to look like the new cards in KTK.

Browse Source
This commit is contained in:
Krazy
2014-09-13 20:00:32 +00:00
parent 8e5b5c8b4f
commit 835ecb735c
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1904,8 +1904,8 @@ public class Card extends GameEntity implements Comparable<Card> {
sb.append("\r\n\r\n"); sb.append("\r\n\r\n");
} }
if (this.isCommander) { if (this.isCommander) {
sb.append(getOwner() + "'s Commander\r\n"); sb.append(getOwner()).append("'s Commander\r\n");
sb.append(CardFactoryUtil.getCommanderInfo(getOwner()) + "\r\n"); sb.append(CardFactoryUtil.getCommanderInfo(getOwner())).append("\r\n");
} }
sb.append(this.getAbilityText()); sb.append(this.getAbilityText());
@@ -2442,10 +2442,11 @@ public class Card extends GameEntity implements Comparable<Card> {
private StringBuilder abilityTextInstantSorcery() { private StringBuilder abilityTextInstantSorcery() {
final String s = this.getSpellText(); final String s = this.getSpellText();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
// Give spellText line breaks for easier reading // Give spellText line breaks for easier reading
sb.append(s.replaceAll("\\\\r\\\\n", "\r\n")); sb.append(s.replaceAll("\\\\r\\\\n", "\r\n"));
// NOTE: // NOTE:
if (sb.toString().contains(" (NOTE: ")) { if (sb.toString().contains(" (NOTE: ")) {
sb.insert(sb.indexOf("(NOTE: "), "\r\n"); sb.insert(sb.indexOf("(NOTE: "), "\r\n");
@@ -2457,7 +2458,36 @@ public class Card extends GameEntity implements Comparable<Card> {
// I think SpellAbilities should be displayed after Keywords // I think SpellAbilities should be displayed after Keywords
// Add SpellAbilities // Add SpellAbilities
for (final SpellAbility element : this.getSpellAbilities()) { for (final SpellAbility element : this.getSpellAbilities()) {
sb.append(element.toString() + "\r\n");
String elementText = element.toString();
//Determine if a card has multiple choices, then format it in an easier to read list.
if (element.getApi().equals(ApiType.Charm)) {
String chooseText = elementText.split("-")[0].trim();
sb.append(chooseText).append("&#151;\r\n");
String[] choices = elementText.split("-")[1].split(";");
for (int i = 0; i < choices.length; i++) {
String choice = choices[i].trim();
if (choice.startsWith("Or ") || choice.startsWith("or ")) {
choice = choice.substring(3);
}
sb.append("&#32;&#32;&#32;&#32;&#149; ").append(Character.toUpperCase(choice.charAt(0)))
.append(choice.substring(1));
if (i < choices.length - 1) {
sb.append(".");
}
sb.append("\r\n");
}
} else {
sb.append(elementText).append("\r\n");
}
} }
// Add Keywords // Add Keywords