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

- Make sure the names of face-down cards are not spoiled, e.g. during blockers damage order assignment.

Browse Source 
- A little typo fix.
This commit is contained in:
Agetian
2014-12-11 17:08:22 +00:00
parent 6de61cb9a6
commit 0ea126cd5d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -274,7 +274,7 @@ public class GameAction {
// Reveal if face-down // Reveal if face-down
if (c.isFaceDown()) { if (c.isFaceDown()) {
c.setState(CardStateName.Original, true); c.setState(CardStateName.Original, true);
reveal(new CardCollection(c), c.getOwner(), true, "Face-down card leaves the battlefield"); reveal(new CardCollection(c), c.getOwner(), true, "Face-down card leaves the battlefield: ");
c.setState(CardStateName.FaceDown, true); c.setState(CardStateName.FaceDown, true);
copied.setState(CardStateName.Original, true); copied.setState(CardStateName.Original, true);
} }

7
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -676,7 +676,12 @@ public class CardView extends GameEntityView {
if (name.isEmpty()) { if (name.isEmpty()) {
CardStateView alternate = getAlternateState(); CardStateView alternate = getAlternateState();
if (alternate != null) { if (alternate != null) {
return "Face-down card (" + getId() + ", " + getAlternateState().getName() + ")"; if (this.getCurrentState().getState() == CardStateName.FaceDown) {
return "Face-down card (H" + getHiddenId() + ")";
} else {
return getAlternateState().getName();
}
//return "Face-down card (" + getId() + ", " + getAlternateState().getName() + ")";
} }
} }
return (name + " (" + getId() + ")").trim(); return (name + " (" + getId() + ")").trim();