7 files changed, 55 insertions, 29 deletions

@@ -24,6 +24,7 @@ var _received_items = {}
 var _slot_data = {}
 var _accessible_locations = []
 var _accessible_worldports = []
+var _goal_accessible = false
 
 signal could_not_connect
 signal connect_status
@@ -61,6 +62,7 @@ func _reset_state():
         _checked_worldports = []
         _accessible_locations = []
         _accessible_worldports = []
+        _goal_accessible = false
 
 
 func disconnect_from_ap():
@@ -174,6 +176,8 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                                 for port_id in message["worldports"]:
                                         _accessible_worldports.append(int(port_id))
 
+                        _goal_accessible = bool(message.get("goal", false))
+
                         accessible_locations_updated.emit()
 
                 elif cmd == "UpdateKeyboard":
@@ -14,6 +14,7 @@ var letter_id_by_ap_id = {}
 var symbol_item_ids = []
 var anti_trap_ids = {}
 var location_name_by_id = {}
+var ending_display_name_by_name = {}
 
 var kSYMBOL_ITEMS
 
@@ -103,7 +104,9 @@ func load(data_bytes):
                 location_name_by_id[mastery.get_ap_id()] = _get_mastery_location_name(mastery)
 
         for ending in objects.get_endings():
-                location_name_by_id[ending.get_ap_id()] = _get_ending_location_name(ending)
+                var location_name = _get_ending_location_name(ending)
+                location_name_by_id[ending.get_ap_id()] = location_name
+                ending_display_name_by_name[ending.get_name()] = location_name
 
         for keyholder in objects.get_keyholders():
                 if keyholder.has_key():
@@ -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
@@ -45,7 +43,23 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0
 const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1
 const kCYAN_DOOR_BEHAVIOR_ITEM = 2
 
-var apworld_version = [0, 0]
+const kEndingNameByVictoryValue = {
+        0: "GRAY",
+        1: "PURPLE",
+        2: "MINT",
+        3: "BLACK",
+        4: "BLUE",
+        5: "CYAN",
+        6: "RED",
+        7: "PLUM",
+        8: "ORANGE",
+        9: "GOLD",
+        10: "YELLOW",
+        11: "GREEN",
+        12: "WHITE",
+}
+
+var apworld_version = [0, 0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
@@ -379,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"):
@@ -1,21 +1,5 @@
 extends "res://scripts/nodes/player.gd"
 
-const kEndingNameByVictoryValue = {
-        0: "GRAY",
-        1: "PURPLE",
-        2: "MINT",
-        3: "BLACK",
-        4: "BLUE",
-        5: "CYAN",
-        6: "RED",
-        7: "PLUM",
-        8: "ORANGE",
-        9: "GOLD",
-        10: "YELLOW",
-        11: "GREEN",
-        12: "WHITE",
-}
-
 signal evaluate_solvability
 
 var compass
@@ -138,7 +122,7 @@ func _ready():
 
                 get_parent().add_child.call_deferred(locationListener)
 
-                if kEndingNameByVictoryValue.get(ap.victory_condition, null) == ending.get_name():
+                if ap.kEndingNameByVictoryValue.get(ap.victory_condition, null) == ending.get_name():
                         var victoryListener = ap.SCRIPT_victoryListener.new()
                         victoryListener.name = "victoryListener"
                         victoryListener.senders.append(NodePath("/root/scene/" + ending.get_path()))
@@ -216,9 +200,9 @@ func _ready():
 
                 var sign2 = sign_prefab.instantiate()
                 sign2.position = Vector3(-7, 4, -15.01)
-                sign2.text = "%s ending" % kEndingNameByVictoryValue.get(ap.victory_condition, "?")
+                sign2.text = "%s ending" % ap.kEndingNameByVictoryValue.get(ap.victory_condition, "?")
 
-                var sign2_color = kEndingNameByVictoryValue.get(ap.victory_condition, "coral").to_lower()
+                var sign2_color = ap.kEndingNameByVictoryValue.get(ap.victory_condition, "coral").to_lower()
                 if sign2_color == "white":
                         sign2_color = "silver"
 
@@ -10,6 +10,7 @@ var is_open = false
 var locations_overlay
 var location_texture
 var worldport_texture
+var goal_texture
 
 var worldports_tab
 var worldports_tree
@@ -116,6 +117,10 @@ func _ready():
         worldport_image.load_png_from_buffer(runtime.read_path("assets/worldport.png"))
         worldport_texture = ImageTexture.create_from_image(worldport_image)
 
+        var goal_image = Image.new()
+        goal_image.load_png_from_buffer(runtime.read_path("assets/goal.png"))
+        goal_texture = ImageTexture.create_from_image(goal_image)
+
 
 func _input(event):
         if global.loaded and event is InputEventKey and event.pressed:
@@ -179,6 +184,7 @@ func update_locations():
 
         const kLocation = 0
         const kWorldport = 1
+        const kGoal = 2
 
         var location_names = []
         var type_by_name = {}
@@ -196,6 +202,13 @@ func update_locations():
 
         location_names.sort()
 
+        if ap.client._goal_accessible:
+                var location_name = gamedata.ending_display_name_by_name[ap.kEndingNameByVictoryValue[
+                        ap.victory_condition
+                ]]
+                location_names.push_front(location_name)
+                type_by_name[location_name] = kGoal
+
         var count = 0
         for location_name in location_names:
                 tracker_label.append_text("[p]%s[/p]" % location_name)
@@ -207,6 +220,8 @@ func update_locations():
                                 locations_overlay.add_image(location_texture)
                         elif type_by_name[location_name] == kWorldport:
                                 locations_overlay.add_image(worldport_texture)
+                        elif type_by_name[location_name] == kGoal:
+                                locations_overlay.add_image(goal_texture)
                         locations_overlay.pop()
                 count += 1