7 files changed, 18 insertions, 9 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:
@@ -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
@@ -1,4 +1,8 @@
-version: 6
+version {
+  major: 7
+  minor: 0
+  patch: 0
+}
 # Filler item.
 special_names: "A Job Well Done"
 # Symbol items.
@@ -93,6 +93,12 @@ message Vec3d {
   optional double z = 3;
 }
 
+message VersionNumber {
+  optional uint64 major = 1;
+  optional uint64 minor = 2;
+  optional uint64 patch = 3;
+}
+
 message ProxyIdentifier {
   optional uint64 panel = 1;
   optional string answer = 2;
@@ -275,7 +281,7 @@ message DoorGroup {
 }
 
 message AllObjects {
-  optional uint64 version = 15;
+  optional VersionNumber version = 15;
 
   repeated Map maps = 7;
   repeated Room rooms = 1;
@@ -237,7 +237,7 @@ message HumanDoorGroups {
 
 message HumanGlobalMetadata {
   repeated string special_names = 1;
-  optional uint64 version = 2;
+  optional VersionNumber version = 2;
 }
 
 message IdMappings {
@@ -627,7 +627,7 @@ class DataPacker {
     }
 
     auto h_metadata = ReadMessageFromFile<HumanGlobalMetadata>(path.string());
-    container_.all_objects().set_version(h_metadata.version());
+    *container_.all_objects().mutable_version() = h_metadata.version();
   }
 
   void ProcessIdsFile(std::filesystem::path path) {