2 files changed, 18 insertions, 0 deletions

@@ -18,3 +18,9 @@ class Lingo2PlayerLogic:
         for door in world.static_logic.objects.doors:
             if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.LOCATION_ONLY]:
                 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id))
+
+        for letter in world.static_logic.objects.letters:
+            self.locations_by_room.setdefault(letter.room_id, []).append(PlayerLocation(letter.ap_id))
+
+        for mastery in world.static_logic.objects.masteries:
+            self.locations_by_room.setdefault(mastery.room_id, []).append(PlayerLocation(mastery.ap_id))
@@ -26,5 +26,17 @@ class Lingo2StaticLogic:
                 item_name = f"{self.objects.maps[door.map_id].name} - {door.name}"
                 self.item_id_to_name[door.ap_id] = item_name
 
+        for letter in self.objects.letters:
+            letter_name = f"{letter.key.upper()}{'' if letter.double else '2'}"
+            location_name = f"{self.objects.maps[self.objects.rooms[letter.room_id].map_id].name} - {letter_name}"
+            self.location_id_to_name[letter.ap_id] = location_name
+
+            if not letter.double:
+                self.item_id_to_name[letter.ap_id] = letter_name
+
+        for mastery in self.objects.masteries:
+            location_name = f"{self.objects.maps[self.objects.rooms[mastery.room_id].map_id].name} - Mastery"
+            self.location_id_to_name[mastery.ap_id] = location_name
+
         self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
         self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}