Client uses new versioning scheme now

1 files changed, 8 insertions, 5 deletions

@@ -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