Client now uses location_id consistently internally, instead of switching on a dime all the time

And some smaller changes
This commit is contained in:
Fabian Dill
2021-03-07 22:05:07 +01:00
parent f7dc21ddcc
commit a528ed5e9e
7 changed files with 112 additions and 97 deletions

View File

@@ -164,9 +164,7 @@ def ShopSlotFill(world):
blacklist_word in item_name for blacklist_word in blacklist_words)}
blacklist_words.add("Bee")
locations_per_sphere = list(list(sphere).sort(key=lambda location: location.name) for sphere in world.get_spheres())
locations_per_sphere = list(sorted(sphere, key=lambda location: location.name) for sphere in world.get_spheres())
# currently special care needs to be taken so that Shop.region.locations.item is identical to Shop.inventory
# Potentially create Locations as needed and make inventory the only source, to prevent divergence