diff options
| -rw-r--r-- | client/game.gd | 8 | ||||
| -rw-r--r-- | client/gui/overlays/popup_message/popup_message.gd | 17 | ||||
| -rw-r--r-- | client/gui/overlays/popup_message/popup_message.tscn | 18 |
3 files changed, 27 insertions, 16 deletions
diff --git a/client/game.gd b/client/game.gd index d82ccad3..ae21d8a0 100644 --- a/client/game.gd +++ b/client/game.gd @@ -371,15 +371,15 @@ func handle_packet(p): if position_ == null: # Global hint message if message == null: - overlay_popup_message.clear_server_msg() + overlay_popup_message.clear_server_hint() else: - overlay_popup_message.display_server_msg(MessageParser.new(message, self).result, false) + overlay_popup_message.display_server_hint(MessageParser.new(message, self).result) else: # Positional hint message if message == null: - overlay_popup_message.clear_server_msg(position_) + overlay_popup_message.clear_server_hint(position_) else: - overlay_popup_message.display_server_msg_positional(MessageParser.new(message, self).result, position_, false) + overlay_popup_message.display_server_hint_positional(MessageParser.new(message, self).result, position_, false) "environment": $Environment.update(p.effects) "redirect": diff --git a/client/gui/overlays/popup_message/popup_message.gd b/client/gui/overlays/popup_message/popup_message.gd index dd4c67bf..00b42a8b 100644 --- a/client/gui/overlays/popup_message/popup_message.gd +++ b/client/gui/overlays/popup_message/popup_message.gd @@ -22,6 +22,7 @@ var positional_messages = {} @onready var positional_messages_node: Control = $Positional @onready var server_msg = $Static/VBox/ServerMessage +@onready var server_hint = $Static/VBox/ServerHint @onready var server_msg_timer: Timer = $ServerMessage @onready var game: Game = $"../../Game" # TODO @@ -44,17 +45,20 @@ func _process(_delta: float): msg.last_size = msg.node.size msg.node.position = -0.5 * msg.last_size +func display_server_hint(msg): + server_hint.show() + server_hint.set_text(msg) + func display_server_msg(msg, auto_remove := true): server_msg.show() server_msg.set_text(msg) - if auto_remove: server_msg_timer.start() func _on_server_timeout() -> void: clear_server_msg() -func display_server_msg_positional(text, pos: Vector2, use_monospace: bool): +func display_server_hint_positional(text, pos: Vector2, use_monospace: bool): var msg := PositionalMessage.new() msg.node = SERVER_MESSAGE_SCENE.instantiate() msg.node_2d = Node2D.new() @@ -65,10 +69,13 @@ func display_server_msg_positional(text, pos: Vector2, use_monospace: bool): msg.position = pos positional_messages[pos] = msg -func clear_server_msg(position_ = null): +func clear_server_msg(): + server_msg_timer.stop() + server_msg.hide() + +func clear_server_hint(position_ = null): if position_ == null: - server_msg_timer.stop() - server_msg.hide() + server_hint.hide() else: if position_ in positional_messages: var msg: PositionalMessage = positional_messages[position_] diff --git a/client/gui/overlays/popup_message/popup_message.tscn b/client/gui/overlays/popup_message/popup_message.tscn index fab35e3e..e75cd168 100644 --- a/client/gui/overlays/popup_message/popup_message.tscn +++ b/client/gui/overlays/popup_message/popup_message.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=4 format=3 uid="uid://b21nrnkygiyjt"] +[gd_scene format=3 uid="uid://b21nrnkygiyjt"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_a1566"] [ext_resource type="Script" uid="uid://c2cx41lrgf5b0" path="res://gui/overlays/popup_message/popup_message.gd" id="2_sbew6"] [ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://gui/overlays/popup_message/server_message.tscn" id="3_m3rok"] -[node name="PopupMessage" type="Control"] +[node name="PopupMessage" type="Control" unique_id=739397547] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -14,11 +14,11 @@ grow_vertical = 2 mouse_filter = 2 script = ExtResource("2_sbew6") -[node name="ServerMessage" type="Timer" parent="."] +[node name="ServerMessage" type="Timer" parent="." unique_id=265858330] wait_time = 5.0 one_shot = true -[node name="Static" type="MarginContainer" parent="."] +[node name="Static" type="MarginContainer" parent="." unique_id=138464647] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -28,15 +28,19 @@ grow_vertical = 2 mouse_filter = 2 theme = ExtResource("1_a1566") -[node name="VBox" type="VBoxContainer" parent="Static"] +[node name="VBox" type="VBoxContainer" parent="Static" unique_id=312654300] layout_mode = 2 mouse_filter = 2 -[node name="ServerMessage" parent="Static/VBox" instance=ExtResource("3_m3rok")] +[node name="ServerMessage" parent="Static/VBox" unique_id=337238699 instance=ExtResource("3_m3rok")] visible = false layout_mode = 2 -[node name="Positional" type="Control" parent="."] +[node name="ServerHint" parent="Static/VBox" unique_id=704424213 instance=ExtResource("3_m3rok")] +visible = false +layout_mode = 2 + +[node name="Positional" type="Control" parent="." unique_id=610159147] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 |