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

Fixed issue with inverted and certain pottery settings.

Browse Source
This commit is contained in:
aerinon
2022-08-26 14:42:06 -06:00
parent 0dfdbfd39e
commit 55364c071a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BaseClasses.py
View File

@@ -2805,6 +2805,11 @@ class Pot(object):
item = self.item if not self.indicator else self.standing_item_code item = self.item if not self.indicator else self.standing_item_code
return [self.x, high_byte, item] return [self.x, high_byte, item]
def get_region(self, world, player):
if world.mode[player] == 'inverted' and self.room == 'Links House':
return world.get_region('Inverted Links House', 1)
return world.get_region(self.room, 1)
def __eq__(self, other): def __eq__(self, other):
return self.x == other.x and self.y == other.y and self.room == other.room return self.x == other.x and self.y == other.y and self.room == other.room

1
RELEASENOTES.md
View File

@@ -190,6 +190,7 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o
* Fixed an issue where trinity goal would open pyramid unexpectedly. (No longer does so if ER mdoe is shuffling holes). Crystals goal updated to match that behavior. * Fixed an issue where trinity goal would open pyramid unexpectedly. (No longer does so if ER mdoe is shuffling holes). Crystals goal updated to match that behavior.
* Fixed a playthrough issue that was not respecting pot rules * Fixed a playthrough issue that was not respecting pot rules
* Fixed an issue that was conflicting with downstream OWR project * Fixed an issue that was conflicting with downstream OWR project
* Fixed an issue with inverted and certain pottery settings
* 1.0.1.1 * 1.0.1.1
* Fixed the pots in Mire Storyteller/ Dark Desert Hint to be colorized when they should be * Fixed the pots in Mire Storyteller/ Dark Desert Hint to be colorized when they should be
* Certain pot items no longer reload when reloading the supertile (matches original pot behavior better) * Certain pot items no longer reload when reloading the supertile (matches original pot behavior better)

4
Regions.py
View File

@@ -1065,9 +1065,9 @@ def valid_pot_location(pot, pot_set, world, player):
return True return True
if world.pottery[player] in ['reduced', 'clustered'] and pot in pot_set: if world.pottery[player] in ['reduced', 'clustered'] and pot in pot_set:
return True return True
if world.pottery[player] == 'dungeon' and world.get_region(pot.room, player).type == RegionType.Dungeon: if world.pottery[player] == 'dungeon' and pot.get_region(world, player).type == RegionType.Dungeon:
return True return True
if world.pottery[player] in ['cave', 'cavekeys'] and world.get_region(pot.room, player).type == RegionType.Cave: if world.pottery[player] in ['cave', 'cavekeys'] and pot.get_region(world, player).type == RegionType.Cave:
return True return True
return False return False