Merge pull request #3982 from kevlahnota/newmaster2

remove UI_CLONE_MODE_SOURCE preference
2025-11-16 02:38:02 +00:00 · 2023-10-26 17:22:40 +08:00
parent 36fe377977 fcccd1fc3d
commit a5e3a43b84
17 changed files with 0 additions and 44 deletions
--- a/forge-game/src/main/java/forge/game/GameRules.java
+++ b/forge-game/src/main/java/forge/game/GameRules.java
@@ -15,8 +15,6 @@ public class GameRules {
    private final Set<GameType> appliedVariants = EnumSet.noneOf(GameType.class);

    // it's a preference, not rule... but I could hardly find a better place for it
-    private boolean canCloneUseTargetsImage;
-    // same for me
    private boolean useGrayText;

    // whether to warn about cards AI can't play well
@@ -99,13 +97,6 @@ public class GameRules {
                || appliedVariants.contains(GameType.Brawl);
    }

-    public boolean canCloneUseTargetsImage() {
-        return canCloneUseTargetsImage;
-    }
-    public void setCanCloneUseTargetsImage(final boolean canCloneUseTargetsImage) {
-        this.canCloneUseTargetsImage = canCloneUseTargetsImage;
-    }
-
    public boolean useGrayText() {
        return useGrayText;
    }
--- 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
@@ -125,7 +125,6 @@ public enum CSubmenuPreferences implements ICDoc {
        lstControls.add(Pair.of(view.getCbPerformanceMode(), FPref.PERFORMANCE_MODE));
        lstControls.add(Pair.of(view.getCbSideboardForAI(), FPref.MATCH_SIDEBOARD_FOR_AI));
        lstControls.add(Pair.of(view.getCbFilteredHands(), FPref.FILTERED_HANDS));
-        lstControls.add(Pair.of(view.getCbCloneImgSource(), FPref.UI_CLONE_MODE_SOURCE));
        lstControls.add(Pair.of(view.getCbRemoveSmall(), FPref.DECKGEN_NOSMALL));
        lstControls.add(Pair.of(view.getCbCardBased(), FPref.DECKGEN_CARDBASED));
        lstControls.add(Pair.of(view.getCbRemoveArtifacts(), FPref.DECKGEN_ARTIFACTS));
--- 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
@@ -81,7 +81,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
    private final JCheckBox cbFilteredHands = new OptionsCheckBox(localizer.getMessage("cbFilteredHands"));
    private final JCheckBox cbImageFetcher = new OptionsCheckBox(localizer.getMessage("cbImageFetcher"));
    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"));
    private final JCheckBox cbRenderBlackCardBorders = new OptionsCheckBox(localizer.getMessage("cbRenderBlackCardBorders"));
    private final JCheckBox cbLargeCardViewers = new OptionsCheckBox(localizer.getMessage("cbLargeCardViewers"));
@@ -236,9 +235,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
        pnlPrefs.add(cbFilteredHands, titleConstraints);
        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlFilteredHands")), descriptionConstraints);

-        pnlPrefs.add(cbCloneImgSource, titleConstraints);
-        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlCloneImgSource")), descriptionConstraints);
-
        pnlPrefs.add(cbPromptFreeBlocks, titleConstraints);
        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlPromptFreeBlocks")), descriptionConstraints);

@@ -846,11 +842,6 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
        return cbFilteredHands;
    }

-    /** @return {@link javax.swing.JCheckBox} */
-    public JCheckBox getCbCloneImgSource() {
-        return cbCloneImgSource;
-    }
-
    /** @return {@link javax.swing.JCheckBox} */
    public JCheckBox getCbPromptFreeBlocks() {
        return cbPromptFreeBlocks;
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -233,10 +233,6 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                Forge.getLocalizer().getMessage("cbFilteredHands"),
                Forge.getLocalizer().getMessage("nlFilteredHands")),
                1);
