update watermark

- show watermark on catalogpage only
This commit is contained in:
Anthony Calosa
2024-11-09 10:17:40 +08:00
parent ac15b32f32
commit b130f45fe1
5 changed files with 19 additions and 4 deletions

View File

@@ -173,6 +173,7 @@ public class AdventureDeckEditor extends TabPageScreen<AdventureDeckEditor> {
super(ItemManagerConfig.ADVENTURE_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), CATALOG_ICON); super(ItemManagerConfig.ADVENTURE_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), CATALOG_ICON);
cardManager.setBtnAdvancedSearchOptions(true); cardManager.setBtnAdvancedSearchOptions(true);
cardManager.setCatalogDisplay(true); cardManager.setCatalogDisplay(true);
cardManager.setShowNFSWatermark(true);
} }
@Override @Override

View File

@@ -176,6 +176,7 @@ public class FSkin {
Forge.getAssets().loadTexture(getSkinFile("hd_logo.png")); Forge.getAssets().loadTexture(getSkinFile("hd_logo.png"));
Forge.getAssets().loadTexture(getDefaultSkinFile("adv_logo.png"), new TextureLoader.TextureParameter()); Forge.getAssets().loadTexture(getDefaultSkinFile("adv_logo.png"), new TextureLoader.TextureParameter());
Forge.getAssets().loadTexture(getDefaultSkinFile("cover.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("cover.png"));
Forge.getAssets().loadTexture(getDefaultSkinFile("nfs.png"));
Forge.getAssets().loadTexture(getDefaultSkinFile("overlay_alpha.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("overlay_alpha.png"));
Forge.getAssets().loadTexture(getDefaultSkinFile("spiral.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("spiral.png"));
Forge.getAssets().loadTexture(getDefaultSkinFile("splatter.png")); Forge.getAssets().loadTexture(getDefaultSkinFile("splatter.png"));

View File

@@ -86,6 +86,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
private boolean hideFilters = false; private boolean hideFilters = false;
private boolean wantUnique = false; private boolean wantUnique = false;
private boolean showRanking = false; private boolean showRanking = false;
private boolean showNFSWatermark = false;
private boolean multiSelectMode = false; private boolean multiSelectMode = false;
private FEventHandler selectionChangedHandler, itemActivateHandler; private FEventHandler selectionChangedHandler, itemActivateHandler;
private ContextMenuBuilder<T> contextMenuBuilder; private ContextMenuBuilder<T> contextMenuBuilder;
@@ -913,6 +914,10 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
return showRanking; return showRanking;
} }
public boolean showNFSWatermark() {
return showNFSWatermark;
}
public void setWantUnique(boolean unique) { public void setWantUnique(boolean unique) {
wantUnique = unique; wantUnique = unique;
} }
@@ -921,6 +926,10 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
showRanking = showRanking0; showRanking = showRanking0;
} }
public void setShowNFSWatermark(boolean val) {
showNFSWatermark = val;
}
public void setSelectionSupport(int minSelections0, int maxSelections0) { public void setSelectionSupport(int minSelections0, int maxSelections0) {
for (ItemView<T> view : views) { for (ItemView<T> view : views) {
view.setSelectionSupport(minSelections0, maxSelections0); view.setSelectionSupport(minSelections0, maxSelections0);

View File

@@ -1127,7 +1127,11 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
cardPrice = ((ShopScene) Forge.getCurrentScene()).getCardPrice((PaperCard) item); cardPrice = ((ShopScene) Forge.getCurrentScene()).getCardPrice((PaperCard) item);
drawCardLabel(g, "$" + cardPrice, Color.GOLD, x, y ,w ,h); drawCardLabel(g, "$" + cardPrice, Color.GOLD, x, y ,w ,h);
} else { } else {
if (((PaperCard) item).isNoSell()) { 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); drawCardLabel(g, Forge.getLocalizer().getMessage("lblNoSell"), Color.RED, x, y, w, h);
} }
} }
@@ -1164,7 +1168,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
//g.drawImage(tr, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); //g.drawImage(tr, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale);
} }
//draw plastic effect overlay. //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 //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); 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<T extends InventoryItem> extends ItemView<T> {
//temporary fill image //temporary fill image
g.fillRect(Color.BLACK, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale); g.fillRect(Color.BLACK, x + (w - w * scale) / 2, y + (h - h * scale) / 1.5f, w * scale, h * scale);
//draw plastic effect overlay. //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);
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB