diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 63dbe17256cc..e586b437af58 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -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); diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 913a39a47e71..6a237bef67ae 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -986,7 +986,6 @@ public CardStateView getRightSplitState() { public boolean hasBackSide() { return get(TrackableProperty.HasBackSide); } - public String getBackSideName() { return get(TrackableProperty.BackSideName); } public CardStateView createAlternateState(final CardStateName state0) { return new CardStateView(getId(), state0, tracker); @@ -995,9 +994,8 @@ public CardStateView createAlternateState(final CardStateName state0) { public CardStateView getState(final boolean alternate0) { return alternate0 ? getAlternateState() : getCurrentState(); } - void updateBackSide(String stateName, boolean hasBackSide) { + void updateBackSide(boolean hasBackSide) { set(TrackableProperty.HasBackSide, hasBackSide); - set(TrackableProperty.BackSideName, stateName); } public boolean wasDestroyed() { @@ -1061,9 +1059,9 @@ void updateState(Card c) { set(TrackableProperty.Room, c.isRoom()); set(TrackableProperty.FacedownImageKey, c.getFacedownImageKey()); - //backside + // hasBackside if (c.getAlternateState() != null) - updateBackSide(c.getAlternateState().getName(), c.isDoubleFaced()); + updateBackSide(c.isDoubleFaced()); final Card cloner = c.getCloner(); set(TrackableProperty.Cloner, cloner == null ? null : cloner.getName() + " (" + cloner.getId() + ")"); diff --git a/forge-game/src/main/java/forge/trackable/TrackableProperty.java b/forge-game/src/main/java/forge/trackable/TrackableProperty.java index 3f2e0ca0b42d..feedeb14e4c8 100644 --- a/forge-game/src/main/java/forge/trackable/TrackableProperty.java +++ b/forge-game/src/main/java/forge/trackable/TrackableProperty.java @@ -216,7 +216,6 @@ public enum TrackableProperty { SA_IsSpell(TrackableTypes.BooleanType), //HasBackSide - BackSideName(TrackableTypes.StringType), HasBackSide(TrackableTypes.BooleanType), //StackItem diff --git a/forge-gui-mobile/src/forge/util/CardRendererUtils.java b/forge-gui-mobile/src/forge/util/CardRendererUtils.java index d60907aef38b..01dd0b3dd72f 100644 --- a/forge-gui-mobile/src/forge/util/CardRendererUtils.java +++ b/forge-gui-mobile/src/forge/util/CardRendererUtils.java @@ -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.getAlternateState().getName()) || card.getAlternateState().getAbilityText().contains(reference); else if (card.hasSecondaryState()) showAlt = reference.equals(card.getAlternateState().getAbilityText()); else if (card.isSplitCard()) { diff --git a/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java index ef5cae395daa..995b4d657f42 100644 --- a/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java @@ -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.getAlternateState().getName() + " " + + card.getAlternateState().getManaCost().toString() + ": " + + card.getAlternateState().getAbilityText() + ); + } return area.toString().trim(); } }