1 files changed, 51 insertions, 6 deletions

@@ -1,14 +1,18 @@
 """
 Archipelago init file for Lingo 2
 """
+from typing import ClassVar
+
 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 .options import Lingo2Options
 from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
 from .static_logic import Lingo2StaticLogic
-from .version import APWORLD_VERSION
+from worlds.LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
 
 
 class Lingo2WebWorld(WebWorld):
@@ -24,6 +28,15 @@ class Lingo2WebWorld(WebWorld):
     )]
 
 
+class Lingo2Settings(Group):
+    class ExecutableFile(UserFilePath):
+        """Path to the Lingo 2 executable"""
+        is_exe = True
+
+    exe_file: ExecutableFile = ExecutableFile()
+    start_game: bool = True
+
+
 class Lingo2World(World):
     """
     Lingo 2 is a first person indie puzzle game where you solve word puzzles in a labyrinthe world. Compared to its
@@ -33,6 +46,9 @@ class Lingo2World(World):
     game = "Lingo 2"
     web = Lingo2WebWorld()
 
+    settings: ClassVar[Lingo2Settings]
+    settings_key = "lingo2_options"
+
     topology_present = True
 
     options_dataclass = Lingo2Options
@@ -44,6 +60,8 @@ class Lingo2World(World):
     item_name_groups = static_logic.item_name_groups
     location_name_groups = static_logic.location_name_groups
 
+    for_tracker: ClassVar[bool] = False
+
     player_logic: Lingo2PlayerLogic
 
     port_pairings: dict[int, int]
@@ -59,15 +77,18 @@ class Lingo2World(World):
         if self.options.shuffle_worldports:
             if hasattr(self.multiworld, "re_gen_passthrough") and "Lingo 2" in self.multiworld.re_gen_passthrough:
                 slot_value = self.multiworld.re_gen_passthrough["Lingo 2"]["port_pairings"]
-                self.port_pairings = {int(fp): int(tp) for fp, tp in slot_value.items()}
+                self.port_pairings = {
+                    self.static_logic.port_id_by_ap_id[int(fp)]: self.static_logic.port_id_by_ap_id[int(tp)]
+                    for fp, tp in slot_value.items()
+                }
 
                 connect_ports_from_ut(self.port_pairings, self)
             else:
                 shuffle_entrances(self)
 
-        from Utils import visualize_regions
+        #from Utils import visualize_regions
 
-        visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
+        #visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
 
     def create_items(self):
         pool = [self.create_item(name) for name in self.player_logic.real_items]
@@ -92,6 +113,11 @@ class Lingo2World(World):
         for i in range(0, item_difference):
             pool.append(self.create_item(self.get_filler_item_name()))
 
+        if not any(ItemClassification.progression in item.classification for item in pool):
+            raise OptionError(f"Lingo 2 player {self.player} has no progression items. Please enable at least one "
+                              f"option that would add progression gating to your world, such as Shuffle Doors or "
+                              f"Shuffle Letters.")
+
         self.multiworld.itempool += pool
 
     def create_item(self, name: str) -> Item:
@@ -107,7 +133,11 @@ class Lingo2World(World):
         slot_options = [
             "cyan_door_behavior",
             "daedalus_roof_access",
+            "enable_gift_maps",
+            "enable_icarus",
+            "endings_requirement",
             "keyholder_sanity",
+            "masteries_requirement",
             "shuffle_control_center_colors",
             "shuffle_doors",
             "shuffle_gallery_paintings",
@@ -121,11 +151,15 @@ class Lingo2World(World):
 
         slot_data: dict[str, object] = {
             **self.options.as_dict(*slot_options),
-            "version": [self.static_logic.get_data_version(), APWORLD_VERSION],
+            "version": self.static_logic.get_data_version(),
         }
 
         if self.options.shuffle_worldports:
-            slot_data["port_pairings"] = self.port_pairings
+            def get_port_ap_id(port_id):
+                return self.static_logic.objects.ports[port_id].ap_id
+
+            slot_data["port_pairings"] = {get_port_ap_id(from_id): get_port_ap_id(to_id)
+                                          for from_id, to_id in self.port_pairings.items()}
 
         return slot_data
 
@@ -139,3 +173,14 @@ class Lingo2World(World):
         # returning slot_data so it regens, giving it back in multiworld.re_gen_passthrough
         # we are using re_gen_passthrough over modifying the world here due to complexities with ER
         return slot_data
+
+
+def launch_client(*args):
+    from .context import client_main
+    launch_component(client_main, name="Lingo2Client", args=args)
+
+
+icon_paths["lingo2_ico"] = f"ap:{__name__}/logo.png"
+component = Component("Lingo 2 Client", component_type=Type.CLIENT, func=launch_client,
+                      description="Open Lingo 2.", supports_uri=True, game_name="Lingo 2", icon="lingo2_ico")
+components.append(component)