Moving boss logic to the logic tab

thezerothcat · Nov 23, 2018 · 08ece2a · 08ece2a
1 parent e26611d
commit 08ece2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/lmr/randomizer/ui/ChallengePanel.java b/src/main/java/lmr/randomizer/ui/ChallengePanel.java
@@ -10,8 +10,6 @@ public class ChallengePanel extends JPanel {
     private JCheckBox automaticHardmode;
     private JCheckBox coinChestGraphics;
 
-    private DifficultyPanel difficultyPanel;
-
     public ChallengePanel() {
         super(new MigLayout("fillx, wrap"));
 
@@ -26,27 +24,21 @@ public ChallengePanel() {
         checkboxContainer.add(coinChestGraphics);
         add(checkboxContainer, "growx, wrap");
 
-        difficultyPanel = new DifficultyPanel();
-        add(difficultyPanel, "growx, aligny, wrap");
-
         updateTranslations();
     }
 
     public void updateTranslations() {
         automaticHardmode.setText(Translations.getText("challenge.automaticHardmode"));
         coinChestGraphics.setText(Translations.getText("challenge.coinChestGraphics"));
-        difficultyPanel.updateTranslations();
     }
 
     public void updateSettings() {
         Settings.setAutomaticHardmode(automaticHardmode.isSelected(), true);
         Settings.setCoinChestGraphics(coinChestGraphics.isSelected(), true);
-        difficultyPanel.updateSettings();
     }
 
     public void reloadSettings() {
         automaticHardmode.setSelected(Settings.isAutomaticHardmode());
         coinChestGraphics.setSelected(Settings.isCoinChestGraphics());
-        difficultyPanel.reloadSettings();
     }
 }
diff --git a/src/main/java/lmr/randomizer/ui/LogicPanel.java b/src/main/java/lmr/randomizer/ui/LogicPanel.java
@@ -10,6 +10,8 @@ public class LogicPanel extends JPanel {
     private DboostPanel dboostPanel;
     private GlitchPanel glitchPanel;
 
+    private DifficultyPanel difficultyPanel;
+
     private JCheckBox requireSoftwareComboForKeyFairy;
     private JCheckBox requireIceCapeForLava;
     private JCheckBox requireFlaresForExtinction;
@@ -48,12 +50,16 @@ public LogicPanel() {
         checkboxContainer.add(subweaponOnlyLogic);
         add(checkboxContainer, "growx, wrap");
 
+        difficultyPanel = new DifficultyPanel();
+        add(difficultyPanel, "growx, aligny, wrap");
+
         updateTranslations();
     }
 
     public void updateTranslations() {
         dboostPanel.updateTranslations();
         glitchPanel.updateTranslations();
+        difficultyPanel.updateTranslations();
         requireIceCapeForLava.setText(Translations.getText("logic.requireIceCapeForLava"));
         requireFlaresForExtinction.setText(Translations.getText("logic.requireFlaresForExtinction"));
         requireSoftwareComboForKeyFairy.setText(Translations.getText("logic.requireSoftwareComboForKeyFairy"));
@@ -64,6 +70,7 @@ public void updateTranslations() {
     public void updateSettings() {
         dboostPanel.updateSettings();
         glitchPanel.updateSettings();
+        difficultyPanel.updateSettings();
         Settings.setRequireIceCapeForLava(requireIceCapeForLava.isSelected(), true);
         Settings.setRequireFlaresForExtinction(requireFlaresForExtinction.isSelected(), true);
         Settings.setRequireSoftwareComboForKeyFairy(requireSoftwareComboForKeyFairy.isSelected(), true);
@@ -74,6 +81,7 @@ public void updateSettings() {
     public void reloadSettings() {
         dboostPanel.reloadSettings();
         glitchPanel.reloadSettings();
+        difficultyPanel.reloadSettings();
         requireIceCapeForLava.setSelected(Settings.isRequireIceCapeForLava());
         requireFlaresForExtinction.setSelected(Settings.isRequireFlaresForExtinction());
         requireSoftwareComboForKeyFairy.setSelected(Settings.isRequireSoftwareComboForKeyFairy());