summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--apworld/__init__.py8
-rw-r--r--apworld/static_logic.py2
-rw-r--r--data/ids.yaml2
3 files changed, 8 insertions, 4 deletions
diff --git a/apworld/__init__.py b/apworld/__init__.py index 7ebdf56..30737f3 100644 --- a/apworld/__init__.py +++ b/apworld/__init__.py
@@ -52,12 +52,13 @@ class Lingo2World(World):
52 52
53 item_difference = total_locations - len(pool) 53 item_difference = total_locations - len(pool)
54 for i in range(0, item_difference): 54 for i in range(0, item_difference):
55 pool.append(self.create_item("Nothing")) 55 pool.append(self.create_item(self.get_filler_item_name()))
56 56
57 self.multiworld.itempool += pool 57 self.multiworld.itempool += pool
58 58
59 def create_item(self, name: str) -> Item: 59 def create_item(self, name: str) -> Item:
60 return Lingo2Item(name, ItemClassification.filler if name == "Nothing" else ItemClassification.progression, 60 return Lingo2Item(name, ItemClassification.filler if name == self.get_filler_item_name() else
61 ItemClassification.progression,
61 self.item_name_to_id.get(name), self.player) 62 self.item_name_to_id.get(name), self.player)
62 63
63 def set_rules(self): 64 def set_rules(self):
@@ -76,3 +77,6 @@ class Lingo2World(World):
76 } 77 }
77 78
78 return slot_data 79 return slot_data
80
81 def get_filler_item_name(self) -> str:
82 return "A Job Well Done"
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index a945bc0..b33a357 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py
@@ -49,7 +49,7 @@ class Lingo2StaticLogic:
49 location_name = f"{self.get_room_object_location_prefix(keyholder)} - {keyholder.key.upper()} Keyholder" 49 location_name = f"{self.get_room_object_location_prefix(keyholder)} - {keyholder.key.upper()} Keyholder"
50 self.location_id_to_name[keyholder.ap_id] = location_name 50 self.location_id_to_name[keyholder.ap_id] = location_name
51 51
52 self.item_id_to_name[self.objects.special_ids["Nothing"]] = "Nothing" 52 self.item_id_to_name[self.objects.special_ids["A Job Well Done"]] = "A Job Well Done"
53 53
54 self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()} 54 self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
55 self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()} 55 self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}
diff --git a/data/ids.yaml b/data/ids.yaml index b66d6a9..f241b3f 100644 --- a/data/ids.yaml +++ b/data/ids.yaml
@@ -3859,7 +3859,7 @@ endings:
3859 WHITE: 2738 3859 WHITE: 2738
3860 YELLOW: 1206 3860 YELLOW: 1206
3861special: 3861special:
3862 Nothing: 1160 3862 A Job Well Done: 1160
3863progressives: 3863progressives:
3864 Progressive Gold Ending: 2753 3864 Progressive Gold Ending: 2753
3865 Progressive Symbolic Entrance: 2752 3865 Progressive Symbolic Entrance: 2752