From c52f886e89edfb14c0c3e74806d51f8ce586dfe8 Mon Sep 17 00:00:00 2001 From: Heitor Bittencourt Date: Sat, 22 Mar 2025 01:55:47 -0300 Subject: [PATCH] Adventure: Disable Not For Sale Overlay Setting --- .../src/forge/adventure/data/SettingData.java | 1 + .../src/forge/adventure/scene/SettingsScene.java | 8 ++++++++ .../src/forge/itemmanager/views/ImageView.java | 3 ++- forge-gui/res/languages/de-DE.properties | 1 + forge-gui/res/languages/en-US.properties | 1 + forge-gui/res/languages/es-ES.properties | 1 + forge-gui/res/languages/fr-FR.properties | 1 + forge-gui/res/languages/it-IT.properties | 1 + forge-gui/res/languages/ja-JP.properties | 1 + forge-gui/res/languages/pt-BR.properties | 1 + forge-gui/res/languages/zh-CN.properties | 1 + 11 files changed, 19 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/adventure/data/SettingData.java b/forge-gui-mobile/src/forge/adventure/data/SettingData.java index fea2c5e4bff..1b2d9cbbd4d 100644 --- a/forge-gui-mobile/src/forge/adventure/data/SettingData.java +++ b/forge-gui-mobile/src/forge/adventure/data/SettingData.java @@ -20,6 +20,7 @@ public class SettingData { public Float cardTooltipAdjLandscape; public boolean dayNightBG; public boolean disableWinLose; + public boolean disableNotForSale; public boolean showShopOverlay; public boolean useAllCardVariants; public boolean generateLDADecks; diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java index 7dc9b0dda3f..9b0d3fc29d2 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java @@ -213,6 +213,14 @@ public class SettingsScene extends UIScene { Config.instance().saveSettings(); } }); + addSettingField(Forge.getLocalizer().getMessage("lblDisableNotForSaleOverlay"), + Config.instance().getSettingData().disableNotForSale, new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + Config.instance().getSettingData().disableNotForSale = ((CheckBox) actor).isChecked(); + Config.instance().saveSettings(); + } + }); addSettingField(Forge.getLocalizer().getMessage("lblShowShopOverlay"), Config.instance().getSettingData().showShopOverlay, new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index bf7a15c3f98..9d34a582970 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -12,6 +12,7 @@ import forge.Forge.KeyInputAdapter; import forge.Graphics; import forge.ImageKeys; import forge.adventure.scene.ShopScene; +import forge.adventure.util.Config; import forge.assets.*; import forge.assets.FSkinColor.Colors; import forge.card.*; @@ -1081,7 +1082,7 @@ 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() && itemManager.showNFSWatermark()) { + if (((PaperCard) item).isNoSell() && itemManager.showNFSWatermark() && !Config.instance().getSettingData().disableNotForSale) { Texture nfs = Forge.getAssets().getTexture(getDefaultSkinFile("nfs.png"), false); if (nfs != null) g.drawImage(nfs, x, y, w, h); diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 816048807ce..f994776f24d 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -3034,6 +3034,7 @@ lblChangelog=Änderungen lblToken=Spielstein lblBackToAdventure=Zurück zum Abenteuer lblDisableWinLose=Deaktivieren Sie Winslose Overlay +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=Shop -Artikelname anzeigen lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 9e1df788bc2..f1027f49a64 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -3092,6 +3092,7 @@ lblBackToAdventure=Back to Adventure lblQuitAdventureEventMatch=Quit Match (will count as a loss) lblQuitAdventureEvent=You have matches left to play!\nLeaving the event early will forfeit your potential future winnings.\nYou will still receive winnings as if you conceded your remaining matches.\n\nWould you still like to quit the event? lblDisableWinLose=Disable WinLose Overlay +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=Display Shop Item names lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index bcc88edbbac..b74eef76cd7 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -3048,6 +3048,7 @@ lblChangelog=Cambios lblToken=Simbólico lblBackToAdventure=Volver a la aventura lblDisableWinLose=Desactivar WinLose Overlay +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=Nombre del artículo de la tienda de exhibición lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index 9e1ad3ce337..cee6c9f7e27 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -3042,6 +3042,7 @@ lblChangelog=Changements lblToken=Jeton lblBackToAdventure=Retour à l'aventure lblDisableWinLose=Désactiver la superposition Winlose +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=Nom de l'article de la boutique d'affichage lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 136f51b1b33..d444a8fd6a5 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -3040,6 +3040,7 @@ lblChangelog=I cambiamenti lblToken=Gettone lblBackToAdventure=Torna all'avventura lblDisableWinLose=Disabilita overlay winlose +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=Visualizza il nome dell'articolo del negozio lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index 694baf9b490..d2c21aa8355 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -3036,6 +3036,7 @@ lblChangelog=変更 lblToken=トークン lblBackToAdventure=冒険に戻ります lblDisableWinLose=Winloseオーバーレイを無効にします +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblShowShopOverlay=ショップアイテム名を表示します lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index 80656f4e66c..88df93579ef 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -3127,6 +3127,7 @@ lblToken=Símbolo lblBackToAdventure=De volta à aventura lblDisableWinLose=Desative a sobreposição de Winlose lblShowShopOverlay=Nome do item da loja de exibição +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required) lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks lblExitToWoldMap=Sair para o mapa do mundo? diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 9c4d191b06e..457d529e78a 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -3028,6 +3028,7 @@ lblToken=令牌 lblBackToAdventure=回到冒险 lblDisableWinLose=禁用Winlose覆盖 lblShowShopOverlay=展示商店项目名称 +lblDisableNotForSaleOverlay=Disable Not For Sale Overlay lblUseAllCardVariants=使用来自所有系列的牌张重印版（这需要重新启动） lblGenerateLDADecks=生成原型套牌而不是由AI生成的套牌 lblExitToWoldMap=退出世界地图？