Many bugfixes

* Fixed inverted generation issues with pottery option
* Moved SRAM according to SRAM standard
* Removed equitable algorithm
* Upped TFH goal limit to 254
* Cuccos should no longer cause trap door rooms to not open
* Added double click fix for install.py
* Fix for pottery item palettes near bonkable torches
* Fix for multiworld progression balancing would place Nothing or Arrow items
This commit is contained in:
aerinon
2022-02-09 14:19:10 -07:00
parent 64c19bc651
commit 49accbd2b1
15 changed files with 38 additions and 22 deletions

View File

@@ -1057,7 +1057,11 @@ def create_pot_location(pot, pot_index, super_tile, world, player):
if (pot.item not in [PotItem.Key, PotItem.Hole]
and (pot.item != PotItem.Switch or world.potshuffle[player])):
address = pot_address(pot_index, super_tile)
parent = world.get_region(pot.room, player)
region = pot.room
if world.mode[player] == 'inverted':
if region == 'Links House':
region = 'Inverted Links House'
parent = world.get_region(region, player)
descriptor = 'Large Block' if pot.flags & PotFlags.Block else f'Pot #{pot_index+1}'
hint_text = ('under a block' if pot.flags & PotFlags.Block else 'in a pot')
modifier = parent.hint_text not in {'a storyteller', 'fairies deep in a cave', 'a spiky hint',
@@ -1073,7 +1077,7 @@ def create_pot_location(pot, pot_index, super_tile, world, player):
def pot_address(pot_index, super_tile):
return 0x7f6600 + super_tile * 2 + (pot_index << 24)
return 0x7f6018 + super_tile * 2 + (pot_index << 24)
# (type, room_id, shopkeeper, custom, locked, [items])