aboutsummaryrefslogtreecommitdiff
path: root/client/player
diff options
context:
space:
mode:
Diffstat (limited to 'client/player')
-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
9 files changed, 13 insertions, 13 deletions
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)