diff --git a/Main.py b/Main.py index 78f2b4c1..683ee0da 100644 --- a/Main.py +++ b/Main.py @@ -26,7 +26,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.3.1.6-u' +__version__ = '0.3.1.7-u' class EnemizerError(RuntimeError): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4d941e4f..a8366811 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -144,6 +144,9 @@ New item counter modified to show total # Bug Fixes and Notes. +* 0.3.1.7-u + * TFH counter fixed + * * 0.3.1.6-u * Fix for inverted. AT or GT vanilla lobby in intensity 3 should not softlock on exit in non-ER modes. * Backward compatibility for "chaos" enemizer flags. (Thanks krebel) diff --git a/Rom.py b/Rom.py index f38d3ae4..392efbb7 100644 --- a/Rom.py +++ b/Rom.py @@ -1117,10 +1117,11 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): # set up goals for treasure hunt rom.write_bytes(0x180165, [0x0E, 0x28] if world.treasure_hunt_icon[player] == 'Triforce Piece' else [0x0D, 0x28]) - rom.write_byte(0x180167, int(world.treasure_hunt_count[player]) % 256) - rom.write_byte(0x180194, 1) # Must turn in triforced pieces (instant win not enabled) + if world.goal[player] == 'triforcehunt': + rom.write_byte(0x180167, int(world.treasure_hunt_count[player]) % 256) + rom.write_byte(0x180194, 1) # Must turn in triforced pieces (instant win not enabled) - rom.write_bytes(0x180213, [0x00, 0x01]) # Not a Tournament Seed + rom.write_bytes(0x180213, [0x00, 0x01]) # Not a Tournament Seed gametype = 0x04 # item if world.shuffle[player] != 'vanilla' or world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]: diff --git a/Rules.py b/Rules.py index 07a7d2f2..249d6c0d 100644 --- a/Rules.py +++ b/Rules.py @@ -1284,21 +1284,15 @@ def set_inverted_big_bomb_rules(world, player): 'Hookshot Cave', 'Turtle Rock Isolated Ledge Entrance', 'Hookshot Cave Back Entrance', - 'Inverted Agahnims Tower', - 'Dark Lake Hylia Ledge Fairy', - 'Dark Lake Hylia Ledge Spike Cave', - 'Dark Lake Hylia Ledge Hint', - 'Mire Shed', - 'Dark Desert Hint', - 'Dark Desert Fairy', - 'Misery Mire'] + 'Inverted Agahnims Tower',] LW_walkable_entrances = ['Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Hint', 'Mire Shed', 'Dark Desert Hint', 'Dark Desert Fairy', - 'Desert Palace Entrance (East)'] + 'Misery Mire', + 'Red Shield Shop'] LW_bush_entrances = ['Bush Covered House', 'Light World Bomb Hut', 'Graveyard Cave'] diff --git a/resources/app/meta/manifests/pip_requirements.txt b/resources/app/meta/manifests/pip_requirements.txt index f192a6b3..595691d2 100644 --- a/resources/app/meta/manifests/pip_requirements.txt +++ b/resources/app/meta/manifests/pip_requirements.txt @@ -1,3 +1,6 @@ aenum fast-enum -python-bps-continued \ No newline at end of file +python-bps-continued +colorama +aioconsole +websockets \ No newline at end of file