alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Merged in DR v0.4.0.9

Browse Source
This commit is contained in:
codemann8
2021-07-10 13:51:04 -05:00
parent 0571dc881b
commit e89442a3a0
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DoorShuffle.py
View File

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

2
Main.py
View File

@@ -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 ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
from Utils import output_path, parse_player_names from Utils import output_path, parse_player_names
__version__ = '0.4.0.8-u' __version__ = '0.4.0.9-u'
class EnemizerError(RuntimeError): class EnemizerError(RuntimeError):

4
RELEASENOTES.md
View File

@@ -14,6 +14,10 @@ Thanks to qadan, cheuer, & compiling
# Bug Fixes and Notes. # 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 * 0.4.0.8
* Ganon jokes added for when silvers aren't available * Ganon jokes added for when silvers aren't available
* Some text updated (Blind jokes, uncle text) * Some text updated (Blind jokes, uncle text)

2
Rom.py
View File

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

BIN
data/base2current.bps
View File

Binary file not shown.

2
resources/app/cli/args.json
View File

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