-        lstSettings.addItem(new BooleanSetting(FPref.UI_CLONE_MODE_SOURCE,
-                Forge.getLocalizer().getMessage("cbCloneImgSource"),
-                Forge.getLocalizer().getMessage("nlCloneImgSource")),
-                1);
        lstSettings.addItem(new BooleanSetting(FPref.MATCHPREF_PROMPT_FREE_BLOCKS,
                Forge.getLocalizer().getMessage("cbPromptFreeBlocks"),
                Forge.getLocalizer().getMessage("nlPromptFreeBlocks")),
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=Sideboard für Mensch/KI
 cbPerformanceMode=Performance-Modus
 cbFilteredHands=Alternative Starthand
 cbImageFetcher=Lade automatisch fehlende Kartenbilder
-cbCloneImgSource=Klone zeigen eigenes Kartenbild
 cbScaleLarger=Skaliere Bilder größer
 cbRenderBlackCardBorders=Zeige schwarzen Rand
 cbLargeCardViewers=Nutze große Kartenansicht
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=Erzwingt eine Deck-Konformität zum gewählten Format (min
 nlSideboardForAI=Erlaubt Spielern das Nutzen des Sideboards von KI-Decks und in Constructed-Formaten.
 nlPerformanceMode=Schalten zusätzlich Prüfungen auf statische Fähigkeiten ab, um das Spiel zu beschleunigen. Warnung: Kann Probleme mit 'Aufblitzen' bei Karten von KI-Gegner verursachen!
 nlFilteredHands=Erzeugt zwei Starthände, und behält die, welche am nächsten an der durchschnittlichen Länderanzahl im Deck ist. (Erfordert Neustart)
-nlCloneImgSource=Zeige das originale Kartenbild des Klones statt der geklonten Karte.
 nlPromptFreeBlocks=Wenn ein neuer Block nichts kosten würde, dann wird er automatisch bezahlt.
 nlPauseWhileMinimized=Wenn aktiviert, pausiert Forge im minimierten Zustand (betrifft hauptsächlich KI gegen KI).
 nlEscapeEndsTurn=Wenn aktiviert, funktioniert ESCape als Alternative um den Zug zu beenden.
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=Human Sideboard for AI
 cbPerformanceMode=Performance Mode
 cbFilteredHands=Filtered Hands
 cbImageFetcher=Automatically Download Missing Card Art
-cbCloneImgSource=Clones Use Original Card Art
 cbScaleLarger=Scale Image Larger
 cbRenderBlackCardBorders=Render Black Card Borders
 cbLargeCardViewers=Use Large Card Viewers
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=Enforces deck legality relevant to each environment (minim
 nlSideboardForAI=Allows users to sideboard with the AIs deck and sideboard in constructed game formats.
 nlPerformanceMode=Disables additional static abilities checks to speed up the game engine. (Warning: breaks some ''as if had flash'' scenarios when casting cards owned by opponents).
 nlFilteredHands=Generates two starting hands and keeps the one with the closest to average land count for the deck. (REQUIRES RESTART)
-nlCloneImgSource=When enabled clones will use their original art instead of the cloned card''s art.
 nlPromptFreeBlocks=When enabled, if you would have to pay 0 to block, pay automatically without prompt.
 nlPauseWhileMinimized=When enabled, Forge pauses when minimized (primarily for AI vs AI).
 nlEscapeEndsTurn=When enabled, Escape key functions as an alternative shortcut to end the current turn.
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=Banquillo humano para la IA
 cbPerformanceMode=Modo de desempeño
 cbFilteredHands=Manos filtradas
 cbImageFetcher=Descargar automáticamente el arte de la carta si no existe
-cbCloneImgSource=Clones usan el arte original de la carta
 cbScaleLarger=Imagen de escala más grande
 cbRenderBlackCardBorders=Renderizar bordes de cartas negras
 cbLargeCardViewers=Usar visores de cartas grandes
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=Aplica la legalidad del mazo correspondiente a cada entorn
 nlSideboardForAI=Permite a los usuarios sideboard con el mazo de la IA y el sideboard en formatos de juego construidos.
 nlPerformanceMode=Desactiva las comprobaciones de habilidades estáticas adicionales para acelerar el motor del juego. (Advertencia: rompe algunos escenarios ''como si tuviera flash'' cuando se lanzan cartas de propiedad de los oponentes).
 nlFilteredHands=Genera dos manos iniciales y mantiene la que tiene el recuento de tierras más cercano al promedio del mazo (Requiere reinicio)
-nlCloneImgSource=Cuando se habilita, los clones usarán su arte original en lugar del arte de la carta clonada.
 nlPromptFreeBlocks=Cuando está habilitado, si tuvieses que pagar 0 para bloquear, paga automáticamente sin aviso.
 nlPauseWhileMinimized=Cuando está habilitado, Forge hace una pausa cuando está minimizado (principalmente para IA contra IA).
 nlEscapeEndsTurn=Cuando está habilitada, la tecla Escape funciona como un atajo alternativo para finalizar el turno actual.
--- a/forge-gui/res/languages/fr-FR.properties
+++ b/forge-gui/res/languages/fr-FR.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=Réserve humain pour l''IA
 cbPerformanceMode=Mode Performances
 cbFilteredHands=Mains filtrées
 cbImageFetcher=Télécharger automatiquement l''illustration de la carte manquante
-cbCloneImgSource=Les clones utilisent l''illustration originale de la carte
 cbScaleLarger=Agrandir l''image
 cbRenderBlackCardBorders=Rendre les bordures noires de la carte
 cbLargeCardViewers=Utiliser les visionneuses de grandes cartes
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=Applique la légalité du deck en fonction de chaque envir
 nlSideboardForAI=Permet aux utilisateurs de se sideboarder avec le deck IA et le sideboard dans des formats de jeu construits.
 nlPerformanceMode=Désactive les vérifications supplémentaires des capacités statiques pour accélérer le moteur de jeu. (Attention : casse certains scénarios ''comme si c''était flash'' lors du lancement de cartes appartenant à des adversaires).
 nlFilteredHands=Génère deux mains de départ et conserve celle dont le nombre de terrains est le plus proche de la moyenne pour le deck. (NÉCESSITE UN REDÉMARRAGE)
-nlCloneImgSource=Lorsqu''il est activé, les clones utiliseront leur art original au lieu de l''art de la carte clonée.
 nlPromptFreeBlocks=Lorsqu''il est activé, si vous deviez payer 0 pour bloquer, payez automatiquement sans invite.
 nlPauseWhileMinimized=Lorsqu''il est activé, Forge s''arrête lorsqu''il est réduit (principalement pour l''IA par rapport à l''IA).
 nlEscapeEndsTurn=Lorsqu''elle est activée, la touche Échap fonctionne comme un raccourci alternatif pour terminer le tour en cours.
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -73,7 +73,6 @@ cbSideboardForAI=Sideboard umana per IA
 cbPerformanceMode=Modalità alte prestazioni
 cbFilteredHands=Mani Filtrate
 cbImageFetcher=Scarica automaticamente l''arte delle carte mancanti
-cbCloneImgSource=I cloni usano l''arte della carta originale
 cbScaleLarger=Ingrandisci l''immagine
 cbRenderBlackCardBorders=Disegna i bordi neri delle carte
 cbLargeCardViewers=Usa visualizzatori di carte di grandi dimensioni
@@ -158,7 +157,6 @@ nlEnforceDeckLegality=Fa rispettare la legalità del mazzo relativa a ciascun am
 nlSideboardForAI=Consente agli utenti di gestire la sideboard con il mazzo dell''IA e la propria nei formati di gioco constructed.
 nlPerformanceMode=Disabilita delle verifiche aggiuntive delle abilità statiche per velocizzare il motore di gioco. (Attenzione: non fa funzionare correttamente il giocare carte di proprietà di un avversario in contesti "come se avesse lampo").
 nlFilteredHands=Genera due mani iniziali e mantiene quella con il numero di terre più vicino alla media del mazzo. (RIAVVIO NECESSARIO)
-nlCloneImgSource=Se abilitato, i cloni useranno la loro arte originale invece di quella della carta clonata.
 nlPromptFreeBlocks=Se abilitato, quando è richiesto un pagamento di 0 per bloccare, paga automaticamente senza chiedere conferma.
 nlPauseWhileMinimized=Se abilitato, mette in pausa Forge quando è ridotto a icona (principalmente per IA vs IA).
 nlEscapeEndsTurn=Se abilitato, il tasto Esc funziona come scorciatoia alternativa per terminare il turno in corso.
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=人間が AI の代わりにサイドボードする
 cbPerformanceMode=パフォーマンスモード
 cbFilteredHands=初期ハンド補正
 cbImageFetcher=欠落したカード画像を自動的にダウンロードする
-cbCloneImgSource=コピーカードは元のカード画像を使用します
 cbScaleLarger=画像を拡大する
 cbRenderBlackCardBorders=黒枠のレンダリング
 cbLargeCardViewers=大きなカードビューアーを使用する
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=各環境に使えるデッキの合法性を強制しま
 nlSideboardForAI=人間が構築戦の時、AI の替わりに AI のデッキのサイドボードをします。
 nlPerformanceMode=常在型能力の追加チェックを無効にして、ゲームエンジンを高速化します。 （警告：対戦相手が所有するカードをキャストするときに、「あたかもフラッシュがあるかのように」の能力が無効になるかもしれません。）
 nlFilteredHands=2つのハンドを生成し、デッキの平均土地数に最も近いハンドをキープします。
-nlCloneImgSource=有効にすると、クローンはクローン先のカードのアートの代わりに元のアートを使用します。
 nlPromptFreeBlocks=有効にすると、ブロックするために0を支払う必要がある場合、プロンプトなしで自動的に支払います。
 nlPauseWhileMinimized=有効にすると、Forge は最小化すると一時停止します（主に AI 対 AI）。
 nlEscapeEndsTurn=有効にすると、エスケープキーは現在のターンを終了するための代替ショートカットとして機能します。
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -75,7 +75,6 @@ cbSideboardForAI=Humano e a Reserva de IA
 cbPerformanceMode=Modo de Desempenho
 cbFilteredHands=Mãos Filtradas
 cbImageFetcher=Baixar Automaticamente a Arte de Cartas Ausentes
-cbCloneImgSource=Clones Usam a Arte da Carta Origem
 cbScaleLarger=Expandir Imagem
 cbRenderBlackCardBorders=Renderizar Bordas Pretas de Carta
 cbLargeCardViewers=Usar Visualizadores de Cartas Grande
@@ -160,7 +159,6 @@ nlEnforceDeckLegality=Força a legalidade do deck relevante para cada ambiente (
 nlSideboardForAI=Permite os usuários trocarem cartas com decks IA e a reserva em formatos de jogo construídos.
 nlPerformanceMode=Desabilita verificações adicionais de habilidades estáticas para acelerar o jogo. (Aviso\: quebra alguns cenários 'como se tivesse lampejo' ao conjurar cartas pertencentes a adversários).
 nlFilteredHands=Gera duas mãos iniciais e mantém a mão mais próxima da média da contagem de terreno do deck. (REQUER REINÍCIO)
-nlCloneImgSource=Quando ativado os clones usarão sua arte original em vez da arte da carta clonada.
 nlPromptFreeBlocks=Quando ativado, se você tiver que pagar 0 para bloquear, pague automaticamente sem solicitação.
 nlPauseWhileMinimized=Quando ativado, o Forge pausa quando minimizado (principalmente para IA vs IA).
 nlEscapeEndsTurn=Quando ativado, a tecla Escape funciona como um atalho alternativo para o final do turno atual.
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -74,7 +74,6 @@ cbSideboardForAI=玩家为AI换备
 cbPerformanceMode=性能模式
 cbFilteredHands=手牌过滤
 cbImageFetcher=自动下载缺失的图片
-cbCloneImgSource=复制使用原始的图片
 cbScaleLarger=将图像缩放的更大
 cbRenderBlackCardBorders=渲染黑卡边框
 cbLargeCardViewers=使用大图查看器
@@ -159,7 +158,6 @@ nlEnforceDeckLegality=强制每个与环境相关的套牌合法性（最小单
 nlSideboardForAI=允许用户在构筑赛制中为AI换备牌。
 nlPerformanceMode=禁止其他静态能力检查以加速游戏引擎（警告：对手手牌有闪现单卡能使用时可能会跳过）。
 nlFilteredHands=生成两个起手并发给你最接近套牌地比例的起手（需要重启）
-nlCloneImgSource=启用克隆的时候将使用原画而不是克隆牌的画
 nlPromptFreeBlocks=启用后如果你需要支付0来阻挡，则不会提示自动支付0。
 nlPauseWhileMinimized=启用后，Forge将在暂停时最小化（主要用于AI VS AI）。
 nlEscapeEndsTurn=启用后，空格键可以用于结束当前回合的替代按键。
--- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
@@ -89,7 +89,6 @@ public class HostedMatch {
        gameRules.setMatchAnteRarity(FModel.getPreferences().getPrefBoolean(FPref.UI_ANTE_MATCH_RARITY));
        gameRules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN));
        gameRules.setSideboardForAI(FModel.getPreferences().getPrefBoolean(FPref.MATCH_SIDEBOARD_FOR_AI));
-        gameRules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE));
        gameRules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT));
        gameRules.setGamesPerMatch(FModel.getPreferences().getPrefInt(FPref.UI_MATCHES_PER_GAME));
        return gameRules;
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestController.java
@@ -138,7 +138,6 @@ public class ConquestController {
        final GameRules rules = new GameRules(GameType.PlanarConquest);
        rules.setGamesPerMatch(battle.gamesPerMatch());
        rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN));
