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

fixed CardDetailUtil: currently if more equips are attached to one creature, it only shows the first name, because of the (nr) in the name it does think of it as reminder text.

Browse Source 
FSkin: make the pattern not-greedy so it only does hide the number from it.
This commit is contained in:
Hanmac
2016-05-27 12:02:34 +00:00
parent 74423305e2
commit 1b1b90a1e6
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -976,9 +976,9 @@ public class FSkin {
if (formatReminderText) {
//format reminder text in italics (or hide if preference set)
pattern = "\\((.+)\\)";
pattern = " \\((.+?)\\)";
replacement = FModel.getPreferences().getPrefBoolean(FPref.UI_HIDE_REMINDER_TEXT) ?
"" : "<i>\\($1\\)</i>";
"" : " <i>\\($1\\)</i>";
str = str.replaceAll(pattern, replacement);
}

35
forge-gui/src/main/java/forge/card/CardDetailUtil.java
View File

@@ -422,12 +422,7 @@ public class CardDetailUtil {
area.append("\n");
}
area.append("=Equipped by ");
for (final Iterator<CardView> it = card.getEquippedBy().iterator(); it.hasNext();) {
area.append(it.next());
if (it.hasNext()) {
area.append(", ");
}
}
area.append(StringUtils.join(card.getEquippedBy(), ", "));
area.append("=");
}
@@ -451,12 +446,7 @@ public class CardDetailUtil {
area.append("\n");
}
area.append("*Enchanted by ");
for (final Iterator<CardView> it = card.getEnchantedBy().iterator(); it.hasNext();) {
area.append(it.next());
if (it.hasNext()) {
area.append(", ");
}
}
area.append(StringUtils.join(card.getEnchantedBy(), ", "));
area.append("*");
}
@@ -466,12 +456,7 @@ public class CardDetailUtil {
area.append("\n");
}
area.append("+Controlling: ");
for (final Iterator<CardView> it = card.getGainControlTargets().iterator(); it.hasNext();) {
area.append(it.next());
if (it.hasNext()) {
area.append(", ");
}
}
area.append(StringUtils.join(card.getGainControlTargets(), ", "));
area.append("+");
}
@@ -491,12 +476,7 @@ public class CardDetailUtil {
area.append("\n");
}
area.append("Imprinting: ");
for (final Iterator<CardView> it = card.getImprintedCards().iterator(); it.hasNext();) {
area.append(it.next());
if (it.hasNext()) {
area.append(", ");
}
}
area.append(StringUtils.join(card.getImprintedCards(), ", "));
}
// Haunt
@@ -505,12 +485,7 @@ public class CardDetailUtil {
area.append("\n");
}
area.append("Haunted by: ");
for (final Iterator<CardView> it = card.getHauntedBy().iterator(); it.hasNext();) {
area.append(it.next());
if (it.hasNext()) {
area.append(", ");
}
}
area.append(StringUtils.join(card.getHauntedBy(), ", "));
}
if (card.getHaunting() != null) {
if (area.length() != 0) {