diff options
| author | tpart <tpart120@proton.me> | 2024-09-28 20:22:07 +0200 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2024-09-28 20:22:07 +0200 |
| commit | 8b00ef705713c901ee07d3f29abcc1716dcab056 (patch) | |
| tree | 94671c0abc47e67c426145870c00172cfa33d97b | |
| parent | c31d9c453d1f6a0d5537457ae29f5c5937eace67 (diff) | |
| download | hurrycurry-8b00ef705713c901ee07d3f29abcc1716dcab056.tar hurrycurry-8b00ef705713c901ee07d3f29abcc1716dcab056.tar.bz2 hurrycurry-8b00ef705713c901ee07d3f29abcc1716dcab056.tar.zst | |
Add support for non-monospace server messages
| -rw-r--r-- | client/game.gd | 2 | ||||
| -rw-r--r-- | client/menu/communicate/popup_message/popup_message.gd | 4 | ||||
| -rw-r--r-- | client/menu/communicate/popup_message/server_message.gd | 8 | ||||
| -rw-r--r-- | client/menu/communicate/popup_message/server_message.tscn | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/client/game.gd b/client/game.gd index ce244674..a34ff57e 100644 --- a/client/game.gd +++ b/client/game.gd @@ -315,7 +315,7 @@ func handle_packet(p): if message == null: popup_message.clear_server_msg(position_) else: - popup_message.display_server_msg_positional(get_message_str(message), position_) + popup_message.display_server_msg_positional(get_message_str(message), position_, false) "environment": $Environment.update(p.effects) "redirect": diff --git a/client/menu/communicate/popup_message/popup_message.gd b/client/menu/communicate/popup_message/popup_message.gd index 5977db55..7a4dce4b 100644 --- a/client/menu/communicate/popup_message/popup_message.gd +++ b/client/menu/communicate/popup_message/popup_message.gd @@ -93,13 +93,13 @@ func display_server_msg(msg: String, auto_remove := true): func _on_server_timeout() -> void: clear_server_msg() -func display_server_msg_positional(text: String, pos: Vector2): +func display_server_msg_positional(text: String, pos: Vector2, use_monospace: bool): var msg := PositionalMessage.new() msg.node = SERVER_MESSAGE_SCENE.instantiate() msg.node_2d = Node2D.new() positional_messages_node.add_child(msg.node_2d) msg.node_2d.add_child(msg.node) - msg.node.set_text(text) + msg.node.set_text(text, use_monospace) msg.node.size = Vector2.ZERO msg.position = pos positional_messages[pos] = msg diff --git a/client/menu/communicate/popup_message/server_message.gd b/client/menu/communicate/popup_message/server_message.gd index cbf4ba71..fc12ee76 100644 --- a/client/menu/communicate/popup_message/server_message.gd +++ b/client/menu/communicate/popup_message/server_message.gd @@ -1,7 +1,13 @@ extends BlurSetup class_name ServerMessage +const DEFAULT_FONT = preload("res://menu/theme/font-josefin-sans.woff2") +const MONOSPACE_FONT = preload("res://menu/theme/font-azaret-mono.woff2") + @onready var label: Label = $CenterContainer/Label -func set_text(text: String): +func set_text(text: String, use_monospace := true): label.text = text + var font: FontVariation = label.get_theme_font("font") + font.base_font = MONOSPACE_FONT if use_monospace else DEFAULT_FONT + label.add_theme_font_size_override("font_size", 16 if use_monospace else 20) diff --git a/client/menu/communicate/popup_message/server_message.tscn b/client/menu/communicate/popup_message/server_message.tscn index 2015027b..2a848419 100644 --- a/client/menu/communicate/popup_message/server_message.tscn +++ b/client/menu/communicate/popup_message/server_message.tscn @@ -20,6 +20,7 @@ corner_radius_bottom_right = 16 corner_radius_bottom_left = 16 [sub_resource type="FontVariation" id="FontVariation_qfltj"] +resource_local_to_scene = true base_font = ExtResource("3_dw20j") variation_embolden = 0.75 @@ -45,5 +46,6 @@ mouse_filter = 2 layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_fonts/font = SubResource("FontVariation_qfltj") +theme_override_font_sizes/font_size = 16 theme_override_styles/normal = SubResource("StyleBoxEmpty_3rgop") text = "Server message" |