-        rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE));
        final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
        FThreads.invokeInEdtNowOrLater(new Runnable(){
            @Override
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestDraftUtils.java
@@ -250,7 +250,6 @@ public class QuestDraftUtils {
        rules.setMatchAnteRarity(false);
        rules.setGamesPerMatch(3);
        rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN));
-        rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE));
        rules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT));
        return rules;
    }
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtil.java
@@ -598,7 +598,6 @@ public class QuestUtil {
        rules.setMatchAnteRarity(matchAnteRarity);
        rules.setGamesPerMatch(qData.getMatchLength());
        rules.setManaBurn(FModel.getPreferences().getPrefBoolean(FPref.UI_MANABURN));
-        rules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE));
        rules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT));

        final TreeSet<GameType> variant = new TreeSet<>();
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
@@ -128,7 +128,6 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
        UI_CURRENT_SOUND_SET("Default"),
        UI_CURRENT_MUSIC_SET("Default"),
        UI_CURRENT_AI_PROFILE ("Default"),
-        UI_CLONE_MODE_SOURCE ("false"),
        UI_MATCH_IMAGE_VISIBLE ("true"),
        UI_THEMED_COMBOBOX ("true"), // Now applies to all theme settings, not just Combo.
        UI_LOCK_TITLE_BAR ("false"),