1 files changed, 17 insertions, 2 deletions

@@ -7,7 +7,7 @@ from BaseClasses import ItemClassification, Item, Tutorial
 from Options import OptionError
 from settings import Group, UserFilePath
 from worlds.AutoWorld import WebWorld, World
-from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS
+from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS, ALL_LETTERS_UPPER
 from .options import Lingo2Options
 from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
@@ -70,7 +70,14 @@ class Lingo2World(World):
         self.player_logic = Lingo2PlayerLogic(self)
         self.port_pairings = {}
 
+        if self.options.restrict_letter_placements:
+            self.options.local_items.value |= set(ALL_LETTERS_UPPER)
+
     def create_regions(self):
+        if hasattr(self.multiworld, "re_gen_passthrough") and "Lingo 2" in self.multiworld.re_gen_passthrough:
+            self.player_logic.rte_mapping = [self.world.static_logic.map_id_by_name[map_name]
+                                             for map_name in self.multiworld.re_gen_passthrough["Lingo 2"]["rte"]]
+
         create_regions(self)
 
     def connect_entrances(self):
@@ -124,11 +131,14 @@ class Lingo2World(World):
             self.push_precollected(self.create_item(name))
 
     def create_item(self, name: str) -> Item:
-        return Lingo2Item(name, ItemClassification.filler if name == self.get_filler_item_name() else
+        item = Lingo2Item(name, ItemClassification.filler if name == self.get_filler_item_name() else
                                 ItemClassification.trap if name in ANTI_COLLECTABLE_TRAPS else
                                 ItemClassification.progression,
                           self.item_name_to_id.get(name), self.player)
 
+        item.is_letter = (name in ALL_LETTERS_UPPER)
+        return item
+
     def set_rules(self):
         self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
 
@@ -140,12 +150,14 @@ class Lingo2World(World):
             "enable_gift_maps",
             "enable_icarus",
             "endings_requirement",
+            "fast_travel_access",
             "keyholder_sanity",
             "masteries_requirement",
             "shuffle_control_center_colors",
             "shuffle_doors",
             "shuffle_gallery_paintings",
             "shuffle_letters",
+            "shuffle_music",
             "shuffle_symbols",
             "shuffle_worldports",
             "strict_cyan_ending",
@@ -155,6 +167,9 @@ class Lingo2World(World):
 
         slot_data: dict[str, object] = {
             **self.options.as_dict(*slot_options),
+            "custom_mint_ending": self.player_logic.custom_mint_ending or "",
+            "rte": [self.static_logic.objects.maps[map_id].name for map_id in self.player_logic.rte_mapping],
+            "seed": self.random.randint(0, 1000000),
             "version": self.static_logic.get_data_version(),
         }