Non-GUI setting

fenhl · Jul 16, 2024 · cab9e20 · cab9e20
1 parent 790152e
commit cab9e20
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/Main.py b/Main.py
@@ -189,7 +189,7 @@ def make_spoiler(settings: Settings, worlds: list[World]) -> Spoiler:
     elif any(world.dungeon_rewards_hinted for world in worlds) or any(hint_type in settings.misc_hints for hint_type in misc_item_hint_table) or any(hint_type in settings.misc_hints for hint_type in misc_location_hint_table):
         spoiler.find_misc_hint_items()
     spoiler.build_file_hash()
-    spoiler.build_password(False)
+    spoiler.build_password(settings.password_lock)
     return spoiler
 
 

diff --git a/Plandomizer.py b/Plandomizer.py
@@ -1301,6 +1301,9 @@ def to_json(self, include_output: bool = True, spoiler: bool = True) -> dict[str
             'settings': self.settings.to_json(),
         }
 
+        if not self.settings.password_lock:
+            self_dict.pop('password')
+
         if spoiler:
             world_dist_dicts = [world_dist.to_json() for world_dist in self.world_dists]
             if self.settings.world_count > 1:

diff --git a/SettingsList.py b/SettingsList.py
@@ -571,6 +571,20 @@ class SettingInfos:
             ''',
     )
 
+    password_lock = Checkbutton(
+        gui_text         = "Lock the seed behind a password",
+        default          = False,
+        gui_tooltip      = '''\
+            The file select screen will be locked behind a password provided in the spoiler log.
+        ''',
+        shared           = True,
+        disabled_default = 0,
+        gui_params       = {
+            'optional':           True,
+            "hide_when_disabled": True,
+        },
+    )
+
     # Main Rules (and "Guarantee Reachable Locations")
 
     randomize_settings = Checkbutton(

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -7,6 +7,7 @@
         "user_message": "Easy Mode",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -196,6 +197,7 @@
         "user_message": "S7 Tournament",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -399,6 +401,7 @@
         "user_message": "Standard Weekly (2024-07-05)",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -604,6 +607,7 @@
         "user_message": "DDR Season 2",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -812,6 +816,7 @@
         "user_message": "Scrub Tournament",
         "world_count": 1,
         "create_spoiler": false,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -1017,6 +1022,7 @@
         "user_message": "Multiworld Tournament Season 4",
         "world_count": 3,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -1221,6 +1227,7 @@
         "user_message": "Hell Mode",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -1599,6 +1606,7 @@
         "user_message": "Bingo",
         "world_count": 1,
         "create_spoiler": true,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",
@@ -1788,6 +1796,7 @@
         "user_message": "OoTR League S7",
         "world_count": 1,
         "create_spoiler": false,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "beatable",
@@ -2008,6 +2017,7 @@
         "user_message": "Co-Op Tournament Season 3",
         "world_count": 1,
         "create_spoiler": false,
+        "password_lock": false,
         "randomize_settings": false,
         "logic_rules": "glitchless",
         "reachable_locations": "all",