diff options
-rw-r--r-- | client/map/items/item.gd | 2 | ||||
-rw-r--r-- | client/map/progress/progress.gd (renamed from client/map/progress.gd) | 0 | ||||
-rw-r--r-- | client/map/progress/progress.gdshader (renamed from client/map/progress.gdshader) | 0 | ||||
-rw-r--r-- | client/map/progress/progress.tscn (renamed from client/map/progress.tscn) | 4 | ||||
-rw-r--r-- | client/map/textures/palette.png (renamed from client/map/palette.png) | bin | 38079 -> 38079 bytes | |||
-rw-r--r-- | client/map/textures/palette.png.import (renamed from client/map/palette.png.import) | 8 | ||||
-rw-r--r-- | client/map/tiles/grass_side.res.depren | bin | 1430 -> 0 bytes | |||
-rw-r--r-- | client/menu/auto_setup/scroll_container_custom.gd (renamed from client/menu/scroll_container_custom.gd) | 0 | ||||
-rw-r--r-- | client/menu/book/book.tscn | 2 | ||||
-rw-r--r-- | client/menu/communicate/chat/chat_open.tscn | 2 | ||||
-rw-r--r-- | client/menu/communicate/item/item_message.gd | 2 | ||||
-rw-r--r-- | client/menu/credits.tscn | 2 | ||||
-rw-r--r-- | client/menu/lobby.tscn | 2 | ||||
-rw-r--r-- | client/menu/menu_background.tscn | 2 | ||||
-rw-r--r-- | client/menu/play.tscn | 2 | ||||
-rw-r--r-- | client/menu/printed_material.tres | 6 | ||||
-rw-r--r-- | client/menu/rating/rating.tscn | 2 | ||||
-rw-r--r-- | client/menu/setup.tscn | 2 | ||||
-rw-r--r-- | client/menu/theme/materials/printed_material.tres | 6 | ||||
-rw-r--r-- | client/menu/theme/shaders/menu_background.gdshader (renamed from client/menu/menu_background.gdshader) | 0 | ||||
-rw-r--r-- | client/menu/theme/shaders/printed.gdshader (renamed from client/menu/printed.gdshader) | 0 | ||||
-rw-r--r-- | client/player/angry.tscn | 2 | ||||
-rw-r--r-- | client/player/marker/interact_marker.gdshader (renamed from client/player/interact_marker.gdshader) | 0 | ||||
-rw-r--r-- | client/player/marker/marker.gd (renamed from client/player/marker.gd) | 0 | ||||
-rw-r--r-- | client/player/marker/marker.tscn (renamed from client/player/marker.tscn) | 4 | ||||
-rw-r--r-- | client/player/particles/angry/angry.webp (renamed from client/player/angry.webp) | bin | 5022 -> 5022 bytes | |||
-rw-r--r-- | client/player/particles/angry/angry.webp.import (renamed from client/player/angry.webp.import) | 8 | ||||
-rw-r--r-- | client/player/particles/effect.gd (renamed from client/player/effect.gd) | 0 | ||||
-rw-r--r-- | client/player/particles/effect.tscn (renamed from client/player/effect.tscn) | 4 | ||||
-rw-r--r-- | client/player/particles/satisfied/star.webp (renamed from client/player/star.webp) | bin | 5818 -> 5818 bytes | |||
-rw-r--r-- | client/player/particles/satisfied/star.webp.import (renamed from client/player/star.webp.import) | 8 | ||||
-rw-r--r-- | client/player/particles/satisfied/stars.tscn (renamed from client/player/stars.tscn) | 2 | ||||
-rw-r--r-- | client/player/player.gd | 4 | ||||
-rw-r--r-- | locale/de.ini | 16 | ||||
-rw-r--r-- | locale/en.ini | 18 | ||||
-rw-r--r-- | locale/fr.ini | 146 |
36 files changed, 153 insertions, 103 deletions
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/progress.gd b/client/map/progress/progress.gd index fc31408c..fc31408c 100644 --- a/client/map/progress.gd +++ b/client/map/progress/progress.gd diff --git a/client/map/progress.gdshader b/client/map/progress/progress.gdshader index a5ebf575..a5ebf575 100644 --- a/client/map/progress.gdshader +++ b/client/map/progress/progress.gdshader diff --git a/client/map/progress.tscn b/client/map/progress/progress.tscn index 7a0629a1..7f2ec175 100644 --- a/client/map/progress.tscn +++ b/client/map/progress/progress.tscn @@ -1,7 +1,7 @@ [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"] +[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) diff --git a/client/map/palette.png b/client/map/textures/palette.png Binary files differindex e184fe5b..e184fe5b 100644 --- a/client/map/palette.png +++ b/client/map/textures/palette.png diff --git a/client/map/palette.png.import b/client/map/textures/palette.png.import index 92840fcf..97dc821b 100644 --- a/client/map/palette.png.import +++ b/client/map/textures/palette.png.import @@ -3,8 +3,8 @@ 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" +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 @@ -12,8 +12,8 @@ metadata={ [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"] +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] diff --git a/client/map/tiles/grass_side.res.depren b/client/map/tiles/grass_side.res.depren Binary files differdeleted file mode 100644 index 3116171f..00000000 --- a/client/map/tiles/grass_side.res.depren +++ /dev/null diff --git a/client/menu/scroll_container_custom.gd b/client/menu/auto_setup/scroll_container_custom.gd index a456f644..a456f644 100644 --- a/client/menu/scroll_container_custom.gd +++ b/client/menu/auto_setup/scroll_container_custom.gd 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/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/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/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/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/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/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/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/menu_background.gdshader b/client/menu/theme/shaders/menu_background.gdshader index 91b94601..91b94601 100644 --- a/client/menu/menu_background.gdshader +++ b/client/menu/theme/shaders/menu_background.gdshader diff --git a/client/menu/printed.gdshader b/client/menu/theme/shaders/printed.gdshader index 3b35faa8..3b35faa8 100644 --- a/client/menu/printed.gdshader +++ b/client/menu/theme/shaders/printed.gdshader 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/interact_marker.gdshader b/client/player/marker/interact_marker.gdshader index 3720290f..3720290f 100644 --- a/client/player/interact_marker.gdshader +++ b/client/player/marker/interact_marker.gdshader diff --git a/client/player/marker.gd b/client/player/marker/marker.gd index 07f6bfe8..07f6bfe8 100644 --- a/client/player/marker.gd +++ b/client/player/marker/marker.gd diff --git a/client/player/marker.tscn b/client/player/marker/marker.tscn index 0d5efedb..bb638c7e 100644 --- a/client/player/marker.tscn +++ b/client/player/marker/marker.tscn @@ -1,7 +1,7 @@ [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"] +[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"] diff --git a/client/player/angry.webp b/client/player/particles/angry/angry.webp Binary files differindex 866ba92c..866ba92c 100644 --- a/client/player/angry.webp +++ b/client/player/particles/angry/angry.webp diff --git a/client/player/angry.webp.import b/client/player/particles/angry/angry.webp.import index 2d622e73..3deee645 100644 --- a/client/player/angry.webp.import +++ b/client/player/particles/angry/angry.webp.import @@ -3,8 +3,8 @@ 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" +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 @@ -12,8 +12,8 @@ metadata={ [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"] +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] diff --git a/client/player/effect.gd b/client/player/particles/effect.gd index 00c95441..00c95441 100644 --- a/client/player/effect.gd +++ b/client/player/particles/effect.gd diff --git a/client/player/effect.tscn b/client/player/particles/effect.tscn index a360d1a8..13423874 100644 --- a/client/player/effect.tscn +++ b/client/player/particles/effect.tscn @@ -1,7 +1,7 @@ [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="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"] diff --git a/client/player/star.webp b/client/player/particles/satisfied/star.webp Binary files differindex c1d2e8ff..c1d2e8ff 100644 --- a/client/player/star.webp +++ b/client/player/particles/satisfied/star.webp diff --git a/client/player/star.webp.import b/client/player/particles/satisfied/star.webp.import index ff84dd75..11d15c58 100644 --- a/client/player/star.webp.import +++ b/client/player/particles/satisfied/star.webp.import @@ -3,8 +3,8 @@ 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" +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 @@ -12,8 +12,8 @@ metadata={ [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"] +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] diff --git a/client/player/stars.tscn b/client/player/particles/satisfied/stars.tscn index 5c96c291..2bfaaec0 100644 --- a/client/player/stars.tscn +++ b/client/player/particles/satisfied/stars.tscn @@ -1,6 +1,6 @@ [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"] +[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 diff --git a/client/player/player.gd b/client/player/player.gd index f90b2b1b..7a002d23 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -35,8 +35,8 @@ 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 marker: Marker = preload("res://player/marker.tscn").instantiate() +var effect: Effect = preload("res://player/particles/effect.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() 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 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 diff --git a/locale/fr.ini b/locale/fr.ini index c4d49424..722d8f64 100644 --- a/locale/fr.ini +++ b/locale/fr.ini @@ -1,46 +1,49 @@ [hurrycurry] -c.settings.input.boost= -c.settings.input.rotate_down= -c.settings.input.rotate_left= -c.settings.input.reset=Utilisez {0} pour réinitialiser la caméra -c.settings.input.rotate_right= -c.settings.input.rotate_up= -c.settings.input.chat= -c.settings.input.fullscreen=Plein écran -c.settings.input.interact=Entrez le chemin -c.settings.input.backwards= -c.settings.input.forwards= -c.settings.input.left= -c.settings.input.right= -c.settings.input.zoom_in= -c.settings.input.zoom_in_discrete= -c.settings.input.zoom_out= -c.settings.input.zoom_out_discrete= +b.about = À propos de ce live +b.about.image_attrib = Attribution de l'image d'arrière-plan +b.about.name = Le livre de cuisine de Hurry Curry!. +b.bun = Petit pain +b.bun.desc = Le repas le plus nourrissant de tous. À déguster de préférence avec une soupe à la tomate. +b.burger = Burger +b.curry = Curry au riz +b.dishes = Plats +b.drinks = Boissons +b.icecream = Glace à la fraise +b.ingred.bun = un petit pain +b.ingred.cheese = un morceau de fromage +c.chat.write_message = Écrire un message c.credits.developed_by=développé par +c.credits.models=Modèles +c.credits.sounds=Sons c.credits.thanks=Merci d’avoir joué c.credits.title=Hurry Curry! - un jeu sur la cuisine -c.error=Erreur c.error.cannot_cancel_no_game=Impossible d’annuler la partiecar aucune partie n’est en cours. +c.error.empty_username = Le nom d’utilisateur ne peut pas être vide. c.error.must_join_to_cancel=Vous devez rejoindre une partie pour pouvoir l’annuler. c.error.placeholder=///. +c.error.select_hairstyle = Tu doit choisir une coiffure. +c.error.server = Erreur du serveur : {0} c.error.websocket=WebSocket a fermé avec le code : {0}, raison {1}. Propre : {2} -c.hint=Indice +c.error=Erreur 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. +c.hint.interact=Appuyez sur {0} pour attraper des objets et maintenez {1} enfoncé pour interagir avec les outils c.hint.movement=Utilisez {0} pour avancer c.hint.reset_camera=Appuyez sur {0} pour réinitialiser la caméra c.hint.zoom_camera=Utilisez {0} pour zoomer/dézoomer +c.hint=Indice c.lobby.botenable=Activer des robots c.lobby.mapname=Nom de la carte c.lobby.players=Joueurs c.lobby.start=Comencer serveur -c.map.difficulty=Difficulté c.map.difficulty.0=Facile c.map.difficulty.1=Difficile c.map.difficulty.2=Normale c.map.difficulty.3=L’horreur c.map.difficulty.4=Très difficile +c.map.difficulty=Difficulté c.map.players_recommended={0} joueurs recommandés +c.menu.accept=Accepter c.menu.back=Retour c.menu.credits=Crédits c.menu.ingame.cancel=Annuler la partie @@ -53,10 +56,10 @@ c.menu.ingame.reconnect=Se reconnecter c.menu.ingame.resume=Reprendre c.menu.ingame.spectate=Mode spectateur c.menu.my_chef=Mon Chef -c.menu.play=Jouer c.menu.play.connect=Connexion c.menu.play.quick_connect=Connexion rapide c.menu.play.server=Serveur +c.menu.play=Jouer c.menu.quit=Quitter c.menu.settings=Paramètres c.score.acceptable=Service acceptable @@ -64,68 +67,90 @@ c.score.completed=Complété c.score.excellent=Excellent service c.score.failed=Échoué c.score.good=Bon service -c.score.points=Points c.score.points_par=Vous avez collecté {0} points +c.score.points=Points c.score.poor=Mauvais service c.settings.apply=Sauver & Appliquer -c.settings.audio= c.settings.audio.master_volume=Volume principal c.settings.audio.music_volume=Volume de la musique c.settings.audio.sfx_volume=Volume des effets sonores -c.settings.input= -c.settings.input.add= -c.settings.input.joypad= -c.settings.input.joypad_axis= -c.settings.input.keyboard= -c.settings.input.mouse_button=Bouton de menu -c.settings.input.other_event= -c.settings.input.press_any_key= +c.settings.audio= +c.settings.gameplay.hints_started=Tutoriel commencé +c.settings.gameplay.interpolate_camera_rotation=Interpoler la rotation de la caméra +c.settings.gameplay.invert_camera=Inverser le mouvement de caméra +c.settings.gameplay.latch_boost=Toujours prolonger le boost jusqu’à la durée maximale +c.settings.gameplay.setup_completed=Configuration initiale terminée. (Décochez et recommencer pour entrer à nouveau) +c.settings.gameplay.usernames=Montrer les noms d’utilisateur +c.settings.gameplay= +c.settings.graphics.aa=Anti crénelage +c.settings.graphics.ao=Occlusion ambiante c.settings.graphics.debug_info=Montrer les informations de débogage (Fréquence d’images, etc.) -c.settings.graphics.fullscreen=Plein écran c.settings.graphics.fullscreen.always=Toujours c.settings.graphics.fullscreen.keep=Garder c.settings.graphics.fullscreen.never=Jamais -c.settings.gameplay= -c.settings.gameplay.latch_boost=Toujours prolonger le boost jusqu’à la durée maximale -c.settings.graphics.gi=Luminosité générale +c.settings.graphics.fullscreen=Plein écran c.settings.graphics.gi.sdfgi=SDFGI c.settings.graphics.gi.voxelgi=IG Voxel +c.settings.graphics.gi=Luminosité générale c.settings.graphics.glow=Activer la lueur -c.settings.graphics=Graphismes -c.settings.graphics.aa=Anti crénelage -c.settings.graphics.ao=Occlusion ambiante -c.settings.graphics.taa=Anti crénelage temporel c.settings.graphics.grass_amount=Quantité d’herbe 3D par tuile d’herbe -c.settings.ui.language=Langue -c.settings.ui.language.system=Défaut du système c.settings.graphics.lq_trees=Arbres de quelques polygones -c.settings.other= c.settings.graphics.preset.high=Élevé c.settings.graphics.preset.low=Faible c.settings.graphics.preset.medium=Moyen -c.settings.other.server_data=Répertoire de données du serveur (laisser vide pour la détection automatique) -c.settings.other.server_binary=Binaire du serveur (laisser vide pour rechercher le chemin) -c.settings.other.server_binary.placeholder=Entrez le chemin c.settings.graphics.shadows=Activer les ombres -c.settings.gameplay.interpolate_camera_rotation=Interpoler la rotation de la caméra -c.settings.ui=Nom d’utilisateur +c.settings.graphics.taa=Anti crénelage temporel +c.settings.graphics.ui_blur=Activer le flou dans l’interface utilisateus +c.settings.graphics=Graphismes +c.settings.input.add= +c.settings.input.backwards= +c.settings.input.boost= +c.settings.input.chat= +c.settings.input.forwards= +c.settings.input.fullscreen=Plein écran +c.settings.input.interact=Entrez le chemin +c.settings.input.joypad_axis= +c.settings.input.joypad= +c.settings.input.keyboard= +c.settings.input.left= +c.settings.input.mouse_button=Bouton de menu +c.settings.input.other_event= +c.settings.input.press_any_key= +c.settings.input.reset=Utilisez {0} pour réinitialiser la caméra +c.settings.input.right= +c.settings.input.rotate_down= +c.settings.input.rotate_left= +c.settings.input.rotate_right= +c.settings.input.rotate_up= +c.settings.input.zoom_in_discrete= +c.settings.input.zoom_in= +c.settings.input.zoom_out_discrete= +c.settings.input.zoom_out= +c.settings.input= +c.settings.other.server_binary.placeholder=Entrez le chemin +c.settings.other.server_binary=Binaire du serveur (laisser vide pour rechercher le chemin) +c.settings.other.server_data=Répertoire de données du serveur (laisser vide pour la détection automatique) +c.settings.other= +c.settings.ui.language.system=Défaut du système +c.settings.ui.language=Langue c.settings.ui.scale_factor=Taille de l’interface utilisateur -c.settings.ui.scale_mode=Mode d’échelle de l’interface utilisateur c.settings.ui.scale_mode.resize=Redimensionner +c.settings.ui.scale_mode=Mode d’échelle de l’interface utilisateur c.settings.ui.touch_controls=Activer les commandes de l’écran tactile -c.settings.graphics.ui_blur=Activer le flou dans l’interface utilisateus +c.settings.ui=Nom d’utilisateur c.settings.username=Nom d’utilisateur -c.setup.contract_title=CONTRAT DE TRAVAIL +c.setup.compensation.salary.prefix=Le salaire est de +c.setup.compensation.salary.suffix=par mois +c.setup.compensation.salary=0,00 € +c.setup.compensation=6. [b]Compensation.[/b] Vous recevrez une compensation mensuelle pour votre 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.contract_title=CONTRAT DE TRAVAIL +c.setup.frank_signature=F.Miller 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.position=2. [b]Fiche de poste[/b] +c.setup.uniform.value=Coiffure {0} c.setup.uniform=3. [b]Uniforme de travail.[/b] Vous devrez toujours porter l’une des coiffures suivantes. -c.setup.compensation=6. [b]Compensation.[/b] Vous recevrez une compensation mensuelle pour votre travail. -c.setup.compensation.salary.prefix=Le salaire est de -c.setup.compensation.salary=0,00 € -c.setup.compensation.salary.suffix=par mois -c.setup.frank_signature=F.Miller c.setup.user_signature=Cliquez pour signer s.bot.simple=Chef simple s.bot.waiter=Barman @@ -138,25 +163,16 @@ unknown464=- unknown476=MAJUSCULE unknown484=stick gauche unknown488=BARRE D’ESPACE -c.settings.gameplay.invert_camera=Inverser le mouvement de caméra -c.hint.interact=Appuyez sur {0} pour attraper des objets et maintenez {1} enfoncé pour interagir avec les outils unknown506=Page précédente/Page suivante unknown510=Utilisez {0} pour orienter le point de vue de la caméra unknown514=Touches fléchées unknown518=stick droit unknown524=Les noms d’utilisateurs peuvent être activées/désactivées dans les paramètres -c.settings.gameplay.usernames=Montrer les noms d’utilisateur unknown530=Appuyez sur {0} et cliquez sur "Rejoindre" pour rejoindre le partie lorsqu’elle est en route unknown534=ÉCHAP unknown538=Bouton de menu unknown551=Serveur (Indisponible) -c.setup.uniform.value=Coiffure {0} -c.credits.models=Modèles -c.credits.sounds=Sons -c.settings.gameplay.setup_completed=Configuration initiale terminée. (Décochez et recommencer pour entrer à nouveau) unknown622=Vous devez remplir tous les champs requis. -c.menu.accept=Accepter -c.settings.gameplay.hints_started=Tutoriel commencé unknown732= unknown736= unknown740=Regarder |