Merged in DR v0.4.0.9

DoorShuffle.py

@@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke
 
 
 def link_doors(world, player):
+    orig_swamp_patch = world.swamp_patch_required[player]
     attempt, valid = 1, False
     while not valid:
         try:
@@ -43,6 +44,7 @@ def link_doors(world, player):
             reset_portals(world, player)
             reset_rooms(world, player)
             world.get_door("Skull Pinball WS", player).no_exit()
+            world.swamp_patch_required[player] = orig_swamp_patch
 
 
 def link_doors_main(world, player):
@@ -467,8 +469,8 @@ def choose_portals(world, player):
                 world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance)
 
     if not world.swamp_patch_required[player]:
-        swamp_region = world.get_entrance('Swamp Palace', player).connected_region
-        if swamp_region.name != 'Swamp Lobby':
+        swamp_portal = world.get_portal('Swamp', player)
+        if swamp_portal.door.name != 'Swamp Lobby S':
             world.swamp_patch_required[player] = True
 
 

Main.py

@@ -28,7 +28,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
 from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
 from Utils import output_path, parse_player_names
 
-__version__ = '0.4.0.8-u'
+__version__ = '0.4.0.9-u'
 
 
 class EnemizerError(RuntimeError):

RELEASENOTES.md

@@ -14,6 +14,10 @@ Thanks to qadan, cheuer, & compiling
 
 # Bug Fixes and Notes.
 
+* 0.4.0.9
+	* Fixes for stats and P/C indicator (thanks Kara)
+	* Swamp lobby fixes (thanks Catobat)
+	* Fix for --hints flag on CLI
 * 0.4.0.8
 	* Ganon jokes added for when silvers aren't available
 	* Some text updated (Blind jokes, uncle text)

Rom.py

@@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'e081da80a32d9341010895b8fcb5ec77'
+RANDOMIZERBASEHASH = '1dc1961e57d4e588a262fa706de6c753'
 
 
 class JsonRom(object):

resources/app/cli/args.json

@@ -291,7 +291,7 @@
     ]
   },
   "hints": {
-    "action": "store_false",
+    "action": "store_true",
     "type": "bool"
   },
   "no_hints": {