4 files changed, 72 insertions, 1 deletions

@@ -912,6 +912,10 @@ func parse_printjson(message):
                 textclient_node.parse_printjson("".join(parts))
 
 
+func get_player_name():
+        return _player_name_by_slot[_slot]
+
+
 func compareVersion(lhs, rhs):
         if lhs["major"] == rhs["major"]:
                 if lhs["minor"] == rhs["minor"]:
@@ -672,6 +672,7 @@ func _load():
         # Create the multiplayer node, if needed.
         if apclient.enable_multiplayer:
                 var multiplayer_node = apclient.SCRIPT_multiplayer.new()
+                multiplayer_node.name = "Multiplayer"
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
         
@@ -1,5 +1,8 @@
 extends "res://scripts/multiplayer.gd"
 
+var queued_messages = []
+var queued_messages_mutex = Mutex.new()
+
 
 func _request_lobby_list():
         var apclient = global.get_node("Archipelago")
@@ -41,3 +44,55 @@ func _update_lobby_members():
                 if member_id != player_steam_id and member_id in active_lobby_members:
                         var slot_name = Steam.getLobbyMemberData(active_lobby_id, member_id, "slot_name")
                         active_lobby_members[member_id].steam_name = slot_name
+
+
+func say(text):
+        queued_messages_mutex.lock()
+        queued_messages.append(text)
+        queued_messages_mutex.unlock()
+
+
+func _physics_process(_delta):
+        if queued_messages_mutex.try_lock() == OK:
+                if queued_messages.empty():
+                        queued_messages_mutex.unlock()
+                else:
+                        var messages = queued_messages.duplicate()
+                        queued_messages = []
+                        queued_messages_mutex.unlock()
+
+                        var player = get_tree().get_root().get_node("Spatial/player")
+                        var space_state = get_tree().get_root().get_world().direct_space_state
+                        var nearby_members = []
+                        for member_id in active_lobby_members.keys():
+                                var other_member = active_lobby_members[member_id]
+                                var ray = space_state.intersect_ray(
+                                        player.global_translation, other_member.global_translation, [player], 0b0101
+                                )
+                                if !("collider" in ray) or ray["collider"] == other_member:
+                                        # Visible!
+                                        nearby_members.append(member_id)
+
+                        var apclient = global.get_node("Archipelago")
+                        var player_name = apclient.get_player_name()
+                        for member_id in nearby_members:
+                                for msg in messages:
+                                        _send_p2p_packet(
+                                                {"solves": [{"say": msg, "from": player_name}]},
+                                                member_id,
+                                                Steam.P2P_SEND_RELIABLE,
+                                                true
+                                        )
+
+
+# I'm completely hijacking this callback, since we're in ghost mode and it won't be called normally.
+func _receive_solve(data):
+        if "say" in data:
+                get_tree().get_root().get_node("Spatial/AP_TextClient").parse_printjson(
+                        "[LOCAL] [color=#fafad2]%s[/color]: %s" % [data["from"], data["say"]]
+                )
+                messages.showMessage("[color=#fafad2]%s[/color]: %s" % [data["from"], data["say"]])
+
+
+func _send_hi(_discard):
+        pass
@@ -84,5 +84,16 @@ func parse_printjson(text):
 
 func text_entered(text):
         var apclient = global.get_node("Archipelago")
-        apclient.say(text.trim_suffix("\n"))
+        var cmd = text.trim_suffix("\n")
+        if cmd.begins_with("/say "):
+                if apclient.enable_multiplayer:
+                        var msg = cmd.trim_prefix("/say ")
+                        parse_printjson(
+                                "[LOCAL] [color=#ee00ee]%s[/color]: %s" % [apclient.get_player_name(), msg]
+                        )
+                        get_tree().get_root().get_node("Spatial/Multiplayer").say(msg)
+                else:
+                        parse_printjson("Multiplayer must be enabled to use /say")
+        else:
+                apclient.say(cmd)
         entry.text = ""