5 files changed, 9 insertions, 6 deletions

@@ -8,9 +8,8 @@ from .options import Lingo2Options
 from .player_logic import Lingo2PlayerLogic
 from .regions import create_regions
 from .static_logic import Lingo2StaticLogic
+from .version import APWORLD_VERSION
 
-MAJOR_VERSION = 1
-MINOR_VERSION = 0
 
 class Lingo2WebWorld(WebWorld):
     rich_text_options_doc = True
@@ -90,7 +89,7 @@ class Lingo2World(World):
 
         slot_data = {
             **self.options.as_dict(*slot_options),
-            "version": [MAJOR_VERSION, MINOR_VERSION],
+            "version": [self.static_logic.get_data_version(), APWORLD_VERSION],
         }
 
         return slot_data
@@ -154,3 +154,6 @@ class Lingo2StaticLogic:
             return f"{game_map.display_name} ({room.panel_display_name})"
         else:
             return game_map.display_name
+
+    def get_data_version(self) -> int:
+        return self.objects.version
@@ -0,0 +1 @@
+APWORLD_VERSION = 0
@@ -1,7 +1,6 @@
 extends Node
 
-const MAJOR_VERSION = 1
-const MINOR_VERSION = 0
+const MOD_VERSION = 0
 
 var SCRIPT_client
 var SCRIPT_keyboard
@@ -67,6 +67,7 @@ func _ready():
                 global.add_child(textclient_instance)
 
         var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
         ap.connect("ap_connected", connectionSuccessful)
         ap.connect("could_not_connect", connectionUnsuccessful)
         ap.connect("connect_status", connectionStatus)
@@ -90,7 +91,7 @@ func _ready():
         history_box.get_popup().connect("id_pressed", historySelected)
 
         # Show client version.
-        $Panel/title.text = "ARCHIPELAGO (%d.%d)" % [ap.MAJOR_VERSION, ap.MINOR_VERSION]
+        $Panel/title.text = "ARCHIPELAGO (%d.%d)" % [gamedata.objects.get_version(), ap.MOD_VERSION]
 
         # Increase font size in text boxes.
         $Panel/server_box.add_theme_font_size_override("font_size", 36)