6 files changed, 21 insertions, 17 deletions

@@ -11,7 +11,6 @@ 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 ..LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
 
 
@@ -138,7 +137,7 @@ 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:
@@ -102,8 +102,9 @@ func _ready():
         history_box.get_popup().id_pressed.connect(historySelected)
 
         # Show client version.
+        var version = gamedata.objects.get_version()
         get_node("../Panel/title").text = (
-                "ARCHIPELAGO (%d.%d)" % [gamedata.objects.get_version(), ap.MOD_VERSION]
+                "ARCHIPELAGO (%d.%d.%d)" % [version.get_major(), version.get_minor(), version.get_patch()]
         )
 
         # Increase font size in text boxes.
@@ -173,18 +174,20 @@ func connectionSuccessful():
         var gamedata = global.get_node("Gamedata")
 
         # Check for major version mismatch.
-        if ap.apworld_version[0] != gamedata.objects.get_version():
+        if ap.apworld_version[0] != gamedata.objects.get_version().get_major():
                 get_node("../Panel/AcceptDialog").exclusive = false
 
                 var popup = get_node("../Panel/VersionMismatch")
                 popup.title = "Version Mismatch!"
                 popup.dialog_text = (
-                        "This slot was generated using v%d.%d of the Lingo 2 apworld,\nwhich has a different major version than this client (v%d.%d).\nIt is highly recommended to play using the correct version of the client.\nYou may experience bugs or logic issues if you continue."
+                        "This slot was generated using v%d.%d.%d of the Lingo 2 apworld,\nwhich has a different major version than this client (v%d.%d.%d).\nIt is highly recommended to play using the correct version of the client.\nYou may experience bugs or logic issues if you continue."
                         % [
                                 ap.apworld_version[0],
                                 ap.apworld_version[1],
-                                gamedata.objects.get_version(),
-                                ap.MOD_VERSION
+                                ap.apworld_version[2],
+                                gamedata.objects.get_version().get_major(),
+                                gamedata.objects.get_version().get_minor(),
+                                gamedata.objects.get_version().get_patch()
                         ]
                 )
                 popup.exclusive = true
@@ -1,7 +1,5 @@
 extends Node
 
-const MOD_VERSION = 7
-
 var SCRIPT_client
 var SCRIPT_keyboard
 var SCRIPT_locationListener
@@ -61,7 +59,7 @@ const kEndingNameByVictoryValue = {
         12: "WHITE",
 }
 
-var apworld_version = [0, 0]
+var apworld_version = [0, 0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
@@ -395,7 +393,10 @@ func _client_connected(slot_data):
         victory_condition = int(slot_data.get("victory_condition", 0))
 
         if slot_data.has("version"):
-                apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])]
+                var version_msg = slot_data["version"]
+                apworld_version = [int(version_msg[0]), int(version_msg[1]), 0]
+                if version_msg.size() > 2:
+                        apworld_version[2] = int(version_msg[2])
 
         port_pairings.clear()
         if slot_data.has("port_pairings"):
@@ -369,9 +369,10 @@ class Lingo2ClientContext(CommonContext):
                 })
 
             self.manager.game_ctx.send_location_info(locations)
-        elif cmd == "Received":
-            if args["key"] == self.victory_data_storage_key:
-                self.handle_status_update(args["value"])
+        elif cmd == "Retrieved":
+            for k, v in args["keys"].items():
+                if k == self.victory_data_storage_key:
+                    self.handle_status_update(v)
         elif cmd == "SetReply":
             if args["key"] == self.get_datastorage_key("keyboard1"):
                 self.handle_keyboard_update(1, args)
@@ -166,5 +166,6 @@ class Lingo2StaticLogic:
         else:
             return game_map.display_name
 
-    def get_data_version(self) -> int:
-        return self.objects.version
+    def get_data_version(self) -> list[int]:
+        version = self.objects.version
+        return [version.major, version.minor, version.patch]
@@ -1 +0,0 @@
-APWORLD_VERSION = 6