diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index 7e500950d1d..1c0fa85e556 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java @@ -173,6 +173,7 @@ public class AdventureDeckEditor extends TabPageScreen { super(ItemManagerConfig.ADVENTURE_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), CATALOG_ICON); cardManager.setBtnAdvancedSearchOptions(true); cardManager.setCatalogDisplay(true); + cardManager.setShowNFSWatermark(true); } @Override diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index f36a92818fb..25d3754b952 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -176,6 +176,7 @@ public class FSkin { Forge.getAssets().loadTexture(getSkinFile("hd_logo.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("adv_logo.png"), new TextureLoader.TextureParameter()); Forge.getAssets().loadTexture(getDefaultSkinFile("cover.png")); + Forge.getAssets().loadTexture(getDefaultSkinFile("nfs.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("overlay_alpha.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("spiral.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("splatter.png")); diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 02058e8cfe4..566b33d7713 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -86,6 +86,7 @@ public abstract class ItemManager extends FContainer im private boolean hideFilters = false; private boolean wantUnique = false; private boolean showRanking = false; + private boolean showNFSWatermark = false; private boolean multiSelectMode = false; private FEventHandler selectionChangedHandler, itemActivateHandler; private ContextMenuBuilder contextMenuBuilder; @@ -913,6 +914,10 @@ public abstract class ItemManager extends FContainer im return showRanking; } + public boolean showNFSWatermark() { + return showNFSWatermark; + } + public void setWantUnique(boolean unique) { wantUnique = unique; } @@ -921,6 +926,10 @@ public abstract class ItemManager extends FContainer im showRanking = showRanking0; } + public void setShowNFSWatermark(boolean val) { + showNFSWatermark = val; + } + public void setSelectionSupport(int minSelections0, int maxSelections0) { for (ItemView view : views) { view.setSelectionSupport(minSelections0, maxSelections0); diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index ca347f33524..60097618cc1 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -1127,8 +1127,12 @@ public class ImageView extends ItemView { cardPrice = ((ShopScene) Forge.getCurrentScene()).getCardPrice((PaperCard) item); drawCardLabel(g, "$" + cardPrice, Color.GOLD, x, y ,w ,h); } else { - if (((PaperCard) item).isNoSell()) { - drawCardLabel(g, Forge.getLocalizer().getMessage("lblNoSell"), Color.RED, x, y, w, h); + if (((PaperCard) item).isNoSell() && itemManager.showNFSWatermark()) { + Texture nfs = Forge.getAssets().getTexture(getDefaultSkinFile("nfs.png"), false); + if (nfs != null) + g.drawImage(nfs, x, y, w, h); + else + drawCardLabel(g, Forge.getLocalizer().getMessage("lblNoSell"), Color.RED, x, y, w, h); } } } @@ -1164,7 +1168,7 @@ public class ImageView extends ItemView { //g.drawImage(tr, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); } //draw plastic effect overlay. - g.drawImage(Forge.getAssets().getTexture(getDefaultSkinFile("cover.png")), x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); + g.drawImage(Forge.getAssets().getTexture(getDefaultSkinFile("cover.png"), false), x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); } //fake labelname shadow g.drawText(item.getName(), GROUP_HEADER_FONT, Color.BLACK, (x + PADDING) - 1f, (y + PADDING * 2) + 1f, w - 2 * PADDING, h - 2 * PADDING, true, Align.center, false); @@ -1192,7 +1196,7 @@ public class ImageView extends ItemView { //temporary fill image g.fillRect(Color.BLACK, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); //draw plastic effect overlay. - g.drawImage(Forge.getAssets().getTexture(getDefaultSkinFile("cover.png")), x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); + g.drawImage(Forge.getAssets().getTexture(getDefaultSkinFile("cover.png"), false), x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); } } diff --git a/forge-gui/res/skins/default/nfs.png b/forge-gui/res/skins/default/nfs.png new file mode 100644 index 00000000000..3ae0ef9e353 Binary files /dev/null and b/forge-gui/res/skins/default/nfs.png differ