8 files changed, 130 insertions, 16 deletions

@@ -18,10 +18,12 @@ var _seed = ""
 var _team = 0
 var _slot = 0
 var _checked_locations = []
+var _checked_worldports = []
 var _received_indexes = []
 var _received_items = {}
 var _slot_data = {}
 var _accessible_locations = []
+var _accessible_worldports = []
 
 signal could_not_connect
 signal connect_status
@@ -33,6 +35,8 @@ signal item_sent_notification(message)
 signal hint_received(message)
 signal accessible_locations_updated
 signal checked_locations_updated
+signal checked_worldports_updated
+signal keyboard_update_received
 
 
 func _init():
@@ -54,7 +58,9 @@ func _reset_state():
         _should_process = false
         _received_items = {}
         _received_indexes = []
+        _checked_worldports = []
         _accessible_locations = []
+        _accessible_worldports = []
 
 
 func disconnect_from_ap():
@@ -116,6 +122,14 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                         checked_locations_updated.emit()
 
+                elif cmd == "UpdateWorldports":
+                        for port_id in message["worldports"]:
+                                var lint = int(port_id)
+                                if not _checked_worldports.has(lint):
+                                        _checked_worldports.append(lint)
+
+                        checked_worldports_updated.emit()
+
                 elif cmd == "ItemReceived":
                         for item in message["items"]:
                                 var index = int(item["index"])
@@ -151,12 +165,24 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                 elif cmd == "AccessibleLocations":
                         _accessible_locations.clear()
+                        _accessible_worldports.clear()
 
                         for loc in message["locations"]:
                                 _accessible_locations.append(int(loc))
 
+                        if "worldports" in message:
+                                for port_id in message["worldports"]:
+                                        _accessible_worldports.append(int(port_id))
+
                         accessible_locations_updated.emit()
 
+                elif cmd == "UpdateKeyboard":
+                        var updates = {}
+                        for k in message["updates"]:
+                                updates[k] = int(message["updates"][k])
+
+                        keyboard_update_received.emit(updates)
+
 
 func connectToServer(server, un, pw):
         sendMessage([{"cmd": "Connect", "server": server, "player": un, "password": pw}])
@@ -202,19 +228,6 @@ func sendLocations(loc_ids):
         sendMessage([{"cmd": "LocationChecks", "locations": loc_ids}])
 
 
-func setValue(key, value, operation = "replace"):
-        sendMessage(
-                [
-                        {
-                                "cmd": "Set",
-                                "key": "Lingo2_%d_%s" % [_slot, key],
-                                "want_reply": false,
-                                "operations": [{"operation": operation, "value": value}]
-                        }
-                ]
-        )
-
-
 func say(textdata):
         sendMessage([{"cmd": "Say", "text": textdata}])
 
@@ -227,6 +240,15 @@ func scoutLocations(loc_ids):
         sendMessage([{"cmd": "LocationScouts", "locations": loc_ids}])
 
 
+func updateKeyboard(updates):
+        sendMessage([{"cmd": "UpdateKeyboard", "keyboard": updates}])
+
+
+func checkWorldport(port_id):
+        if not _checked_worldports.has(port_id):
+                sendMessage([{"cmd": "CheckWorldport", "port_id": port_id}])
+
+
 func sendQuit():
         sendMessage([{"cmd": "Quit"}])
 
@@ -161,11 +161,23 @@ func get_door_ap_id(door_id):
                 return null
 
 
+func get_door_map_name(door_id):
+        var door = objects.get_doors()[door_id]
+        var room = objects.get_rooms()[door.get_room_id()]
+        var map = objects.get_maps()[room.get_map_id()]
+        return map.get_name()
+
+
 func get_door_receivers(door_id):
         var door = objects.get_doors()[door_id]
         return door.get_receivers()
 
 
+func get_worldport_display_name(port_id):
+        var port = objects.get_ports()[port_id]
+        return "%s - %s (Worldport)" % [_get_room_object_map_name(port), port.get_name()]
+
+
 func _get_map_object_map_name(obj):
         return objects.get_maps()[obj.get_map_id()].get_display_name()
 
@@ -48,6 +48,9 @@ func load_seed():
                 if localdata.size() > 2:
                         keyholder_state = localdata[2]
 
+        if not letters_saved.is_empty():
+                ap.client.updateKeyboard(letters_saved)
+
         for k in kALL_LETTERS:
                 var level = 0
 
@@ -105,10 +108,20 @@ func update_unlocks():
 
 
 func collect_local_letter(key, level):
-        if level < 0 or level > 2 or level < letters_saved.get(key, 0):
+        var ap = global.get_node("Archipelago")
+        var true_level = 0
+
+        if ap.get_letter_behavior(key, false) == ap.kLETTER_BEHAVIOR_VANILLA:
+                true_level += 1
+        if level == 2 and ap.get_letter_behavior(key, true) == ap.kLETTER_BEHAVIOR_VANILLA:
+                true_level += 1
+
+        if true_level < letters_saved.get(key, 0):
                 return
 
-        letters_saved[key] = level
+        letters_saved[key] = true_level
+
+        ap.client.updateKeyboard({key: true_level})
 
         if letters_blocked.has(key):
                 letters_blocked.erase(key)
@@ -197,3 +210,22 @@ func reset_keyholders():
         save()
 
         return cleared_anything
