teatov/cadastery
1
0
Fork 0
Code Issues Pull Requests Actions Releases 4 Activity

add message_sent signal to consoler

Browse Source
This commit is contained in:
Teatov 2025-02-15 02:14:27 +10:00
parent f9603e0a5a
commit f10eebd332
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/globals/consoler.gd
View File

@ -1,6 +1,9 @@
extends Node extends Node
signal message_sent(message: String)
var input_thread: Thread var input_thread: Thread
var stop: bool = false
func _enter_tree() -> void: func _enter_tree() -> void:
@ -9,15 +12,15 @@ func _enter_tree() -> void:
func _exit_tree() -> void: func _exit_tree() -> void:
stop = true
input_thread.wait_to_finish() input_thread.wait_to_finish()
func _process_input() -> void: func _process_input() -> void:
var text := "" var text := ""
while text != "quit": while not stop and text != "quit":
print("Insert some text: ")
text = OS.read_string_from_stdin().strip_edges() text = OS.read_string_from_stdin().strip_edges()
print("Inserted text: ",text) if text and Referencer.chat:
if Referencer.chat: print("Inserted text: ", text)
Referencer.chat.send_server_message(text) message_sent.emit(text)
get_tree().quit() print("STOPPING!")

9
scripts/ui/chat.gd
View File

@ -21,6 +21,7 @@ func _ready() -> void:
_message_edit.text_submitted.connect(_on_message_edit_text_submitted) _message_edit.text_submitted.connect(_on_message_edit_text_submitted)
_message_edit.visible = false _message_edit.visible = false
_msg_margin.minimum_size_changed.connect(_on_message_margin_minimum_size_changed) _msg_margin.minimum_size_changed.connect(_on_message_margin_minimum_size_changed)
Consoler.message_sent.connect(_on_consoler_message_sent)
Referencer.chat = self Referencer.chat = self
@ -64,10 +65,6 @@ func close() -> void:
_msg_scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_SHOW_NEVER _msg_scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_SHOW_NEVER
func send_server_message(message: String) -> void:
_send_message.rpc(message, true)
@rpc("any_peer", "call_local", "reliable", 1) @rpc("any_peer", "call_local", "reliable", 1)
func _send_message(message: String, server: bool = false) -> void: func _send_message(message: String, server: bool = false) -> void:
var player_name := "" var player_name := ""
@ -121,3 +118,7 @@ func _on_message_margin_minimum_size_changed() -> void:
_msg_scroll.set_deferred( _msg_scroll.set_deferred(
"scroll_vertical", int(_msg_scroll.get_v_scroll_bar().max_value) + 100 "scroll_vertical", int(_msg_scroll.get_v_scroll_bar().max_value) + 100
) )
func _on_consoler_message_sent(message: String) -> void:
_send_message.rpc(message, true)