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

- Added a new color identity display mode: "Changed" (displays color identity only for cards that had their identity altered).

Browse Source 
- Improved the use of related string constants.
This commit is contained in:
Agetian
2015-06-02 05:07:10 +00:00
parent 136b133f76
commit 6bc4848857
5 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,14 +11,17 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Sets;
import forge.game.GameView;
import forge.game.card.Card;
import forge.game.card.CardUtil;
import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView;
import forge.game.card.CounterType;
import forge.item.InventoryItemFromSet;
import forge.item.PaperCard;
import forge.item.PreconDeck;
import forge.item.SealedProduct;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences;
import forge.util.Lang;
@@ -509,10 +512,37 @@ public class CardDetailUtil {
//show card color identity if enabled
String colorIdentMode = FModel.getPreferences().getPref(ForgePreferences.FPref.UI_DISPLAY_COLOR_IDENTITY);
if (!colorIdentMode.equals("Never")) {
if (!colorIdentMode.equals(ForgeConstants.DISP_COLOR_IDENT_NEVER)) {
final String colorIdent = getColorIdentity(state);
final int numColors = state.getColors().countColors();
if (!colorIdentMode.equals("Only Multicolor") || numColors > 1) {
boolean showIdentity = false;
if (colorIdentMode.equals(ForgeConstants.DISP_COLOR_IDENT_CHANGED)) {
String origIdent = "";
PaperCard origPaperCard = null;
Card origCard = null;
try {
if (!card.getName().isEmpty()) {
origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getName());
} else {
// probably a morph, try to get its identity from the alternate state
origPaperCard = FModel.getMagicDb().getCommonCards().getCard(card.getAlternateState().getName());
}
if (origPaperCard != null) {
origCard = Card.getCardForUi(origPaperCard); // if null, probably a variant card
}
origIdent = origCard != null ? getColorIdentity(CardView.get(origCard).getCurrentState()) : "";
} catch(Exception ex) {
System.err.println("Unexpected behavior: card " + card.getName() + "[" + card.getId() + "] tripped an exception when trying to process color identity.");
}
showIdentity = !colorIdent.equals(origIdent);
} else if (colorIdentMode.equals(ForgeConstants.DISP_COLOR_IDENT_MULTICOLOR)) {
final int numColors = state.getColors().countColors();
showIdentity = numColors > 1;
} else if (colorIdentMode.equals(ForgeConstants.DISP_COLOR_IDENT_ALWAYS)) {
showIdentity = true;
}
if (showIdentity) {
if (area.length() != 0) {
area.append("\n\n");
}

3
forge-gui/src/main/java/forge/properties/ForgeConstants.java
View File

@@ -180,7 +180,8 @@ public final class ForgeConstants {
// Constants for Display Card Identity game setting
public static final String DISP_COLOR_IDENT_ALWAYS = "Always";
public static final String DISP_COLOR_IDENT_MULTICOLOR = "Only Multicolor";
public static final String DISP_COLOR_IDENT_CHANGED = "Changed";
public static final String DISP_COLOR_IDENT_MULTICOLOR = "Multicolor";
public static final String DISP_COLOR_IDENT_NEVER = "Never";
}