+
+
+func remote_keyboard_updated(updates):
+        var reverse = {}
+        var should_update = false
+
+        for k in updates:
+                if not letters_saved.has(k) or updates[k] > letters_saved[k]:
+                        letters_saved[k] = updates[k]
+                        should_update = true
+                elif updates[k] < letters_saved[k]:
+                        reverse[k] = letters_saved[k]
+
+        if should_update:
+                update_unlocks()
+
+        if not reverse.is_empty():
+                var ap = global.get_node("Archipelago")
+                ap.client.updateKeyboard(reverse)
@@ -15,6 +15,7 @@ var ap_pass = ""
 var connection_history = []
 var show_compass = false
 var show_locations = false
+var show_minimap = false
 
 var client
 var keyboard
@@ -93,6 +94,9 @@ func _init():
                 if data.size() > 5:
                         show_locations = data[5]
 
+                if data.size() > 6:
+                        show_minimap = data[6]
+
 
 func _ready():
         client = SCRIPT_client.new()
@@ -105,6 +109,7 @@ func _ready():
         client.hint_received.connect(_process_hint_received)
         client.accessible_locations_updated.connect(_on_accessible_locations_updated)
         client.checked_locations_updated.connect(_on_checked_locations_updated)
+        client.checked_worldports_updated.connect(_on_checked_worldports_updated)
 
         client.could_not_connect.connect(_client_could_not_connect)
         client.connect_status.connect(_client_connect_status)
@@ -114,6 +119,7 @@ func _ready():
 
         keyboard = SCRIPT_keyboard.new()
         add_child(keyboard)
+        client.keyboard_update_received.connect(keyboard.remote_keyboard_updated)
 
 
 func saveSettings():
@@ -128,6 +134,7 @@ func saveSettings():
                 connection_history,
                 show_compass,
                 show_locations,
+                show_minimap,
         ]
         file.store_var(data, true)
         file.close()
@@ -189,6 +196,7 @@ func _process_item(item, amount):
                         if gamedata.get_door_map_name(lock[0]) != global.map:
                                 continue
 
+                        # TODO: fix doors opening from door groups
                         var receivers = gamedata.get_door_receivers(lock[0])
                         var scene = get_tree().get_root().get_node_or_null("scene")
                         if scene != null:
@@ -321,6 +329,12 @@ func _on_checked_locations_updated():
                 textclient_node.update_locations()
 
 
+func _on_checked_worldports_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
 func _client_could_not_connect(message):
         could_not_connect.emit(message)
 
@@ -2,6 +2,7 @@ extends "res://scripts/ui/pauseMenu.gd"
 
 var compass_button
 var locations_button
+var minimap_button
 
 
 func _ready():
@@ -29,6 +30,15 @@ func _ready():
         locations_button.pressed.connect(_toggle_locations)
         ap_panel.add_child(locations_button)
 
+        minimap_button = CheckBox.new()
+        minimap_button.text = "show minimap"
+        minimap_button.button_pressed = ap.show_minimap
+        minimap_button.position = Vector2(65, 300)
+        minimap_button.theme = preload("res://assets/themes/baseUI.tres")
+        minimap_button.add_theme_font_size_override("font_size", 60)
+        minimap_button.pressed.connect(_toggle_minimap)
+        ap_panel.add_child(minimap_button)
+
         super._ready()
 
 
@@ -69,3 +79,13 @@ func _toggle_locations():
 
         var textclient = global.get_node("Textclient")
         textclient.update_locations_visibility()
+
+
+func _toggle_minimap():
+        var ap = global.get_node("Archipelago")
+        ap.show_minimap = minimap_button.button_pressed
+        ap.saveSettings()
+
+        var minimap = get_tree().get_root().get_node("scene/Minimap")
+        if minimap != null:
+                minimap.visible = ap.show_minimap
@@ -330,6 +330,7 @@ func _ready():
 
         var minimap = ap.SCRIPT_minimap.new()
         minimap.name = "Minimap"
+        minimap.visible = ap.show_minimap
         get_parent().add_child.call_deferred(minimap)
 
         super._ready()
@@ -150,6 +150,11 @@ func update_locations():
                         var location_name = gamedata.location_name_by_id.get(location_id, "(Unknown)")
                         location_names.append(location_name)
 
+        for port_id in ap.client._accessible_worldports:
+                if not ap.client._checked_worldports.has(port_id):
+                        var port_name = gamedata.get_worldport_display_name(port_id)
+                        location_names.append(port_name)
+
         location_names.sort()
 
         var count = 0
@@ -3,6 +3,8 @@ extends "res://scripts/nodes/worldport.gd"
 var absolute_rotation = false
 var target_rotation = 0
 
+var port_id = null
+
 
 func _ready():
         var node_path = String(
@@ -13,7 +15,7 @@ func _ready():
 
         if ap.shuffle_worldports:
                 var gamedata = global.get_node("Gamedata")
-                var port_id = gamedata.get_port_for_map_node_path(global.map, node_path)
+                port_id = gamedata.get_port_for_map_node_path(global.map, node_path)
                 if port_id != null:
                         if port_id in ap.port_pairings:
                                 var target_port = gamedata.objects.get_ports()[ap.port_pairings[port_id]]
@@ -29,6 +31,8 @@ func _ready():
                                 sets_entry_point = true
                                 invisible = false
                                 fades = true
+                        else:
+                                port_id = null
 
         if global.map == "icarus" and exit == "daedalus":
                 if not ap.daedalus_roof_access:
@@ -39,6 +43,10 @@ func _ready():
 
 func bodyEntered(body):
         if body.is_in_group("player"):
+                if port_id != null:
+                        var ap = global.get_node("Archipelago")
+                        ap.client.checkWorldport(port_id)
+
                 if absolute_rotation:
                         entry_rotate.y = target_rotation - body.rotation_degrees.y