Merge pull request #6 from aerinon/DoorDev

Gui fixes for clocks/dungeon_counters

BaseClasses.py

@@ -41,7 +41,7 @@ class World(object):
         self.shuffle_bonk_prizes = False
         self.light_world_light_cone = False
         self.dark_world_light_cone = False
-        self.clock_mode = 'off'
+        self.clock_mode = 'none'
         self.rupoor_cost = 10
         self.aga_randomness = True
         self.lock_aga_door_in_escape = False

CLI.py

@@ -188,7 +188,7 @@ def parse_arguments(argv, no_defaults=False):
                                         base game.                        
                         ''')
     parser.add_argument('--experimental', default=defval(settings["experimental"] != 0), help='Enable experimental features', action='store_true')
-    parser.add_argument('--dungeon_counters', default=defval(settings["dungeon_counters"]), help='Enable dungeon chest counters', const='off', nargs='?', choices=['off', 'on', 'pickup'])
+    parser.add_argument('--dungeon_counters', default=defval(settings["dungeon_counters"]), help='Enable dungeon chest counters', const='off', nargs='?', choices=['off', 'on', 'pickup', 'default'])
     parser.add_argument('--crystals_ganon', default=defval(settings["crystals_ganon"]), const='7', nargs='?', choices=['random', '0', '1', '2', '3', '4', '5', '6', '7'],
                         help='''\
                              How many crystals are needed to defeat ganon. Any other
@@ -358,7 +358,7 @@ def get_settings():
         "keysanity": False,
         "door_shuffle": "basic",
         "experimental": 0,
-        "dungeon_counters": "off",
+        "dungeon_counters": "default",
 
         "multi": 1,
         "names": "",

Main.py

@@ -24,7 +24,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute
 from ItemList import generate_itempool, difficulties, fill_prizes
 from Utils import output_path, parse_player_names
 
-__version__ = '0.0.18.2d'
+__version__ = '0.0.18.3d'
 
 
 def main(args, seed=None):

Rom.py

@@ -899,7 +899,7 @@ def patch_rom(world, rom, player, team, enemized):
         ERtimeincrease = 20
     if world.keyshuffle[player] or world.bigkeyshuffle[player] or world.mapshuffle[player]:
         ERtimeincrease = ERtimeincrease + 15
-    if world.clock_mode == 'off':
+    if world.clock_mode == 'none':
         rom.write_bytes(0x180190, [0x00, 0x00, 0x00])  # turn off clock mode
         write_int32(rom, 0x180200, 0)  # red clock adjustment time (in frames, sint32)
         write_int32(rom, 0x180204, 0)  # blue clock adjustment time (in frames, sint32)
@@ -1157,7 +1157,7 @@ def patch_rom(world, rom, player, team, enemized):
     rom.write_byte(0x18003B, 0x01 if world.mapshuffle[player] else 0x00)  # maps showing crystals on overworld
 
     # compasses showing dungeon count
-    if world.clock_mode != 'off' or world.dungeon_counters[player] == 'off':
+    if world.clock_mode != 'none' or world.dungeon_counters[player] == 'off':
         rom.write_byte(0x18003C, 0x00)  # Currently must be off if timer is on, because they use same HUD location
     elif world.dungeon_counters[player] == 'on':
         rom.write_byte(0x18003C, 0x02)  # always on

gui/custom/overview.py

@@ -49,7 +49,7 @@ def custom_page(top, parent):
             for key in dictWidgets:
                 self.customWidgets[key] = dictWidgets[key]
 
-    for i, key in enumerate(CONST.CUSTOMITEMS):
-        self.customWidgets[key].storageVar.set(top.settings["customitemarray"][i])
+    for key in CONST.CUSTOMITEMS:
+        self.customWidgets[key].storageVar.set(top.settings["customitemarray"][key])
 
     return self

resources/app/gui/randomize/dungeon/widgets.json

@@ -37,9 +37,10 @@
       "selectbox": {
         "side": "right"
       },
-      "default": "Off"
+      "default": "Auto"
     },
     "options": {
+      "Auto": "default",
       "Off": "off",
       "On": "on",
       "On Compass Pickup": "pickup"