Skip to content

Move prepare card text details to CardDetailUtil #11635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevlahnota wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Move prepare card text details to CardDetailUtil #11635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e581f
move extra text renders for Prepare Cards
kevlahnota Aug 17, 2026
bdbe784
minor changes
kevlahnota Aug 17, 2026
b008b63
Update CardDetailUtil.java
kevlahnota Aug 17, 2026
cfb9c57
Merge branch 'master' into movepreparecardsdetails
kevlahnota Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions forge-game/src/main/java/forge/game/card/Card.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,18 +3117,6 @@ public String getAbilityText(final CardState state) {
sb.append("\r\n");
}

if (hasState(CardStateName.PreparedSpell) && state.getStateName().equals(CardStateName.Original)) {
CardState prepState = getState(CardStateName.PreparedSpell);
SpellAbility prepSA = prepState.getFirstSpellAbility();
if (prepSA != null) {
sb.append(Localizer.getInstance().getMessage("lblPrepared"));
sb.append(" — ").append(CardTranslation.getTranslatedName(prepState));
sb.append(" ").append(prepSA.getPayCosts().toSimpleString());
sb.append(": ");
sb.append(prepSA);
}
}

// replace triple line feeds with double line feeds
final String s = "\r\n\r\n\r\n";
int start = sb.lastIndexOf(s);
Expand Down
10 changes: 5 additions & 5 deletions forge-game/src/main/java/forge/game/card/CardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ public CardStateView getRightSplitState() {
public boolean hasBackSide() {
return get(TrackableProperty.HasBackSide);
}
public String getBackSideName() { return get(TrackableProperty.BackSideName); }
public String getAlternateStateName() { return get(TrackableProperty.AlternateStateName); }

public CardStateView createAlternateState(final CardStateName state0) {
return new CardStateView(getId(), state0, tracker);
Expand All @@ -992,9 +992,9 @@ public CardStateView createAlternateState(final CardStateName state0) {
public CardStateView getState(final boolean alternate0) {
return alternate0 ? getAlternateState() : getCurrentState();
}
void updateBackSide(String stateName, boolean hasBackSide) {
void updateAlternateStateName(String stateName, boolean hasBackSide) {
set(TrackableProperty.HasBackSide, hasBackSide);
set(TrackableProperty.BackSideName, stateName);
set(TrackableProperty.AlternateStateName, stateName);
}

public boolean wasDestroyed() {
Expand Down Expand Up @@ -1051,9 +1051,9 @@ void updateState(Card c) {
set(TrackableProperty.Room, c.isRoom());
set(TrackableProperty.FacedownImageKey, c.getFacedownImageKey());

//backside
//alternateStateName && hasBackside
if (c.getAlternateState() != null)
updateBackSide(c.getAlternateState().getName(), c.isDoubleFaced());
updateAlternateStateName(c.getAlternateState().getName(), c.isDoubleFaced());

final Card cloner = c.getCloner();
set(TrackableProperty.Cloner, cloner == null ? null : cloner.getName() + " (" + cloner.getId() + ")");
Expand Down
2 changes: 1 addition & 1 deletion forge-game/src/main/java/forge/trackable/TrackableProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public enum TrackableProperty {
PairedWith(TrackableTypes.CardViewType),
CurrentState(TrackableTypes.CardStateViewType, FreezeMode.IgnoresFreeze),
AlternateState(TrackableTypes.CardStateViewType, FreezeMode.IgnoresFreeze),
AlternateStateName(TrackableTypes.StringType),
LeftSplitState(TrackableTypes.CardStateViewType, FreezeMode.IgnoresFreeze),
RightSplitState(TrackableTypes.CardStateViewType, FreezeMode.IgnoresFreeze),
Room(TrackableTypes.BooleanType, FreezeMode.IgnoresFreeze),
Expand Down Expand Up @@ -217,7 +218,6 @@ public enum TrackableProperty {
SA_IsSpell(TrackableTypes.BooleanType),

//HasBackSide
BackSideName(TrackableTypes.StringType),
HasBackSide(TrackableTypes.BooleanType),

//StackItem
Expand Down
2 changes: 1 addition & 1 deletion forge-gui-mobile/src/forge/util/CardRendererUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static boolean canShowAlternate(final CardView card, final String referen
boolean showAlt = false;
if (card.hasAlternateState()) {
if (card.hasBackSide())
showAlt = reference.contains(card.getBackSideName()) || card.getAlternateState().getAbilityText().contains(reference);
showAlt = reference.contains(card.getAlternateStateName()) || card.getAlternateState().getAbilityText().contains(reference);
else if (card.hasSecondaryState())
showAlt = reference.equals(card.getAlternateState().getAbilityText());
else if (card.isSplitCard()) {
Expand Down
9 changes: 9 additions & 0 deletions forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,15 @@ public static String composeCardText(final CardStateView state, final GameView g
area.append("\n\n");
area.append("Owner: ").append(card.getOwner().toString());
}

if (card.hasPreparedSpell()) {
area.append("\n\n");
area.append(Localizer.getInstance().getMessage("lblPrepared") + " — "
+ card.getAlternateStateName() + " "
+ card.getAlternateState().getManaCost().toString() + ": "
+ card.getAlternateState().getAbilityText()
);
}
return area.toString().trim();
}
}
Loading