summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/map/items/item.gd2
-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)bin38079 -> 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.deprenbin1430 -> 0 bytes
-rw-r--r--client/menu/communicate/item/item_message.gd2
-rw-r--r--client/menu/menu_background.tscn2
-rw-r--r--client/menu/printed_material.tres6
-rw-r--r--client/menu/rating/rating.tscn2
-rw-r--r--client/menu/theme/materials/printed_material.tres6
-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.tscn2
-rw-r--r--client/player/particles/angry/angry.webp (renamed from client/player/angry.webp)bin5022 -> 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)bin5818 -> 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.gd2
23 files changed, 29 insertions, 29 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
index e184fe5b..e184fe5b 100644
--- a/client/map/palette.png
+++ b/client/map/textures/palette.png
Binary files differ
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
deleted file mode 100644
index 3116171f..00000000
--- a/client/map/tiles/grass_side.res.depren
+++ /dev/null
Binary files 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.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_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/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/angry.webp b/client/player/particles/angry/angry.webp
index 866ba92c..866ba92c 100644
--- a/client/player/angry.webp
+++ b/client/player/particles/angry/angry.webp
Binary files differ
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
index c1d2e8ff..c1d2e8ff 100644
--- a/client/player/star.webp
+++ b/client/player/particles/satisfied/star.webp
Binary files differ
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..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)
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 10:30:35 +0000