From e89442a3a09316544f7b59e3a8d5de2d009dd402 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 10 Jul 2021 13:51:04 -0500 Subject: [PATCH] Merged in DR v0.4.0.9 --- DoorShuffle.py | 6 ++++-- Main.py | 2 +- RELEASENOTES.md | 4 ++++ Rom.py | 2 +- data/base2current.bps | Bin 141165 -> 141183 bytes resources/app/cli/args.json | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 5634efce..7a6f21d9 100644 --- a/DoorShuffle.py +++ b/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 diff --git a/Main.py b/Main.py index b185c128..74484b68 100644 --- a/Main.py +++ b/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): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index dd2ce1fc..a4c5eace 100644 --- a/RELEASENOTES.md +++ b/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) diff --git a/Rom.py b/Rom.py index 2f484faf..7d56fa35 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'e081da80a32d9341010895b8fcb5ec77' +RANDOMIZERBASEHASH = '1dc1961e57d4e588a262fa706de6c753' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 3600f761902be8b96505b2002300498f13bd4da4..3b42822351ebc6065e2e1c932dd27ffee9e7ea7b 100644 GIT binary patch delta 2527 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 diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 782d37af..43dabb31 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -291,7 +291,7 @@ ] }, "hints": { - "action": "store_false", + "action": "store_true", "type": "bool" }, "no_hints": {