Converted to proto2

This will let us use an older version of protobuf in Python, and allows
us to use the Godot protobuf implementation at all. Scalar fields with
custom defaults in data.proto were changed to not have a default,
because Godot doesn't handle it properly. The equivalent fields in
human.proto still have the defaults, and datapacker copies the default
value in if necessary. The Panel message in data.proto was also renamed
to PanelData because otherwise it conflicts with the native Godot class
named Panel. The double field in Letter was renamed to level2, because
Godot couldn't handle it well. Finally, common.proto was removed and
its contents were moved into data.proto, which allows us to generate
code for Python without needing to edit it.

NOTE: I had to slightly modify the Godot protobuf code generator. I'll
need to upload that somewhere.

2 files changed, 8 insertions, 9 deletions

@@ -1,4 +1,4 @@
-from .generated import common_pb2 as common_pb2
+from .generated import data_pb2 as data_pb2
 from typing import TYPE_CHECKING, NamedTuple
 
 if TYPE_CHECKING:
@@ -79,11 +79,11 @@ class Lingo2PlayerLogic:
         self.real_items = list()
 
         for door in world.static_logic.objects.doors:
-            if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.LOCATION_ONLY]:
+            if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]:
                 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id,
                                                                                           self.get_door_reqs(door.id)))
 
-            if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
+            if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
                 self.real_items.append(self.world.static_logic.get_door_item_name(door.id))
 
         for letter in world.static_logic.objects.letters:
@@ -146,7 +146,7 @@ class Lingo2PlayerLogic:
         reqs = AccessRequirements()
 
         use_item = False
-        if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
+        if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
             use_item = True
 
         if use_item:
@@ -1,4 +1,3 @@
-from .generated import common_pb2 as common_pb2
 from .generated import data_pb2 as data_pb2
 import pkgutil
 
@@ -18,20 +17,20 @@ class Lingo2StaticLogic:
         self.objects.ParseFromString(bytearray(file))
 
         for door in self.objects.doors:
-            if door.type in [common_pb2.DoorType.STANDARD, common_pb2.DoorType.LOCATION_ONLY]:
+            if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]:
                 location_name = f"{self.objects.maps[door.map_id].name} - {door.name}"
                 self.location_id_to_name[door.ap_id] = location_name
 
-            if door.type not in [common_pb2.DoorType.EVENT, common_pb2.DoorType.LOCATION_ONLY]:
+            if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY]:
                 item_name = self.get_door_item_name(door.id)
                 self.item_id_to_name[door.ap_id] = item_name
 
         for letter in self.objects.letters:
-            letter_name = f"{letter.key.upper()}{'' if letter.double else '2'}"
+            letter_name = f"{letter.key.upper()}{'' if letter.level2 else '2'}"
             location_name = f"{self.objects.maps[self.objects.rooms[letter.room_id].map_id].name} - {letter_name}"
             self.location_id_to_name[letter.ap_id] = location_name
 
-            if not letter.double:
+            if not letter.level2:
                 self.item_id_to_name[letter.ap_id] = letter_name
 
         for mastery in self.objects.masteries: