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

Merge branch 'gray2' into 'master'

Browse Source 
improve Gray Text preference implementation

See merge request core-developers/forge!5618
This commit is contained in:
Michael Kamensky
2021-10-21 15:26:25 +00:00
parent 158de07d60 843a2a643c
commit e4394d135d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2226,12 +2226,12 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
public String getAbilityText(final CardState state) { public String getAbilityText(final CardState state) {
final String linebreak = "\r\n\r\n"; final String linebreak = "\r\n\r\n";
final String grayTag = "<span style=\"color:gray;\">";
final String endTag = "</span>";
boolean useGrayTag = true; boolean useGrayTag = true;
if (getGame() != null && getController() != null && game.getAge() != GameStage.Play) { if (getGame() != null) {
useGrayTag = game.getRules().useGrayText(); useGrayTag = game.getRules().useGrayText();
} }
final String grayTag = useGrayTag ? "<span style=\"color:gray;\">" : "";
final String endTag = useGrayTag ? "</span>" : "";
final CardTypeView type = state.getType(); final CardTypeView type = state.getType();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
@@ -2331,7 +2331,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// Triggered abilities // Triggered abilities
for (final Trigger trig : state.getTriggers()) { for (final Trigger trig : state.getTriggers()) {
if (!trig.isSecondary() && !trig.isClassAbility()) { if (!trig.isSecondary() && !trig.isClassAbility()) {
boolean disabled = false; boolean disabled;
// Disable text of other rooms // Disable text of other rooms
if (type.isDungeon()) { if (type.isDungeon()) {
disabled = !trig.getOverridingAbility().getParam("RoomName").equals(getCurrentRoom()); disabled = !trig.getOverridingAbility().getParam("RoomName").equals(getCurrentRoom());
@@ -2339,9 +2339,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
disabled = getGame() != null && !trig.requirementsCheck(getGame()); disabled = getGame() != null && !trig.requirementsCheck(getGame());
} }
String trigStr = trig.replaceAbilityText(trig.toString(), state); String trigStr = trig.replaceAbilityText(trig.toString(), state);
if (disabled && useGrayTag) sb.append(grayTag); if (disabled) sb.append(grayTag);
sb.append(trigStr.replaceAll("\\\\r\\\\n", "\r\n")); sb.append(trigStr.replaceAll("\\\\r\\\\n", "\r\n"));
if (disabled && useGrayTag) sb.append(endTag); if (disabled) sb.append(endTag);
sb.append(linebreak); sb.append(linebreak);
} }
} }
@@ -2355,9 +2355,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
final String stAbD = stAb.toString(); final String stAbD = stAb.toString();
if (!stAbD.equals("")) { if (!stAbD.equals("")) {
boolean disabled = getGame() != null && getController() != null && game.getAge() != GameStage.Play && !stAb.checkConditions(); boolean disabled = getGame() != null && getController() != null && game.getAge() != GameStage.Play && !stAb.checkConditions();
if (disabled && useGrayTag) sb.append(grayTag); if (disabled) sb.append(grayTag);
sb.append(stAbD); sb.append(stAbD);
if (disabled && useGrayTag) sb.append(endTag); if (disabled) sb.append(endTag);
sb.append(linebreak); sb.append(linebreak);
} }
} }
@@ -2458,9 +2458,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// Class second part is a static ability that grants the other abilities // Class second part is a static ability that grants the other abilities
for (final StaticAbility st : state.getStaticAbilities()) { for (final StaticAbility st : state.getStaticAbilities()) {
if (st.isClassLevelNAbility(level) && !st.isSecondary()) { if (st.isClassLevelNAbility(level) && !st.isSecondary()) {
if (disabled && useGrayTag) sb.append(grayTag); if (disabled) sb.append(grayTag);
sb.append(st.toString()); sb.append(st.toString());
if (disabled && useGrayTag) sb.append(endTag); if (disabled) sb.append(endTag);
sb.append(linebreak); sb.append(linebreak);
} }
} }