LttP: free core of checks_in_area #1798
Conversation
# Conflicts: # Main.py # worlds/alttp/Dungeons.py
| @@ -172,6 +172,7 @@ def FillDisabledShopSlots(world): | |||
| shop: Shop = location.parent_region.shop | |||
| location.item = ItemFactory(shop.inventory[location.shop_slot]['item'], location.player) | |||
| location.item_rule = lambda item: item.name == location.item.name and item.player == location.player | |||
| location.locked = True | |||
There was a problem hiding this comment.
They normally get locked right after anyway, but this was due to timing guarenteed by it being in main.py. Since we can now get interjected by other worlds we lock as we place.
There was a problem hiding this comment.
(It might not be needed, I added this one for safety)
| @@ -278,6 +279,8 @@ def ShopSlotFill(multiworld): | |||
| if 'P' in multiworld.shop_shuffle[location.player]: | |||
| price_to_funny_price(multiworld, shop.inventory[location.shop_slot], location.player) | |||
|
|
|||
| FillDisabledShopSlots(multiworld) | |||
There was a problem hiding this comment.
this might require some explanation. is shop kind of broken in current main?
There was a problem hiding this comment.
It isn't, but it gets moved. FillDisabledShopSlots was originally in Main.py
| @classmethod | ||
| def stage_modify_multidata(cls, multiworld, multidata: dict): | ||
|
|
There was a problem hiding this comment.
this looks like it might break old seeds on new webhost and vice versa. what was tested? (i didn't test yet)
There was a problem hiding this comment.
the seeds themselves shouldn't break, the webtracker definitely does though. Current webtracker can't load rooms made with this change.
| ordered_areas = ( | ||
| 'Light World', 'Dark World', 'Hyrule Castle', 'Agahnims Tower', 'Eastern Palace', 'Desert Palace', | ||
| 'Tower of Hera', 'Palace of Darkness', 'Swamp Palace', 'Skull Woods', 'Thieves Town', 'Ice Palace', | ||
| 'Misery Mire', 'Turtle Rock', 'Ganons Tower', "Total" | ||
| ) |
There was a problem hiding this comment.
this looks like the list we have in main.py?
There was a problem hiding this comment.
it should be removed from main.py with this though?
There was a problem hiding this comment.
yeah, it is. i mixed up stuff
ThePhar
added
is: bug/fix
|
We could stage this out over two updates if desired. First we make the tracker work with the new or old data, then in a subsequent release we switch to the new data. |
If you have the time to write that up, that would probably be better. If not then we "just" have some angry users :-D |
|
I kind of don't so I instead waited, reducing the time of brokenness. |
What is this fixing or adding?
extension to #1787, however, multiworlds generated with these changes will crash the web tracker without these changes.
How was this tested?
With LttP, Subnautica and Factorio worlds, using local webhost mostly.
If this makes graphical changes, please attach screenshots.