Fixed the error with TFH counter turned on for wrong modes

Updated pip requirements for MultiClient
Fixed Big bomb rules for Inverted (merge mistake)
This commit is contained in:
aerinon
2021-03-18 13:53:19 -06:00
parent 27ed4ecd04
commit 906134800b
5 changed files with 15 additions and 14 deletions

View File

@@ -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 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.3.1.6-u' __version__ = '0.3.1.7-u'
class EnemizerError(RuntimeError): class EnemizerError(RuntimeError):

View File

@@ -144,6 +144,9 @@ New item counter modified to show total
# Bug Fixes and Notes. # Bug Fixes and Notes.
* 0.3.1.7-u
* TFH counter fixed
*
* 0.3.1.6-u * 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. * 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) * Backward compatibility for "chaos" enemizer flags. (Thanks krebel)

7
Rom.py
View File

@@ -1117,10 +1117,11 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
# set up goals for treasure hunt # 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_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) if world.goal[player] == 'triforcehunt':
rom.write_byte(0x180194, 1) # Must turn in triforced pieces (instant win not enabled) 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 gametype = 0x04 # item
if world.shuffle[player] != 'vanilla' or world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]: if world.shuffle[player] != 'vanilla' or world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]:

View File

@@ -1284,21 +1284,15 @@ def set_inverted_big_bomb_rules(world, player):
'Hookshot Cave', 'Hookshot Cave',
'Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Isolated Ledge Entrance',
'Hookshot Cave Back Entrance', 'Hookshot Cave Back Entrance',
'Inverted Agahnims Tower', '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']
LW_walkable_entrances = ['Dark Lake Hylia Ledge Fairy', LW_walkable_entrances = ['Dark Lake Hylia Ledge Fairy',
'Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint',
'Mire Shed', 'Mire Shed',
'Dark Desert Hint', 'Dark Desert Hint',
'Dark Desert Fairy', 'Dark Desert Fairy',
'Desert Palace Entrance (East)'] 'Misery Mire',
'Red Shield Shop']
LW_bush_entrances = ['Bush Covered House', LW_bush_entrances = ['Bush Covered House',
'Light World Bomb Hut', 'Light World Bomb Hut',
'Graveyard Cave'] 'Graveyard Cave']

View File

@@ -1,3 +1,6 @@
aenum aenum
fast-enum fast-enum
python-bps-continued python-bps-continued
colorama
aioconsole
websockets