summary refs log tree commit diff stats
path: root/apworld
diff options
context:
space:
mode:
Diffstat (limited to 'apworld')
-rw-r--r--apworld/__init__.py9
-rw-r--r--apworld/static_logic.py2
2 files changed, 10 insertions, 1 deletions
diff --git a/apworld/__init__.py b/apworld/__init__.py index 20c1454..07e3982 100644 --- a/apworld/__init__.py +++ b/apworld/__init__.py
@@ -46,7 +46,14 @@ class Lingo2World(World):
46 def create_items(self): 46 def create_items(self):
47 pool = [self.create_item(name) for name in self.player_logic.real_items] 47 pool = [self.create_item(name) for name in self.player_logic.real_items]
48 48
49 total_locations = sum(len(locs) for locs in self.player_logic.locations_by_room.values())
50
51 item_difference = total_locations - len(pool)
52 for i in range(0, item_difference):
53 pool.append(self.create_item("Nothing"))
54
49 self.multiworld.itempool += pool 55 self.multiworld.itempool += pool
50 56
51 def create_item(self, name: str) -> Item: 57 def create_item(self, name: str) -> Item:
52 return Lingo2Item(name, ItemClassification.progression, self.item_name_to_id.get(name), self.player) 58 return Lingo2Item(name, ItemClassification.filler if name == "Nothing" else ItemClassification.progression,
59 self.item_name_to_id.get(name), self.player)
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 5414c91..9cd3ced 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py
@@ -37,6 +37,8 @@ class Lingo2StaticLogic:
37 location_name = f"{self.objects.maps[self.objects.rooms[mastery.room_id].map_id].name} - Mastery" 37 location_name = f"{self.objects.maps[self.objects.rooms[mastery.room_id].map_id].name} - Mastery"
38 self.location_id_to_name[mastery.ap_id] = location_name 38 self.location_id_to_name[mastery.ap_id] = location_name
39 39
40 self.item_id_to_name[self.objects.special_ids["Nothing"]] = "Nothing"
41
40 self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()} 42 self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
41 self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()} 43 self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}
42 44