From 0d395b08c398aca498e36f1b06a31af1c5e53585 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:37:16 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (292 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/de/ --- locale/de.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/de.ini b/locale/de.ini index 081bf794..556104ad 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -309,7 +309,7 @@ s.error.no_info = Keine Informationen verfügbar. s.error.quoting_invalid = Befehlszeichensetzung ungültig s.error.tutorial_already_running = Das Tuturial läuft bereits s.error.tutorial_no_running = Es läuft kein Tutorial -b.bun.steps = Verarbeiten Sie zunächst das Mehl mit einem Mixer. Machen Sie sich wegen der Verpackung keine Gedanken; sie wird in unauffällige Stücke zerkleinert. Nehmen Sie den Teig sobald dieser eine angemessene Konsistenz hat aus dem Mixer und backen Sie den Teig im Ofen. Warte beim herausnehmen des Brotlaibs, bis dieser abgekühlt ist, und schneide ihn dann auf einem Brett in Scheiben. +b.bun.steps = Verarbeiten Sie zunächst das Mehl mit einem Küchenmachine. Machen Sie sich wegen der Verpackung keine Gedanken; sie wird in unauffällige Stücke zerkleinert. Nehmen Sie den Teig sobald dieser eine angemessene Konsistenz hat aus dem Küchenmachine und backen Sie den Teig im Ofen. Warte beim herausnehmen des Brotlaibs, bis dieser abgekühlt ist, und schneide ihn dann auf einem Brett in Scheiben. b.burger.variation = Der Burger kann in verschiedenen Variationen zubereitet werden, z. B. mit oder ohne Käse oder als Veggie-Burger. b.curry.steps = Die Kokosnuss wird für ihre Milch püriert. Die Tomate und der Lauch wird in der Milch gekocht. Das Curry wird dann mit seperat gekochtem Reis serviert. b.icecream.steps = Die Kokosnuss und die Erdbeere wird püriert in der Küchenmaschine und dann unter kontinuierlichem Umrühren in der gleichen Küchenmaschine gefroren. @@ -317,3 +317,4 @@ b.strawberry_shake.steps = Die Erdbeere und die Kokosnuss werden püriert und da b.burger.steps = Schneide zuerst das Steak auf der Schneideunterlage bis es die Form eines runden Burgerpatties annimmt. Lege das Patty anschließend in die Pfanne und brate es auf mittlerer Hitze für zwei Minuten. In der Zwischenzeit kannst du das Gemüße kleinschneiden, wobei jedes Stück in eine einzige Scheibe geschnitten werden sollte. Schneide danach das Brötchen in zwei Hälften. Abschließend, sobald das Patty fertig gebraten ist, staple das aufgeschnittene Brötchen, das Gemüße und das Patty auf eine Teller und serviere das fertige Gericht. Et Voilà. b.tomato_soup.steps = Nimm zuerst eine frische Tomate und püriere sie in einem speziell hellblauen Edelstahlmixer bis sie einer feinen Paste ähnelt. Fülle besagte Paste in einen großen Topf deine Wahl und füge einen ganzen Lauch hinzu. Koche diese Mischung bis die Konsistenz homogen ist und die Farbe apettitlich aussieht. Serviere die Suppe auf einem Teller und genieße sie! b.mochi.steps = Mahle die dir zuerst dein eigenes Reismehl aus ganzen Reiskörnern in der Küchenmaschine. Erhitze dies danach vorsichtig in einem Topf und forme den sich ergebenden Teig um eine Erdbeere. +b.dishes = Hauptspeisen -- cgit v1.2.3-70-g09d2 From 7e22f9ecb46167bfb0ae9a927c4c304f1fa2f7ad Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:41:40 +0000 Subject: Translated using Weblate (French) Currently translated at 38.6% (113 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/fr/ --- locale/fr.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/fr.ini b/locale/fr.ini index 02959be8..3d785693 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -161,3 +161,4 @@ unknown732= unknown736= unknown740=Regarder unknown752= +b.about.image_attrib = Attribution de l'image d'arrière-plan -- cgit v1.2.3-70-g09d2 From cc8d14a6d59e6db7057356697a6fd596930a9c90 Mon Sep 17 00:00:00 2001 From: Vistaus Date: Thu, 3 Oct 2024 18:51:42 +0000 Subject: Translated using Weblate (Dutch) Currently translated at 85.6% (250 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/nl/ --- locale/nl.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/nl.ini b/locale/nl.ini index e975f473..74e23375 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -266,3 +266,7 @@ c.settings.gameplay.vibration = Trillingen inschakelen c.menu.deny = Weigeren c.play.allow_query_registry = Wil je in het register zoeken naar openbare servers? c.error.select_hairstyle = Kies een haarstijl. +b.about.image_attrib = Maker van achtergrondafbeelding +b.about.name = Het Hurry Curry!-receptenboek. +b.about = Over dit boek +b.bun.desc = De meest verzadigende maaltijd van allemaal. Serveer met tomatensoep. -- cgit v1.2.3-70-g09d2 From 5772f85a9758bb6026237a1888fe4aa82797a269 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:42:11 +0000 Subject: Added translation using Weblate (Korean) --- locale/ko.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/ko.ini diff --git a/locale/ko.ini b/locale/ko.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/locale/ko.ini @@ -0,0 +1 @@ + -- cgit v1.2.3-70-g09d2 From fcdf6e834728332564b8c2491f465b8ae1a2ee19 Mon Sep 17 00:00:00 2001 From: Outbreak2096 Date: Fri, 4 Oct 2024 00:22:36 +0000 Subject: Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.3% (291 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/zh_Hans/ --- locale/zh_Hans.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index 4e0940bc..4304b46e 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -318,3 +318,4 @@ s.error.tutorial_already_running = 教程已在运行 b.ingred.cheese = 一块奶酪 b.ingred.steak = 一块生牛排 b.ingred.strawberry = 一颗草莓 +b.curry.desc = 这道开胃且充满异国情调的菜肴会在寒冷的日子里为您带来温暖，并赋予您新的力量。 -- cgit v1.2.3-70-g09d2 From dbadc96e4699a35f67e405972340bdc5536dbf0a Mon Sep 17 00:00:00 2001 From: Outbreak2096 Date: Fri, 4 Oct 2024 00:27:29 +0000 Subject: Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (293 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/zh_Hans/ --- locale/zh_Hans.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index 4304b46e..6b68b3c7 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -281,7 +281,7 @@ b.drinks = 饮料 b.bun.steps = 首先用食品加工机加工面粉。不要介意袋子，它会被撕成不可见的碎片。面团达到可操作的稠度后，就将其从食品加工机中取出并放入烤箱中烘烤。取出面包后，等待其冷却，然后在砧板上切片。 b.burger.variation = 汉堡有多种做法，如不加奶酪或作为素食汉堡。 b.burger = 汉堡 -b.curry.steps = 将椰子磨成泥，取椰奶，番茄和韭菜放入椰奶中煮熟，咖喱与单独煮好的米饭一起上桌。 +b.curry.steps = 首先，从椰子中榨出椰奶。最有效的方法是用食品加工机将整个椰子切碎。不要在意混合物中的木屑，它们不重要！椰子完全搅匀后，您可以将一整个番茄和一整根韭菜放入锅中，无需切碎，因为它们在椰奶中煮沸时会变成糊状。不要浪费时间等待酱汁，而是最好将其用于烹饪菜肴的主要成分：米饭。将其放入锅中。这里不需要加水，这是一种特殊的自我保湿大米品种！完成后，只需将两部分混合即可享用！ b.curry = 咖喱饭 b.about.name = Hurry Curry！食谱书。 b.about.image_attrib = 背景图片署名 @@ -319,3 +319,4 @@ b.ingred.cheese = 一块奶酪 b.ingred.steak = 一块生牛排 b.ingred.strawberry = 一颗草莓 b.curry.desc = 这道开胃且充满异国情调的菜肴会在寒冷的日子里为您带来温暖，并赋予您新的力量。 +b.dishes = 菜肴 -- cgit v1.2.3-70-g09d2 From 0c455ab813f72870481b983edfb76f8257c7699f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 4 Oct 2024 16:06:07 +0000 Subject: Translated using Weblate (German) Currently translated at 99.6% (292 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/de/ --- locale/de.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/de.ini b/locale/de.ini index 556104ad..d3723932 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -318,3 +318,4 @@ b.burger.steps = Schneide zuerst das Steak auf der Schneideunterlage bis es die b.tomato_soup.steps = Nimm zuerst eine frische Tomate und püriere sie in einem speziell hellblauen Edelstahlmixer bis sie einer feinen Paste ähnelt. Fülle besagte Paste in einen großen Topf deine Wahl und füge einen ganzen Lauch hinzu. Koche diese Mischung bis die Konsistenz homogen ist und die Farbe apettitlich aussieht. Serviere die Suppe auf einem Teller und genieße sie! b.mochi.steps = Mahle die dir zuerst dein eigenes Reismehl aus ganzen Reiskörnern in der Küchenmaschine. Erhitze dies danach vorsichtig in einem Topf und forme den sich ergebenden Teig um eine Erdbeere. b.dishes = Hauptspeisen +b.curry.desc = Diese appettitliche und exotische Gericht wärmt dich an kalten Tagen und verleiht die neue Stärke. -- cgit v1.2.3-70-g09d2 From 0c596da02fbb9f6b6701ec96ce7966ca3d3d810e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 6 Oct 2024 10:16:06 +0000 Subject: Added translation using Weblate (Greek) --- locale/el.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/el.ini diff --git a/locale/el.ini b/locale/el.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/locale/el.ini @@ -0,0 +1 @@ + -- cgit v1.2.3-70-g09d2 From 7f95091f799d5a95854008b1475b341ec60b0352 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 6 Oct 2024 17:19:43 +0200 Subject: fix dishwasher crash, fixes #216 --- server/bot/src/algos/dishwasher.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/bot/src/algos/dishwasher.rs b/server/bot/src/algos/dishwasher.rs index bfe57d0c..b52b72d1 100644 --- a/server/bot/src/algos/dishwasher.rs +++ b/server/bot/src/algos/dishwasher.rs @@ -99,10 +99,9 @@ impl Context<'_, DishWasher> { self.assert_tile_is_clear(pos)?; } if self.is_hand_item(self.state.dirty_plate.unwrap()) { - self.interact_with( - self.find_empty_interactable_tile_by_name("sink").unwrap(), - 2.0, - )?; + if let Some(sink) = self.find_empty_interactable_tile_by_name("sink") { + self.interact_with(sink, 2.0)?; + } } self.assert_hand_is_clear()?; Ok(()) -- cgit v1.2.3-70-g09d2 From 5f525f9331b19d18760685d57365eb6a1702a47c Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 6 Oct 2024 17:32:23 +0200 Subject: Modify file structure --- client/menu/arrow.svg | 1 - client/menu/arrow.svg.import | 37 ------------------- client/menu/arrow_focus.svg | 1 - client/menu/arrow_focus.svg.import | 37 ------------------- client/menu/arrow_hover.svg | 1 - client/menu/arrow_hover.svg.import | 37 ------------------- client/menu/arrow_pressed.svg | 1 - client/menu/arrow_pressed.svg.import | 37 ------------------- client/menu/boost.webp | Bin 3670 -> 0 bytes client/menu/boost.webp.import | 34 ------------------ client/menu/character.tscn | 8 ++--- client/menu/circle.svg | 1 - client/menu/circle.svg.import | 37 ------------------- .../communicate/popup_message/popup_message.tscn | 2 +- client/menu/hint.svg | 10 ------ client/menu/hint.svg.import | 37 ------------------- client/menu/icons/arrow.svg | 1 + client/menu/icons/arrow.svg.import | 37 +++++++++++++++++++ client/menu/icons/arrow_focus.svg | 1 + client/menu/icons/arrow_focus.svg.import | 37 +++++++++++++++++++ client/menu/icons/arrow_hover.svg | 1 + client/menu/icons/arrow_hover.svg.import | 37 +++++++++++++++++++ client/menu/icons/arrow_pressed.svg | 1 + client/menu/icons/arrow_pressed.svg.import | 37 +++++++++++++++++++ client/menu/icons/boost.webp | Bin 0 -> 3670 bytes client/menu/icons/boost.webp.import | 34 ++++++++++++++++++ client/menu/icons/circle.svg | 1 + client/menu/icons/circle.svg.import | 37 +++++++++++++++++++ client/menu/icons/hint.svg | 10 ++++++ client/menu/icons/hint.svg.import | 37 +++++++++++++++++++ client/menu/icons/interact.webp | Bin 0 -> 3604 bytes client/menu/icons/interact.webp.import | 34 ++++++++++++++++++ client/menu/icons/pause.webp | Bin 0 -> 3144 bytes client/menu/icons/pause.webp.import | 34 ++++++++++++++++++ client/menu/icons/plus.svg | 4 +++ client/menu/icons/plus.svg.import | 37 +++++++++++++++++++ client/menu/icons/reset.svg | 39 +++++++++++++++++++++ client/menu/icons/reset.svg.import | 37 +++++++++++++++++++ client/menu/icons/user.webp | Bin 0 -> 15122 bytes client/menu/icons/user.webp.import | 34 ++++++++++++++++++ client/menu/interact.webp | Bin 3604 -> 0 bytes client/menu/interact.webp.import | 34 ------------------ client/menu/lobby.tscn | 8 ++--- client/menu/lobby/player.tscn | 2 +- client/menu/pause.webp | Bin 3144 -> 0 bytes client/menu/pause.webp.import | 34 ------------------ client/menu/plus.svg | 4 --- client/menu/plus.svg.import | 37 ------------------- client/menu/reset.svg | 39 --------------------- client/menu/reset.svg.import | 37 ------------------- client/menu/settings/input/input_value_node.tscn | 2 +- client/menu/settings/settings_row.tscn | 2 +- client/menu/user.webp | Bin 15122 -> 0 bytes client/menu/user.webp.import | 34 ------------------ client/player/onscreen_controls/controls.tscn | 6 ++-- 55 files changed, 505 insertions(+), 505 deletions(-) delete mode 100644 client/menu/arrow.svg delete mode 100644 client/menu/arrow.svg.import delete mode 100644 client/menu/arrow_focus.svg delete mode 100644 client/menu/arrow_focus.svg.import delete mode 100644 client/menu/arrow_hover.svg delete mode 100644 client/menu/arrow_hover.svg.import delete mode 100644 client/menu/arrow_pressed.svg delete mode 100644 client/menu/arrow_pressed.svg.import delete mode 100644 client/menu/boost.webp delete mode 100644 client/menu/boost.webp.import delete mode 100644 client/menu/circle.svg delete mode 100644 client/menu/circle.svg.import delete mode 100644 client/menu/hint.svg delete mode 100644 client/menu/hint.svg.import create mode 100644 client/menu/icons/arrow.svg create mode 100644 client/menu/icons/arrow.svg.import create mode 100644 client/menu/icons/arrow_focus.svg create mode 100644 client/menu/icons/arrow_focus.svg.import create mode 100644 client/menu/icons/arrow_hover.svg create mode 100644 client/menu/icons/arrow_hover.svg.import create mode 100644 client/menu/icons/arrow_pressed.svg create mode 100644 client/menu/icons/arrow_pressed.svg.import create mode 100644 client/menu/icons/boost.webp create mode 100644 client/menu/icons/boost.webp.import create mode 100644 client/menu/icons/circle.svg create mode 100644 client/menu/icons/circle.svg.import create mode 100644 client/menu/icons/hint.svg create mode 100644 client/menu/icons/hint.svg.import create mode 100644 client/menu/icons/interact.webp create mode 100644 client/menu/icons/interact.webp.import create mode 100644 client/menu/icons/pause.webp create mode 100644 client/menu/icons/pause.webp.import create mode 100644 client/menu/icons/plus.svg create mode 100644 client/menu/icons/plus.svg.import create mode 100644 client/menu/icons/reset.svg create mode 100644 client/menu/icons/reset.svg.import create mode 100644 client/menu/icons/user.webp create mode 100644 client/menu/icons/user.webp.import delete mode 100644 client/menu/interact.webp delete mode 100644 client/menu/interact.webp.import delete mode 100644 client/menu/pause.webp delete mode 100644 client/menu/pause.webp.import delete mode 100644 client/menu/plus.svg delete mode 100644 client/menu/plus.svg.import delete mode 100644 client/menu/reset.svg delete mode 100644 client/menu/reset.svg.import delete mode 100644 client/menu/user.webp delete mode 100644 client/menu/user.webp.import diff --git a/client/menu/arrow.svg b/client/menu/arrow.svg deleted file mode 100644 index bafc9e69..00000000 --- a/client/menu/arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/menu/arrow.svg.import b/client/menu/arrow.svg.import deleted file mode 100644 index 198224ad..00000000 --- a/client/menu/arrow.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://35rd5gamtyqm" -path="res://.godot/imported/arrow.svg-41f5cc1ac36d42c934f574d48bb6dcd0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/arrow.svg" -dest_files=["res://.godot/imported/arrow.svg-41f5cc1ac36d42c934f574d48bb6dcd0.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/arrow_focus.svg b/client/menu/arrow_focus.svg deleted file mode 100644 index 456f0261..00000000 --- a/client/menu/arrow_focus.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/menu/arrow_focus.svg.import b/client/menu/arrow_focus.svg.import deleted file mode 100644 index 5643398a..00000000 --- a/client/menu/arrow_focus.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://by3qsrpxnfq4w" -path="res://.godot/imported/arrow_focus.svg-796c7015ab25a208e0703cc077245567.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/arrow_focus.svg" -dest_files=["res://.godot/imported/arrow_focus.svg-796c7015ab25a208e0703cc077245567.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/arrow_hover.svg b/client/menu/arrow_hover.svg deleted file mode 100644 index 098063ec..00000000 --- a/client/menu/arrow_hover.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/menu/arrow_hover.svg.import b/client/menu/arrow_hover.svg.import deleted file mode 100644 index c8811de2..00000000 --- a/client/menu/arrow_hover.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b33qmctbpf48g" -path="res://.godot/imported/arrow_hover.svg-e30a6426cf1ccd3c2d183c20eb7b0d9a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/arrow_hover.svg" -dest_files=["res://.godot/imported/arrow_hover.svg-e30a6426cf1ccd3c2d183c20eb7b0d9a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/arrow_pressed.svg b/client/menu/arrow_pressed.svg deleted file mode 100644 index 1abd9a8f..00000000 --- a/client/menu/arrow_pressed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/menu/arrow_pressed.svg.import b/client/menu/arrow_pressed.svg.import deleted file mode 100644 index 74d1dffe..00000000 --- a/client/menu/arrow_pressed.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://j75dbytlbju" -path="res://.godot/imported/arrow_pressed.svg-27eedadced7da045a9df177b0099000b.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/arrow_pressed.svg" -dest_files=["res://.godot/imported/arrow_pressed.svg-27eedadced7da045a9df177b0099000b.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/boost.webp b/client/menu/boost.webp deleted file mode 100644 index afea92df..00000000 Binary files a/client/menu/boost.webp and /dev/null differ diff --git a/client/menu/boost.webp.import b/client/menu/boost.webp.import deleted file mode 100644 index 999115e7..00000000 --- a/client/menu/boost.webp.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bnxllatlo4clg" -path="res://.godot/imported/boost.webp-e0fa5b3507b36424ead2769ac2e73472.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/boost.webp" -dest_files=["res://.godot/imported/boost.webp-e0fa5b3507b36424ead2769ac2e73472.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/client/menu/character.tscn b/client/menu/character.tscn index 463fd4fe..648051e5 100644 --- a/client/menu/character.tscn +++ b/client/menu/character.tscn @@ -5,10 +5,10 @@ [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_6mc88"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"] -[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/arrow.svg" id="5_kvd7k"] -[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/arrow_pressed.svg" id="5_xpff8"] -[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/arrow_hover.svg" id="6_soj8g"] -[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/arrow_focus.svg" id="6_u31hl"] +[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="5_kvd7k"] +[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="5_xpff8"] +[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="6_soj8g"] +[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_u31hl"] [sub_resource type="Environment" id="Environment_ex25y"] background_mode = 1 diff --git a/client/menu/circle.svg b/client/menu/circle.svg deleted file mode 100644 index 05fab1cb..00000000 --- a/client/menu/circle.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/client/menu/circle.svg.import b/client/menu/circle.svg.import deleted file mode 100644 index dcc19684..00000000 --- a/client/menu/circle.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d2xf8qdh01e41" -path="res://.godot/imported/circle.svg-d0b2fb05ade8e48b77faa1fda965eee3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/circle.svg" -dest_files=["res://.godot/imported/circle.svg-d0b2fb05ade8e48b77faa1fda965eee3.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/menu/communicate/popup_message/popup_message.tscn index 880e8670..5131cbf7 100644 --- a/client/menu/communicate/popup_message/popup_message.tscn +++ b/client/menu/communicate/popup_message/popup_message.tscn @@ -6,7 +6,7 @@ [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"] +[ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/icons/hint.svg" id="5_2dxsd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"] shader = ExtResource("3_2vnom") diff --git a/client/menu/hint.svg b/client/menu/hint.svg deleted file mode 100644 index ad64de91..00000000 --- a/client/menu/hint.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/client/menu/hint.svg.import b/client/menu/hint.svg.import deleted file mode 100644 index 9f5eba04..00000000 --- a/client/menu/hint.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b2uv5rf0enikf" -path="res://.godot/imported/hint.svg-84d80eb00de22610835892179ff94034.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/hint.svg" -dest_files=["res://.godot/imported/hint.svg-84d80eb00de22610835892179ff94034.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/arrow.svg b/client/menu/icons/arrow.svg new file mode 100644 index 00000000..bafc9e69 --- /dev/null +++ b/client/menu/icons/arrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/menu/icons/arrow.svg.import b/client/menu/icons/arrow.svg.import new file mode 100644 index 00000000..2338d88e --- /dev/null +++ b/client/menu/icons/arrow.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://35rd5gamtyqm" +path="res://.godot/imported/arrow.svg-4b2b120f303a2e998d242c78a6966282.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/arrow.svg" +dest_files=["res://.godot/imported/arrow.svg-4b2b120f303a2e998d242c78a6966282.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/arrow_focus.svg b/client/menu/icons/arrow_focus.svg new file mode 100644 index 00000000..456f0261 --- /dev/null +++ b/client/menu/icons/arrow_focus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/menu/icons/arrow_focus.svg.import b/client/menu/icons/arrow_focus.svg.import new file mode 100644 index 00000000..19b426b8 --- /dev/null +++ b/client/menu/icons/arrow_focus.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://by3qsrpxnfq4w" +path="res://.godot/imported/arrow_focus.svg-54159cec20654fda644690185faf6883.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/arrow_focus.svg" +dest_files=["res://.godot/imported/arrow_focus.svg-54159cec20654fda644690185faf6883.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/arrow_hover.svg b/client/menu/icons/arrow_hover.svg new file mode 100644 index 00000000..098063ec --- /dev/null +++ b/client/menu/icons/arrow_hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/menu/icons/arrow_hover.svg.import b/client/menu/icons/arrow_hover.svg.import new file mode 100644 index 00000000..6530e4bb --- /dev/null +++ b/client/menu/icons/arrow_hover.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b33qmctbpf48g" +path="res://.godot/imported/arrow_hover.svg-7a4a56e502ea35101b318789923c1f47.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/arrow_hover.svg" +dest_files=["res://.godot/imported/arrow_hover.svg-7a4a56e502ea35101b318789923c1f47.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/arrow_pressed.svg b/client/menu/icons/arrow_pressed.svg new file mode 100644 index 00000000..1abd9a8f --- /dev/null +++ b/client/menu/icons/arrow_pressed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/menu/icons/arrow_pressed.svg.import b/client/menu/icons/arrow_pressed.svg.import new file mode 100644 index 00000000..0958f395 --- /dev/null +++ b/client/menu/icons/arrow_pressed.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://j75dbytlbju" +path="res://.godot/imported/arrow_pressed.svg-064136a9c6bd871ed0ad5fd10df7ddf7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/arrow_pressed.svg" +dest_files=["res://.godot/imported/arrow_pressed.svg-064136a9c6bd871ed0ad5fd10df7ddf7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/boost.webp b/client/menu/icons/boost.webp new file mode 100644 index 00000000..afea92df Binary files /dev/null and b/client/menu/icons/boost.webp differ diff --git a/client/menu/icons/boost.webp.import b/client/menu/icons/boost.webp.import new file mode 100644 index 00000000..a7c0768b --- /dev/null +++ b/client/menu/icons/boost.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnxllatlo4clg" +path="res://.godot/imported/boost.webp-650c006bc54ab6e0ac3213a966d84ecd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/boost.webp" +dest_files=["res://.godot/imported/boost.webp-650c006bc54ab6e0ac3213a966d84ecd.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/client/menu/icons/circle.svg b/client/menu/icons/circle.svg new file mode 100644 index 00000000..05fab1cb --- /dev/null +++ b/client/menu/icons/circle.svg @@ -0,0 +1 @@ + diff --git a/client/menu/icons/circle.svg.import b/client/menu/icons/circle.svg.import new file mode 100644 index 00000000..bb92ad4f --- /dev/null +++ b/client/menu/icons/circle.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2xf8qdh01e41" +path="res://.godot/imported/circle.svg-f3244b3d13a0268ef24c94d9e07216c2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/circle.svg" +dest_files=["res://.godot/imported/circle.svg-f3244b3d13a0268ef24c94d9e07216c2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/hint.svg b/client/menu/icons/hint.svg new file mode 100644 index 00000000..ad64de91 --- /dev/null +++ b/client/menu/icons/hint.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/client/menu/icons/hint.svg.import b/client/menu/icons/hint.svg.import new file mode 100644 index 00000000..e658d219 --- /dev/null +++ b/client/menu/icons/hint.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2uv5rf0enikf" +path="res://.godot/imported/hint.svg-df98298ece507a1bda0092ad9e5243d5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/hint.svg" +dest_files=["res://.godot/imported/hint.svg-df98298ece507a1bda0092ad9e5243d5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/interact.webp b/client/menu/icons/interact.webp new file mode 100644 index 00000000..cf57c4c0 Binary files /dev/null and b/client/menu/icons/interact.webp differ diff --git a/client/menu/icons/interact.webp.import b/client/menu/icons/interact.webp.import new file mode 100644 index 00000000..daf614c6 --- /dev/null +++ b/client/menu/icons/interact.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcgt82qkya880" +path="res://.godot/imported/interact.webp-8116b5d17f0ba3d9118b7be9331681ba.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/interact.webp" +dest_files=["res://.godot/imported/interact.webp-8116b5d17f0ba3d9118b7be9331681ba.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/client/menu/icons/pause.webp b/client/menu/icons/pause.webp new file mode 100644 index 00000000..24ec72d8 Binary files /dev/null and b/client/menu/icons/pause.webp differ diff --git a/client/menu/icons/pause.webp.import b/client/menu/icons/pause.webp.import new file mode 100644 index 00000000..c15aee7b --- /dev/null +++ b/client/menu/icons/pause.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://qto5rj6wlaeb" +path="res://.godot/imported/pause.webp-dc4a5d6b868b49810e4c5551e3a25757.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/pause.webp" +dest_files=["res://.godot/imported/pause.webp-dc4a5d6b868b49810e4c5551e3a25757.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/client/menu/icons/plus.svg b/client/menu/icons/plus.svg new file mode 100644 index 00000000..c79169ba --- /dev/null +++ b/client/menu/icons/plus.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/client/menu/icons/plus.svg.import b/client/menu/icons/plus.svg.import new file mode 100644 index 00000000..f951a1af --- /dev/null +++ b/client/menu/icons/plus.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnfjbowd2i02r" +path="res://.godot/imported/plus.svg-84dacc0e61bf1916a177b38a64ba42e2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/plus.svg" +dest_files=["res://.godot/imported/plus.svg-84dacc0e61bf1916a177b38a64ba42e2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/reset.svg b/client/menu/icons/reset.svg new file mode 100644 index 00000000..660d7759 --- /dev/null +++ b/client/menu/icons/reset.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/client/menu/icons/reset.svg.import b/client/menu/icons/reset.svg.import new file mode 100644 index 00000000..cecca8e4 --- /dev/null +++ b/client/menu/icons/reset.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cucnmy0j5n8l8" +path="res://.godot/imported/reset.svg-8a32af0c84ee1d00a467a7630ce0a918.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/reset.svg" +dest_files=["res://.godot/imported/reset.svg-8a32af0c84ee1d00a467a7630ce0a918.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/client/menu/icons/user.webp b/client/menu/icons/user.webp new file mode 100644 index 00000000..5bba0540 Binary files /dev/null and b/client/menu/icons/user.webp differ diff --git a/client/menu/icons/user.webp.import b/client/menu/icons/user.webp.import new file mode 100644 index 00000000..1b8fbb89 --- /dev/null +++ b/client/menu/icons/user.webp.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://222w1wha75od" +path="res://.godot/imported/user.webp-de27cb424a236a023aa54d8999333695.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://menu/icons/user.webp" +dest_files=["res://.godot/imported/user.webp-de27cb424a236a023aa54d8999333695.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/client/menu/interact.webp b/client/menu/interact.webp deleted file mode 100644 index cf57c4c0..00000000 Binary files a/client/menu/interact.webp and /dev/null differ diff --git a/client/menu/interact.webp.import b/client/menu/interact.webp.import deleted file mode 100644 index 55ec9275..00000000 --- a/client/menu/interact.webp.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dcgt82qkya880" -path="res://.godot/imported/interact.webp-ad70044ea6f17b27fedc400ffc5d7eb5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/interact.webp" -dest_files=["res://.godot/imported/interact.webp-ad70044ea6f17b27fedc400ffc5d7eb5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index 909a14cb..f2cb7b93 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -4,11 +4,11 @@ [ext_resource type="Script" path="res://menu/lobby.gd" id="2_7657i"] [ext_resource type="StyleBox" uid="uid://de80aw86emnql" path="res://menu/theme/style/lobby_panel_override.tres" id="3_6iqoe"] [ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_esmbx"] -[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/arrow.svg" id="3_jxleg"] -[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/arrow_pressed.svg" id="4_eapmn"] +[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="3_jxleg"] +[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="4_eapmn"] [ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_am8pt"] -[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/arrow_hover.svg" id="5_odwav"] -[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/arrow_focus.svg" id="6_tulu3"] +[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="5_odwav"] +[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_tulu3"] [ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"] [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"] diff --git a/client/menu/lobby/player.tscn b/client/menu/lobby/player.tscn index 964bc4fb..73c1f7f6 100644 --- a/client/menu/lobby/player.tscn +++ b/client/menu/lobby/player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://gmldnel4xbxy"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_flfqn"] -[ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://menu/user.webp" id="2_mnaqt"] +[ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://menu/icons/user.webp" id="2_mnaqt"] [ext_resource type="Script" path="res://menu/lobby/player.gd" id="2_w3lyk"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1227j"] diff --git a/client/menu/pause.webp b/client/menu/pause.webp deleted file mode 100644 index 24ec72d8..00000000 Binary files a/client/menu/pause.webp and /dev/null differ diff --git a/client/menu/pause.webp.import b/client/menu/pause.webp.import deleted file mode 100644 index d132a237..00000000 --- a/client/menu/pause.webp.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://qto5rj6wlaeb" -path="res://.godot/imported/pause.webp-109d517ceb320a1dc8b8c95512f630f5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/pause.webp" -dest_files=["res://.godot/imported/pause.webp-109d517ceb320a1dc8b8c95512f630f5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/client/menu/plus.svg b/client/menu/plus.svg deleted file mode 100644 index c79169ba..00000000 --- a/client/menu/plus.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/client/menu/plus.svg.import b/client/menu/plus.svg.import deleted file mode 100644 index 13058c11..00000000 --- a/client/menu/plus.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cnfjbowd2i02r" -path="res://.godot/imported/plus.svg-9648647cb056d51ef71ca6c84e7bca36.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/plus.svg" -dest_files=["res://.godot/imported/plus.svg-9648647cb056d51ef71ca6c84e7bca36.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/reset.svg b/client/menu/reset.svg deleted file mode 100644 index 660d7759..00000000 --- a/client/menu/reset.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - diff --git a/client/menu/reset.svg.import b/client/menu/reset.svg.import deleted file mode 100644 index cf012583..00000000 --- a/client/menu/reset.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cucnmy0j5n8l8" -path="res://.godot/imported/reset.svg-8568f92cfa4ad303d2cf2ad8267c710f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/reset.svg" -dest_files=["res://.godot/imported/reset.svg-8568f92cfa4ad303d2cf2ad8267c710f.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/menu/settings/input/input_value_node.tscn b/client/menu/settings/input/input_value_node.tscn index 496bfaa0..0132a5dc 100644 --- a/client/menu/settings/input/input_value_node.tscn +++ b/client/menu/settings/input/input_value_node.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://c6r0nv5daq7wc"] [ext_resource type="Script" path="res://menu/settings/input/input_value_node.gd" id="1_snxax"] -[ext_resource type="Texture2D" uid="uid://cnfjbowd2i02r" path="res://menu/plus.svg" id="2_3vlvc"] +[ext_resource type="Texture2D" uid="uid://cnfjbowd2i02r" path="res://menu/icons/plus.svg" id="2_3vlvc"] [node name="InputValueNode" type="VBoxContainer"] offset_right = 128.0 diff --git a/client/menu/settings/settings_row.tscn b/client/menu/settings/settings_row.tscn index cd2e3b4b..ba43fed7 100644 --- a/client/menu/settings/settings_row.tscn +++ b/client/menu/settings/settings_row.tscn @@ -3,7 +3,7 @@ [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_iij3k"] [ext_resource type="Script" path="res://menu/settings/settings_row.gd" id="2_l8i7p"] [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="3_7k5da"] -[ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://menu/reset.svg" id="4_bj3dr"] +[ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://menu/icons/reset.svg" id="4_bj3dr"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_pk3rs"] content_margin_left = 16.0 diff --git a/client/menu/user.webp b/client/menu/user.webp deleted file mode 100644 index 5bba0540..00000000 Binary files a/client/menu/user.webp and /dev/null differ diff --git a/client/menu/user.webp.import b/client/menu/user.webp.import deleted file mode 100644 index 112cf9b8..00000000 --- a/client/menu/user.webp.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://222w1wha75od" -path="res://.godot/imported/user.webp-257e5395baacd6a382811f4f2dd7cd93.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://menu/user.webp" -dest_files=["res://.godot/imported/user.webp-257e5395baacd6a382811f4f2dd7cd93.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/client/player/onscreen_controls/controls.tscn b/client/player/onscreen_controls/controls.tscn index 0d09504f..a833b69f 100644 --- a/client/player/onscreen_controls/controls.tscn +++ b/client/player/onscreen_controls/controls.tscn @@ -2,9 +2,9 @@ [ext_resource type="PackedScene" uid="uid://dmr0fcamx7t56" path="res://player/onscreen_controls/virtual_joystick_scene.tscn" id="1_4k4lh"] [ext_resource type="Script" path="res://player/onscreen_controls/controls.gd" id="1_rnoki"] -[ext_resource type="Texture2D" uid="uid://bnxllatlo4clg" path="res://menu/boost.webp" id="2_i4ife"] -[ext_resource type="Texture2D" uid="uid://dcgt82qkya880" path="res://menu/interact.webp" id="3_37rne"] -[ext_resource type="Texture2D" uid="uid://qto5rj6wlaeb" path="res://menu/pause.webp" id="5_4bttq"] +[ext_resource type="Texture2D" uid="uid://bnxllatlo4clg" path="res://menu/icons/boost.webp" id="2_i4ife"] +[ext_resource type="Texture2D" uid="uid://dcgt82qkya880" path="res://menu/icons/interact.webp" id="3_37rne"] +[ext_resource type="Texture2D" uid="uid://qto5rj6wlaeb" path="res://menu/icons/pause.webp" id="5_4bttq"] [node name="UI" type="CanvasLayer"] script = ExtResource("1_rnoki") -- cgit v1.2.3-70-g09d2 From e64753b4394be3b329a10e3e9cc06efbbc91266d Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 6 Oct 2024 17:32:52 +0200 Subject: refactor selector code; fixes #214 --- client/player/controllable_player.gd | 19 +++++++++++-------- client/player/player.gd | 1 - 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 8c907efa..3a245e1a 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -39,7 +39,7 @@ var current_vibration_strength := 0. var current_vibration_change := 0. var target: Vector2i = Vector2i(0, 0) -var last_interaction: Vector2i = Vector2i(0, 0) +var last_interaction = null func _ready(): vibration_timer = Timer.new() @@ -205,20 +205,23 @@ func take_item(tile: Tile): func interact(): if not is_input_enabled(): return var tile = game.map.get_tile_instance(target) - if tile != null and not last_interaction == target: - if interacting: + if tile != null: + marker.visible = true + + # clear last interaction if target has moved since + if last_interaction != null and not last_interaction == target: game.mp.send_tile_interact(game.player_id, last_interaction, false) + marker.set_interacting(false) + last_interaction = null marker.set_interactive(game.get_tile_interactive(target)) - marker.visible = true marker_target = tile.item_base.global_position - if Input.is_action_just_pressed("interact"): - interacting = true + if Input.is_action_just_pressed("interact") and last_interaction == null: last_interaction = target game.mp.send_tile_interact(game.player_id, target, true) tile.interact() marker.set_interacting(true) - elif Input.is_action_just_released("interact"): - interacting = false + if Input.is_action_just_released("interact"): + last_interaction = null game.mp.send_tile_interact(game.player_id, target, false) marker.set_interacting(false) else: diff --git a/client/player/player.gd b/client/player/player.gd index 1ca7a37f..f90b2b1b 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -28,7 +28,6 @@ var position_ = Vector2(0, 0) var position_anim = Vector2(0, 0) var boosting := false var walking := false -var interacting := false var username: String var movement_base: Node3D = Node3D.new() -- cgit v1.2.3-70-g09d2 From 78804e594c0d55c6404370181516fdd3cd550598 Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 6 Oct 2024 17:41:19 +0200 Subject: Remove unused tr in error message --- client/menu/settings/settings_row.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/menu/settings/settings_row.gd b/client/menu/settings/settings_row.gd index 68340918..f75922c4 100644 --- a/client/menu/settings/settings_row.gd +++ b/client/menu/settings/settings_row.gd @@ -24,7 +24,7 @@ signal reset() @onready var reset_button = $HBoxContainer/Reset var value_node: Node -var description = tr("No value was given to the row") +var description = "No value was given to the row" func _ready(): if value_node != null: -- cgit v1.2.3-70-g09d2 From 993644b0a48dd213b6fdd21cc0bf054c2e1baab6 Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 6 Oct 2024 17:50:06 +0200 Subject: Organize theme files --- client/menu/auto_setup/blur_setup.gd | 24 +++++ client/menu/blur_mix.gdshader | 34 ------- client/menu/blur_setup.gd | 24 ----- client/menu/character.tscn | 2 +- client/menu/communicate/chat/chat_message.tscn | 2 +- client/menu/communicate/chat/chat_open.tscn | 6 +- client/menu/communicate/chat/chat_preview.tscn | 6 +- .../popup_message/pinned_item_messages.gd | 2 +- .../communicate/popup_message/popup_message.tscn | 8 +- .../communicate/popup_message/server_message.gd | 4 +- .../communicate/popup_message/server_message.tscn | 4 +- client/menu/credits.tscn | 6 +- client/menu/error.tscn | 4 +- client/menu/grayscale.gdshader | 25 ----- client/menu/grayscale_material.tres | 6 -- client/menu/hairstyle_preview.tscn | 2 +- client/menu/ingame.tscn | 8 +- client/menu/lobby.tscn | 8 +- client/menu/lobby/player.tscn | 2 +- client/menu/main.tscn | 8 +- client/menu/overlay.tscn | 6 +- client/menu/play.tscn | 6 +- client/menu/popup.tscn | 6 +- client/menu/rating/rating.tscn | 4 +- client/menu/settings.tscn | 6 +- client/menu/settings/settings_row.tscn | 4 +- client/menu/setup.tscn | 4 +- client/menu/textures/paper_texture.tres | 14 +++ client/menu/theme/blur_material.tres | 11 --- client/menu/theme/dark_blur_material.tres | 11 --- client/menu/theme/font-azaret-mono.woff2 | Bin 46132 -> 0 bytes client/menu/theme/font-azaret-mono.woff2.import | 34 ------- client/menu/theme/font-josefin-sans.woff2 | Bin 47448 -> 0 bytes client/menu/theme/font-josefin-sans.woff2.import | 34 ------- client/menu/theme/font-sansita-swashed.woff2 | Bin 92808 -> 0 bytes .../menu/theme/font-sansita-swashed.woff2.import | 34 ------- client/menu/theme/fonts/font-azaret-mono.woff2 | Bin 0 -> 46132 bytes .../menu/theme/fonts/font-azaret-mono.woff2.import | 34 +++++++ client/menu/theme/fonts/font-josefin-sans.woff2 | Bin 0 -> 47448 bytes .../theme/fonts/font-josefin-sans.woff2.import | 34 +++++++ client/menu/theme/fonts/font-sansita-swashed.woff2 | Bin 0 -> 92808 bytes .../theme/fonts/font-sansita-swashed.woff2.import | 34 +++++++ client/menu/theme/materials/blur_material.tres | 11 +++ .../menu/theme/materials/dark_blur_material.tres | 11 +++ .../menu/theme/materials/grayscale_material.tres | 6 ++ client/menu/theme/paper.tres | 108 --------------------- client/menu/theme/paper_panel_style.tres | 6 -- client/menu/theme/paper_texture.tres | 14 --- client/menu/theme/shaders/blur_mix.gdshader | 34 +++++++ client/menu/theme/shaders/grayscale.gdshader | 25 +++++ client/menu/theme/style/paper_panel_style.tres | 6 ++ client/menu/theme/theme.tres | 67 ------------- client/menu/theme/theme/paper.tres | 108 +++++++++++++++++++++ client/menu/theme/theme/theme.tres | 67 +++++++++++++ client/player/chat_message.tscn | 2 +- 55 files changed, 463 insertions(+), 463 deletions(-) create mode 100644 client/menu/auto_setup/blur_setup.gd delete mode 100644 client/menu/blur_mix.gdshader delete mode 100644 client/menu/blur_setup.gd delete mode 100644 client/menu/grayscale.gdshader delete mode 100644 client/menu/grayscale_material.tres create mode 100644 client/menu/textures/paper_texture.tres delete mode 100644 client/menu/theme/blur_material.tres delete mode 100644 client/menu/theme/dark_blur_material.tres delete mode 100644 client/menu/theme/font-azaret-mono.woff2 delete mode 100644 client/menu/theme/font-azaret-mono.woff2.import delete mode 100644 client/menu/theme/font-josefin-sans.woff2 delete mode 100644 client/menu/theme/font-josefin-sans.woff2.import delete mode 100644 client/menu/theme/font-sansita-swashed.woff2 delete mode 100644 client/menu/theme/font-sansita-swashed.woff2.import create mode 100644 client/menu/theme/fonts/font-azaret-mono.woff2 create mode 100644 client/menu/theme/fonts/font-azaret-mono.woff2.import create mode 100644 client/menu/theme/fonts/font-josefin-sans.woff2 create mode 100644 client/menu/theme/fonts/font-josefin-sans.woff2.import create mode 100644 client/menu/theme/fonts/font-sansita-swashed.woff2 create mode 100644 client/menu/theme/fonts/font-sansita-swashed.woff2.import create mode 100644 client/menu/theme/materials/blur_material.tres create mode 100644 client/menu/theme/materials/dark_blur_material.tres create mode 100644 client/menu/theme/materials/grayscale_material.tres delete mode 100644 client/menu/theme/paper.tres delete mode 100644 client/menu/theme/paper_panel_style.tres delete mode 100644 client/menu/theme/paper_texture.tres create mode 100644 client/menu/theme/shaders/blur_mix.gdshader create mode 100644 client/menu/theme/shaders/grayscale.gdshader create mode 100644 client/menu/theme/style/paper_panel_style.tres delete mode 100644 client/menu/theme/theme.tres create mode 100644 client/menu/theme/theme/paper.tres create mode 100644 client/menu/theme/theme/theme.tres diff --git a/client/menu/auto_setup/blur_setup.gd b/client/menu/auto_setup/blur_setup.gd new file mode 100644 index 00000000..9d55a9d4 --- /dev/null +++ b/client/menu/auto_setup/blur_setup.gd @@ -0,0 +1,24 @@ +# 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 BlurSetup + +func _ready(): + update(Global.get_setting("graphics.ui_blur")) + Settings.hook_changed("graphics.ui_blur", false, update) + +func update(state): + material.set_shader_parameter("enable_blur", state) diff --git a/client/menu/blur_mix.gdshader b/client/menu/blur_mix.gdshader deleted file mode 100644 index 7e95224d..00000000 --- a/client/menu/blur_mix.gdshader +++ /dev/null @@ -1,34 +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 . - -*/ -shader_type canvas_item; - -uniform float blur_amount : hint_range(-2.0, 10.0); -uniform float mix_amount : hint_range(0.0, 1.0); -uniform float mix_amount_no_blur : hint_range(0.0, 1.0); -uniform vec4 color_over: source_color; -uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap; -uniform bool enable_blur; - -void fragment() { - if (enable_blur) { - vec4 blurred = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount); - COLOR = mix(blurred, color_over, mix_amount); - } else { - COLOR = mix(texture(SCREEN_TEXTURE, SCREEN_UV), color_over, mix_amount_no_blur); - } -} \ No newline at end of file diff --git a/client/menu/blur_setup.gd b/client/menu/blur_setup.gd deleted file mode 100644 index 9d55a9d4..00000000 --- a/client/menu/blur_setup.gd +++ /dev/null @@ -1,24 +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 BlurSetup - -func _ready(): - update(Global.get_setting("graphics.ui_blur")) - Settings.hook_changed("graphics.ui_blur", false, update) - -func update(state): - material.set_shader_parameter("enable_blur", state) diff --git a/client/menu/character.tscn b/client/menu/character.tscn index 648051e5..bc4e1663 100644 --- a/client/menu/character.tscn +++ b/client/menu/character.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=3 uid="uid://1f7xpirm5d28"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_ak2pw"] [ext_resource type="Script" path="res://menu/character.gd" id="1_brhd1"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_6mc88"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"] diff --git a/client/menu/communicate/chat/chat_message.tscn b/client/menu/communicate/chat/chat_message.tscn index 06a9311e..d4db3f5d 100644 --- a/client/menu/communicate/chat/chat_message.tscn +++ b/client/menu/communicate/chat/chat_message.tscn @@ -1,7 +1,7 @@ [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"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_rx6vg"] [sub_resource type="FontVariation" id="FontVariation_jfhbh"] variation_embolden = 1.3 diff --git a/client/menu/communicate/chat/chat_open.tscn b/client/menu/communicate/chat/chat_open.tscn index 0247a1ca..8830c4f7 100644 --- a/client/menu/communicate/chat/chat_open.tscn +++ b/client/menu/communicate/chat/chat_open.tscn @@ -1,9 +1,9 @@ [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="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="1_isqmk"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="2_urbd2"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/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"] diff --git a/client/menu/communicate/chat/chat_preview.tscn b/client/menu/communicate/chat/chat_preview.tscn index 4cc39e00..e1cac207 100644 --- a/client/menu/communicate/chat/chat_preview.tscn +++ b/client/menu/communicate/chat/chat_preview.tscn @@ -1,9 +1,9 @@ [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="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/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"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_jo1xn"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_1l77s"] [node name="ChatPreview" type="Control"] layout_mode = 3 diff --git a/client/menu/communicate/popup_message/pinned_item_messages.gd b/client/menu/communicate/popup_message/pinned_item_messages.gd index c98b9184..15ae96b5 100644 --- a/client/menu/communicate/popup_message/pinned_item_messages.gd +++ b/client/menu/communicate/popup_message/pinned_item_messages.gd @@ -17,7 +17,7 @@ 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") +const PAPER_PANEL_STYLE := preload("res://menu/theme/style/paper_panel_style.tres") var pinned_items := {} diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/menu/communicate/popup_message/popup_message.tscn index 5131cbf7..05b31e11 100644 --- a/client/menu/communicate/popup_message/popup_message.tscn +++ b/client/menu/communicate/popup_message/popup_message.tscn @@ -1,11 +1,11 @@ [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="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/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="Shader" path="res://menu/theme/shaders/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="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_pvwmw"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="4_wsrnf"] [ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/icons/hint.svg" id="5_2dxsd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"] diff --git a/client/menu/communicate/popup_message/server_message.gd b/client/menu/communicate/popup_message/server_message.gd index fc12ee76..c3fc0a78 100644 --- a/client/menu/communicate/popup_message/server_message.gd +++ b/client/menu/communicate/popup_message/server_message.gd @@ -1,8 +1,8 @@ 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") +const DEFAULT_FONT = preload("res://menu/theme/fonts/font-josefin-sans.woff2") +const MONOSPACE_FONT = preload("res://menu/theme/fonts/font-azaret-mono.woff2") @onready var label: Label = $CenterContainer/Label diff --git a/client/menu/communicate/popup_message/server_message.tscn b/client/menu/communicate/popup_message/server_message.tscn index 2a848419..b23d2527 100644 --- a/client/menu/communicate/popup_message/server_message.tscn +++ b/client/menu/communicate/popup_message/server_message.tscn @@ -1,8 +1,8 @@ [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="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_qv8ew"] [ext_resource type="Script" path="res://menu/communicate/popup_message/server_message.gd" id="2_csqo8"] -[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/font-azaret-mono.woff2" id="3_dw20j"] +[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="3_dw20j"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"] shader = ExtResource("1_qv8ew") diff --git a/client/menu/credits.tscn b/client/menu/credits.tscn index 12bd3c23..ddbc8ebe 100644 --- a/client/menu/credits.tscn +++ b/client/menu/credits.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://7mqbxa054bjv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_16kk6"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_16kk6"] [ext_resource type="Script" path="res://menu/credits.gd" id="2_alvab"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_nwoiv"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_8sii3"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_nwoiv"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_8sii3"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="4_bfcw8"] [node name="CreditsMenu" type="Control"] diff --git a/client/menu/error.tscn b/client/menu/error.tscn index dfe6e015..55c3c9d9 100644 --- a/client/menu/error.tscn +++ b/client/menu/error.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://cimgn07lbcs4v"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cabdu"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cabdu"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"] [ext_resource type="Script" path="res://menu/error.gd" id="2_dbe41"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_hxkkd"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hxkkd"] [node name="ErrorMenu" type="Control"] layout_mode = 3 diff --git a/client/menu/grayscale.gdshader b/client/menu/grayscale.gdshader deleted file mode 100644 index cc132c54..00000000 --- a/client/menu/grayscale.gdshader +++ /dev/null @@ -1,25 +0,0 @@ -/* - Hurry Curry! - a game about cooking - 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 . - -*/ -shader_type canvas_item; - -void fragment() { - float brightness = 0.2126 * COLOR.r + 0.7152 * COLOR.g + 0.0722 * COLOR.b; - brightness = (brightness - .5) * 2.; - COLOR.rgb = vec3(brightness); - COLOR.a *= 1. - brightness; -} diff --git a/client/menu/grayscale_material.tres b/client/menu/grayscale_material.tres deleted file mode 100644 index 06d5e698..00000000 --- a/client/menu/grayscale_material.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bplhkekj6rebp"] - -[ext_resource type="Shader" path="res://menu/grayscale.gdshader" id="1_u0c2c"] - -[resource] -shader = ExtResource("1_u0c2c") diff --git a/client/menu/hairstyle_preview.tscn b/client/menu/hairstyle_preview.tscn index 46bb9c74..5952de63 100644 --- a/client/menu/hairstyle_preview.tscn +++ b/client/menu/hairstyle_preview.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://dfon56nwd2tgn"] [ext_resource type="Script" path="res://menu/hairstyle_preview.gd" id="1_0qdmv"] -[ext_resource type="Shader" path="res://menu/grayscale.gdshader" id="1_sf0gc"] +[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_sf0gc"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="2_jtitc"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_entrs"] diff --git a/client/menu/ingame.tscn b/client/menu/ingame.tscn index 4bb2a458..74b0a486 100644 --- a/client/menu/ingame.tscn +++ b/client/menu/ingame.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=11 format=3 uid="uid://lxlgtjm8hw7v"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_2vmyh"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_2vmyh"] [ext_resource type="Script" path="res://menu/ingame.gd" id="2_0h3no"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_vvvlt"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_b6bm7"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="4_scupw"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_vvvlt"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_b6bm7"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="4_scupw"] [ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_vr8y1"] [sub_resource type="Animation" id="Animation_8sedy"] diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index f2cb7b93..9f4e14c9 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=16 format=3 uid="uid://bc50la65ntifb"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_u18ke"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_u18ke"] [ext_resource type="Script" path="res://menu/lobby.gd" id="2_7657i"] [ext_resource type="StyleBox" uid="uid://de80aw86emnql" path="res://menu/theme/style/lobby_panel_override.tres" id="3_6iqoe"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_esmbx"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_esmbx"] [ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="3_jxleg"] [ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="4_eapmn"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_am8pt"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_am8pt"] [ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="5_odwav"] [ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_tulu3"] [ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="8_cwbpa"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="10_bgene"] [ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://menu/controller_buttons/y.svg" id="11_5uugf"] diff --git a/client/menu/lobby/player.tscn b/client/menu/lobby/player.tscn index 73c1f7f6..344aae91 100644 --- a/client/menu/lobby/player.tscn +++ b/client/menu/lobby/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://gmldnel4xbxy"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_flfqn"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_flfqn"] [ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://menu/icons/user.webp" id="2_mnaqt"] [ext_resource type="Script" path="res://menu/lobby/player.gd" id="2_w3lyk"] diff --git a/client/menu/main.tscn b/client/menu/main.tscn index ff4e7a94..7ec73085 100644 --- a/client/menu/main.tscn +++ b/client/menu/main.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=9 format=3 uid="uid://dbj8508whxgwv"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_3qfu3"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_3qfu3"] [ext_resource type="Script" path="res://menu/main.gd" id="2_xjnc3"] [ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="3_4evao"] -[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/blur_material.tres" id="4_nx4vf"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_0mn56"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="5_k7bqq"] +[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="4_nx4vf"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="5_0mn56"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_k7bqq"] [ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="5_qlyeo"] [sub_resource type="FontVariation" id="FontVariation_htgmg"] diff --git a/client/menu/overlay.tscn b/client/menu/overlay.tscn index b298f54b..25ecae4c 100644 --- a/client/menu/overlay.tscn +++ b/client/menu/overlay.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=3 uid="uid://bpikve6wlsjfl"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_4kujw"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_4kujw"] [ext_resource type="Script" path="res://menu/overlay.gd" id="2_kbjds"] -[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/theme/paper_texture.tres" id="3_oum5g"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_u54fv"] +[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="3_oum5g"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_u54fv"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_04ujj"] bg_color = Color(0, 0, 0, 0) diff --git a/client/menu/play.tscn b/client/menu/play.tscn index 7808c7b4..958eab8e 100644 --- a/client/menu/play.tscn +++ b/client/menu/play.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://c8url5fpttbem"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_cckds"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cckds"] [ext_resource type="Script" path="res://menu/play.gd" id="2_phxx0"] -[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/blur_material.tres" id="3_fsbt7"] +[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="3_fsbt7"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_cm120"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="5_ojpbf"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_ojpbf"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ukani"] diff --git a/client/menu/popup.tscn b/client/menu/popup.tscn index 68818643..84c44515 100644 --- a/client/menu/popup.tscn +++ b/client/menu/popup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://lwtym0pbc17g"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_m0d0r"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_m0d0r"] [ext_resource type="Script" path="res://menu/popup.gd" id="2_1h10j"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_iouvy"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_e4iqk"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_iouvy"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_e4iqk"] [node name="Popup" type="Control"] layout_mode = 3 diff --git a/client/menu/rating/rating.tscn b/client/menu/rating/rating.tscn index 4b4b7a5f..dc4ed714 100644 --- a/client/menu/rating/rating.tscn +++ b/client/menu/rating/rating.tscn @@ -2,9 +2,9 @@ [ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/star.webp" id="1_7qv7r"] [ext_resource type="Shader" path="res://menu/rating/desaturate.gdshader" id="1_pddsm"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_uwajf"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_uwajf"] [ext_resource type="Script" path="res://menu/rating/rating.gd" id="2_cq0se"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="4_hdurb"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hdurb"] [ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="5_tutpj"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_oi7xd"] diff --git a/client/menu/settings.tscn b/client/menu/settings.tscn index d29a3646..7206990f 100644 --- a/client/menu/settings.tscn +++ b/client/menu/settings.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://8ic77jmadadj"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_foq3a"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_foq3a"] [ext_resource type="Script" path="res://menu/settings.gd" id="2_3hgm8"] -[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_8nykw"] -[ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_v6q3y"] +[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_8nykw"] +[ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_v6q3y"] [node name="SettingsMenu" type="Control"] layout_mode = 3 diff --git a/client/menu/settings/settings_row.tscn b/client/menu/settings/settings_row.tscn index ba43fed7..489239f3 100644 --- a/client/menu/settings/settings_row.tscn +++ b/client/menu/settings/settings_row.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=7 format=3 uid="uid://o5e5vpem8w0k"] -[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_iij3k"] +[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_iij3k"] [ext_resource type="Script" path="res://menu/settings/settings_row.gd" id="2_l8i7p"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="3_7k5da"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="3_7k5da"] [ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://menu/icons/reset.svg" id="4_bj3dr"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_pk3rs"] diff --git a/client/menu/setup.tscn b/client/menu/setup.tscn index 67610aba..9e09a050 100644 --- a/client/menu/setup.tscn +++ b/client/menu/setup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=15 format=3 uid="uid://ddl3efikvqp66"] [ext_resource type="Script" path="res://menu/setup.gd" id="1_mo46n"] -[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/paper.tres" id="1_yq0aa"] +[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/theme/paper.tres" id="1_yq0aa"] [ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="2_4caf2"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_2vg4d"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_2vg4d"] [ext_resource type="AudioStream" uid="uid://do7ii5hx71p0m" path="res://menu/sounds/page.ogg" id="5_xac6d"] [ext_resource type="AudioStream" uid="uid://5b3noxjmasmu" path="res://menu/sounds/sign.ogg" id="6_wf0gh"] diff --git a/client/menu/textures/paper_texture.tres b/client/menu/textures/paper_texture.tres new file mode 100644 index 00000000..2c681244 --- /dev/null +++ b/client/menu/textures/paper_texture.tres @@ -0,0 +1,14 @@ +[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://chxkwohi56cxx"] + +[sub_resource type="Gradient" id="Gradient_pkrjd"] +colors = PackedColorArray(0.917969, 0.866454, 0.770122, 1, 0.832031, 0.781817, 0.666307, 1) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_k7p6k"] +noise_type = 0 +frequency = 0.0084 +domain_warp_enabled = true +domain_warp_frequency = -1.465 + +[resource] +color_ramp = SubResource("Gradient_pkrjd") +noise = SubResource("FastNoiseLite_k7p6k") diff --git a/client/menu/theme/blur_material.tres b/client/menu/theme/blur_material.tres deleted file mode 100644 index c035d230..00000000 --- a/client/menu/theme/blur_material.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://2j8a0c0a2ta5"] - -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_d16rd"] - -[resource] -shader = ExtResource("1_d16rd") -shader_parameter/blur_amount = 3.5 -shader_parameter/mix_amount = 0.3 -shader_parameter/mix_amount_no_blur = 0.5 -shader_parameter/color_over = null -shader_parameter/enable_blur = false diff --git a/client/menu/theme/dark_blur_material.tres b/client/menu/theme/dark_blur_material.tres deleted file mode 100644 index daf74099..00000000 --- a/client/menu/theme/dark_blur_material.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://beea1pc5nt67r"] - -[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_cynu0"] - -[resource] -shader = ExtResource("1_cynu0") -shader_parameter/blur_amount = 3.5 -shader_parameter/mix_amount = 0.5 -shader_parameter/mix_amount_no_blur = 0.7 -shader_parameter/color_over = null -shader_parameter/enable_blur = null diff --git a/client/menu/theme/font-azaret-mono.woff2 b/client/menu/theme/font-azaret-mono.woff2 deleted file mode 100644 index c413b182..00000000 Binary files a/client/menu/theme/font-azaret-mono.woff2 and /dev/null differ diff --git a/client/menu/theme/font-azaret-mono.woff2.import b/client/menu/theme/font-azaret-mono.woff2.import deleted file mode 100644 index cafe1fbd..00000000 --- a/client/menu/theme/font-azaret-mono.woff2.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="font_data_dynamic" -type="FontFile" -uid="uid://bk704sc5gkrb3" -path="res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata" - -[deps] - -source_file="res://menu/theme/font-azaret-mono.woff2" -dest_files=["res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata"] - -[params] - -Rendering=null -antialiasing=1 -generate_mipmaps=false -disable_embedded_bitmaps=true -multichannel_signed_distance_field=false -msdf_pixel_range=8 -msdf_size=48 -allow_system_fallback=true -force_autohinter=false -hinting=1 -subpixel_positioning=1 -oversampling=0.0 -Fallbacks=null -fallbacks=[] -Compress=null -compress=true -preload=[] -language_support={} -script_support={} -opentype_features={} diff --git a/client/menu/theme/font-josefin-sans.woff2 b/client/menu/theme/font-josefin-sans.woff2 deleted file mode 100644 index dce2708f..00000000 Binary files a/client/menu/theme/font-josefin-sans.woff2 and /dev/null differ diff --git a/client/menu/theme/font-josefin-sans.woff2.import b/client/menu/theme/font-josefin-sans.woff2.import deleted file mode 100644 index 03e086da..00000000 --- a/client/menu/theme/font-josefin-sans.woff2.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="font_data_dynamic" -type="FontFile" -uid="uid://5ixo6b3bd3km" -path="res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata" - -[deps] - -source_file="res://menu/theme/font-josefin-sans.woff2" -dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"] - -[params] - -Rendering=null -antialiasing=1 -generate_mipmaps=false -disable_embedded_bitmaps=true -multichannel_signed_distance_field=false -msdf_pixel_range=8 -msdf_size=48 -allow_system_fallback=true -force_autohinter=false -hinting=1 -subpixel_positioning=1 -oversampling=0.0 -Fallbacks=null -fallbacks=[] -Compress=null -compress=true -preload=[] -language_support={} -script_support={} -opentype_features={} diff --git a/client/menu/theme/font-sansita-swashed.woff2 b/client/menu/theme/font-sansita-swashed.woff2 deleted file mode 100644 index 5c665fb0..00000000 Binary files a/client/menu/theme/font-sansita-swashed.woff2 and /dev/null differ diff --git a/client/menu/theme/font-sansita-swashed.woff2.import b/client/menu/theme/font-sansita-swashed.woff2.import deleted file mode 100644 index 2d38716d..00000000 --- a/client/menu/theme/font-sansita-swashed.woff2.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="font_data_dynamic" -type="FontFile" -uid="uid://bo4vh5xkpvrh1" -path="res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata" - -[deps] - -source_file="res://menu/theme/font-sansita-swashed.woff2" -dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"] - -[params] - -Rendering=null -antialiasing=1 -generate_mipmaps=false -disable_embedded_bitmaps=true -multichannel_signed_distance_field=false -msdf_pixel_range=8 -msdf_size=48 -allow_system_fallback=true -force_autohinter=false -hinting=1 -subpixel_positioning=1 -oversampling=0.0 -Fallbacks=null -fallbacks=[] -Compress=null -compress=true -preload=[] -language_support={} -script_support={} -opentype_features={} diff --git a/client/menu/theme/fonts/font-azaret-mono.woff2 b/client/menu/theme/fonts/font-azaret-mono.woff2 new file mode 100644 index 00000000..c413b182 Binary files /dev/null and b/client/menu/theme/fonts/font-azaret-mono.woff2 differ diff --git a/client/menu/theme/fonts/font-azaret-mono.woff2.import b/client/menu/theme/fonts/font-azaret-mono.woff2.import new file mode 100644 index 00000000..20a14c40 --- /dev/null +++ b/client/menu/theme/fonts/font-azaret-mono.woff2.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bk704sc5gkrb3" +path="res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata" + +[deps] + +source_file="res://menu/theme/fonts/font-azaret-mono.woff2" +dest_files=["res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/client/menu/theme/fonts/font-josefin-sans.woff2 b/client/menu/theme/fonts/font-josefin-sans.woff2 new file mode 100644 index 00000000..dce2708f Binary files /dev/null and b/client/menu/theme/fonts/font-josefin-sans.woff2 differ diff --git a/client/menu/theme/fonts/font-josefin-sans.woff2.import b/client/menu/theme/fonts/font-josefin-sans.woff2.import new file mode 100644 index 00000000..8334a70e --- /dev/null +++ b/client/menu/theme/fonts/font-josefin-sans.woff2.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://5ixo6b3bd3km" +path="res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata" + +[deps] + +source_file="res://menu/theme/fonts/font-josefin-sans.woff2" +dest_files=["res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/client/menu/theme/fonts/font-sansita-swashed.woff2 b/client/menu/theme/fonts/font-sansita-swashed.woff2 new file mode 100644 index 00000000..5c665fb0 Binary files /dev/null and b/client/menu/theme/fonts/font-sansita-swashed.woff2 differ diff --git a/client/menu/theme/fonts/font-sansita-swashed.woff2.import b/client/menu/theme/fonts/font-sansita-swashed.woff2.import new file mode 100644 index 00000000..d35f5ae1 --- /dev/null +++ b/client/menu/theme/fonts/font-sansita-swashed.woff2.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bo4vh5xkpvrh1" +path="res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata" + +[deps] + +source_file="res://menu/theme/fonts/font-sansita-swashed.woff2" +dest_files=["res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/client/menu/theme/materials/blur_material.tres b/client/menu/theme/materials/blur_material.tres new file mode 100644 index 00000000..035351c5 --- /dev/null +++ b/client/menu/theme/materials/blur_material.tres @@ -0,0 +1,11 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://2j8a0c0a2ta5"] + +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_d16rd"] + +[resource] +shader = ExtResource("1_d16rd") +shader_parameter/blur_amount = 3.5 +shader_parameter/mix_amount = 0.3 +shader_parameter/mix_amount_no_blur = 0.5 +shader_parameter/color_over = null +shader_parameter/enable_blur = false diff --git a/client/menu/theme/materials/dark_blur_material.tres b/client/menu/theme/materials/dark_blur_material.tres new file mode 100644 index 00000000..cee1aeca --- /dev/null +++ b/client/menu/theme/materials/dark_blur_material.tres @@ -0,0 +1,11 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://beea1pc5nt67r"] + +[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_cynu0"] + +[resource] +shader = ExtResource("1_cynu0") +shader_parameter/blur_amount = 3.5 +shader_parameter/mix_amount = 0.5 +shader_parameter/mix_amount_no_blur = 0.7 +shader_parameter/color_over = null +shader_parameter/enable_blur = null diff --git a/client/menu/theme/materials/grayscale_material.tres b/client/menu/theme/materials/grayscale_material.tres new file mode 100644 index 00000000..065356e5 --- /dev/null +++ b/client/menu/theme/materials/grayscale_material.tres @@ -0,0 +1,6 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bplhkekj6rebp"] + +[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_u0c2c"] + +[resource] +shader = ExtResource("1_u0c2c") diff --git a/client/menu/theme/paper.tres b/client/menu/theme/paper.tres deleted file mode 100644 index acf6699a..00000000 --- a/client/menu/theme/paper.tres +++ /dev/null @@ -1,108 +0,0 @@ -[gd_resource type="Theme" load_steps=17 format=3 uid="uid://ci2qajdoa1an1"] - -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="1_koj1m"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_tc8bk"] - -[sub_resource type="FontVariation" id="FontVariation_pirkj"] -base_font = ExtResource("1_tc8bk") -variation_embolden = 0.5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l5fao"] -bg_color = Color(0, 0, 0, 0.305882) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color(0.819608, 0.92549, 1, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3p3im"] -bg_color = Color(0, 0, 0, 0.145098) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xxmhf"] -bg_color = Color(0, 0, 0, 0.305882) - -[sub_resource type="SystemFont" id="SystemFont_3j83h"] - -[sub_resource type="FontVariation" id="FontVariation_8qr07"] -base_font = SubResource("SystemFont_3j83h") -variation_embolden = -0.44 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rq65v"] -content_margin_left = 10.0 -bg_color = Color(1, 1, 1, 0) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_st08c"] -content_margin_left = 10.0 -bg_color = Color(0, 0, 0, 0) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color(0.300781, 0.300781, 0.300781, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxLine" id="StyleBoxLine_8q7ob"] -thickness = 3 - -[sub_resource type="FontVariation" id="FontVariation_cx2xx"] -base_font = ExtResource("1_koj1m") - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_huhkg"] -content_margin_left = 10.0 -bg_color = Color(0.6, 0.6, 0.6, 0) -border_width_bottom = 2 -border_color = Color(0, 0, 0, 1) - -[sub_resource type="SystemFont" id="SystemFont_c2823"] - -[sub_resource type="FontVariation" id="FontVariation_c3ws0"] -base_font = SubResource("SystemFont_c2823") -variation_embolden = 0.53 - -[sub_resource type="FontVariation" id="FontVariation_ex8wc"] -base_font = SubResource("SystemFont_3j83h") -variation_embolden = -0.44 - -[resource] -Button/colors/font_color = Color(0.21875, 0.21875, 0.21875, 1) -Button/fonts/font = SubResource("FontVariation_pirkj") -Button/styles/focus = SubResource("StyleBoxFlat_l5fao") -Button/styles/hover = SubResource("StyleBoxFlat_3p3im") -Button/styles/normal = SubResource("StyleBoxFlat_xxmhf") -Button/styles/pressed = SubResource("StyleBoxFlat_xxmhf") -CheckBox/colors/font_color = Color(0, 0, 0, 1) -CheckBox/colors/font_disabled_color = Color(0, 0, 0, 1) -CheckBox/colors/font_focus_color = Color(0, 0, 0, 1) -CheckBox/colors/font_hover_color = Color(0, 0, 0, 1) -CheckBox/colors/font_hover_pressed_color = Color(0, 0, 0, 1) -CheckBox/colors/font_pressed_color = Color(0, 0, 0, 1) -CheckBox/constants/h_separation = 4 -CheckBox/fonts/font = SubResource("FontVariation_8qr07") -CheckBox/styles/disabled = SubResource("StyleBoxFlat_rq65v") -CheckBox/styles/focus = SubResource("StyleBoxFlat_st08c") -CheckBox/styles/hover = SubResource("StyleBoxFlat_rq65v") -CheckBox/styles/hover_pressed = SubResource("StyleBoxFlat_rq65v") -CheckBox/styles/normal = SubResource("StyleBoxFlat_rq65v") -CheckBox/styles/pressed = SubResource("StyleBoxFlat_rq65v") -HSeparator/constants/separation = 6 -HSeparator/styles/separator = SubResource("StyleBoxLine_8q7ob") -Label/colors/font_color = Color(0, 0, 0, 1) -LineEdit/colors/caret_color = Color(0, 0.0209808, 0.414062, 1) -LineEdit/colors/font_color = Color(0, 0.0196078, 0.415686, 1) -LineEdit/fonts/font = SubResource("FontVariation_cx2xx") -LineEdit/styles/focus = SubResource("StyleBoxFlat_huhkg") -LineEdit/styles/normal = SubResource("StyleBoxFlat_huhkg") -LineEdit/styles/read_only = SubResource("StyleBoxFlat_huhkg") -MarginContainer/constants/margin_bottom = 30 -MarginContainer/constants/margin_left = 70 -MarginContainer/constants/margin_right = 30 -MarginContainer/constants/margin_top = 30 -RichTextLabel/colors/default_color = Color(0, 0, 0, 1) -RichTextLabel/fonts/bold_font = SubResource("FontVariation_c3ws0") -RichTextLabel/fonts/bold_italics_font = null -RichTextLabel/fonts/italics_font = null -RichTextLabel/fonts/mono_font = null -RichTextLabel/fonts/normal_font = SubResource("FontVariation_ex8wc") diff --git a/client/menu/theme/paper_panel_style.tres b/client/menu/theme/paper_panel_style.tres deleted file mode 100644 index 5a8a4a78..00000000 --- a/client/menu/theme/paper_panel_style.tres +++ /dev/null @@ -1,6 +0,0 @@ -[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/paper_texture.tres b/client/menu/theme/paper_texture.tres deleted file mode 100644 index 2c681244..00000000 --- a/client/menu/theme/paper_texture.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://chxkwohi56cxx"] - -[sub_resource type="Gradient" id="Gradient_pkrjd"] -colors = PackedColorArray(0.917969, 0.866454, 0.770122, 1, 0.832031, 0.781817, 0.666307, 1) - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_k7p6k"] -noise_type = 0 -frequency = 0.0084 -domain_warp_enabled = true -domain_warp_frequency = -1.465 - -[resource] -color_ramp = SubResource("Gradient_pkrjd") -noise = SubResource("FastNoiseLite_k7p6k") diff --git a/client/menu/theme/shaders/blur_mix.gdshader b/client/menu/theme/shaders/blur_mix.gdshader new file mode 100644 index 00000000..7e95224d --- /dev/null +++ b/client/menu/theme/shaders/blur_mix.gdshader @@ -0,0 +1,34 @@ +/* + 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 . + +*/ +shader_type canvas_item; + +uniform float blur_amount : hint_range(-2.0, 10.0); +uniform float mix_amount : hint_range(0.0, 1.0); +uniform float mix_amount_no_blur : hint_range(0.0, 1.0); +uniform vec4 color_over: source_color; +uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap; +uniform bool enable_blur; + +void fragment() { + if (enable_blur) { + vec4 blurred = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount); + COLOR = mix(blurred, color_over, mix_amount); + } else { + COLOR = mix(texture(SCREEN_TEXTURE, SCREEN_UV), color_over, mix_amount_no_blur); + } +} \ No newline at end of file diff --git a/client/menu/theme/shaders/grayscale.gdshader b/client/menu/theme/shaders/grayscale.gdshader new file mode 100644 index 00000000..cc132c54 --- /dev/null +++ b/client/menu/theme/shaders/grayscale.gdshader @@ -0,0 +1,25 @@ +/* + Hurry Curry! - a game about cooking + 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 . + +*/ +shader_type canvas_item; + +void fragment() { + float brightness = 0.2126 * COLOR.r + 0.7152 * COLOR.g + 0.0722 * COLOR.b; + brightness = (brightness - .5) * 2.; + COLOR.rgb = vec3(brightness); + COLOR.a *= 1. - brightness; +} diff --git a/client/menu/theme/style/paper_panel_style.tres b/client/menu/theme/style/paper_panel_style.tres new file mode 100644 index 00000000..bd49eea4 --- /dev/null +++ b/client/menu/theme/style/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/textures/paper_texture.tres" id="1_u1kqj"] + +[resource] +texture = ExtResource("1_u1kqj") diff --git a/client/menu/theme/theme.tres b/client/menu/theme/theme.tres deleted file mode 100644 index fff223c0..00000000 --- a/client/menu/theme/theme.tres +++ /dev/null @@ -1,67 +0,0 @@ -[gd_resource type="Theme" load_steps=11 format=3 uid="uid://b0qmvo504e457"] - -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_f8qb0"] -[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"] -[ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://menu/theme/style/normal_style.tres" id="2_8fwoi"] -[ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://menu/theme/style/hover_style.tres" id="2_ye28t"] -[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_8u6ww"] -[ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://menu/theme/style/panel_style.tres" id="4_42dlp"] - -[sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"] -content_margin_top = 5.0 -content_margin_bottom = 5.0 -color = Color(1, 1, 1, 1) -grow_begin = 0.0 -grow_end = 0.0 -thickness = 3 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_25x32"] -content_margin_left = 10.0 -content_margin_top = 10.0 -content_margin_right = 10.0 -content_margin_bottom = 10.0 -bg_color = Color(1, 1, 1, 0.0352941) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="FontVariation" id="FontVariation_ff4nr"] -base_font = ExtResource("3_8u6ww") -variation_embolden = 0.7 - -[sub_resource type="FontVariation" id="FontVariation_lyo8w"] -base_font = ExtResource("1_f8qb0") -variation_embolden = 1.25 -spacing_top = 5 - -[resource] -default_font = SubResource("FontVariation_lyo8w") -Button/font_sizes/font_size = 18 -Button/styles/disabled = ExtResource("2_8fwoi") -Button/styles/focus = ExtResource("1_x88rs") -Button/styles/hover = ExtResource("2_ye28t") -Button/styles/normal = ExtResource("2_8fwoi") -Button/styles/pressed = ExtResource("2_8fwoi") -CheckButton/font_sizes/font_size = 18 -CheckButton/styles/disabled = ExtResource("2_8fwoi") -CheckButton/styles/focus = ExtResource("1_x88rs") -CheckButton/styles/hover = ExtResource("2_ye28t") -CheckButton/styles/hover_pressed = ExtResource("2_ye28t") -CheckButton/styles/normal = ExtResource("2_8fwoi") -CheckButton/styles/pressed = ExtResource("2_8fwoi") -HSeparator/styles/separator = SubResource("StyleBoxLine_emtvk") -Label/font_sizes/font_size = 16 -LineEdit/styles/focus = ExtResource("1_x88rs") -LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32") -LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32") -MarginContainer/constants/margin_bottom = 32 -MarginContainer/constants/margin_left = 32 -MarginContainer/constants/margin_right = 32 -MarginContainer/constants/margin_top = 32 -Panel/styles/panel = ExtResource("4_42dlp") -PanelContainer/styles/panel = ExtResource("4_42dlp") -RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr") -RichTextLabel/fonts/bold_italics_font = SubResource("FontVariation_lyo8w") -RichTextLabel/fonts/italics_font = SubResource("FontVariation_lyo8w") -RichTextLabel/fonts/mono_font = SubResource("FontVariation_lyo8w") diff --git a/client/menu/theme/theme/paper.tres b/client/menu/theme/theme/paper.tres new file mode 100644 index 00000000..6ff3bd10 --- /dev/null +++ b/client/menu/theme/theme/paper.tres @@ -0,0 +1,108 @@ +[gd_resource type="Theme" load_steps=17 format=3 uid="uid://ci2qajdoa1an1"] + +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="1_koj1m"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_tc8bk"] + +[sub_resource type="FontVariation" id="FontVariation_pirkj"] +base_font = ExtResource("1_tc8bk") +variation_embolden = 0.5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l5fao"] +bg_color = Color(0, 0, 0, 0.305882) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(0.819608, 0.92549, 1, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3p3im"] +bg_color = Color(0, 0, 0, 0.145098) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xxmhf"] +bg_color = Color(0, 0, 0, 0.305882) + +[sub_resource type="SystemFont" id="SystemFont_3j83h"] + +[sub_resource type="FontVariation" id="FontVariation_8qr07"] +base_font = SubResource("SystemFont_3j83h") +variation_embolden = -0.44 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rq65v"] +content_margin_left = 10.0 +bg_color = Color(1, 1, 1, 0) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_st08c"] +content_margin_left = 10.0 +bg_color = Color(0, 0, 0, 0) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color(0.300781, 0.300781, 0.300781, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_8q7ob"] +thickness = 3 + +[sub_resource type="FontVariation" id="FontVariation_cx2xx"] +base_font = ExtResource("1_koj1m") + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_huhkg"] +content_margin_left = 10.0 +bg_color = Color(0.6, 0.6, 0.6, 0) +border_width_bottom = 2 +border_color = Color(0, 0, 0, 1) + +[sub_resource type="SystemFont" id="SystemFont_c2823"] + +[sub_resource type="FontVariation" id="FontVariation_c3ws0"] +base_font = SubResource("SystemFont_c2823") +variation_embolden = 0.53 + +[sub_resource type="FontVariation" id="FontVariation_ex8wc"] +base_font = SubResource("SystemFont_3j83h") +variation_embolden = -0.44 + +[resource] +Button/colors/font_color = Color(0.21875, 0.21875, 0.21875, 1) +Button/fonts/font = SubResource("FontVariation_pirkj") +Button/styles/focus = SubResource("StyleBoxFlat_l5fao") +Button/styles/hover = SubResource("StyleBoxFlat_3p3im") +Button/styles/normal = SubResource("StyleBoxFlat_xxmhf") +Button/styles/pressed = SubResource("StyleBoxFlat_xxmhf") +CheckBox/colors/font_color = Color(0, 0, 0, 1) +CheckBox/colors/font_disabled_color = Color(0, 0, 0, 1) +CheckBox/colors/font_focus_color = Color(0, 0, 0, 1) +CheckBox/colors/font_hover_color = Color(0, 0, 0, 1) +CheckBox/colors/font_hover_pressed_color = Color(0, 0, 0, 1) +CheckBox/colors/font_pressed_color = Color(0, 0, 0, 1) +CheckBox/constants/h_separation = 4 +CheckBox/fonts/font = SubResource("FontVariation_8qr07") +CheckBox/styles/disabled = SubResource("StyleBoxFlat_rq65v") +CheckBox/styles/focus = SubResource("StyleBoxFlat_st08c") +CheckBox/styles/hover = SubResource("StyleBoxFlat_rq65v") +CheckBox/styles/hover_pressed = SubResource("StyleBoxFlat_rq65v") +CheckBox/styles/normal = SubResource("StyleBoxFlat_rq65v") +CheckBox/styles/pressed = SubResource("StyleBoxFlat_rq65v") +HSeparator/constants/separation = 6 +HSeparator/styles/separator = SubResource("StyleBoxLine_8q7ob") +Label/colors/font_color = Color(0, 0, 0, 1) +LineEdit/colors/caret_color = Color(0, 0.0209808, 0.414062, 1) +LineEdit/colors/font_color = Color(0, 0.0196078, 0.415686, 1) +LineEdit/fonts/font = SubResource("FontVariation_cx2xx") +LineEdit/styles/focus = SubResource("StyleBoxFlat_huhkg") +LineEdit/styles/normal = SubResource("StyleBoxFlat_huhkg") +LineEdit/styles/read_only = SubResource("StyleBoxFlat_huhkg") +MarginContainer/constants/margin_bottom = 30 +MarginContainer/constants/margin_left = 70 +MarginContainer/constants/margin_right = 30 +MarginContainer/constants/margin_top = 30 +RichTextLabel/colors/default_color = Color(0, 0, 0, 1) +RichTextLabel/fonts/bold_font = SubResource("FontVariation_c3ws0") +RichTextLabel/fonts/bold_italics_font = null +RichTextLabel/fonts/italics_font = null +RichTextLabel/fonts/mono_font = null +RichTextLabel/fonts/normal_font = SubResource("FontVariation_ex8wc") diff --git a/client/menu/theme/theme/theme.tres b/client/menu/theme/theme/theme.tres new file mode 100644 index 00000000..9e2c4ac6 --- /dev/null +++ b/client/menu/theme/theme/theme.tres @@ -0,0 +1,67 @@ +[gd_resource type="Theme" load_steps=11 format=3 uid="uid://b0qmvo504e457"] + +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_f8qb0"] +[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"] +[ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://menu/theme/style/normal_style.tres" id="2_8fwoi"] +[ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://menu/theme/style/hover_style.tres" id="2_ye28t"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_8u6ww"] +[ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://menu/theme/style/panel_style.tres" id="4_42dlp"] + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"] +content_margin_top = 5.0 +content_margin_bottom = 5.0 +color = Color(1, 1, 1, 1) +grow_begin = 0.0 +grow_end = 0.0 +thickness = 3 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_25x32"] +content_margin_left = 10.0 +content_margin_top = 10.0 +content_margin_right = 10.0 +content_margin_bottom = 10.0 +bg_color = Color(1, 1, 1, 0.0352941) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="FontVariation" id="FontVariation_ff4nr"] +base_font = ExtResource("3_8u6ww") +variation_embolden = 0.7 + +[sub_resource type="FontVariation" id="FontVariation_lyo8w"] +base_font = ExtResource("1_f8qb0") +variation_embolden = 1.25 +spacing_top = 5 + +[resource] +default_font = SubResource("FontVariation_lyo8w") +Button/font_sizes/font_size = 18 +Button/styles/disabled = ExtResource("2_8fwoi") +Button/styles/focus = ExtResource("1_x88rs") +Button/styles/hover = ExtResource("2_ye28t") +Button/styles/normal = ExtResource("2_8fwoi") +Button/styles/pressed = ExtResource("2_8fwoi") +CheckButton/font_sizes/font_size = 18 +CheckButton/styles/disabled = ExtResource("2_8fwoi") +CheckButton/styles/focus = ExtResource("1_x88rs") +CheckButton/styles/hover = ExtResource("2_ye28t") +CheckButton/styles/hover_pressed = ExtResource("2_ye28t") +CheckButton/styles/normal = ExtResource("2_8fwoi") +CheckButton/styles/pressed = ExtResource("2_8fwoi") +HSeparator/styles/separator = SubResource("StyleBoxLine_emtvk") +Label/font_sizes/font_size = 16 +LineEdit/styles/focus = ExtResource("1_x88rs") +LineEdit/styles/normal = SubResource("StyleBoxFlat_25x32") +LineEdit/styles/read_only = SubResource("StyleBoxFlat_25x32") +MarginContainer/constants/margin_bottom = 32 +MarginContainer/constants/margin_left = 32 +MarginContainer/constants/margin_right = 32 +MarginContainer/constants/margin_top = 32 +Panel/styles/panel = ExtResource("4_42dlp") +PanelContainer/styles/panel = ExtResource("4_42dlp") +RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr") +RichTextLabel/fonts/bold_italics_font = SubResource("FontVariation_lyo8w") +RichTextLabel/fonts/italics_font = SubResource("FontVariation_lyo8w") +RichTextLabel/fonts/mono_font = SubResource("FontVariation_lyo8w") diff --git a/client/player/chat_message.tscn b/client/player/chat_message.tscn index 594e9ec1..287891d5 100644 --- a/client/player/chat_message.tscn +++ b/client/player/chat_message.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://5rcfoyuiwuya"] -[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_3ximm"] +[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_3ximm"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"] bg_color = Color(1, 1, 1, 1) -- cgit v1.2.3-70-g09d2 From d7c7b2d94b547a25c65bf0528b1f2b4aaaa62740 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:37:16 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (292 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/de/ --- locale/de.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/de.ini b/locale/de.ini index 081bf794..556104ad 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -309,7 +309,7 @@ s.error.no_info = Keine Informationen verfügbar. s.error.quoting_invalid = Befehlszeichensetzung ungültig s.error.tutorial_already_running = Das Tuturial läuft bereits s.error.tutorial_no_running = Es läuft kein Tutorial -b.bun.steps = Verarbeiten Sie zunächst das Mehl mit einem Mixer. Machen Sie sich wegen der Verpackung keine Gedanken; sie wird in unauffällige Stücke zerkleinert. Nehmen Sie den Teig sobald dieser eine angemessene Konsistenz hat aus dem Mixer und backen Sie den Teig im Ofen. Warte beim herausnehmen des Brotlaibs, bis dieser abgekühlt ist, und schneide ihn dann auf einem Brett in Scheiben. +b.bun.steps = Verarbeiten Sie zunächst das Mehl mit einem Küchenmachine. Machen Sie sich wegen der Verpackung keine Gedanken; sie wird in unauffällige Stücke zerkleinert. Nehmen Sie den Teig sobald dieser eine angemessene Konsistenz hat aus dem Küchenmachine und backen Sie den Teig im Ofen. Warte beim herausnehmen des Brotlaibs, bis dieser abgekühlt ist, und schneide ihn dann auf einem Brett in Scheiben. b.burger.variation = Der Burger kann in verschiedenen Variationen zubereitet werden, z. B. mit oder ohne Käse oder als Veggie-Burger. b.curry.steps = Die Kokosnuss wird für ihre Milch püriert. Die Tomate und der Lauch wird in der Milch gekocht. Das Curry wird dann mit seperat gekochtem Reis serviert. b.icecream.steps = Die Kokosnuss und die Erdbeere wird püriert in der Küchenmaschine und dann unter kontinuierlichem Umrühren in der gleichen Küchenmaschine gefroren. @@ -317,3 +317,4 @@ b.strawberry_shake.steps = Die Erdbeere und die Kokosnuss werden püriert und da b.burger.steps = Schneide zuerst das Steak auf der Schneideunterlage bis es die Form eines runden Burgerpatties annimmt. Lege das Patty anschließend in die Pfanne und brate es auf mittlerer Hitze für zwei Minuten. In der Zwischenzeit kannst du das Gemüße kleinschneiden, wobei jedes Stück in eine einzige Scheibe geschnitten werden sollte. Schneide danach das Brötchen in zwei Hälften. Abschließend, sobald das Patty fertig gebraten ist, staple das aufgeschnittene Brötchen, das Gemüße und das Patty auf eine Teller und serviere das fertige Gericht. Et Voilà. b.tomato_soup.steps = Nimm zuerst eine frische Tomate und püriere sie in einem speziell hellblauen Edelstahlmixer bis sie einer feinen Paste ähnelt. Fülle besagte Paste in einen großen Topf deine Wahl und füge einen ganzen Lauch hinzu. Koche diese Mischung bis die Konsistenz homogen ist und die Farbe apettitlich aussieht. Serviere die Suppe auf einem Teller und genieße sie! b.mochi.steps = Mahle die dir zuerst dein eigenes Reismehl aus ganzen Reiskörnern in der Küchenmaschine. Erhitze dies danach vorsichtig in einem Topf und forme den sich ergebenden Teig um eine Erdbeere. +b.dishes = Hauptspeisen -- cgit v1.2.3-70-g09d2 From 476f40627e2cbceccb202ea02e039fa833c32182 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:41:40 +0000 Subject: Translated using Weblate (French) Currently translated at 38.6% (113 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/fr/ --- locale/fr.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/fr.ini b/locale/fr.ini index 02959be8..3d785693 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -161,3 +161,4 @@ unknown732= unknown736= unknown740=Regarder unknown752= +b.about.image_attrib = Attribution de l'image d'arrière-plan -- cgit v1.2.3-70-g09d2 From e4b809512e51e8cedb0f15c4360b5b1c28009e9b Mon Sep 17 00:00:00 2001 From: Vistaus Date: Thu, 3 Oct 2024 18:51:42 +0000 Subject: Translated using Weblate (Dutch) Currently translated at 85.6% (250 of 292 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/nl/ --- locale/nl.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/nl.ini b/locale/nl.ini index e975f473..74e23375 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -266,3 +266,7 @@ c.settings.gameplay.vibration = Trillingen inschakelen c.menu.deny = Weigeren c.play.allow_query_registry = Wil je in het register zoeken naar openbare servers? c.error.select_hairstyle = Kies een haarstijl. +b.about.image_attrib = Maker van achtergrondafbeelding +b.about.name = Het Hurry Curry!-receptenboek. +b.about = Over dit boek +b.bun.desc = De meest verzadigende maaltijd van allemaal. Serveer met tomatensoep. -- cgit v1.2.3-70-g09d2 From d778625a590982880fa3c09e0f36c4c1ae838588 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 3 Oct 2024 21:42:11 +0000 Subject: Added translation using Weblate (Korean) --- locale/ko.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/ko.ini diff --git a/locale/ko.ini b/locale/ko.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/locale/ko.ini @@ -0,0 +1 @@ + -- cgit v1.2.3-70-g09d2 From ca4fb662071f02607cf160fbf1b05b4167eb5948 Mon Sep 17 00:00:00 2001 From: Outbreak2096 Date: Fri, 4 Oct 2024 00:22:36 +0000 Subject: Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.3% (291 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/zh_Hans/ --- locale/zh_Hans.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index 4e0940bc..4304b46e 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -318,3 +318,4 @@ s.error.tutorial_already_running = 教程已在运行 b.ingred.cheese = 一块奶酪 b.ingred.steak = 一块生牛排 b.ingred.strawberry = 一颗草莓 +b.curry.desc = 这道开胃且充满异国情调的菜肴会在寒冷的日子里为您带来温暖，并赋予您新的力量。 -- cgit v1.2.3-70-g09d2 From 81afc70873a05298bcc9ea1d69f6920744c3428d Mon Sep 17 00:00:00 2001 From: Outbreak2096 Date: Fri, 4 Oct 2024 00:27:29 +0000 Subject: Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (293 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/zh_Hans/ --- locale/zh_Hans.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index 4304b46e..6b68b3c7 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -281,7 +281,7 @@ b.drinks = 饮料 b.bun.steps = 首先用食品加工机加工面粉。不要介意袋子，它会被撕成不可见的碎片。面团达到可操作的稠度后，就将其从食品加工机中取出并放入烤箱中烘烤。取出面包后，等待其冷却，然后在砧板上切片。 b.burger.variation = 汉堡有多种做法，如不加奶酪或作为素食汉堡。 b.burger = 汉堡 -b.curry.steps = 将椰子磨成泥，取椰奶，番茄和韭菜放入椰奶中煮熟，咖喱与单独煮好的米饭一起上桌。 +b.curry.steps = 首先，从椰子中榨出椰奶。最有效的方法是用食品加工机将整个椰子切碎。不要在意混合物中的木屑，它们不重要！椰子完全搅匀后，您可以将一整个番茄和一整根韭菜放入锅中，无需切碎，因为它们在椰奶中煮沸时会变成糊状。不要浪费时间等待酱汁，而是最好将其用于烹饪菜肴的主要成分：米饭。将其放入锅中。这里不需要加水，这是一种特殊的自我保湿大米品种！完成后，只需将两部分混合即可享用！ b.curry = 咖喱饭 b.about.name = Hurry Curry！食谱书。 b.about.image_attrib = 背景图片署名 @@ -319,3 +319,4 @@ b.ingred.cheese = 一块奶酪 b.ingred.steak = 一块生牛排 b.ingred.strawberry = 一颗草莓 b.curry.desc = 这道开胃且充满异国情调的菜肴会在寒冷的日子里为您带来温暖，并赋予您新的力量。 +b.dishes = 菜肴 -- cgit v1.2.3-70-g09d2 From d8c384c5f4531b48d215f735959ceb2054fd070f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 4 Oct 2024 16:06:07 +0000 Subject: Translated using Weblate (German) Currently translated at 99.6% (292 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/de/ --- locale/de.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/de.ini b/locale/de.ini index 556104ad..d3723932 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -318,3 +318,4 @@ b.burger.steps = Schneide zuerst das Steak auf der Schneideunterlage bis es die b.tomato_soup.steps = Nimm zuerst eine frische Tomate und püriere sie in einem speziell hellblauen Edelstahlmixer bis sie einer feinen Paste ähnelt. Fülle besagte Paste in einen großen Topf deine Wahl und füge einen ganzen Lauch hinzu. Koche diese Mischung bis die Konsistenz homogen ist und die Farbe apettitlich aussieht. Serviere die Suppe auf einem Teller und genieße sie! b.mochi.steps = Mahle die dir zuerst dein eigenes Reismehl aus ganzen Reiskörnern in der Küchenmaschine. Erhitze dies danach vorsichtig in einem Topf und forme den sich ergebenden Teig um eine Erdbeere. b.dishes = Hauptspeisen +b.curry.desc = Diese appettitliche und exotische Gericht wärmt dich an kalten Tagen und verleiht die neue Stärke. -- cgit v1.2.3-70-g09d2 From 1d17f5624befdba0ae5241ac3a1e94df5412f642 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 6 Oct 2024 10:16:06 +0000 Subject: Added translation using Weblate (Greek) --- locale/el.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/el.ini diff --git a/locale/el.ini b/locale/el.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/locale/el.ini @@ -0,0 +1 @@ + -- cgit v1.2.3-70-g09d2 From 97b8fe64c2c8e5b27b4520a0c167c75004ca3d77 Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 6 Oct 2024 17:11:46 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (293 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/de/ --- locale/de.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de.ini b/locale/de.ini index d3723932..6f543875 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -311,7 +311,7 @@ s.error.tutorial_already_running = Das Tuturial läuft bereits s.error.tutorial_no_running = Es läuft kein Tutorial b.bun.steps = Verarbeiten Sie zunächst das Mehl mit einem Küchenmachine. Machen Sie sich wegen der Verpackung keine Gedanken; sie wird in unauffällige Stücke zerkleinert. Nehmen Sie den Teig sobald dieser eine angemessene Konsistenz hat aus dem Küchenmachine und backen Sie den Teig im Ofen. Warte beim herausnehmen des Brotlaibs, bis dieser abgekühlt ist, und schneide ihn dann auf einem Brett in Scheiben. b.burger.variation = Der Burger kann in verschiedenen Variationen zubereitet werden, z. B. mit oder ohne Käse oder als Veggie-Burger. -b.curry.steps = Die Kokosnuss wird für ihre Milch püriert. Die Tomate und der Lauch wird in der Milch gekocht. Das Curry wird dann mit seperat gekochtem Reis serviert. +b.curry.steps = Extrahiere zuerst die Milch aus der Kokosnuss. Das geht am effizientesten, indem du die ganze Kokosnuss in der Küchenmaschine schredderst. Die Holzstückchen in dem Gemisch kannst du ignorieren. Sie sind irrelevant! Sobald die Nuss zu einem homogenen Gemisch zerkleinert wurde, kannst du eine ganze Tomate und eine ganze Stange Lauch in einen Topf geben. Schneiden musst du beides nicht, denn sie werden sowieso zu Brei, während sie in der Kokosmilch köcheln. Du solltest keine Zeit verschwenden um auf die Sauce zu warten. Stattdessen kannst du sie am besten dafür nutzen, die Hauptzutat des Gerichts zu kochen: Den Reis. Gebe ihn einen Topf. Du brauchst hierbei kein Wasser, es handelt sich um eine besondere, selbstbefeuchtende Reissorte! Sobald dieser fertig gekocht ist, kannst du beide Teile zusammenfügen und genießen! b.icecream.steps = Die Kokosnuss und die Erdbeere wird püriert in der Küchenmaschine und dann unter kontinuierlichem Umrühren in der gleichen Küchenmaschine gefroren. b.strawberry_shake.steps = Die Erdbeere und die Kokosnuss werden püriert und dann in ein Glas umgefüllt. b.burger.steps = Schneide zuerst das Steak auf der Schneideunterlage bis es die Form eines runden Burgerpatties annimmt. Lege das Patty anschließend in die Pfanne und brate es auf mittlerer Hitze für zwei Minuten. In der Zwischenzeit kannst du das Gemüße kleinschneiden, wobei jedes Stück in eine einzige Scheibe geschnitten werden sollte. Schneide danach das Brötchen in zwei Hälften. Abschließend, sobald das Patty fertig gebraten ist, staple das aufgeschnittene Brötchen, das Gemüße und das Patty auf eine Teller und serviere das fertige Gericht. Et Voilà. -- cgit v1.2.3-70-g09d2 From b7704411a0c13cc84f2d84bcf87290d393c15f9d Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 6 Oct 2024 17:45:31 +0000 Subject: Translated using Weblate (French) Currently translated at 43.6% (128 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/fr/ --- locale/fr.ini | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/locale/fr.ini b/locale/fr.ini index 3d785693..6b4955d0 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -23,7 +23,7 @@ c.error=Erreur c.error.cannot_cancel_no_game=Impossible d’annuler la partiecar aucune partie n’est en cours. c.error.must_join_to_cancel=Vous devez rejoindre une partie pour pouvoir l’annuler. c.error.placeholder=///. -c.error.websocket=WebSocket clos par le code: {0}, raison {1}. Nettoyer: {2} +c.error.websocket=WebSocket a fermé avec le code : {0}, raison {1}. Propre : {2} c.hint=Indice c.hint.boost=Appuyez sur {0} pour le boost c.hint.framerate_low=Votre fréquence d’images semble mauvaise. Vous pouvez réduire vos paramètres graphiques dans le menu des paramètres. @@ -117,7 +117,7 @@ c.settings.graphics.ui_blur=Activer le flou dans l’interface utilisateus c.settings.username=Nom d’utilisateur c.setup.contract_title=CONTRAT DE TRAVAIL c.setup.contract_desc=Ce contrat légal est rédigé entre vous (l’employé) et Musterfoods Ltd. (l’employeur) pour travailler comme chef ou serveur. -c.setup.name=1. [b]Nom de l’employé[/b] +c.setup.name=1. [b]Nom de l’employé[/b] Entre votre nom, s'il vous plaît. Les autres chefs peuvent voir ton nom sur votre étiquette. c.setup.position=2. [b]Fiche de poste[/b] c.setup.position.value=Chef / Serveur c.setup.uniform=3. [b]Uniforme de travail.[/b] Vous devrez toujours porter l’une des coiffures suivantes. @@ -162,3 +162,17 @@ unknown736= unknown740=Regarder unknown752= b.about.image_attrib = Attribution de l'image d'arrière-plan +b.ingred.cheese = un morceau de fromage +c.chat.write_message = Écrire un message +c.error.server = Erreur du serveur : {0} +c.error.empty_username = Le nom d’utilisateur ne peut pas être vide. +b.dishes = Plats +b.ingred.bun = un petit pain +c.error.select_hairstyle = Tu doit choisir une coiffure. +b.about.name = Le livre de cuisine de Hurry Curry!. +b.about = À propos de ce live +b.bun = Petit pain +b.burger = Burger +b.curry = Curry au riz +b.drinks = Boissons +b.icecream = Glace à la fraise -- cgit v1.2.3-70-g09d2 From a00505492eaec3b61661d4e506b6745292260048 Mon Sep 17 00:00:00 2001 From: BigBrotherLurien Date: Sun, 6 Oct 2024 17:52:52 +0000 Subject: Translated using Weblate (French) Currently translated at 43.6% (128 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/fr/ --- locale/fr.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/fr.ini b/locale/fr.ini index 6b4955d0..357c2cab 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -176,3 +176,4 @@ b.burger = Burger b.curry = Curry au riz b.drinks = Boissons b.icecream = Glace à la fraise +b.bun.desc = Le repas le plus nourrissant de tous. À déguster de préférence avec une soupe à la tomate. -- cgit v1.2.3-70-g09d2 From a40aeca5d1ade9df8dfdeec7e54e57649086a3e9 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 6 Oct 2024 23:02:06 +0200 Subject: strings from website --- locale/en.ini | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/locale/en.ini b/locale/en.ini index 41265980..7ecbd8b9 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -1,4 +1,22 @@ [hurrycurry] +i.abstract={_b}Hurry Curry!{_b_end} is a multiplayer game about cooking. Your goal is to run a restaurant and gain points by serving meals you’ve cooked. The game is completely free software, licenced AGPL 3.0 only. +i.gameplay_overview=Gameplay Overview +i.gameplay_overview.par=During the game, customers will enter your restaurant and order different meals. The players task is to assemble these meals by cutting, cooking, baking and combining resources in the kitchen. Multitasking is crucial but can lead to food burning or customers leaving if the player takes to long. There are many different restaurant/kitchen layouts. +i.how_to_play=How to play +i.how_to_play.par=To play, download the game for your platform or use {_a_browser_version}the rather laggy browser version{_a_end}. Assemble your team of chefs in the lobby before starting the game. +i.how_to_play.book=The recipes can be found in the Recipe {_a_book}Book{_a_end} (also available ingame in some maps). +i.how_to_play.keyboard_controls=Keyboard Controls: Move character with WASD. Move camera with arrow keys. Interact with Space or J. Boost with Left Shift or K. Open/close menus with Escape. Press Enter to open chat. Reset view with R. +i.how_to_play.controller_controls=Controller Controls: Move character with Left Stick. Move camera with Right Stick. Interact with A, Boost with B, Open/close menus with Menu button. Use keyboard for chat. Reset view with Y. +i.installation=Installation +i.installation.par=The source code repository is available on {_a_codeberg}Codeberg{_a_end}. Prebuilt packages can be downloaded from one of the following sources: +i.public_servers=Public Servers +i.credits=Credits +i.credits.primary=The game is primarily developed by {_developers}. +i.credits.contributers=Other contributers include Sofviic, BigBrotherNii and RustyStriker. +i.contribute=Contribute +i.contribute.par=You can help make the game better by contributing code through pull requests on {_a_codeberg}Codeberg{_a_end} +i.contribute.translate=You can also translate the game to your language on {_a_weblate}Codeberg’s Weblate{_a_end}. +i.have_fun=Have fun! b.about.image_attrib=Background image attribution b.about.name=The Hurry Curry! recipe book. b.about=About this book -- cgit v1.2.3-70-g09d2 From 26e4226f3ef410e5ec437bc8a1f2e286dcc8cde2 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 6 Oct 2024 23:28:31 +0200 Subject: german locale for website --- locale/de.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/locale/de.ini b/locale/de.ini index 6f543875..2cccb160 100644 --- a/locale/de.ini +++ b/locale/de.ini @@ -1,4 +1,20 @@ [hurrycurry] +i.abstract={_b}Hurry Curry!{_b_end} ist ein mehrspieler Spiel rund ums Kochen. Dein Ziel ist es, ein Restaurant zu führen und durch das Servieren von selbstgekochten Speisen Punkte zu sammeln. Das Spiel ist vollständig freie Software, lizensiert als AGPL 3.0 only. +i.gameplay_overview=Spielübersicht +i.how_to_play=Wie wird gespielt? +i.how_to_play.par=Um zu spielen, lade dir das Spiel für dein System herunter oder verwende {_a_browser_version}die etwas rucklige Browserversion{_a_end}. Stelle dir dein Team an Köchen in der Lobby zusammen und starte ein Spiel. +i.how_to_play.book=Die Rezepte sind im {_a_book}Rezeptebuch{_a_end} nachlesbar (welches auch in manchen Küchen im Spiel verfügbar ist). +i.how_to_play.keyboard_controls=Tastatursteuerung: Bewege deinen Spieler mit WASD. Bewege die Kamera mit den Pfeiltasten. Interagiere mit der Leertaste oder J. Bewegungsschub mit der linken Umschalttaste oder K. Öffne bzw. Schließe Menüs mit Escape. Drücke die Eingabetaste um den Chat zu öffnen. Setze die Kameraeinstellung mit R zurück. +i.installation=Installation +i.installation.par=Das Quellcoderepositorium ist auf {_a_codeberg}Codeberg{_a_end} verfügbar. Fertige Pakete können aus einer der folgenden Quellen heruntergeladen werden: +i.public_servers=Öffentliche Server +i.credits=Anerkennungen +i.credits.primary=Das spiel wird primär von {_developers} entwickelt. +i.credits.contributers=Andere Beiträger beinhalten Sofviic, BigBrotherNii und RustyStriker. +i.contribute=Hilf mit +i.contribute.par=Du kannst dabei mithelfen diese Spiel noch besser zu machen, in dem du Code auf {_a_codeberg}Codeberg{_a_end} beiträgst. +i.contribute.translate=Du kannst auch auf {_a_weblate}Codeberg’s Weblate{_a_end} das Spiel in deine eigene Sprache übersetzen. +i.have_fun=Viel spaß! c.credits.developed_by=entwickelt von c.credits.models=Modelle c.credits.sounds=Soundeffekte -- cgit v1.2.3-70-g09d2 From 64f62ef24af848c359fdb0313a226a57364060db Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 6 Oct 2024 18:18:21 +0000 Subject: Translated using Weblate (French) Currently translated at 44.3% (130 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/fr/ --- locale/fr.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/fr.ini b/locale/fr.ini index 357c2cab..c4d49424 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -177,3 +177,5 @@ b.curry = Curry au riz b.drinks = Boissons b.icecream = Glace à la fraise b.bun.desc = Le repas le plus nourrissant de tous. À déguster de préférence avec une soupe à la tomate. +c.error.version_mismatch = Les versions du serveur et du client ne correspondent pas. Serveur : {0}.{1}, Client : {2}.{3}%nEst-tu sûr que le jeu est à jour ? +c.error.websocket.unavailable = indisponible -- cgit v1.2.3-70-g09d2 From 57783a3c56ce74161c18fc8884cf19d5793b942d Mon Sep 17 00:00:00 2001 From: Vistaus Date: Sun, 6 Oct 2024 18:15:31 +0000 Subject: Translated using Weblate (Dutch) Currently translated at 86.3% (253 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/nl/ --- locale/nl.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locale/nl.ini b/locale/nl.ini index 74e23375..52a403ae 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -270,3 +270,6 @@ b.about.image_attrib = Maker van achtergrondafbeelding b.about.name = Het Hurry Curry!-receptenboek. b.about = Over dit boek b.bun.desc = De meest verzadigende maaltijd van allemaal. Serveer met tomatensoep. +b.curry.desc = Dit smakelijke, exotische gerecht geeft je een warm gevoel op een koude dag, en voorziet je van nieuwe energie. +b.burger.variation = De burger kan op meerdere manieren worden gemaakt, bijvoorbeeld zonder kaas of vegetarisch. +b.burger = Burger -- cgit v1.2.3-70-g09d2 From 4ee632304449b77689bf075d3dbcd2466210e118 Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 6 Oct 2024 21:17:52 +0200 Subject: Reorganize map files; Fix location of some theme files --- client/map/items/item.gd | 2 +- client/map/palette.png | Bin 38079 -> 0 bytes client/map/palette.png.import | 36 ---------------- client/map/progress.gd | 24 ----------- client/map/progress.gdshader | 48 --------------------- client/map/progress.tscn | 19 -------- client/map/progress/progress.gd | 24 +++++++++++ client/map/progress/progress.gdshader | 48 +++++++++++++++++++++ client/map/progress/progress.tscn | 19 ++++++++ client/map/textures/palette.png | Bin 0 -> 38079 bytes client/map/textures/palette.png.import | 36 ++++++++++++++++ client/map/tiles/grass_side.res.depren | Bin 1430 -> 0 bytes client/menu/communicate/item/item_message.gd | 2 +- client/menu/menu_background.gdshader | 36 ---------------- client/menu/menu_background.tscn | 2 +- client/menu/printed.gdshader | 22 ---------- client/menu/printed_material.tres | 6 --- client/menu/rating/rating.tscn | 2 +- client/menu/theme/materials/printed_material.tres | 6 +++ client/menu/theme/shaders/menu_background.gdshader | 36 ++++++++++++++++ client/menu/theme/shaders/printed.gdshader | 22 ++++++++++ client/player/angry.tscn | 2 +- client/player/angry.webp | Bin 5022 -> 0 bytes client/player/angry.webp.import | 36 ---------------- client/player/effect.gd | 45 ------------------- client/player/effect.tscn | 36 ---------------- client/player/particles/angry/angry.webp | Bin 0 -> 5022 bytes client/player/particles/angry/angry.webp.import | 36 ++++++++++++++++ client/player/particles/effect.gd | 45 +++++++++++++++++++ client/player/particles/effect.tscn | 36 ++++++++++++++++ client/player/particles/satisfied/star.webp | Bin 0 -> 5818 bytes client/player/particles/satisfied/star.webp.import | 36 ++++++++++++++++ client/player/particles/satisfied/stars.tscn | 37 ++++++++++++++++ client/player/player.gd | 2 +- client/player/star.webp | Bin 5818 -> 0 bytes client/player/star.webp.import | 36 ---------------- client/player/stars.tscn | 37 ---------------- 37 files changed, 387 insertions(+), 387 deletions(-) delete mode 100644 client/map/palette.png delete mode 100644 client/map/palette.png.import delete mode 100644 client/map/progress.gd delete mode 100644 client/map/progress.gdshader delete mode 100644 client/map/progress.tscn create mode 100644 client/map/progress/progress.gd create mode 100644 client/map/progress/progress.gdshader create mode 100644 client/map/progress/progress.tscn create mode 100644 client/map/textures/palette.png create mode 100644 client/map/textures/palette.png.import delete mode 100644 client/map/tiles/grass_side.res.depren delete mode 100644 client/menu/menu_background.gdshader delete mode 100644 client/menu/printed.gdshader delete mode 100644 client/menu/printed_material.tres create mode 100644 client/menu/theme/materials/printed_material.tres create mode 100644 client/menu/theme/shaders/menu_background.gdshader create mode 100644 client/menu/theme/shaders/printed.gdshader delete mode 100644 client/player/angry.webp delete mode 100644 client/player/angry.webp.import delete mode 100644 client/player/effect.gd delete mode 100644 client/player/effect.tscn create mode 100644 client/player/particles/angry/angry.webp create mode 100644 client/player/particles/angry/angry.webp.import create mode 100644 client/player/particles/effect.gd create mode 100644 client/player/particles/effect.tscn create mode 100644 client/player/particles/satisfied/star.webp create mode 100644 client/player/particles/satisfied/star.webp.import create mode 100644 client/player/particles/satisfied/stars.tscn delete mode 100644 client/player/star.webp delete mode 100644 client/player/star.webp.import delete mode 100644 client/player/stars.tscn diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 80aa4d6d..f7592d87 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -21,7 +21,7 @@ extends Node3D var owned_by: Node3D var base: Node3D = Node3D.new() -var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate() +var progress_instance: ProgressBar3D = preload("res://map/progress/progress.tscn").instantiate() var take_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() var put_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() var ding_sound := AudioStreamPlayer3D.new() diff --git a/client/map/palette.png b/client/map/palette.png deleted file mode 100644 index e184fe5b..00000000 Binary files a/client/map/palette.png and /dev/null differ diff --git a/client/map/palette.png.import b/client/map/palette.png.import deleted file mode 100644 index 92840fcf..00000000 --- a/client/map/palette.png.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dgcs4wkxsxe6a" -path.s3tc="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex" -path.etc2="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://map/palette.png" -dest_files=["res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex", "res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/client/map/progress.gd b/client/map/progress.gd deleted file mode 100644 index fc31408c..00000000 --- a/client/map/progress.gd +++ /dev/null @@ -1,24 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 metamuffin -# 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 ProgressBar3D -extends MeshInstance3D - -func update(new_position: float, new_warn: bool): - var mat: ShaderMaterial = get_active_material(0) - mat.set_shader_parameter("progress", new_position) - mat.set_shader_parameter("bad", new_warn) diff --git a/client/map/progress.gdshader b/client/map/progress.gdshader deleted file mode 100644 index a5ebf575..00000000 --- a/client/map/progress.gdshader +++ /dev/null @@ -1,48 +0,0 @@ -/* - 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 . - -*/ -shader_type spatial; -render_mode unshaded; - -uniform float progress = 0.; -uniform bool bad = false; - -void fragment() { - vec3 color = vec3(0., .5, 0.); - float alpha_fac = 1.; - if (bad) { - color = vec3(progress, 1. - progress, 0.); - alpha_fac = (sin(TIME * 15.) + 1.) * .5; - } - if (UV.x > progress) { - ALPHA = 1.; - color = vec3(0.1, 0.1, 0.1); - } - ALPHA *= alpha_fac; - ALBEDO = color; -} - -void vertex() { - mat4 modified_model_view = VIEW_MATRIX * mat4( - INV_VIEW_MATRIX[0], - INV_VIEW_MATRIX[1], - INV_VIEW_MATRIX[2], - MODEL_MATRIX[3] - ); - MODELVIEW_MATRIX = modified_model_view; -} diff --git a/client/map/progress.tscn b/client/map/progress.tscn deleted file mode 100644 index 7a0629a1..00000000 --- a/client/map/progress.tscn +++ /dev/null @@ -1,19 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://4ewufm6tqhpb"] - -[ext_resource type="Shader" path="res://map/progress.gdshader" id="1_6f2a0"] -[ext_resource type="Script" path="res://map/progress.gd" id="2_bb3u3"] - -[sub_resource type="QuadMesh" id="QuadMesh_m0itj"] -size = Vector2(0.75, 0.1) - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_4k6cy"] -resource_local_to_scene = true -render_priority = 0 -shader = ExtResource("1_6f2a0") -shader_parameter/progress = 0.0 -shader_parameter/bad = false - -[node name="Progress" type="MeshInstance3D"] -mesh = SubResource("QuadMesh_m0itj") -surface_material_override/0 = SubResource("ShaderMaterial_4k6cy") -script = ExtResource("2_bb3u3") diff --git a/client/map/progress/progress.gd b/client/map/progress/progress.gd new file mode 100644 index 00000000..fc31408c --- /dev/null +++ b/client/map/progress/progress.gd @@ -0,0 +1,24 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 metamuffin +# 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 ProgressBar3D +extends MeshInstance3D + +func update(new_position: float, new_warn: bool): + var mat: ShaderMaterial = get_active_material(0) + mat.set_shader_parameter("progress", new_position) + mat.set_shader_parameter("bad", new_warn) diff --git a/client/map/progress/progress.gdshader b/client/map/progress/progress.gdshader new file mode 100644 index 00000000..a5ebf575 --- /dev/null +++ b/client/map/progress/progress.gdshader @@ -0,0 +1,48 @@ +/* + 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 . + +*/ +shader_type spatial; +render_mode unshaded; + +uniform float progress = 0.; +uniform bool bad = false; + +void fragment() { + vec3 color = vec3(0., .5, 0.); + float alpha_fac = 1.; + if (bad) { + color = vec3(progress, 1. - progress, 0.); + alpha_fac = (sin(TIME * 15.) + 1.) * .5; + } + if (UV.x > progress) { + ALPHA = 1.; + color = vec3(0.1, 0.1, 0.1); + } + ALPHA *= alpha_fac; + ALBEDO = color; +} + +void vertex() { + mat4 modified_model_view = VIEW_MATRIX * mat4( + INV_VIEW_MATRIX[0], + INV_VIEW_MATRIX[1], + INV_VIEW_MATRIX[2], + MODEL_MATRIX[3] + ); + MODELVIEW_MATRIX = modified_model_view; +} diff --git a/client/map/progress/progress.tscn b/client/map/progress/progress.tscn new file mode 100644 index 00000000..7f2ec175 --- /dev/null +++ b/client/map/progress/progress.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=5 format=3 uid="uid://4ewufm6tqhpb"] + +[ext_resource type="Shader" path="res://map/progress/progress.gdshader" id="1_6f2a0"] +[ext_resource type="Script" path="res://map/progress/progress.gd" id="2_bb3u3"] + +[sub_resource type="QuadMesh" id="QuadMesh_m0itj"] +size = Vector2(0.75, 0.1) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4k6cy"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("1_6f2a0") +shader_parameter/progress = 0.0 +shader_parameter/bad = false + +[node name="Progress" type="MeshInstance3D"] +mesh = SubResource("QuadMesh_m0itj") +surface_material_override/0 = SubResource("ShaderMaterial_4k6cy") +script = ExtResource("2_bb3u3") diff --git a/client/map/textures/palette.png b/client/map/textures/palette.png new file mode 100644 index 00000000..e184fe5b Binary files /dev/null and b/client/map/textures/palette.png differ diff --git a/client/map/textures/palette.png.import b/client/map/textures/palette.png.import new file mode 100644 index 00000000..97dc821b --- /dev/null +++ b/client/map/textures/palette.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dgcs4wkxsxe6a" +path.s3tc="res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.s3tc.ctex" +path.etc2="res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://map/textures/palette.png" +dest_files=["res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.s3tc.ctex", "res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/client/map/tiles/grass_side.res.depren b/client/map/tiles/grass_side.res.depren deleted file mode 100644 index 3116171f..00000000 Binary files a/client/map/tiles/grass_side.res.depren and /dev/null differ diff --git a/client/menu/communicate/item/item_message.gd b/client/menu/communicate/item/item_message.gd index 17d2a629..dfbaf232 100644 --- a/client/menu/communicate/item/item_message.gd +++ b/client/menu/communicate/item/item_message.gd @@ -17,7 +17,7 @@ class_name ItemMessage extends Control -const PRINTED_MAT := preload("res://menu/printed_material.tres") +const PRINTED_MAT := preload("res://menu/theme/materials/printed_material.tres") @export var enable_rotation := true @export var enable_grayscale := false diff --git a/client/menu/menu_background.gdshader b/client/menu/menu_background.gdshader deleted file mode 100644 index 91b94601..00000000 --- a/client/menu/menu_background.gdshader +++ /dev/null @@ -1,36 +0,0 @@ -/* - Hurry Curry! - a game about cooking - Copyright 2024 metamuffin - - 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 . - -*/ -shader_type spatial; -render_mode unshaded; - -uniform sampler2D noise : source_color; -uniform vec3 ccloud : source_color; -uniform vec3 csky : source_color; - -void fragment() { - vec2 uv = UV * 0.9; - uv += TIME * vec2(0.001,0.002); - - float f = texture(noise, uv).x; - f = 1. - f; - f = pow(f, 1.5); - f = floor(f*5.)/5.; - f = pow(f, 2.); - - ALBEDO = mix(csky, ccloud, f); -} diff --git a/client/menu/menu_background.tscn b/client/menu/menu_background.tscn index 19f0d506..c8cd7c53 100644 --- a/client/menu/menu_background.tscn +++ b/client/menu/menu_background.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://menu/menu_background.gd" id="1_ijsg0"] [ext_resource type="Script" path="res://map/auto_setup/environment_setup.gd" id="2_rkilw"] -[ext_resource type="Shader" path="res://menu/menu_background.gdshader" id="3_5mp8y"] +[ext_resource type="Shader" path="res://menu/theme/shaders/menu_background.gdshader" id="3_5mp8y"] [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_p80a7"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_uw50b"] diff --git a/client/menu/printed.gdshader b/client/menu/printed.gdshader deleted file mode 100644 index 3b35faa8..00000000 --- a/client/menu/printed.gdshader +++ /dev/null @@ -1,22 +0,0 @@ -/* - Hurry Curry! - a game about cooking - Copyright 2024 metamuffin - - 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 . - -*/ -shader_type canvas_item; - -void fragment() { - COLOR = floor(COLOR*5.)/5.; -} diff --git a/client/menu/printed_material.tres b/client/menu/printed_material.tres deleted file mode 100644 index 595248fd..00000000 --- a/client/menu/printed_material.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://dogdyoqrmy6ft"] - -[ext_resource type="Shader" path="res://menu/printed.gdshader" id="1_v4ily"] - -[resource] -shader = ExtResource("1_v4ily") diff --git a/client/menu/rating/rating.tscn b/client/menu/rating/rating.tscn index dc4ed714..a1f48c64 100644 --- a/client/menu/rating/rating.tscn +++ b/client/menu/rating/rating.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=12 format=3 uid="uid://buu3cdpigs8qq"] -[ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/star.webp" id="1_7qv7r"] +[ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/particles/satisfied/star.webp" id="1_7qv7r"] [ext_resource type="Shader" path="res://menu/rating/desaturate.gdshader" id="1_pddsm"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_uwajf"] [ext_resource type="Script" path="res://menu/rating/rating.gd" id="2_cq0se"] diff --git a/client/menu/theme/materials/printed_material.tres b/client/menu/theme/materials/printed_material.tres new file mode 100644 index 00000000..5695d5a5 --- /dev/null +++ b/client/menu/theme/materials/printed_material.tres @@ -0,0 +1,6 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://dogdyoqrmy6ft"] + +[ext_resource type="Shader" path="res://menu/theme/shaders/printed.gdshader" id="1_sevww"] + +[resource] +shader = ExtResource("1_sevww") diff --git a/client/menu/theme/shaders/menu_background.gdshader b/client/menu/theme/shaders/menu_background.gdshader new file mode 100644 index 00000000..91b94601 --- /dev/null +++ b/client/menu/theme/shaders/menu_background.gdshader @@ -0,0 +1,36 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + 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 . + +*/ +shader_type spatial; +render_mode unshaded; + +uniform sampler2D noise : source_color; +uniform vec3 ccloud : source_color; +uniform vec3 csky : source_color; + +void fragment() { + vec2 uv = UV * 0.9; + uv += TIME * vec2(0.001,0.002); + + float f = texture(noise, uv).x; + f = 1. - f; + f = pow(f, 1.5); + f = floor(f*5.)/5.; + f = pow(f, 2.); + + ALBEDO = mix(csky, ccloud, f); +} diff --git a/client/menu/theme/shaders/printed.gdshader b/client/menu/theme/shaders/printed.gdshader new file mode 100644 index 00000000..3b35faa8 --- /dev/null +++ b/client/menu/theme/shaders/printed.gdshader @@ -0,0 +1,22 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + 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 . + +*/ +shader_type canvas_item; + +void fragment() { + COLOR = floor(COLOR*5.)/5.; +} diff --git a/client/player/angry.tscn b/client/player/angry.tscn index 56fa4d05..c8f82ab6 100644 --- a/client/player/angry.tscn +++ b/client/player/angry.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://cvty1rwt52anq"] -[ext_resource type="Texture2D" uid="uid://unjbxplj845n" path="res://player/angry.webp" id="1_5op6v"] +[ext_resource type="Texture2D" uid="uid://unjbxplj845n" path="res://player/particles/angry/angry.webp" id="1_5op6v"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ysmnk"] transparency = 1 diff --git a/client/player/angry.webp b/client/player/angry.webp deleted file mode 100644 index 866ba92c..00000000 Binary files a/client/player/angry.webp and /dev/null differ diff --git a/client/player/angry.webp.import b/client/player/angry.webp.import deleted file mode 100644 index 2d622e73..00000000 --- a/client/player/angry.webp.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://unjbxplj845n" -path.s3tc="res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex" -path.etc2="res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://player/angry.webp" -dest_files=["res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex", "res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/client/player/effect.gd b/client/player/effect.gd deleted file mode 100644 index 00c95441..00000000 --- a/client/player/effect.gd +++ /dev/null @@ -1,45 +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 . -# -class_name Effect -extends Node3D - -@onready var success = $Success -@onready var failure = $Failure -@onready var angry_grunt: PlayRandom = $AngryGrunt -@onready var stars = $Stars -@onready var angry = $Angry - - -func set_effect(e: String): - clear_effect() - match e: - "satisfied": - stars.emitting = true - success.play() - "angry": - angry.emitting = true - angry_grunt.play_random() - failure.play() - _: - push_warning("effect %s unknown" % e) - -func clear_effect(): - stars.emitting = false - success.stop() - angry.emitting = false - angry_grunt.stop_all() - failure.stop() diff --git a/client/player/effect.tscn b/client/player/effect.tscn deleted file mode 100644 index a360d1a8..00000000 --- a/client/player/effect.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://dn2ne30t81ame"] - -[ext_resource type="Script" path="res://player/effect.gd" id="1_aqsk6"] -[ext_resource type="PackedScene" uid="uid://yaed1vnhd0aa" path="res://player/stars.tscn" id="2_shb5l"] -[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="3_favyn"] -[ext_resource type="AudioStream" uid="uid://cv4isy6po6pqd" path="res://menu/sounds/failure.ogg" id="4_j38qf"] -[ext_resource type="PackedScene" uid="uid://cvty1rwt52anq" path="res://player/angry.tscn" id="4_uxxex"] -[ext_resource type="Script" path="res://audio/play_random.gd" id="5_t2upj"] -[ext_resource type="AudioStream" uid="uid://c3gatgrsb0npf" path="res://player/sounds/angry1.ogg" id="6_ou7uy"] -[ext_resource type="AudioStream" uid="uid://cty282m6ckt62" path="res://player/sounds/angry2.ogg" id="7_r21iy"] - -[node name="Effect" type="Node3D"] -script = ExtResource("1_aqsk6") - -[node name="Stars" parent="." instance=ExtResource("2_shb5l")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) - -[node name="Success" type="AudioStreamPlayer" parent="."] -stream = ExtResource("3_favyn") - -[node name="Failure" type="AudioStreamPlayer" parent="."] -stream = ExtResource("4_j38qf") -volume_db = -8.0 - -[node name="Angry" parent="." instance=ExtResource("4_uxxex")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) - -[node name="AngryGrunt" type="Node3D" parent="."] -script = ExtResource("5_t2upj") -volume_db = -8.0 - -[node name="Angry1" type="AudioStreamPlayer3D" parent="AngryGrunt"] -stream = ExtResource("6_ou7uy") - -[node name="Angry2" type="AudioStreamPlayer3D" parent="AngryGrunt"] -stream = ExtResource("7_r21iy") diff --git a/client/player/particles/angry/angry.webp b/client/player/particles/angry/angry.webp new file mode 100644 index 00000000..866ba92c Binary files /dev/null and b/client/player/particles/angry/angry.webp differ diff --git a/client/player/particles/angry/angry.webp.import b/client/player/particles/angry/angry.webp.import new file mode 100644 index 00000000..3deee645 --- /dev/null +++ b/client/player/particles/angry/angry.webp.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://unjbxplj845n" +path.s3tc="res://.godot/imported/angry.webp-f649f66bf6a009b3b61480c4e451c61b.s3tc.ctex" +path.etc2="res://.godot/imported/angry.webp-f649f66bf6a009b3b61480c4e451c61b.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://player/particles/angry/angry.webp" +dest_files=["res://.godot/imported/angry.webp-f649f66bf6a009b3b61480c4e451c61b.s3tc.ctex", "res://.godot/imported/angry.webp-f649f66bf6a009b3b61480c4e451c61b.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/client/player/particles/effect.gd b/client/player/particles/effect.gd new file mode 100644 index 00000000..00c95441 --- /dev/null +++ b/client/player/particles/effect.gd @@ -0,0 +1,45 @@ +# 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 . +# +class_name Effect +extends Node3D + +@onready var success = $Success +@onready var failure = $Failure +@onready var angry_grunt: PlayRandom = $AngryGrunt +@onready var stars = $Stars +@onready var angry = $Angry + + +func set_effect(e: String): + clear_effect() + match e: + "satisfied": + stars.emitting = true + success.play() + "angry": + angry.emitting = true + angry_grunt.play_random() + failure.play() + _: + push_warning("effect %s unknown" % e) + +func clear_effect(): + stars.emitting = false + success.stop() + angry.emitting = false + angry_grunt.stop_all() + failure.stop() diff --git a/client/player/particles/effect.tscn b/client/player/particles/effect.tscn new file mode 100644 index 00000000..13423874 --- /dev/null +++ b/client/player/particles/effect.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=9 format=3 uid="uid://dn2ne30t81ame"] + +[ext_resource type="Script" path="res://player/particles/effect.gd" id="1_aqsk6"] +[ext_resource type="PackedScene" uid="uid://yaed1vnhd0aa" path="res://player/particles/satisfied/stars.tscn" id="2_shb5l"] +[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="3_favyn"] +[ext_resource type="AudioStream" uid="uid://cv4isy6po6pqd" path="res://menu/sounds/failure.ogg" id="4_j38qf"] +[ext_resource type="PackedScene" uid="uid://cvty1rwt52anq" path="res://player/angry.tscn" id="4_uxxex"] +[ext_resource type="Script" path="res://audio/play_random.gd" id="5_t2upj"] +[ext_resource type="AudioStream" uid="uid://c3gatgrsb0npf" path="res://player/sounds/angry1.ogg" id="6_ou7uy"] +[ext_resource type="AudioStream" uid="uid://cty282m6ckt62" path="res://player/sounds/angry2.ogg" id="7_r21iy"] + +[node name="Effect" type="Node3D"] +script = ExtResource("1_aqsk6") + +[node name="Stars" parent="." instance=ExtResource("2_shb5l")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) + +[node name="Success" type="AudioStreamPlayer" parent="."] +stream = ExtResource("3_favyn") + +[node name="Failure" type="AudioStreamPlayer" parent="."] +stream = ExtResource("4_j38qf") +volume_db = -8.0 + +[node name="Angry" parent="." instance=ExtResource("4_uxxex")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) + +[node name="AngryGrunt" type="Node3D" parent="."] +script = ExtResource("5_t2upj") +volume_db = -8.0 + +[node name="Angry1" type="AudioStreamPlayer3D" parent="AngryGrunt"] +stream = ExtResource("6_ou7uy") + +[node name="Angry2" type="AudioStreamPlayer3D" parent="AngryGrunt"] +stream = ExtResource("7_r21iy") diff --git a/client/player/particles/satisfied/star.webp b/client/player/particles/satisfied/star.webp new file mode 100644 index 00000000..c1d2e8ff Binary files /dev/null and b/client/player/particles/satisfied/star.webp differ diff --git a/client/player/particles/satisfied/star.webp.import b/client/player/particles/satisfied/star.webp.import new file mode 100644 index 00000000..11d15c58 --- /dev/null +++ b/client/player/particles/satisfied/star.webp.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b10goh4dsa3b0" +path.s3tc="res://.godot/imported/star.webp-4edd9a951e46ba686b105839f622c981.s3tc.ctex" +path.etc2="res://.godot/imported/star.webp-4edd9a951e46ba686b105839f622c981.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://player/particles/satisfied/star.webp" +dest_files=["res://.godot/imported/star.webp-4edd9a951e46ba686b105839f622c981.s3tc.ctex", "res://.godot/imported/star.webp-4edd9a951e46ba686b105839f622c981.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/client/player/particles/satisfied/stars.tscn b/client/player/particles/satisfied/stars.tscn new file mode 100644 index 00000000..2bfaaec0 --- /dev/null +++ b/client/player/particles/satisfied/stars.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=6 format=3 uid="uid://yaed1vnhd0aa"] + +[ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/particles/satisfied/star.webp" id="1_v8q3r"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_d8uy0"] +transparency = 1 +shading_mode = 0 +vertex_color_use_as_albedo = true +albedo_texture = ExtResource("1_v8q3r") +billboard_mode = 2 +billboard_keep_scale = true + +[sub_resource type="QuadMesh" id="QuadMesh_d0lru"] +material = SubResource("StandardMaterial3D_d8uy0") + +[sub_resource type="Curve" id="Curve_0rju1"] +_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.51927, 1), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="Gradient" id="Gradient_lmymu"] +offsets = PackedFloat32Array(0, 0.711828, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +[node name="Stars" type="CPUParticles3D"] +emitting = false +amount = 5 +lifetime = 2.0 +one_shot = true +explosiveness = 1.0 +mesh = SubResource("QuadMesh_d0lru") +direction = Vector3(0, 1, 0) +spread = 30.0 +gravity = Vector3(0, 0, 0) +initial_velocity_min = 1.0 +initial_velocity_max = 1.5 +scale_amount_curve = SubResource("Curve_0rju1") +color_ramp = SubResource("Gradient_lmymu") diff --git a/client/player/player.gd b/client/player/player.gd index f90b2b1b..1d7541fe 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -35,7 +35,7 @@ var movement_base: Node3D = Node3D.new() var character: Character = preload("res://player/character/character.tscn").instantiate() var chat_bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate() var item_bubble: ItemBubble = preload("res://player/item_bubble.tscn").instantiate() -var effect: Effect = preload("res://player/effect.tscn").instantiate() +var effect: Effect = preload("res://player/particles/effect.tscn").instantiate() var marker: Marker = preload("res://player/marker.tscn").instantiate() var marker_target = Vector3(0, 0, 0) diff --git a/client/player/star.webp b/client/player/star.webp deleted file mode 100644 index c1d2e8ff..00000000 Binary files a/client/player/star.webp and /dev/null differ diff --git a/client/player/star.webp.import b/client/player/star.webp.import deleted file mode 100644 index ff84dd75..00000000 --- a/client/player/star.webp.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b10goh4dsa3b0" -path.s3tc="res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.s3tc.ctex" -path.etc2="res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://player/star.webp" -dest_files=["res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.s3tc.ctex", "res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/client/player/stars.tscn b/client/player/stars.tscn deleted file mode 100644 index 5c96c291..00000000 --- a/client/player/stars.tscn +++ /dev/null @@ -1,37 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://yaed1vnhd0aa"] - -[ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/star.webp" id="1_v8q3r"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_d8uy0"] -transparency = 1 -shading_mode = 0 -vertex_color_use_as_albedo = true -albedo_texture = ExtResource("1_v8q3r") -billboard_mode = 2 -billboard_keep_scale = true - -[sub_resource type="QuadMesh" id="QuadMesh_d0lru"] -material = SubResource("StandardMaterial3D_d8uy0") - -[sub_resource type="Curve" id="Curve_0rju1"] -_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.51927, 1), 0.0, 0.0, 0, 0] -point_count = 2 - -[sub_resource type="Gradient" id="Gradient_lmymu"] -offsets = PackedFloat32Array(0, 0.711828, 1) -colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) - -[node name="Stars" type="CPUParticles3D"] -emitting = false -amount = 5 -lifetime = 2.0 -one_shot = true -explosiveness = 1.0 -mesh = SubResource("QuadMesh_d0lru") -direction = Vector3(0, 1, 0) -spread = 30.0 -gravity = Vector3(0, 0, 0) -initial_velocity_min = 1.0 -initial_velocity_max = 1.5 -scale_amount_curve = SubResource("Curve_0rju1") -color_ramp = SubResource("Gradient_lmymu") -- cgit v1.2.3-70-g09d2 From 8fc3db922922e87fa5f8bdb09e4a3b6b2d4cf96e Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 6 Oct 2024 21:21:51 +0200 Subject: Categorize interact marker; Fix misplaced file --- client/menu/auto_setup/scroll_container_custom.gd | 45 +++++++++++++++++++ client/menu/book/book.tscn | 2 +- client/menu/communicate/chat/chat_open.tscn | 2 +- client/menu/credits.tscn | 2 +- client/menu/lobby.tscn | 2 +- client/menu/play.tscn | 2 +- client/menu/scroll_container_custom.gd | 45 ------------------- client/menu/setup.tscn | 2 +- client/player/interact_marker.gdshader | 47 -------------------- client/player/marker.gd | 27 ------------ client/player/marker.tscn | 54 ----------------------- client/player/marker/interact_marker.gdshader | 47 ++++++++++++++++++++ client/player/marker/marker.gd | 27 ++++++++++++ client/player/marker/marker.tscn | 54 +++++++++++++++++++++++ 14 files changed, 179 insertions(+), 179 deletions(-) create mode 100644 client/menu/auto_setup/scroll_container_custom.gd delete mode 100644 client/menu/scroll_container_custom.gd delete mode 100644 client/player/interact_marker.gdshader delete mode 100644 client/player/marker.gd delete mode 100644 client/player/marker.tscn create mode 100644 client/player/marker/interact_marker.gdshader create mode 100644 client/player/marker/marker.gd create mode 100644 client/player/marker/marker.tscn diff --git a/client/menu/auto_setup/scroll_container_custom.gd b/client/menu/auto_setup/scroll_container_custom.gd new file mode 100644 index 00000000..a456f644 --- /dev/null +++ b/client/menu/auto_setup/scroll_container_custom.gd @@ -0,0 +1,45 @@ +# 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 ScrollContainer +class_name ScrollContainerCustom + +# Adds support for scrolling with joypad and touch + +const SCROLL_SPEED := 1000. +var velocity := 0. + +@export var auto_scroll_to_bottom := false + +func _init(): + follow_focus = true + +func _ready(): + if auto_scroll_to_bottom: + call_deferred("scroll_to_bottom") + +func scroll_to_bottom(): + set_deferred("scroll_vertical", get_v_scroll_bar().max_value) + +func _process(delta): + velocity = G.interpolate(velocity, 0., delta * 5.) + velocity = 0. if abs(velocity) < .001 else velocity + if Input.get_axis("scroll_up", "scroll_down") != 0.: + velocity = Input.get_axis("scroll_up", "scroll_down") + set_deferred("scroll_vertical", scroll_vertical + velocity * delta * SCROLL_SPEED) + +func _input(event): + if event is InputEventScreenDrag: + velocity = -(scroll_vertical - (scroll_vertical - event.relative.y)) * .1 diff --git a/client/menu/book/book.tscn b/client/menu/book/book.tscn index 824c062d..366959a4 100644 --- a/client/menu/book/book.tscn +++ b/client/menu/book/book.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bdggwo8un3mys"] [ext_resource type="Script" path="res://menu/book/book.gd" id="1_gyisx"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="2_0d0p0"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="2_0d0p0"] [node name="Book" type="Control"] layout_mode = 3 diff --git a/client/menu/communicate/chat/chat_open.tscn b/client/menu/communicate/chat/chat_open.tscn index 8830c4f7..09cc4526 100644 --- a/client/menu/communicate/chat/chat_open.tscn +++ b/client/menu/communicate/chat/chat_open.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="2_urbd2"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/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"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="5_3mths"] [node name="ChatOpen" type="Control"] layout_mode = 3 diff --git a/client/menu/credits.tscn b/client/menu/credits.tscn index ddbc8ebe..783b308b 100644 --- a/client/menu/credits.tscn +++ b/client/menu/credits.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://menu/credits.gd" id="2_alvab"] [ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_nwoiv"] [ext_resource type="Script" path="res://menu/auto_setup/blur_setup.gd" id="4_8sii3"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="4_bfcw8"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="4_bfcw8"] [node name="CreditsMenu" type="Control"] layout_mode = 3 diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index 9f4e14c9..83284357 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"] [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="10_bgene"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="10_bgene"] [ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://menu/controller_buttons/y.svg" id="11_5uugf"] [sub_resource type="FontVariation" id="FontVariation_5xxr2"] diff --git a/client/menu/play.tscn b/client/menu/play.tscn index 958eab8e..94801dfb 100644 --- a/client/menu/play.tscn +++ b/client/menu/play.tscn @@ -3,7 +3,7 @@ [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cckds"] [ext_resource type="Script" path="res://menu/play.gd" id="2_phxx0"] [ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="3_fsbt7"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="5_cm120"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="5_cm120"] [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_ojpbf"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ukani"] diff --git a/client/menu/scroll_container_custom.gd b/client/menu/scroll_container_custom.gd deleted file mode 100644 index a456f644..00000000 --- a/client/menu/scroll_container_custom.gd +++ /dev/null @@ -1,45 +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 ScrollContainer -class_name ScrollContainerCustom - -# Adds support for scrolling with joypad and touch - -const SCROLL_SPEED := 1000. -var velocity := 0. - -@export var auto_scroll_to_bottom := false - -func _init(): - follow_focus = true - -func _ready(): - if auto_scroll_to_bottom: - call_deferred("scroll_to_bottom") - -func scroll_to_bottom(): - set_deferred("scroll_vertical", get_v_scroll_bar().max_value) - -func _process(delta): - velocity = G.interpolate(velocity, 0., delta * 5.) - velocity = 0. if abs(velocity) < .001 else velocity - if Input.get_axis("scroll_up", "scroll_down") != 0.: - velocity = Input.get_axis("scroll_up", "scroll_down") - set_deferred("scroll_vertical", scroll_vertical + velocity * delta * SCROLL_SPEED) - -func _input(event): - if event is InputEventScreenDrag: - velocity = -(scroll_vertical - (scroll_vertical - event.relative.y)) * .1 diff --git a/client/menu/setup.tscn b/client/menu/setup.tscn index 9e09a050..0ad994a5 100644 --- a/client/menu/setup.tscn +++ b/client/menu/setup.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://menu/setup.gd" id="1_mo46n"] [ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/theme/paper.tres" id="1_yq0aa"] -[ext_resource type="Script" path="res://menu/scroll_container_custom.gd" id="2_4caf2"] +[ext_resource type="Script" path="res://menu/auto_setup/scroll_container_custom.gd" id="2_4caf2"] [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_2vg4d"] [ext_resource type="AudioStream" uid="uid://do7ii5hx71p0m" path="res://menu/sounds/page.ogg" id="5_xac6d"] [ext_resource type="AudioStream" uid="uid://5b3noxjmasmu" path="res://menu/sounds/sign.ogg" id="6_wf0gh"] diff --git a/client/player/interact_marker.gdshader b/client/player/interact_marker.gdshader deleted file mode 100644 index 3720290f..00000000 --- a/client/player/interact_marker.gdshader +++ /dev/null @@ -1,47 +0,0 @@ -/* - Hurry Curry! - a game about cooking - 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 . - -*/ -shader_type spatial; - -uniform float max_width = .1; -uniform float marker_length = .5; -uniform float pulse_speed = 4.; -uniform bool interactive = false; -uniform bool interacting = false; - -void fragment() { - if (interacting) { - ALBEDO = vec3(0., 0., 15.); - } else if (interactive) { - ALBEDO = vec3(15., 0., 0.); - } else { - ALBEDO = vec3(.1, .1, .1); - } - vec2 uv = abs(2. * UV.xy - 1.); - float m_length = marker_length / max_width; - float anim; - if (interactive || interacting) { - anim = sin(TIME * pulse_speed) * .5 + 1.; - } else { - anim = .5; - } - float alpha = step( - 1. - max_width * anim, max(uv.x, uv.y)) - * step(1. - max_width * m_length, min(uv.x, uv.y) - ); - ALPHA = alpha; -} diff --git a/client/player/marker.gd b/client/player/marker.gd deleted file mode 100644 index 07f6bfe8..00000000 --- a/client/player/marker.gd +++ /dev/null @@ -1,27 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2024 metamuffin -# 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 . -# -class_name Marker -extends Node3D - -@onready var _cube: MeshInstance3D = $Cube -@onready var mat: ShaderMaterial = _cube.get_active_material(0) - -func set_interactive(val: bool): - mat.set_shader_parameter("interactive", val) - -func set_interacting(val: bool): - mat.set_shader_parameter("interacting", val) diff --git a/client/player/marker.tscn b/client/player/marker.tscn deleted file mode 100644 index 0d5efedb..00000000 --- a/client/player/marker.tscn +++ /dev/null @@ -1,54 +0,0 @@ -[gd_scene load_steps=7 format=3 uid="uid://c0euiv7duqfp4"] - -[ext_resource type="Script" path="res://player/marker.gd" id="1_3njdu"] -[ext_resource type="Shader" path="res://player/interact_marker.gdshader" id="2_dejwy"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o4v68"] - -[sub_resource type="ArrayMesh" id="ArrayMesh_2tdb0"] -_surfaces = [{ -"aabb": AABB(-1, -1, -1, 2, 2, 2.00001), -"format": 34896613377, -"index_count": 36, -"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0, 2, 0, 7, 0, 3, 0, 2, 0, 6, 0, 7, 0, 6, 0, 5, 0, 7, 0, 6, 0, 4, 0, 5, 0, 4, 0, 1, 0, 5, 0, 4, 0, 0, 0, 1, 0, 2, 0, 4, 0, 6, 0, 2, 0, 0, 0, 4, 0, 7, 0, 1, 0, 3, 0, 7, 0, 5, 0, 1, 0), -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 8, -"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 0, 0, 0, 0, 255, 255, 254, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 255, 255, 0, 0, 254, 255, 0, 0, 255, 255, 255, 255, 254, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_2ie13"] -resource_name = "marker_Cube_001" -_surfaces = [{ -"aabb": AABB(-1, -1, -1, 2, 2, 2.00001), -"attribute_data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255), -"format": 34896613399, -"index_count": 36, -"index_data": PackedByteArray(2, 0, 11, 0, 5, 0, 2, 0, 8, 0, 11, 0, 6, 0, 21, 0, 9, 0, 6, 0, 18, 0, 21, 0, 20, 0, 17, 0, 23, 0, 20, 0, 14, 0, 17, 0, 12, 0, 3, 0, 15, 0, 12, 0, 0, 0, 3, 0, 7, 0, 13, 0, 19, 0, 7, 0, 1, 0, 13, 0, 22, 0, 4, 0, 10, 0, 22, 0, 16, 0, 4, 0), -"material": SubResource("StandardMaterial3D_o4v68"), -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 24, -"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 255, 191, 0, 0, 0, 0, 254, 255, 255, 191, 0, 0, 0, 0, 254, 255, 84, 213, 0, 0, 255, 255, 254, 255, 255, 191, 0, 0, 255, 255, 254, 255, 255, 255, 0, 0, 255, 255, 254, 255, 84, 213, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 84, 213, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 84, 213, 255, 255, 0, 0, 254, 255, 255, 191, 255, 255, 0, 0, 254, 255, 255, 191, 255, 255, 0, 0, 254, 255, 84, 213, 255, 255, 255, 255, 254, 255, 255, 191, 255, 255, 255, 255, 254, 255, 255, 255, 255, 255, 255, 255, 254, 255, 84, 213, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 191, 255, 255, 0, 0, 0, 0, 84, 213, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 84, 213, 255, 255, 255, 255, 0, 0, 255, 127, 84, 213, 84, 213, 255, 255, 255, 255, 255, 127, 255, 191, 84, 213, 84, 213, 255, 191, 255, 191, 0, 0, 255, 127, 84, 213, 84, 213, 255, 191, 255, 191, 255, 127, 255, 191, 84, 213, 84, 213, 255, 255, 255, 255, 0, 0, 255, 127, 170, 42, 170, 42, 255, 255, 255, 255, 255, 127, 255, 191, 170, 42, 170, 42, 255, 191, 255, 191, 0, 0, 255, 127, 170, 42, 170, 42, 255, 191, 255, 191, 255, 127, 255, 191, 170, 42, 170, 42) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_2tdb0") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_wuj1v"] -render_priority = 0 -shader = ExtResource("2_dejwy") -shader_parameter/max_width = 0.1 -shader_parameter/marker_length = 0.5 -shader_parameter/pulse_speed = 4.0 -shader_parameter/interactive = false -shader_parameter/interacting = false - -[node name="Marker" type="Node3D"] -script = ExtResource("1_3njdu") - -[node name="Cube" type="MeshInstance3D" parent="."] -transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.25, 0) -mesh = SubResource("ArrayMesh_2ie13") -skeleton = NodePath("") -surface_material_override/0 = SubResource("ShaderMaterial_wuj1v") diff --git a/client/player/marker/interact_marker.gdshader b/client/player/marker/interact_marker.gdshader new file mode 100644 index 00000000..3720290f --- /dev/null +++ b/client/player/marker/interact_marker.gdshader @@ -0,0 +1,47 @@ +/* + Hurry Curry! - a game about cooking + 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 . + +*/ +shader_type spatial; + +uniform float max_width = .1; +uniform float marker_length = .5; +uniform float pulse_speed = 4.; +uniform bool interactive = false; +uniform bool interacting = false; + +void fragment() { + if (interacting) { + ALBEDO = vec3(0., 0., 15.); + } else if (interactive) { + ALBEDO = vec3(15., 0., 0.); + } else { + ALBEDO = vec3(.1, .1, .1); + } + vec2 uv = abs(2. * UV.xy - 1.); + float m_length = marker_length / max_width; + float anim; + if (interactive || interacting) { + anim = sin(TIME * pulse_speed) * .5 + 1.; + } else { + anim = .5; + } + float alpha = step( + 1. - max_width * anim, max(uv.x, uv.y)) + * step(1. - max_width * m_length, min(uv.x, uv.y) + ); + ALPHA = alpha; +} diff --git a/client/player/marker/marker.gd b/client/player/marker/marker.gd new file mode 100644 index 00000000..07f6bfe8 --- /dev/null +++ b/client/player/marker/marker.gd @@ -0,0 +1,27 @@ +# Hurry Curry! - a game about cooking +# Copyright 2024 metamuffin +# 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 . +# +class_name Marker +extends Node3D + +@onready var _cube: MeshInstance3D = $Cube +@onready var mat: ShaderMaterial = _cube.get_active_material(0) + +func set_interactive(val: bool): + mat.set_shader_parameter("interactive", val) + +func set_interacting(val: bool): + mat.set_shader_parameter("interacting", val) diff --git a/client/player/marker/marker.tscn b/client/player/marker/marker.tscn new file mode 100644 index 00000000..bb638c7e --- /dev/null +++ b/client/player/marker/marker.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=7 format=3 uid="uid://c0euiv7duqfp4"] + +[ext_resource type="Script" path="res://player/marker/marker.gd" id="1_3njdu"] +[ext_resource type="Shader" path="res://player/marker/interact_marker.gdshader" id="2_dejwy"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o4v68"] + +[sub_resource type="ArrayMesh" id="ArrayMesh_2tdb0"] +_surfaces = [{ +"aabb": AABB(-1, -1, -1, 2, 2, 2.00001), +"format": 34896613377, +"index_count": 36, +"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0, 2, 0, 7, 0, 3, 0, 2, 0, 6, 0, 7, 0, 6, 0, 5, 0, 7, 0, 6, 0, 4, 0, 5, 0, 4, 0, 1, 0, 5, 0, 4, 0, 0, 0, 1, 0, 2, 0, 4, 0, 6, 0, 2, 0, 0, 0, 4, 0, 7, 0, 1, 0, 3, 0, 7, 0, 5, 0, 1, 0), +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 8, +"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 0, 0, 0, 0, 255, 255, 254, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 255, 255, 0, 0, 254, 255, 0, 0, 255, 255, 255, 255, 254, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0) +}] +blend_shape_mode = 0 + +[sub_resource type="ArrayMesh" id="ArrayMesh_2ie13"] +resource_name = "marker_Cube_001" +_surfaces = [{ +"aabb": AABB(-1, -1, -1, 2, 2, 2.00001), +"attribute_data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255), +"format": 34896613399, +"index_count": 36, +"index_data": PackedByteArray(2, 0, 11, 0, 5, 0, 2, 0, 8, 0, 11, 0, 6, 0, 21, 0, 9, 0, 6, 0, 18, 0, 21, 0, 20, 0, 17, 0, 23, 0, 20, 0, 14, 0, 17, 0, 12, 0, 3, 0, 15, 0, 12, 0, 0, 0, 3, 0, 7, 0, 13, 0, 19, 0, 7, 0, 1, 0, 13, 0, 22, 0, 4, 0, 10, 0, 22, 0, 16, 0, 4, 0), +"material": SubResource("StandardMaterial3D_o4v68"), +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 24, +"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 255, 191, 0, 0, 0, 0, 254, 255, 255, 191, 0, 0, 0, 0, 254, 255, 84, 213, 0, 0, 255, 255, 254, 255, 255, 191, 0, 0, 255, 255, 254, 255, 255, 255, 0, 0, 255, 255, 254, 255, 84, 213, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 255, 191, 0, 0, 0, 0, 0, 0, 84, 213, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 84, 213, 255, 255, 0, 0, 254, 255, 255, 191, 255, 255, 0, 0, 254, 255, 255, 191, 255, 255, 0, 0, 254, 255, 84, 213, 255, 255, 255, 255, 254, 255, 255, 191, 255, 255, 255, 255, 254, 255, 255, 255, 255, 255, 255, 255, 254, 255, 84, 213, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 191, 255, 255, 0, 0, 0, 0, 84, 213, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 84, 213, 255, 255, 255, 255, 0, 0, 255, 127, 84, 213, 84, 213, 255, 255, 255, 255, 255, 127, 255, 191, 84, 213, 84, 213, 255, 191, 255, 191, 0, 0, 255, 127, 84, 213, 84, 213, 255, 191, 255, 191, 255, 127, 255, 191, 84, 213, 84, 213, 255, 255, 255, 255, 0, 0, 255, 127, 170, 42, 170, 42, 255, 255, 255, 255, 255, 127, 255, 191, 170, 42, 170, 42, 255, 191, 255, 191, 0, 0, 255, 127, 170, 42, 170, 42, 255, 191, 255, 191, 255, 127, 255, 191, 170, 42, 170, 42) +}] +blend_shape_mode = 0 +shadow_mesh = SubResource("ArrayMesh_2tdb0") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_wuj1v"] +render_priority = 0 +shader = ExtResource("2_dejwy") +shader_parameter/max_width = 0.1 +shader_parameter/marker_length = 0.5 +shader_parameter/pulse_speed = 4.0 +shader_parameter/interactive = false +shader_parameter/interacting = false + +[node name="Marker" type="Node3D"] +script = ExtResource("1_3njdu") + +[node name="Cube" type="MeshInstance3D" parent="."] +transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.25, 0) +mesh = SubResource("ArrayMesh_2ie13") +skeleton = NodePath("") +surface_material_override/0 = SubResource("ShaderMaterial_wuj1v") -- cgit v1.2.3-70-g09d2 From 3565bc1b6060be43e7b783accf4e92479bc04f2c Mon Sep 17 00:00:00 2001 From: tpart Date: Tue, 8 Oct 2024 20:32:22 +0200 Subject: Fix incorrect scene path for marker --- client/player/player.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/player/player.gd b/client/player/player.gd index 1d7541fe..7a002d23 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -36,7 +36,7 @@ var character: Character = preload("res://player/character/character.tscn").inst var chat_bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate() var item_bubble: ItemBubble = preload("res://player/item_bubble.tscn").instantiate() var effect: Effect = preload("res://player/particles/effect.tscn").instantiate() -var marker: Marker = preload("res://player/marker.tscn").instantiate() +var marker: Marker = preload("res://player/marker/marker.tscn").instantiate() var marker_target = Vector3(0, 0, 0) var clear_timer: Timer = Timer.new() -- cgit v1.2.3-70-g09d2 From e1e9f843abd3b1d99df917b29bb2107e2c48ef29 Mon Sep 17 00:00:00 2001 From: Vistaus Date: Thu, 10 Oct 2024 09:21:46 +0000 Subject: Translated using Weblate (Dutch) Currently translated at 93.8% (275 of 293 strings) Translation: Hurry Curry!/Game Translate-URL: https://translate.codeberg.org/projects/hurrycurry/game/nl/ --- locale/nl.ini | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/locale/nl.ini b/locale/nl.ini index 52a403ae..d3431dbe 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -273,3 +273,25 @@ b.bun.desc = De meest verzadigende maaltijd van allemaal. Serveer met tomatensoe b.curry.desc = Dit smakelijke, exotische gerecht geeft je een warm gevoel op een koude dag, en voorziet je van nieuwe energie. b.burger.variation = De burger kan op meerdere manieren worden gemaakt, bijvoorbeeld zonder kaas of vegetarisch. b.burger = Burger +b.curry.steps = Extraheer de melk uit de kokosnoot door deze in een keukenmachine fijn te hakken. Let niet op de stukjes hout in het mengsel. Als de noot volledig verwerkt is, kun je de melk in een pan gieten, tezamen met een tomaat en prei. Je hoeft ze niet van tevoren te snijden, want ze worden vanzelf lekker zompig in de kokosmelk. Kook vervolgens de rijst zonder water (deze speciale rijst produceert zelf water). Combineer de rijst en de saus en geniet van de maaltijd! +b.bun.steps = Stop de bloem in een keukenmachine. De zak is niet relevant, want die wordt in kleine, onzichtbare stukjes gehakt. Als het deeg de juiste consistentie heeft bereik, kun je het uit de machine halen en in de oven stoppen totdat het mooi bruin is. Wacht daarna tot het is afgekoeld en snijd het op een snijplank in plakjes. +b.bun = Broodje +b.burger.desc = Een rijke maaltijd met gezonde groenten, brood en een perfecte steak. +b.burger.steps = Leg de steak op een snijplank en snijd met een mes in een ronde vorm. Leg de burger in een pan en laat twee minuten op middelhoge temperatuur bakken. Snijd ondertussen alle groenten in kleine plakjes en het broodje in tweeën. Leg vervolgens de burger op de ene helft van het broodje en de groenten daar weer bovenop, en ten slotte de andere helft van het broodje. Et voilà. +b.curry = Curry met rijst +b.drinks = Dranken +b.icecream.steps = Stop kokosnoot en aardbei in een keukenmachine en blijf doorroeren. +b.icecream = Aardbeienijs +b.mochi.steps = Maak je eigen rijstbloem door rijst te verwerken in een keukenmachine. Kook de rijstbloem vervolgens stoomgaar in een pan. +b.dishes = Gerechten +b.ingred.bun = een broodje +b.ingred.cheese = een stuk kaas +b.ingred.coconut = een kokosnoot +b.ingred.fish = een vis +b.ingred.flour = een zak bloem +b.ingred.leek = een prei +b.ingred.lettuce = een krop sla +b.ingred.rice = een zak rijst +b.ingred.steak = een rauwe steak +b.ingred.strawberry = een aardbei +b.ingred.tomato = een tomaat -- cgit v1.2.3-70-g09d2 From 64e270447e4eec834e1970ac76a573afd7e9e2cc Mon Sep 17 00:00:00 2001 From: tpart Date: Thu, 10 Oct 2024 12:12:10 +0200 Subject: Show message if no servers are available --- client/menu/play.gd | 4 ++++ client/menu/play.tscn | 7 +++++++ locale/en.ini | 1 + 3 files changed, 12 insertions(+) diff --git a/client/menu/play.gd b/client/menu/play.gd index 7ef60bea..3d9a0d84 100644 --- a/client/menu/play.gd +++ b/client/menu/play.gd @@ -21,6 +21,7 @@ var url_regex: RegEx = RegEx.new() @onready var server_list: VBoxContainer = $side/margin/options/second/ScrollContainerCustom/ServerList @onready var server_list_loading: Label = $side/margin/options/second/Loading +@onready var server_list_empty: Label = $side/margin/options/second/NoServers @onready var connect_uri = $side/margin/options/second/connect/uri @onready var server = $side/margin/options/second/server @onready var server_control = $side/margin/options/second/server/control @@ -88,6 +89,9 @@ func update_server_list(lists: Array[Array]): connect_uri.grab_focus() else: server_list.get_child(idx - 1).grab_focus() + + # Show message if no servers available + server_list_empty.visible = idx == 0 func update_server_list_loading(status: bool): server_list_loading.visible = status diff --git a/client/menu/play.tscn b/client/menu/play.tscn index 94801dfb..43a3414f 100644 --- a/client/menu/play.tscn +++ b/client/menu/play.tscn @@ -66,6 +66,13 @@ size_flags_horizontal = 3 text = "c.menu.play.fetching_list" horizontal_alignment = 1 +[node name="NoServers" type="Label" parent="side/margin/options/second"] +visible = false +layout_mode = 2 +size_flags_horizontal = 3 +text = "c.menu.play.no_servers" +horizontal_alignment = 1 + [node name="ScrollContainerCustom" type="ScrollContainer" parent="side/margin/options/second"] layout_mode = 2 size_flags_vertical = 3 diff --git a/locale/en.ini b/locale/en.ini index 7ecbd8b9..85839ccf 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -110,6 +110,7 @@ c.menu.play.allow_query_registry=To show a public server list a registry service c.menu.play.connect=Connect c.menu.play.fetching_list=Fetching server list... c.menu.play.list_item={0} ({1} players) +c.menu.play.no_servers=No servers available. c.menu.play.quick_connect=Quick Connect c.menu.play.server_binary_not_found=Server binary was not found. Please install the server separately. c.menu.play.server_failed_tooltip=The server crashed or exited in some way or another.%nYou should try starting the server from the command-line. -- cgit v1.2.3-70-g09d2 From f0d6634e0786106969730b78d5d177e12cd3808d Mon Sep 17 00:00:00 2001 From: tpart Date: Thu, 10 Oct 2024 17:08:26 +0200 Subject: Remove tab container panel background (Fixes #163) --- client/menu/theme/theme/theme.tres | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/menu/theme/theme/theme.tres b/client/menu/theme/theme/theme.tres index 9e2c4ac6..b10c230a 100644 --- a/client/menu/theme/theme/theme.tres +++ b/client/menu/theme/theme/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=11 format=3 uid="uid://b0qmvo504e457"] +[gd_resource type="Theme" load_steps=12 format=3 uid="uid://b0qmvo504e457"] [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_f8qb0"] [ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"] @@ -35,6 +35,8 @@ base_font = ExtResource("1_f8qb0") variation_embolden = 1.25 spacing_top = 5 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_or5ri"] + [resource] default_font = SubResource("FontVariation_lyo8w") Button/font_sizes/font_size = 18 @@ -65,3 +67,4 @@ RichTextLabel/fonts/bold_font = SubResource("FontVariation_ff4nr") RichTextLabel/fonts/bold_italics_font = SubResource("FontVariation_lyo8w") RichTextLabel/fonts/italics_font = SubResource("FontVariation_lyo8w") RichTextLabel/fonts/mono_font = SubResource("FontVariation_lyo8w") +TabContainer/styles/panel = SubResource("StyleBoxEmpty_or5ri") -- cgit v1.2.3-70-g09d2 From 47d1ca9d3f470fb8e90efe52ee033e9f17677e96 Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 12 Oct 2024 02:07:34 +0200 Subject: Add note about matrix room --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index 8b304883..a340dcf1 100644 --- a/readme.md +++ b/readme.md @@ -91,6 +91,10 @@ make test-client `python -m http.server 8080 -d test-client` - Open the page with your browser. +## Contributing + +For discussion regarding development, feel free to join our matrix room: [#hurrycurry:metamuffin.org](https://matrix.to/#/#hurrycurry:metamuffin.org). + ## License AGPL-3.0-only; See [COPYING](./COPYING). -- cgit v1.2.3-70-g09d2