From 2323f3d4ba638491110be16734be9c24485caefa Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 25 Sep 2024 15:30:01 +0200 Subject: Support pinned messages --- client/menu/chat/chat_message.gd | 31 --- client/menu/chat/chat_message.tscn | 30 --- client/menu/chat/chat_open.gd | 46 ----- client/menu/chat/chat_open.tscn | 54 ----- client/menu/chat/chat_preview.gd | 33 --- client/menu/chat/chat_preview.tscn | 39 ---- client/menu/communicate/chat/chat_message.gd | 31 +++ client/menu/communicate/chat/chat_message.tscn | 30 +++ client/menu/communicate/chat/chat_open.gd | 46 +++++ client/menu/communicate/chat/chat_open.tscn | 54 +++++ client/menu/communicate/chat/chat_preview.gd | 33 +++ client/menu/communicate/chat/chat_preview.tscn | 39 ++++ client/menu/communicate/item/item_message.gd | 65 ++++++ client/menu/communicate/item/item_message.tscn | 47 +++++ client/menu/communicate/item/item_render.gd | 35 ++++ client/menu/communicate/item/item_render.tscn | 25 +++ .../popup_message/pinned_item_messages.gd | 32 +++ .../popup_message/pinned_item_messages.tscn | 21 ++ .../communicate/popup_message/popup_message.gd | 230 +++++++++++++++++++++ .../communicate/popup_message/popup_message.tscn | 148 +++++++++++++ .../communicate/popup_message/server_message.tscn | 49 +++++ client/menu/game.gd | 2 +- client/menu/game.tscn | 10 +- client/menu/popup_message/popup_message.gd | 230 --------------------- client/menu/popup_message/popup_message.tscn | 148 ------------- client/menu/popup_message/server_message.tscn | 49 ----- client/menu/theme/paper_panel_style.tres | 6 + .../item_bubble_progress_style_background.tres | 5 + 28 files changed, 904 insertions(+), 664 deletions(-) delete mode 100644 client/menu/chat/chat_message.gd delete mode 100644 client/menu/chat/chat_message.tscn delete mode 100644 client/menu/chat/chat_open.gd delete mode 100644 client/menu/chat/chat_open.tscn delete mode 100644 client/menu/chat/chat_preview.gd delete mode 100644 client/menu/chat/chat_preview.tscn create mode 100644 client/menu/communicate/chat/chat_message.gd create mode 100644 client/menu/communicate/chat/chat_message.tscn create mode 100644 client/menu/communicate/chat/chat_open.gd create mode 100644 client/menu/communicate/chat/chat_open.tscn create mode 100644 client/menu/communicate/chat/chat_preview.gd create mode 100644 client/menu/communicate/chat/chat_preview.tscn create mode 100644 client/menu/communicate/item/item_message.gd create mode 100644 client/menu/communicate/item/item_message.tscn create mode 100644 client/menu/communicate/item/item_render.gd create mode 100644 client/menu/communicate/item/item_render.tscn create mode 100644 client/menu/communicate/popup_message/pinned_item_messages.gd create mode 100644 client/menu/communicate/popup_message/pinned_item_messages.tscn create mode 100644 client/menu/communicate/popup_message/popup_message.gd create mode 100644 client/menu/communicate/popup_message/popup_message.tscn create mode 100644 client/menu/communicate/popup_message/server_message.tscn delete mode 100644 client/menu/popup_message/popup_message.gd delete mode 100644 client/menu/popup_message/popup_message.tscn delete mode 100644 client/menu/popup_message/server_message.tscn create mode 100644 client/menu/theme/paper_panel_style.tres create mode 100644 client/menu/theme/style/item_bubble_progress_style_background.tres (limited to 'client/menu') diff --git a/client/menu/chat/chat_message.gd b/client/menu/chat/chat_message.gd deleted file mode 100644 index 1cc57102..00000000 --- a/client/menu/chat/chat_message.gd +++ /dev/null @@ -1,31 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 tpart -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -extends HBoxContainer -class_name ChatMessage - -@onready var fade_away_timer: Timer = $FadeAway -@onready var sender_label: Label = $Sender -@onready var message_label: Label = $Message - -func set_message(username: String, message: String, fade_away: bool = false, fade_time: float = 5.): - sender_label.text = username - message_label.text = message - - if fade_away: - fade_away_timer.start(fade_time) - -func _on_fade_away_timeout() -> void: - queue_free() diff --git a/client/menu/chat/chat_message.tscn b/client/menu/chat/chat_message.tscn deleted file mode 100644 index c72deb7b..00000000 --- a/client/menu/chat/chat_message.tscn +++ /dev/null @@ -1,30 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://bpc2qgsvcafhe"] - -[ext_resource type="Script" path="res://menu/chat/chat_message.gd" id="1_ey0qp"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_rx6vg"] - -[sub_resource type="FontVariation" id="FontVariation_jfhbh"] -variation_embolden = 1.3 - -[node name="ChatMessage" type="HBoxContainer"] -offset_right = 72.0 -offset_bottom = 165.0 -theme = ExtResource("1_rx6vg") -script = ExtResource("1_ey0qp") - -[node name="Sender" type="Label" parent="."] -layout_mode = 2 -theme_override_fonts/font = SubResource("FontVariation_jfhbh") -text = "" - -[node name="Message" type="Label" parent="."] -layout_mode = 2 -size_flags_horizontal = 3 -text = "Message" -vertical_alignment = 1 -autowrap_mode = 3 - -[node name="FadeAway" type="Timer" parent="."] -one_shot = true - -[connection signal="timeout" from="FadeAway" to="." method="_on_fade_away_timeout"] diff --git a/client/menu/chat/chat_open.gd b/client/menu/chat/chat_open.gd deleted file mode 100644 index 576568ee..00000000 --- a/client/menu/chat/chat_open.gd +++ /dev/null @@ -1,46 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 tpart -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -extends Menu -class_name ChatOpen - -const CHAT_MESSAGE_SCENE = preload("res://menu/chat/chat_message.tscn") - -@onready var messages_container: VBoxContainer = $PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom/Messages -@onready var line: LineEdit = $PanelContainer/MarginContainer/VBoxContainer/LineEdit -@onready var game_menu: GameMenu = get_parent() -@onready var game: Game = game_menu.game - -func _ready() -> void: - super() - for i in game.text_message_history: - add_message(i[0], i[1]) - - game.text_message.connect( - func message(username: String, text: String, _timeout_initial: float, _timeout_remaining: float): - add_message(username, text) - ) - -func _input(event: InputEvent) -> void: - if Input.is_action_just_pressed("chat"): - if line.text != "": - game.mp.send_chat(game.player_id, line.text) - exit() - super(event) - -func add_message(username: String, message: String): - var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate() - messages_container.add_child(chat_message) - chat_message.set_message("<%s>" % username, message) diff --git a/client/menu/chat/chat_open.tscn b/client/menu/chat/chat_open.tscn deleted file mode 100644 index 6d03b391..00000000 --- a/client/menu/chat/chat_open.tscn +++ /dev/null @@ -1,54 +0,0 @@ -[gd_scene load_steps=7 format=3 uid="uid://dbd6k56l4p0ls"] - -[ext_resource type="Script" path="res://menu/chat/chat_open.gd" id="1_dsl4a"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="1_isqmk"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="2_urbd2"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="3_v7xmg"] -[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_ew1yx"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_3mths"] - -[node name="ChatOpen" type="Control"] -layout_mode = 3 -anchors_preset = 9 -anchor_bottom = 1.0 -offset_right = 296.0 -grow_vertical = 2 -script = ExtResource("1_dsl4a") -support_anim = false - -[node name="PanelContainer" type="PanelContainer" parent="."] -material = ExtResource("1_isqmk") -layout_mode = 1 -anchors_preset = 9 -anchor_bottom = 1.0 -offset_right = 296.0 -grow_vertical = 2 -theme = ExtResource("3_v7xmg") -theme_override_styles/panel = ExtResource("4_ew1yx") -script = ExtResource("2_urbd2") - -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] -layout_mode = 2 - -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -theme_override_constants/separation = 0 - -[node name="ScrollContainerCustom" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] -material = ExtResource("1_isqmk") -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -script = ExtResource("5_3mths") -auto_scroll_to_bottom = true - -[node name="Messages" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="LineEdit" type="LineEdit" parent="PanelContainer/MarginContainer/VBoxContainer"] -layout_mode = 2 -placeholder_text = "c.chat.write_message" diff --git a/client/menu/chat/chat_preview.gd b/client/menu/chat/chat_preview.gd deleted file mode 100644 index 7f8212b5..00000000 --- a/client/menu/chat/chat_preview.gd +++ /dev/null @@ -1,33 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 tpart -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -extends Control -class_name ChatPreview - -const CHAT_MESSAGE_SCENE = preload("res://menu/chat/chat_message.tscn") - -@onready var game: Game = $"../Game" -@onready var messages_container: VBoxContainer = $MarginContainer/ScrollContainer/PanelContainer/Messages - -func _ready(): - game.text_message.connect( - func message(username: String, text: String, _timeout_initial: float, timeout_remaining: float): - add_message(username, text, timeout_remaining) - ) - -func add_message(username: String, message: String, time: float): - var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate() - messages_container.add_child(chat_message) - chat_message.set_message("<%s>" % username, message, true, time) diff --git a/client/menu/chat/chat_preview.tscn b/client/menu/chat/chat_preview.tscn deleted file mode 100644 index a50b138a..00000000 --- a/client/menu/chat/chat_preview.tscn +++ /dev/null @@ -1,39 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://xcxbmynn8mhi"] - -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_x8ock"] -[ext_resource type="Script" path="res://menu/chat/chat_preview.gd" id="2_72x70"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_jo1xn"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_1l77s"] - -[node name="ChatPreview" type="Control"] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme = ExtResource("1_x8ock") -script = ExtResource("2_72x70") - -[node name="MarginContainer" type="MarginContainer" parent="."] -layout_mode = 2 -anchor_bottom = 1.0 -offset_right = 296.0 -grow_vertical = 2 - -[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"] -layout_mode = 2 -horizontal_scroll_mode = 0 - -[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/ScrollContainer"] -material = ExtResource("4_jo1xn") -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 0 -mouse_filter = 2 -script = ExtResource("5_1l77s") - -[node name="Messages" type="VBoxContainer" parent="MarginContainer/ScrollContainer/PanelContainer"] -layout_mode = 2 -mouse_filter = 2 diff --git a/client/menu/communicate/chat/chat_message.gd b/client/menu/communicate/chat/chat_message.gd new file mode 100644 index 00000000..1cc57102 --- /dev/null +++ b/client/menu/communicate/chat/chat_message.gd @@ -0,0 +1,31 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends HBoxContainer +class_name ChatMessage + +@onready var fade_away_timer: Timer = $FadeAway +@onready var sender_label: Label = $Sender +@onready var message_label: Label = $Message + +func set_message(username: String, message: String, fade_away: bool = false, fade_time: float = 5.): + sender_label.text = username + message_label.text = message + + if fade_away: + fade_away_timer.start(fade_time) + +func _on_fade_away_timeout() -> void: + queue_free() diff --git a/client/menu/communicate/chat/chat_message.tscn b/client/menu/communicate/chat/chat_message.tscn new file mode 100644 index 00000000..a095c42e --- /dev/null +++ b/client/menu/communicate/chat/chat_message.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=4 format=3 uid="uid://bpc2qgsvcafhe"] + +[ext_resource type="Script" path="res://menu/communicate/chat/chat_message.gd" id="1_ey0qp"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_rx6vg"] + +[sub_resource type="FontVariation" id="FontVariation_jfhbh"] +variation_embolden = 1.3 + +[node name="ChatMessage" type="HBoxContainer"] +offset_right = 72.0 +offset_bottom = 165.0 +theme = ExtResource("1_rx6vg") +script = ExtResource("1_ey0qp") + +[node name="Sender" type="Label" parent="."] +layout_mode = 2 +theme_override_fonts/font = SubResource("FontVariation_jfhbh") +text = "" + +[node name="Message" type="Label" parent="."] +layout_mode = 2 +size_flags_horizontal = 3 +text = "Message" +vertical_alignment = 1 +autowrap_mode = 3 + +[node name="FadeAway" type="Timer" parent="."] +one_shot = true + +[connection signal="timeout" from="FadeAway" to="." method="_on_fade_away_timeout"] diff --git a/client/menu/communicate/chat/chat_open.gd b/client/menu/communicate/chat/chat_open.gd new file mode 100644 index 00000000..c67a1b1c --- /dev/null +++ b/client/menu/communicate/chat/chat_open.gd @@ -0,0 +1,46 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends Menu +class_name ChatOpen + +const CHAT_MESSAGE_SCENE = preload("res://menu/communicate/chat/chat_message.tscn") + +@onready var messages_container: VBoxContainer = $PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom/Messages +@onready var line: LineEdit = $PanelContainer/MarginContainer/VBoxContainer/LineEdit +@onready var game_menu: GameMenu = get_parent() +@onready var game: Game = game_menu.game + +func _ready() -> void: + super() + for i in game.text_message_history: + add_message(i[0], i[1]) + + game.text_message.connect( + func message(username: String, text: String, _timeout_initial: float, _timeout_remaining: float): + add_message(username, text) + ) + +func _input(event: InputEvent) -> void: + if Input.is_action_just_pressed("chat"): + if line.text != "": + game.mp.send_chat(game.player_id, line.text) + exit() + super(event) + +func add_message(username: String, message: String): + var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate() + messages_container.add_child(chat_message) + chat_message.set_message("<%s>" % username, message) diff --git a/client/menu/communicate/chat/chat_open.tscn b/client/menu/communicate/chat/chat_open.tscn new file mode 100644 index 00000000..0247a1ca --- /dev/null +++ b/client/menu/communicate/chat/chat_open.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=7 format=3 uid="uid://dbd6k56l4p0ls"] + +[ext_resource type="Script" path="res://menu/communicate/chat/chat_open.gd" id="1_dsl4a"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="1_isqmk"] +[ext_resource type="Script" path="res://menu/blur_setup.gd" id="2_urbd2"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="3_v7xmg"] +[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_ew1yx"] +[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_3mths"] + +[node name="ChatOpen" type="Control"] +layout_mode = 3 +anchors_preset = 9 +anchor_bottom = 1.0 +offset_right = 296.0 +grow_vertical = 2 +script = ExtResource("1_dsl4a") +support_anim = false + +[node name="PanelContainer" type="PanelContainer" parent="."] +material = ExtResource("1_isqmk") +layout_mode = 1 +anchors_preset = 9 +anchor_bottom = 1.0 +offset_right = 296.0 +grow_vertical = 2 +theme = ExtResource("3_v7xmg") +theme_override_styles/panel = ExtResource("4_ew1yx") +script = ExtResource("2_urbd2") + +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme_override_constants/separation = 0 + +[node name="ScrollContainerCustom" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] +material = ExtResource("1_isqmk") +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource("5_3mths") +auto_scroll_to_bottom = true + +[node name="Messages" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="LineEdit" type="LineEdit" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +placeholder_text = "c.chat.write_message" diff --git a/client/menu/communicate/chat/chat_preview.gd b/client/menu/communicate/chat/chat_preview.gd new file mode 100644 index 00000000..14713f7e --- /dev/null +++ b/client/menu/communicate/chat/chat_preview.gd @@ -0,0 +1,33 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends Control +class_name ChatPreview + +const CHAT_MESSAGE_SCENE = preload("res://menu/communicate/chat/chat_message.tscn") + +@onready var game: Game = $"../Game" +@onready var messages_container: VBoxContainer = $MarginContainer/ScrollContainer/PanelContainer/Messages + +func _ready(): + game.text_message.connect( + func message(username: String, text: String, _timeout_initial: float, timeout_remaining: float): + add_message(username, text, timeout_remaining) + ) + +func add_message(username: String, message: String, time: float): + var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate() + messages_container.add_child(chat_message) + chat_message.set_message("<%s>" % username, message, true, time) diff --git a/client/menu/communicate/chat/chat_preview.tscn b/client/menu/communicate/chat/chat_preview.tscn new file mode 100644 index 00000000..4cc39e00 --- /dev/null +++ b/client/menu/communicate/chat/chat_preview.tscn @@ -0,0 +1,39 @@ +[gd_scene load_steps=5 format=3 uid="uid://xcxbmynn8mhi"] + +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_x8ock"] +[ext_resource type="Script" path="res://menu/communicate/chat/chat_preview.gd" id="2_72x70"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_jo1xn"] +[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_1l77s"] + +[node name="ChatPreview" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme = ExtResource("1_x8ock") +script = ExtResource("2_72x70") + +[node name="MarginContainer" type="MarginContainer" parent="."] +layout_mode = 2 +anchor_bottom = 1.0 +offset_right = 296.0 +grow_vertical = 2 + +[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"] +layout_mode = 2 +horizontal_scroll_mode = 0 + +[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/ScrollContainer"] +material = ExtResource("4_jo1xn") +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 +mouse_filter = 2 +script = ExtResource("5_1l77s") + +[node name="Messages" type="VBoxContainer" parent="MarginContainer/ScrollContainer/PanelContainer"] +layout_mode = 2 +mouse_filter = 2 diff --git a/client/menu/communicate/item/item_message.gd b/client/menu/communicate/item/item_message.gd new file mode 100644 index 00000000..53e6ff22 --- /dev/null +++ b/client/menu/communicate/item/item_message.gd @@ -0,0 +1,65 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 nokoe +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +class_name ItemMessage +extends Control + +var timeout_remaining := 0. +var timeout_initial := 0. + +@onready var item_render: ItemRender = $VBoxContainer/SubViewportContainer/SubViewport/ItemRender +@onready var progress: ProgressBar = $VBoxContainer/ProgressBar +@onready var sub_viewport: SubViewport = $VBoxContainer/SubViewportContainer/SubViewport +@onready var v_box_container: VBoxContainer = $VBoxContainer + +#func _init(): +# progress_style = progress_style.duplicate() + +func set_subviewport_size(sub_viewport_size: Vector2): + sub_viewport.size = sub_viewport_size + progress.custom_minimum_size.y = sub_viewport_size.x - sub_viewport_size.y + v_box_container.size.y = 0 + +func set_round_corner_radius_progress(radius: int): + var style_bg: StyleBoxFlat = progress.get_theme_stylebox("background") + var style_fill: StyleBoxFlat = progress.get_theme_stylebox("fill") + + style_bg.corner_radius_bottom_left = radius + style_bg.corner_radius_bottom_right = radius + style_fill.corner_radius_bottom_left = radius + style_fill.corner_radius_bottom_right = radius + +func set_item(item_name: String, timeout_initial_: float, timeout_remaining_: float): + item_render.set_item(item_name) + + timeout_remaining = timeout_remaining_ + timeout_initial = timeout_initial_ + progress.max_value = timeout_initial + progress.value = timeout_remaining + +func remove_item(): + item_render.remove_item() + +func _process(delta): + if item_render.item != null: + timeout_remaining -= delta + progress.value = timeout_remaining + var x: float = timeout_remaining / timeout_initial + var progress_style: StyleBoxFlat = progress.get_theme_stylebox("fill") + progress_style.bg_color = Color(min((1-x) * 2, 1), min(x * 2, 1), 0.) + if progress_style.corner_radius_bottom_right != 0: + progress_style.corner_radius_bottom_right = max(32.-(1.-x)*320, 0) + progress.add_theme_stylebox_override("fill", progress_style) diff --git a/client/menu/communicate/item/item_message.tscn b/client/menu/communicate/item/item_message.tscn new file mode 100644 index 00000000..c0b0ea95 --- /dev/null +++ b/client/menu/communicate/item/item_message.tscn @@ -0,0 +1,47 @@ +[gd_scene load_steps=6 format=3 uid="uid://fkqh36s4vl3p"] + +[ext_resource type="Script" path="res://menu/communicate/item/item_message.gd" id="1_76lg0"] +[ext_resource type="PackedScene" uid="uid://cem5xcld6vn51" path="res://menu/communicate/item/item_render.tscn" id="1_sju7l"] +[ext_resource type="StyleBox" uid="uid://brw8uogdgx2gf" path="res://menu/theme/style/item_bubble_progress_style.tres" id="3_ipe76"] +[ext_resource type="StyleBox" uid="uid://cu0his4018e7h" path="res://menu/theme/style/item_bubble_progress_style_background.tres" id="3_t61n3"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"] +bg_color = Color(1, 1, 1, 1) +corner_radius_top_left = 30 +corner_radius_top_right = 30 +corner_radius_bottom_right = 30 +corner_radius_bottom_left = 30 + +[node name="ItemMessage" type="PanelContainer"] +auto_translate_mode = 2 +offset_right = 256.0 +offset_bottom = 256.0 +size_flags_vertical = 0 +theme_override_styles/panel = SubResource("StyleBoxFlat_dpele") +script = ExtResource("1_76lg0") + +[node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 2 +size_flags_vertical = 0 +theme_override_constants/separation = 0 + +[node name="SubViewportContainer" type="SubViewportContainer" parent="VBoxContainer"] +layout_mode = 2 + +[node name="SubViewport" type="SubViewport" parent="VBoxContainer/SubViewportContainer"] +own_world_3d = true +transparent_bg = true +handle_input_locally = false +size = Vector2i(256, 224) +render_target_update_mode = 4 + +[node name="ItemRender" parent="VBoxContainer/SubViewportContainer/SubViewport" instance=ExtResource("1_sju7l")] + +[node name="ProgressBar" type="ProgressBar" parent="VBoxContainer"] +custom_minimum_size = Vector2(0, 32) +layout_mode = 2 +theme_override_styles/background = ExtResource("3_t61n3") +theme_override_styles/fill = ExtResource("3_ipe76") +step = 0.0 +value = 100.0 +show_percentage = false diff --git a/client/menu/communicate/item/item_render.gd b/client/menu/communicate/item/item_render.gd new file mode 100644 index 00000000..cd7d726a --- /dev/null +++ b/client/menu/communicate/item/item_render.gd @@ -0,0 +1,35 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends Node3D +class_name ItemRender + +var item: Item + +@onready var base = $ItemBase + +func set_item(item_name: String): + if item != null: + remove_item() + + item = ItemFactory.produce(item_name, base) + base.add_child(item) + +func remove_item(): + if item != null: + item.queue_free() + +func _process(delta: float): + base.rotation.y += delta * TAU * .025 diff --git a/client/menu/communicate/item/item_render.tscn b/client/menu/communicate/item/item_render.tscn new file mode 100644 index 00000000..1309509e --- /dev/null +++ b/client/menu/communicate/item/item_render.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=3 format=3 uid="uid://cem5xcld6vn51"] + +[ext_resource type="Script" path="res://menu/communicate/item/item_render.gd" id="1_jfi7o"] + +[sub_resource type="Environment" id="Environment_iyxrx"] +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) +ambient_light_energy = 0.5 + +[node name="ItemRender" type="Node3D"] +script = ExtResource("1_jfi7o") + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.939693, 0.34202, 0, -0.34202, 0.939693, 0, 0.5, 1) +projection = 1 +size = 0.6 + +[node name="ItemBase" type="Node3D" parent="."] + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.173648, 0.984808, 0, -0.984808, 0.173648, 0, 0, 0) +light_energy = 0.5 + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_iyxrx") diff --git a/client/menu/communicate/popup_message/pinned_item_messages.gd b/client/menu/communicate/popup_message/pinned_item_messages.gd new file mode 100644 index 00000000..7343865c --- /dev/null +++ b/client/menu/communicate/popup_message/pinned_item_messages.gd @@ -0,0 +1,32 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends Control +class_name PinnedItemMessages + +const ITEM_MESSAGE_SCENE := preload("res://menu/communicate/item/item_message.tscn") +const PAPER_PANEL_STYLE := preload("res://menu/theme/paper_panel_style.tres") + +@onready var pinned_items_container: HBoxContainer = $HBoxContainer + +func pin_item(item_name: String, timeout_initial_: float, timeout_remaining_: float): + var item_message: ItemMessage = ITEM_MESSAGE_SCENE.instantiate() + item_message.remove_theme_stylebox_override("panel") + item_message.add_theme_stylebox_override("panel", PAPER_PANEL_STYLE) + pinned_items_container.add_child(item_message) + item_message.set_subviewport_size(Vector2(96, 84)) + item_message.set_round_corner_radius_progress(0) + + item_message.set_item(item_name, timeout_initial_, timeout_remaining_) diff --git a/client/menu/communicate/popup_message/pinned_item_messages.tscn b/client/menu/communicate/popup_message/pinned_item_messages.tscn new file mode 100644 index 00000000..e53b27c3 --- /dev/null +++ b/client/menu/communicate/popup_message/pinned_item_messages.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=2 format=3 uid="uid://dcrr1rwdwbkq8"] + +[ext_resource type="Script" path="res://menu/communicate/popup_message/pinned_item_messages.gd" id="1_q0jkk"] + +[node name="PinnedItemMessages" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_q0jkk") + +[node name="HBoxContainer" type="HBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 10 +anchor_right = 1.0 +offset_bottom = 256.0 +grow_horizontal = 2 +mouse_filter = 2 diff --git a/client/menu/communicate/popup_message/popup_message.gd b/client/menu/communicate/popup_message/popup_message.gd new file mode 100644 index 00000000..6c2c2c0e --- /dev/null +++ b/client/menu/communicate/popup_message/popup_message.gd @@ -0,0 +1,230 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 tpart +# Copyright 2024 nokoe +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +extends MarginContainer +class_name PopupMessage + +var is_ingame := false +var is_joined := false + +@onready var server_msg = $VBox/ServerMessage +@onready var server_msg_positional = $ServerMessagePositional +@onready var hint_msg = $VBox/HintMessage + +@onready var server_msg_timer: Timer = $ServerTimer +@onready var hint_msg_timer: Timer = $HintTimer + +@onready var server_msg_label: Label = $VBox/ServerMessage/CenterContainer/Label +@onready var server_msg_positional_label: Label = $ServerMessagePositional/ServerMessage/CenterContainer/Label +@onready var hint_msg_label: Label = $VBox/HintMessage/CenterContainer/Label + +@onready var server_msg_positional_panel: PanelContainer = $ServerMessagePositional/ServerMessage + +@onready var auto_hint_timers: Node = $AutoHintTimers + +@onready var reset_timer = $Reset +@onready var join_while_running_timer = $JoinWhileRunning + +@onready var game: Game = $"../Game" + +var server_message_position := Vector2.ZERO +var last_server_message_panel_size := Vector2.ZERO + +func _ready(): + game.joined.connect( + func player_joined(): + is_joined = true + update_state() + ) + game.left.connect( + func player_joined(): + is_joined = false + update_state() + ) + game.update_tutorial_running.connect( + func a(running: bool): + if running: + stop_game_hints() + else: + update_state() + ) + +func _process(_delta: float): + if server_msg_positional.visible: + var pos_3d = Vector3(server_message_position.x + 0.5, 1.5, server_message_position.y + 0.5) + var pos_2d = get_viewport().get_camera_3d().unproject_position(pos_3d) + var server_message_panel_size = server_msg_positional_panel.size + server_msg_positional.position = pos_2d.clamp(Vector2.ZERO + 0.5 * server_message_panel_size, Vector2(get_viewport_rect().size) - 0.5 * server_message_panel_size) + + if server_message_panel_size != last_server_message_panel_size: + last_server_message_panel_size = server_message_panel_size + server_msg_positional_panel.position = -0.5 * last_server_message_panel_size + +func ingame(): + is_ingame = true + update_state() + +func lobby(): + is_ingame = false + update_state() + +func update_state(): + if is_ingame and is_joined: + start_game_hints() + elif is_ingame: + stop_game_hints() + join_while_running_timer.start() + else: + stop_game_hints() + +func display_server_msg(msg: String, auto_remove := true): + clear_server_msg() + server_msg.show() + server_msg_label.text = msg + + if auto_remove: + server_msg_timer.start() + +func display_server_msg_positional(msg: String, pos: Vector2, auto_remove := true): + clear_server_msg() + server_msg_positional.show() + server_message_position = pos + server_msg_positional_label.text = msg + server_msg_positional_panel.size = Vector2.ZERO + + if auto_remove: + server_msg_timer.start() + +func clear_server_msg(): + server_msg_timer.stop() + server_msg.hide() + server_msg_positional.hide() + +func _on_server_timer_timeout(): + clear_server_msg() + +func display_hint_msg(msg: String): + hint_msg.show() + hint_msg_label.text = msg + hint_msg_timer.start() + +func _on_hint_timer_timeout(): + hint_msg.hide() + +func start_game_hints(): + for c: Timer in auto_hint_timers.get_children(): + c.start() + +func stop_game_hints(): + _on_hint_timer_timeout() + for c: Timer in auto_hint_timers.get_children(): + c.stop() + reset_timer.stop() + join_while_running_timer.stop() + +func _input(_event): + if Input.is_action_just_pressed("boost"): + Global.set_hint("has_boosted", true) + if any_action_just_pressed(["forwards", "backwards", "left", "right"]): + Global.set_hint("has_moved", true) + if any_action_just_pressed(["rotate_left", "rotate_right", "rotate_up", "rotate_down"]): + if not Global.get_hint("has_reset"): + reset_timer.start() + Global.set_hint("has_rotated", true) + if any_action_just_pressed(["zoom_in", "zoom_out"]): + Global.set_hint("has_zoomed", true) + if Input.is_action_just_pressed("interact"): + Global.set_hint("has_interacted", true) + if Input.is_action_just_pressed("reset"): + Global.set_hint("has_reset", true) + +func _on_boost_timeout(): + if not Global.get_hint("has_boosted") and not Global.using_touch: + display_hint_msg(tr("c.hint.boost").format([display_keybind("boost")])) + +func _on_move_timeout(): + if not Global.get_hint("has_moved") and not Global.using_touch: + display_hint_msg(tr("c.hint.movement").format([", ".join( + [ + display_keybind("forwards"), + display_keybind("left"), + display_keybind("backwards"), + display_keybind("right") + ] + )])) + +func _on_interact_timeout(): + if not Global.get_hint("has_interacted") and not Global.using_touch: + display_hint_msg(tr("c.hint.interact").format([display_keybind("interact")])) + +func _on_reset_timeout(): + if not Global.get_hint("has_reset") and not Global.using_touch: + display_hint_msg(tr("c.hint.reset_camera").format([display_keybind("reset")])) + +func _on_zoom_timeout(): + if not Global.get_hint("has_zoomed") and not Global.using_touch: + display_hint_msg(tr("c.hint.zoom_camera").format([", ".join( + [ + display_keybind("zoom_in"), + display_keybind("zoom_out") + ] + )])) + +func display_keybind(action_name: String) -> String: + var events := InputManager.get_events(action_name) + + if events.size() == 0: + # There are no events which match the action + return tr("c.settings.input.unknown_event") + + for event: InputEvent in events: + # Try to find event which matches input method + var type := InputManager.get_event_type(event) + if Global.using_joypad and type != InputManager.EventType.JOYPAD: + continue + if Global.using_touch and type != InputManager.EventType.TOUCH: + continue + return InputManager.display_input_event(event) + + # No matching event found. Just show any event. + return InputManager.display_input_event(events[0]) + +func any_action_just_pressed(actions: Array) -> bool: + for a: String in actions: + if Input.is_action_just_pressed(a): + return true + return false + +func _on_rotate_camera_timeout(): + if not Global.get_hint("has_rotated") and not Global.using_touch: + display_hint_msg(tr("c.hint.rotate").format([", ".join( + [ + display_keybind("rotate_up"), + display_keybind("rotate_left"), + display_keybind("rotate_down"), + display_keybind("rotate_right") + ] + )])) + +func _on_join_while_running_timeout(): + if not game.is_joined and not Global.get_hint("has_seen_join_while_running"): + Global.set_hint("has_seen_join_while_running", true) + display_hint_msg(tr("c.hint.join_while_running").format([display_keybind("menu")])) + +func _on_performance_timeout() -> void: + if not Global.get_hint("has_seen_performance") and Engine.get_frames_per_second() < DisplayServer.screen_get_refresh_rate() * 0.75: + Global.set_hint("has_seen_performance", true) + display_hint_msg(tr("c.hint.framerate_low")) diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/menu/communicate/popup_message/popup_message.tscn new file mode 100644 index 00000000..799712e1 --- /dev/null +++ b/client/menu/communicate/popup_message/popup_message.tscn @@ -0,0 +1,148 @@ +[gd_scene load_steps=12 format=3 uid="uid://b21nrnkygiyjt"] + +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_a1566"] +[ext_resource type="Script" path="res://menu/communicate/popup_message/popup_message.gd" id="2_sbew6"] +[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="3_2vnom"] +[ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://menu/communicate/popup_message/server_message.tscn" id="3_m3rok"] +[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_pvwmw"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="4_wsrnf"] +[ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/hint.svg" id="5_2dxsd"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"] +shader = ExtResource("3_2vnom") +shader_parameter/blur_amount = 3.5 +shader_parameter/mix_amount = 0.85 +shader_parameter/mix_amount_no_blur = 1.0 +shader_parameter/color_over = Color(0, 0, 0, 1) +shader_parameter/enable_blur = null + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vq4dg"] +bg_color = Color(1, 1, 1, 0.878431) +corner_radius_top_left = 16 +corner_radius_top_right = 16 +corner_radius_bottom_right = 16 +corner_radius_bottom_left = 16 + +[sub_resource type="FontVariation" id="FontVariation_qfltj"] +base_font = ExtResource("4_wsrnf") +variation_embolden = 0.75 + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3rgop"] +content_margin_left = 32.0 +content_margin_top = 8.0 +content_margin_right = 32.0 +content_margin_bottom = 8.0 + +[node name="PopupMessage" type="MarginContainer"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme = ExtResource("1_a1566") +script = ExtResource("2_sbew6") + +[node name="VBox" type="VBoxContainer" parent="."] +layout_mode = 2 +mouse_filter = 2 + +[node name="ServerMessage" parent="VBox" instance=ExtResource("3_m3rok")] +visible = false +layout_mode = 2 + +[node name="HintMessage" type="PanelContainer" parent="VBox"] +visible = false +material = SubResource("ShaderMaterial_k0m35") +layout_mode = 2 +size_flags_vertical = 0 +mouse_filter = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_vq4dg") +script = ExtResource("4_pvwmw") + +[node name="CenterContainer" type="HBoxContainer" parent="VBox/HintMessage"] +layout_mode = 2 +mouse_filter = 2 +alignment = 1 + +[node name="MarginContainer" type="MarginContainer" parent="VBox/HintMessage/CenterContainer"] +layout_mode = 2 +mouse_filter = 2 +theme_override_constants/margin_left = 4 +theme_override_constants/margin_top = 4 +theme_override_constants/margin_right = 4 +theme_override_constants/margin_bottom = 4 + +[node name="TextureRect" type="TextureRect" parent="VBox/HintMessage/CenterContainer/MarginContainer"] +custom_minimum_size = Vector2(28, 28) +layout_mode = 2 +mouse_filter = 2 +texture = ExtResource("5_2dxsd") +expand_mode = 1 +stretch_mode = 4 + +[node name="Label" type="Label" parent="VBox/HintMessage/CenterContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_fonts/font = SubResource("FontVariation_qfltj") +theme_override_styles/normal = SubResource("StyleBoxEmpty_3rgop") +text = "A hint is worth more than a thousand manuals" +autowrap_mode = 3 + +[node name="ServerTimer" type="Timer" parent="."] +wait_time = 5.0 +one_shot = true + +[node name="HintTimer" type="Timer" parent="."] +wait_time = 10.0 +one_shot = true + +[node name="AutoHintTimers" type="Node" parent="."] + +[node name="Move" type="Timer" parent="AutoHintTimers"] +wait_time = 2.0 +one_shot = true + +[node name="Performance" type="Timer" parent="AutoHintTimers"] +wait_time = 20.0 +one_shot = true + +[node name="Boost" type="Timer" parent="AutoHintTimers"] +wait_time = 90.0 +one_shot = true + +[node name="Interact" type="Timer" parent="AutoHintTimers"] +wait_time = 15.0 +one_shot = true + +[node name="RotateCamera" type="Timer" parent="AutoHintTimers"] +wait_time = 120.0 +one_shot = true + +[node name="Zoom" type="Timer" parent="AutoHintTimers"] +wait_time = 135.0 +one_shot = true + +[node name="Reset" type="Timer" parent="."] +wait_time = 10.0 +one_shot = true + +[node name="JoinWhileRunning" type="Timer" parent="."] +wait_time = 5.0 +one_shot = true + +[node name="ServerMessagePositional" type="Node2D" parent="."] +visible = false + +[node name="ServerMessage" parent="ServerMessagePositional" instance=ExtResource("3_m3rok")] + +[connection signal="timeout" from="ServerTimer" to="." method="_on_server_timer_timeout"] +[connection signal="timeout" from="HintTimer" to="." method="_on_hint_timer_timeout"] +[connection signal="timeout" from="AutoHintTimers/Move" to="." method="_on_move_timeout"] +[connection signal="timeout" from="AutoHintTimers/Performance" to="." method="_on_performance_timeout"] +[connection signal="timeout" from="AutoHintTimers/Boost" to="." method="_on_boost_timeout"] +[connection signal="timeout" from="AutoHintTimers/Interact" to="." method="_on_interact_timeout"] +[connection signal="timeout" from="AutoHintTimers/RotateCamera" to="." method="_on_rotate_camera_timeout"] +[connection signal="timeout" from="AutoHintTimers/Zoom" to="." method="_on_zoom_timeout"] +[connection signal="timeout" from="Reset" to="." method="_on_reset_timeout"] +[connection signal="timeout" from="JoinWhileRunning" to="." method="_on_join_while_running_timeout"] diff --git a/client/menu/communicate/popup_message/server_message.tscn b/client/menu/communicate/popup_message/server_message.tscn new file mode 100644 index 00000000..63160942 --- /dev/null +++ b/client/menu/communicate/popup_message/server_message.tscn @@ -0,0 +1,49 @@ +[gd_scene load_steps=8 format=3 uid="uid://dq61p3a8og2b6"] + +[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_qv8ew"] +[ext_resource type="Script" path="res://menu/blur_setup.gd" id="2_80a6b"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="3_dw20j"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"] +shader = ExtResource("1_qv8ew") +shader_parameter/blur_amount = 3.5 +shader_parameter/mix_amount = 0.85 +shader_parameter/mix_amount_no_blur = 0.85 +shader_parameter/color_over = Color(1, 1, 1, 1) +shader_parameter/enable_blur = true + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vq4dg"] +bg_color = Color(1, 1, 1, 0.878431) +corner_radius_top_left = 16 +corner_radius_top_right = 16 +corner_radius_bottom_right = 16 +corner_radius_bottom_left = 16 + +[sub_resource type="FontVariation" id="FontVariation_qfltj"] +base_font = ExtResource("3_dw20j") +variation_embolden = 0.75 + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3rgop"] +content_margin_left = 32.0 +content_margin_top = 8.0 +content_margin_right = 32.0 +content_margin_bottom = 8.0 + +[node name="ServerMessage" type="PanelContainer"] +material = SubResource("ShaderMaterial_q3bbd") +size_flags_horizontal = 4 +size_flags_vertical = 0 +mouse_filter = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_vq4dg") +script = ExtResource("2_80a6b") + +[node name="CenterContainer" type="CenterContainer" parent="."] +layout_mode = 2 +mouse_filter = 2 + +[node name="Label" type="Label" parent="CenterContainer"] +layout_mode = 2 +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = SubResource("FontVariation_qfltj") +theme_override_styles/normal = SubResource("StyleBoxEmpty_3rgop") +text = "Server message" diff --git a/client/menu/game.gd b/client/menu/game.gd index fb0d2fa9..70f28636 100644 --- a/client/menu/game.gd +++ b/client/menu/game.gd @@ -34,7 +34,7 @@ func _input(_event): if Input.is_action_just_pressed("chat"): Sound.play_click() chat_preview.visible = false - await submenu("res://menu/chat/chat_open.tscn") + await submenu("res://menu/communicate/chat/chat_open.tscn") chat_preview.visible = true func _menu_cover(state): diff --git a/client/menu/game.tscn b/client/menu/game.tscn index 23929591..d3a3b446 100644 --- a/client/menu/game.tscn +++ b/client/menu/game.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=7 format=3 uid="uid://bbjwoxs71fnsk"] +[gd_scene load_steps=8 format=3 uid="uid://bbjwoxs71fnsk"] [ext_resource type="Script" path="res://menu/game.gd" id="1_cdpsh"] [ext_resource type="PackedScene" uid="uid://c6krh36hoqfg8" path="res://game.tscn" id="2_uojcy"] [ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="3_i0ytb"] [ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://menu/lobby.tscn" id="3_udxby"] -[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/popup_message/popup_message.tscn" id="5_n1wy0"] -[ext_resource type="PackedScene" uid="uid://xcxbmynn8mhi" path="res://menu/chat/chat_preview.tscn" id="6_dh5lr"] +[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/communicate/popup_message/popup_message.tscn" id="5_n1wy0"] +[ext_resource type="PackedScene" uid="uid://xcxbmynn8mhi" path="res://menu/communicate/chat/chat_preview.tscn" id="6_dh5lr"] +[ext_resource type="PackedScene" uid="uid://dcrr1rwdwbkq8" path="res://menu/communicate/popup_message/pinned_item_messages.tscn" id="7_lf2li"] [node name="GameMenu" type="Control"] layout_mode = 3 @@ -40,3 +41,6 @@ layout_mode = 1 [node name="ChatPreview" parent="." instance=ExtResource("6_dh5lr")] layout_mode = 1 + +[node name="PinnedItemMessages" parent="." instance=ExtResource("7_lf2li")] +layout_mode = 1 diff --git a/client/menu/popup_message/popup_message.gd b/client/menu/popup_message/popup_message.gd deleted file mode 100644 index 6c2c2c0e..00000000 --- a/client/menu/popup_message/popup_message.gd +++ /dev/null @@ -1,230 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 tpart -# Copyright 2024 nokoe -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -extends MarginContainer -class_name PopupMessage - -var is_ingame := false -var is_joined := false - -@onready var server_msg = $VBox/ServerMessage -@onready var server_msg_positional = $ServerMessagePositional -@onready var hint_msg = $VBox/HintMessage - -@onready var server_msg_timer: Timer = $ServerTimer -@onready var hint_msg_timer: Timer = $HintTimer - -@onready var server_msg_label: Label = $VBox/ServerMessage/CenterContainer/Label -@onready var server_msg_positional_label: Label = $ServerMessagePositional/ServerMessage/CenterContainer/Label -@onready var hint_msg_label: Label = $VBox/HintMessage/CenterContainer/Label - -@onready var server_msg_positional_panel: PanelContainer = $ServerMessagePositional/ServerMessage - -@onready var auto_hint_timers: Node = $AutoHintTimers - -@onready var reset_timer = $Reset -@onready var join_while_running_timer = $JoinWhileRunning - -@onready var game: Game = $"../Game" - -var server_message_position := Vector2.ZERO -var last_server_message_panel_size := Vector2.ZERO - -func _ready(): - game.joined.connect( - func player_joined(): - is_joined = true - update_state() - ) - game.left.connect( - func player_joined(): - is_joined = false - update_state() - ) - game.update_tutorial_running.connect( - func a(running: bool): - if running: - stop_game_hints() - else: - update_state() - ) - -func _process(_delta: float): - if server_msg_positional.visible: - var pos_3d = Vector3(server_message_position.x + 0.5, 1.5, server_message_position.y + 0.5) - var pos_2d = get_viewport().get_camera_3d().unproject_position(pos_3d) - var server_message_panel_size = server_msg_positional_panel.size - server_msg_positional.position = pos_2d.clamp(Vector2.ZERO + 0.5 * server_message_panel_size, Vector2(get_viewport_rect().size) - 0.5 * server_message_panel_size) - - if server_message_panel_size != last_server_message_panel_size: - last_server_message_panel_size = server_message_panel_size - server_msg_positional_panel.position = -0.5 * last_server_message_panel_size - -func ingame(): - is_ingame = true - update_state() - -func lobby(): - is_ingame = false - update_state() - -func update_state(): - if is_ingame and is_joined: - start_game_hints() - elif is_ingame: - stop_game_hints() - join_while_running_timer.start() - else: - stop_game_hints() - -func display_server_msg(msg: String, auto_remove := true): - clear_server_msg() - server_msg.show() - server_msg_label.text = msg - - if auto_remove: - server_msg_timer.start() - -func display_server_msg_positional(msg: String, pos: Vector2, auto_remove := true): - clear_server_msg() - server_msg_positional.show() - server_message_position = pos - server_msg_positional_label.text = msg - server_msg_positional_panel.size = Vector2.ZERO - - if auto_remove: - server_msg_timer.start() - -func clear_server_msg(): - server_msg_timer.stop() - server_msg.hide() - server_msg_positional.hide() - -func _on_server_timer_timeout(): - clear_server_msg() - -func display_hint_msg(msg: String): - hint_msg.show() - hint_msg_label.text = msg - hint_msg_timer.start() - -func _on_hint_timer_timeout(): - hint_msg.hide() - -func start_game_hints(): - for c: Timer in auto_hint_timers.get_children(): - c.start() - -func stop_game_hints(): - _on_hint_timer_timeout() - for c: Timer in auto_hint_timers.get_children(): - c.stop() - reset_timer.stop() - join_while_running_timer.stop() - -func _input(_event): - if Input.is_action_just_pressed("boost"): - Global.set_hint("has_boosted", true) - if any_action_just_pressed(["forwards", "backwards", "left", "right"]): - Global.set_hint("has_moved", true) - if any_action_just_pressed(["rotate_left", "rotate_right", "rotate_up", "rotate_down"]): - if not Global.get_hint("has_reset"): - reset_timer.start() - Global.set_hint("has_rotated", true) - if any_action_just_pressed(["zoom_in", "zoom_out"]): - Global.set_hint("has_zoomed", true) - if Input.is_action_just_pressed("interact"): - Global.set_hint("has_interacted", true) - if Input.is_action_just_pressed("reset"): - Global.set_hint("has_reset", true) - -func _on_boost_timeout(): - if not Global.get_hint("has_boosted") and not Global.using_touch: - display_hint_msg(tr("c.hint.boost").format([display_keybind("boost")])) - -func _on_move_timeout(): - if not Global.get_hint("has_moved") and not Global.using_touch: - display_hint_msg(tr("c.hint.movement").format([", ".join( - [ - display_keybind("forwards"), - display_keybind("left"), - display_keybind("backwards"), - display_keybind("right") - ] - )])) - -func _on_interact_timeout(): - if not Global.get_hint("has_interacted") and not Global.using_touch: - display_hint_msg(tr("c.hint.interact").format([display_keybind("interact")])) - -func _on_reset_timeout(): - if not Global.get_hint("has_reset") and not Global.using_touch: - display_hint_msg(tr("c.hint.reset_camera").format([display_keybind("reset")])) - -func _on_zoom_timeout(): - if not Global.get_hint("has_zoomed") and not Global.using_touch: - display_hint_msg(tr("c.hint.zoom_camera").format([", ".join( - [ - display_keybind("zoom_in"), - display_keybind("zoom_out") - ] - )])) - -func display_keybind(action_name: String) -> String: - var events := InputManager.get_events(action_name) - - if events.size() == 0: - # There are no events which match the action - return tr("c.settings.input.unknown_event") - - for event: InputEvent in events: - # Try to find event which matches input method - var type := InputManager.get_event_type(event) - if Global.using_joypad and type != InputManager.EventType.JOYPAD: - continue - if Global.using_touch and type != InputManager.EventType.TOUCH: - continue - return InputManager.display_input_event(event) - - # No matching event found. Just show any event. - return InputManager.display_input_event(events[0]) - -func any_action_just_pressed(actions: Array) -> bool: - for a: String in actions: - if Input.is_action_just_pressed(a): - return true - return false - -func _on_rotate_camera_timeout(): - if not Global.get_hint("has_rotated") and not Global.using_touch: - display_hint_msg(tr("c.hint.rotate").format([", ".join( - [ - display_keybind("rotate_up"), - display_keybind("rotate_left"), - display_keybind("rotate_down"), - display_keybind("rotate_right") - ] - )])) - -func _on_join_while_running_timeout(): - if not game.is_joined and not Global.get_hint("has_seen_join_while_running"): - Global.set_hint("has_seen_join_while_running", true) - display_hint_msg(tr("c.hint.join_while_running").format([display_keybind("menu")])) - -func _on_performance_timeout() -> void: - if not Global.get_hint("has_seen_performance") and Engine.get_frames_per_second() < DisplayServer.screen_get_refresh_rate() * 0.75: - Global.set_hint("has_seen_performance", true) - display_hint_msg(tr("c.hint.framerate_low")) diff --git a/client/menu/popup_message/popup_message.tscn b/client/menu/popup_message/popup_message.tscn deleted file mode 100644 index 659a5b7e..00000000 --- a/client/menu/popup_message/popup_message.tscn +++ /dev/null @@ -1,148 +0,0 @@ -[gd_scene load_steps=12 format=3 uid="uid://b21nrnkygiyjt"] - -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_a1566"] -[ext_resource type="Script" path="res://menu/popup_message/popup_message.gd" id="2_sbew6"] -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="3_2vnom"] -[ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://menu/popup_message/server_message.tscn" id="3_m3rok"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_pvwmw"] -[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="4_wsrnf"] -[ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/hint.svg" id="5_2dxsd"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"] -shader = ExtResource("3_2vnom") -shader_parameter/blur_amount = 3.5 -shader_parameter/mix_amount = 0.85 -shader_parameter/mix_amount_no_blur = 1.0 -shader_parameter/color_over = Color(0, 0, 0, 1) -shader_parameter/enable_blur = null - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vq4dg"] -bg_color = Color(1, 1, 1, 0.878431) -corner_radius_top_left = 16 -corner_radius_top_right = 16 -corner_radius_bottom_right = 16 -corner_radius_bottom_left = 16 - -[sub_resource type="FontVariation" id="FontVariation_qfltj"] -base_font = ExtResource("4_wsrnf") -variation_embolden = 0.75 - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3rgop"] -content_margin_left = 32.0 -content_margin_top = 8.0 -content_margin_right = 32.0 -content_margin_bottom = 8.0 - -[node name="PopupMessage" type="MarginContainer"] -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme = ExtResource("1_a1566") -script = ExtResource("2_sbew6") - -[node name="VBox" type="VBoxContainer" parent="."] -layout_mode = 2 -mouse_filter = 2 - -[node name="ServerMessage" parent="VBox" instance=ExtResource("3_m3rok")] -visible = false -layout_mode = 2 - -[node name="HintMessage" type="PanelContainer" parent="VBox"] -visible = false -material = SubResource("ShaderMaterial_k0m35") -layout_mode = 2 -size_flags_vertical = 0 -mouse_filter = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_vq4dg") -script = ExtResource("4_pvwmw") - -[node name="CenterContainer" type="HBoxContainer" parent="VBox/HintMessage"] -layout_mode = 2 -mouse_filter = 2 -alignment = 1 - -[node name="MarginContainer" type="MarginContainer" parent="VBox/HintMessage/CenterContainer"] -layout_mode = 2 -mouse_filter = 2 -theme_override_constants/margin_left = 4 -theme_override_constants/margin_top = 4 -theme_override_constants/margin_right = 4 -theme_override_constants/margin_bottom = 4 - -[node name="TextureRect" type="TextureRect" parent="VBox/HintMessage/CenterContainer/MarginContainer"] -custom_minimum_size = Vector2(28, 28) -layout_mode = 2 -mouse_filter = 2 -texture = ExtResource("5_2dxsd") -expand_mode = 1 -stretch_mode = 4 - -[node name="Label" type="Label" parent="VBox/HintMessage/CenterContainer"] -layout_mode = 2 -size_flags_horizontal = 3 -theme_override_fonts/font = SubResource("FontVariation_qfltj") -theme_override_styles/normal = SubResource("StyleBoxEmpty_3rgop") -text = "A hint is worth more than a thousand manuals" -autowrap_mode = 3 - -[node name="ServerTimer" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true - -[node name="HintTimer" type="Timer" parent="."] -wait_time = 10.0 -one_shot = true - -[node name="AutoHintTimers" type="Node" parent="."] - -[node name="Move" type="Timer" parent="AutoHintTimers"] -wait_time = 2.0 -one_shot = true - -[node name="Performance" type="Timer" parent="AutoHintTimers"] -wait_time = 20.0 -one_shot = true - -[node name="Boost" type="Timer" parent="AutoHintTimers"] -wait_time = 90.0 -one_shot = true - -[node name="Interact" type="Timer" parent="AutoHintTimers"] -wait_time = 15.0 -one_shot = true - -[node name="RotateCamera" type="Timer" parent="AutoHintTimers"] -wait_time = 120.0 -one_shot = true - -[node name="Zoom" type="Timer" parent="AutoHintTimers"] -wait_time = 135.0 -one_shot = true - -[node name="Reset" type="Timer" parent="."] -wait_time = 10.0 -one_shot = true - -[node name="JoinWhileRunning" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true - -[node name="ServerMessagePositional" type="Node2D" parent="."] -visible = false - -[node name="ServerMessage" parent="ServerMessagePositional" instance=ExtResource("3_m3rok")] - -[connection signal="timeout" from="ServerTimer" to="." method="_on_server_timer_timeout"] -[connection signal="timeout" from="HintTimer" to="." method="_on_hint_timer_timeout"] -[connection signal="timeout" from="AutoHintTimers/Move" to="." method="_on_move_timeout"] -[connection signal="timeout" from="AutoHintTimers/Performance" to="." method="_on_performance_timeout"] -[connection signal="timeout" from="AutoHintTimers/Boost" to="." method="_on_boost_timeout"] -[connection signal="timeout" from="AutoHintTimers/Interact" to="." method="_on_interact_timeout"] -[connection signal="timeout" from="AutoHintTimers/RotateCamera" to="." method="_on_rotate_camera_timeout"] -[connection signal="timeout" from="AutoHintTimers/Zoom" to="." method="_on_zoom_timeout"] -[connection signal="timeout" from="Reset" to="." method="_on_reset_timeout"] -[connection signal="timeout" from="JoinWhileRunning" to="." method="_on_join_while_running_timeout"] diff --git a/client/menu/popup_message/server_message.tscn b/client/menu/popup_message/server_message.tscn deleted file mode 100644 index b7ad98f4..00000000 --- a/client/menu/popup_message/server_message.tscn +++ /dev/null @@ -1,49 +0,0 @@ -[gd_scene load_steps=8 format=3 uid="uid://dq61p3a8og2b6"] - -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_la056"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="2_uinkj"] -[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="3_7fupk"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"] -shader = ExtResource("1_la056") -shader_parameter/blur_amount = 3.5 -shader_parameter/mix_amount = 0.85 -shader_parameter/mix_amount_no_blur = 0.85 -shader_parameter/color_over = Color(1, 1, 1, 1) -shader_parameter/enable_blur = true - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vq4dg"] -bg_color = Color(1, 1, 1, 0.878431) -corner_radius_top_left = 16 -corner_radius_top_right = 16 -corner_radius_bottom_right = 16 -corner_radius_bottom_left = 16 - -[sub_resource type="FontVariation" id="FontVariation_qfltj"] -base_font = ExtResource("3_7fupk") -variation_embolden = 0.75 - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3rgop"] -content_margin_left = 32.0 -content_margin_top = 8.0 -content_margin_right = 32.0 -content_margin_bottom = 8.0 - -[node name="ServerMessage" type="PanelContainer"] -material = SubResource("ShaderMaterial_q3bbd") -size_flags_horizontal = 4 -size_flags_vertical = 0 -mouse_filter = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_vq4dg") -script = ExtResource("2_uinkj") - -[node name="CenterContainer" type="CenterContainer" parent="."] -layout_mode = 2 -mouse_filter = 2 - -[node name="Label" type="Label" parent="CenterContainer"] -layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_fonts/font = SubResource("FontVariation_qfltj") -theme_override_styles/normal = SubResource("StyleBoxEmpty_3rgop") -text = "Server message" diff --git a/client/menu/theme/paper_panel_style.tres b/client/menu/theme/paper_panel_style.tres new file mode 100644 index 00000000..5a8a4a78 --- /dev/null +++ b/client/menu/theme/paper_panel_style.tres @@ -0,0 +1,6 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bqhs5wtdp2oax"] + +[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/theme/paper_texture.tres" id="1_u1kqj"] + +[resource] +texture = ExtResource("1_u1kqj") diff --git a/client/menu/theme/style/item_bubble_progress_style_background.tres b/client/menu/theme/style/item_bubble_progress_style_background.tres new file mode 100644 index 00000000..02362554 --- /dev/null +++ b/client/menu/theme/style/item_bubble_progress_style_background.tres @@ -0,0 +1,5 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://cu0his4018e7h"] + +[resource] +corner_radius_bottom_right = 32 +corner_radius_bottom_left = 32 -- cgit v1.2.3-70-g09d2