diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index 5fbec6209ce..646330e4894 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -136,6 +136,7 @@ public void initialize() { lstControls.add(Pair.of(view.getCbAllowCustomCardsDeckConformance(), FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE)); lstControls.add(Pair.of(view.getCbUseExperimentalNetworkStream(), FPref.UI_NETPLAY_COMPAT)); lstControls.add(Pair.of(view.getCbImageFetcher(), FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER)); + lstControls.add(Pair.of(view.getCbSmartTokenArt(), FPref.UI_ENABLE_SMART_TOKEN_ART)); lstControls.add(Pair.of(view.getCbDisableCardImages(), FPref.UI_DISABLE_CARD_IMAGES)); lstControls.add(Pair.of(view.getCbDisplayFoil(), FPref.UI_OVERLAY_FOIL_EFFECT)); lstControls.add(Pair.of(view.getCbRandomFoil(), FPref.UI_RANDOM_FOIL)); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java index 85fe017e108..15461061e97 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java @@ -86,6 +86,7 @@ public enum VSubmenuPreferences implements IVSubmenu { private final JCheckBox cbSROptimize = new OptionsCheckBox(localizer.getMessage("cbSROptimize")); private final JCheckBox cbFilteredHands = new OptionsCheckBox(localizer.getMessage("cbFilteredHands")); private final JCheckBox cbImageFetcher = new OptionsCheckBox(localizer.getMessage("cbImageFetcher")); + private final JCheckBox cbSmartTokenArt = new OptionsCheckBox(localizer.getMessage("cbPreferEraMatchedTokenArt")); private final JCheckBox cbDisableCardImages = new OptionsCheckBox(localizer.getMessage("lblDisableCardImages")); private final JCheckBox cbCloneImgSource = new OptionsCheckBox(localizer.getMessage("cbCloneImgSource")); private final JCheckBox cbScaleLarger = new OptionsCheckBox(localizer.getMessage("cbScaleLarger")); @@ -398,6 +399,9 @@ public enum VSubmenuPreferences implements IVSubmenu { pnlPrefs.add(cbImageFetcher, titleConstraints); pnlPrefs.add(new NoteLabel(localizer.getMessage("nlImageFetcher")), descriptionConstraints); + pnlPrefs.add(cbSmartTokenArt, titleConstraints); + pnlPrefs.add(new NoteLabel(localizer.getMessage("nlPreferEraMatchedTokenArt")), descriptionConstraints); + pnlPrefs.add(cbDisableCardImages, titleConstraints); pnlPrefs.add(new NoteLabel(localizer.getMessage("nlDisableCardImages")), descriptionConstraints); @@ -751,6 +755,10 @@ public JCheckBox getCbImageFetcher() { return cbImageFetcher; } + public JCheckBox getCbSmartTokenArt() { + return cbSmartTokenArt; + } + /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getCbDisableCardImages() { return cbDisableCardImages; diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index e94d2ea210b..0b566d4f16d 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -105,6 +105,7 @@ cbPerformanceMode=Performance-Modus cbOrderHand=Keep Hand ordered cbFilteredHands=Alternative Starthand cbImageFetcher=Lade automatisch fehlende Kartenbilder +cbPreferEraMatchedTokenArt=Verwende die nächstgelegene Edition für die Token-Grafik cbCloneImgSource=Klone zeigen eigenes Kartenbild cbScaleLarger=Skaliere Bilder größer cbRenderBlackCardBorders=Zeige schwarzen Rand @@ -223,6 +224,7 @@ nlDefaultFontSize=Die Standardschriftgröße. Alle Schriftelemente werden relati nlCardArtFormat=Format der Kartenbilder (Full: Bilder ganzen Karte; Crop: nur Bildteil der Karte) cbpMulliganRule=Mulligan Regel nlImageFetcher=Ermöglicht bei bestehender Onlineverbindung das automatisches Nachladen fehlender Kartenbilder. +nlPreferEraMatchedTokenArt=Wähle die Token-Grafik aus der Edition, die dem Erscheinungsdatum der erzeugenden Karte am nächsten liegt nlDisplayFoil=Zeige FOIL-Karten mit einem optischen FOIL-Effekt. nlRandomFoil=Zeige den FOIL-Effekt bei zufälligen Karten. nlScaleLarger=Erlaubt Kartenbilder größer als ihre originale Größe zu zeigen. diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index d7660d94a7e..13c990439c8 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -107,6 +107,7 @@ cbPerformanceMode=Performance Mode cbOrderHand=Keep Hand ordered cbFilteredHands=Filtered Hands cbImageFetcher=Automatically Download Missing Card Art +cbPreferEraMatchedTokenArt=Prefer Era Matched Token Art cbCloneImgSource=Clones Use Original Card Art cbScaleLarger=Scale Image Larger cbRenderBlackCardBorders=Render Black Card Borders @@ -239,6 +240,7 @@ nlCardArtFormat=The format of card art images. (Full: image of entire card. Crop nlDefaultFontSize=The default font size within the UI. All font elements are scaled relative to this. (REQUIRES RESTART) cbpMulliganRule = Mulligan Rule nlImageFetcher=Enables live fetching of missing card images from an online resource. +nlPreferEraMatchedTokenArt=Pick Token Art from Edition Closest to Producing Card's Release Date nlDisplayFoil=Displays foil cards with the visual foil overlay effect. nlRandomFoil=Adds foil effect to random cards. nlScaleLarger=Allows card pictures to be expanded larger than their original size. diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 1439903e722..f8094b9d03e 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -80,6 +80,7 @@ cbPerformanceMode=Modo de desempeño cbOrderHand=Keep Hand ordered cbFilteredHands=Manos filtradas cbImageFetcher=Descargar automáticamente el arte de la carta si no existe +cbPreferEraMatchedTokenArt=Usar la edición más cercana para la ilustración del token cbCloneImgSource=Clones usan el arte original de la carta cbScaleLarger=Imagen de escala más grande cbRenderBlackCardBorders=Renderizar bordes de cartas negras @@ -199,6 +200,7 @@ nlDefaultFontSize=El tamaño de fuente predeterminado dentro de la interfaz de u nlCardArtFormat=El formato de las imágenes del arte de la carta. (Full: imagen de toda la carta. Crop: sólo la parte del arte) cbpMulliganRule=Regla de mulligan nlImageFetcher=Permite la descarga al vuelo de las imágenes de cartas que falten. +nlPreferEraMatchedTokenArt=Elegir la ilustración del token de la edición más cercana a la fecha de lanzamiento de la carta que lo genera nlDisplayFoil=Mostrar las cartas foil con un capa sobre la carta que da efecto foil nlRandomFoil=Agrega efecto de foil a cartas aleatorias. nlScaleLarger=Permite que las imágenes de las cartas se amplíen más que su tamaño original. diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index caebb0cabd4..807b2e91449 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -79,6 +79,7 @@ cbPerformanceMode=Mode Performances cbOrderHand=Keep Hand ordered cbFilteredHands=Mains filtrées cbImageFetcher=Télécharger automatiquement l'illustration de la carte manquante +cbPreferEraMatchedTokenArt=Utiliser l’édition la plus proche pour l’illustration du jeton cbCloneImgSource=Les clones utilisent l'illustration originale de la carte cbScaleLarger=Agrandir l'image cbRenderBlackCardBorders=Rendre les bordures noires de la carte @@ -197,6 +198,7 @@ nlCardArtFormat=Le format des images d'art de la carte. (Plein : image de la car nlDefaultFontSize=La taille de police par défaut dans l'interface utilisateur. Tous les éléments de police sont mis à l'échelle par rapport à cela. (NÉCESSITE UN REDÉMARRAGE) cbpMulliganRule=règle de Mulligan nlImageFetcher=Active la récupération en direct des images de cartes manquantes à partir d'une ressource en ligne. +nlPreferEraMatchedTokenArt=Choisir l’illustration du jeton à partir de l’édition la plus proche de la date de sortie de la carte qui le produit nlDisplayFoil=Affiche les cartes brillantes avec l'effet visuel de superposition de feuille. nlRandomFoil=Ajoute un effet foil aux cartes aléatoires. nlScaleLarger=Permet aux images de la carte d'être agrandies au-delà de leur taille d'origine. diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index de43c1786e4..cb318ee7973 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -78,6 +78,7 @@ cbPerformanceMode=Modalità alte prestazioni cbOrderHand=Keep Hand ordered cbFilteredHands=Mani Filtrate cbImageFetcher=Scarica automaticamente l'arte delle carte mancanti +cbPreferEraMatchedTokenArt=Usa l’edizione più vicina per l’illustrazione della pedina cbCloneImgSource=I cloni usano l'arte della carta originale cbScaleLarger=Ingrandisci l'immagine cbRenderBlackCardBorders=Disegna i bordi neri delle carte @@ -196,6 +197,7 @@ nlDefaultFontSize=La dimensione predefinita dei caratteri nell'interfaccia utent nlCardArtFormat=Formato delle Illustrazioni delle carte. (Full: Immagine per intero della carta. Crop: Solo illustrazione) cbpMulliganRule=Tipo di Mulligan nlImageFetcher=Consente il recupero in tempo reale delle immagini mancanti da una risorsa online. +nlPreferEraMatchedTokenArt=Scegli l’illustrazione della pedina dall’edizione più vicina alla data di uscita della carta che la genera nlDisplayFoil=Visualizza le carte foil con l'effetto di sovrapposizione foil visivo. nlRandomFoil=Aggiunge l'effetto foil alle carte casuali. nlScaleLarger=Consente di espandere le immagini delle carte più grandi delle loro dimensioni originali. diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index b586b42e17e..4c594eca331 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -79,6 +79,7 @@ cbPerformanceMode=パフォーマンスモード cbOrderHand=Keep Hand ordered cbFilteredHands=初期ハンド補正 cbImageFetcher=欠落したカード画像を自動的にダウンロードする +cbPreferEraMatchedTokenArt=トークンのアートには、最も近いエディションを使用する cbCloneImgSource=コピーカードは元のカード画像を使用します cbScaleLarger=画像を拡大する cbRenderBlackCardBorders=黒枠のレンダリング @@ -197,6 +198,7 @@ nlDefaultFontSize=UI 内のデフォルトのフォントサイズ。 すべて nlCardArtFormat=カード描画時使うアートのフォーマット(Full: カード全体の画像を使う。Crop: カードのアートの部分の画像だけを使う。) cbpMulliganRule =マリガンルール nlImageFetcher=オンラインサーバーから欠落しているカード画像の動的にフェッチを有効にします。 +nlPreferEraMatchedTokenArt=トークンのアートは、それを生成するカードの発売日に最も近いエディションから選択する nlDisplayFoil=視覚的フォイルオーバーレイ効果のあるフォイルカードを表示します。 nlRandomFoil=ランダムなカードにフォイル効果を追加します。 nlScaleLarger=カード画像を元のサイズより大きく拡大できます。 diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index 714cbc2b491..1d254dbdba4 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -80,6 +80,7 @@ cbPerformanceMode=Modo de Desempenho cbOrderHand=Keep Hand ordered cbFilteredHands=Mãos Filtradas cbImageFetcher=Baixar Automaticamente a Arte de Cartas Ausentes +cbPreferEraMatchedTokenArt=Usar a edição mais próxima para a arte do token cbCloneImgSource=Clones Usam a Arte da Carta Origem cbScaleLarger=Expandir Imagem cbRenderBlackCardBorders=Renderizar Bordas Pretas de Carta @@ -198,6 +199,7 @@ nlCardArtFormat=O formato das imagens de arte da carta. (Total\: imagem inteira nlDefaultFontSize=O tamanho padrão da fonte dentro da interface do usuário. Todos os elementos de fonte são dimensionados em relação a isso. (REQUER REINÍCIO) cbpMulliganRule = Regra de Mulligan nlImageFetcher=Habilita a busca sob demanda das imagens das cartas ausentes a partir de um repositório online. +nlPreferEraMatchedTokenArt=Escolher a arte do token a partir da edição mais próxima da data de lançamento da carta que o gera nlDisplayFoil=Exibe cartas cromadas com o efeito de camada cromada. nlRandomFoil=Adiciona o efeito cromado a cartas aleatórias. nlScaleLarger=Permite que as imagens das cartas sejam expandidas maior que o tamanho original. diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 42b0a123335..0f4c5a98b3a 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -80,6 +80,7 @@ cbPerformanceMode=性能模式 cbOrderHand=Keep Hand ordered cbFilteredHands=手牌过滤 cbImageFetcher=自动下载缺失的图片 +cbPreferEraMatchedTokenArt=使用最接近的版本作为衍生物的插画 cbCloneImgSource=复制使用原始的图片 cbScaleLarger=将图像缩放的更大 cbRenderBlackCardBorders=渲染黑卡边框 @@ -199,6 +200,7 @@ nlDefaultFontSize=UI中字体的默认大小。所有字体元素都相对于此 nlCardArtFormat=牌图的格式。(Full表示使用完整的牌张图片,Crop表示只使用牌图的插画部分) cbpMulliganRule = 调度规则 nlImageFetcher=允许从在线资源中实时获取缺失的图片 +nlPreferEraMatchedTokenArt=从与生成该衍生物的卡牌发布日期最接近的版本中选择其插画 nlDisplayFoil=显示闪卡 nlRandomFoil=随机将牌设置为闪卡 nlScaleLarger=允许卡牌图片缩放为初始大小 diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java index 163433a3386..f97eb30e8c3 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java @@ -90,6 +90,7 @@ public enum FPref implements PreferencesStore.IPref { UI_OVERLAY_ABILITY_ICONS("true"), UI_OVERLAY_DRAFT_RANKING("true"), UI_ENABLE_ONLINE_IMAGE_FETCHER ("true"), + UI_ENABLE_SMART_TOKEN_ART ("false"), UI_PREFERRED_ART("LATEST_ART_ALL_EDITIONS"), UI_SMART_CARD_ART("false"), UI_AUTO_AIDECK_SELECTION("true"),