aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/player/angry.svg.import37
-rw-r--r--client/player/angry.tscn37
-rw-r--r--client/player/angry.webpbin0 -> 5022 bytes
-rw-r--r--client/player/angry.webp.import35
-rw-r--r--client/player/effect.gd6
-rw-r--r--client/player/effect.tscn6
6 files changed, 119 insertions, 2 deletions
diff --git a/client/player/angry.svg.import b/client/player/angry.svg.import
new file mode 100644
index 00000000..4f1afd25
--- /dev/null
+++ b/client/player/angry.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dk36vvlrg0t15"
+path="res://.godot/imported/angry.svg-20686ccd97ba20a3d660573cae3108bc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/angry.svg"
+dest_files=["res://.godot/imported/angry.svg-20686ccd97ba20a3d660573cae3108bc.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/player/angry.tscn b/client/player/angry.tscn
new file mode 100644
index 00000000..56fa4d05
--- /dev/null
+++ b/client/player/angry.tscn
@@ -0,0 +1,37 @@
+[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"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ysmnk"]
+transparency = 1
+shading_mode = 0
+vertex_color_use_as_albedo = true
+albedo_texture = ExtResource("1_5op6v")
+billboard_mode = 2
+billboard_keep_scale = true
+
+[sub_resource type="QuadMesh" id="QuadMesh_5nim7"]
+material = SubResource("StandardMaterial3D_ysmnk")
+
+[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="Angry" type="CPUParticles3D"]
+emitting = false
+amount = 5
+lifetime = 2.0
+one_shot = true
+explosiveness = 1.0
+mesh = SubResource("QuadMesh_5nim7")
+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/angry.webp b/client/player/angry.webp
new file mode 100644
index 00000000..866ba92c
--- /dev/null
+++ b/client/player/angry.webp
Binary files differ
diff --git a/client/player/angry.webp.import b/client/player/angry.webp.import
new file mode 100644
index 00000000..989ff542
--- /dev/null
+++ b/client/player/angry.webp.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://unjbxplj845n"
+path.s3tc="res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://player/angry.webp"
+dest_files=["res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.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
index ae6a6756..783d38ca 100644
--- a/client/player/effect.gd
+++ b/client/player/effect.gd
@@ -17,13 +17,17 @@ class_name Effect
extends Node3D
@onready var success = $Success
+@onready var stars = $Stars
+@onready var angry = $Angry
func set_effect(e: String):
clear_effect()
match e:
"satisfied":
- $Stars.emitting = true
+ stars.emitting = true
success.play()
+ "angry":
+ angry.emitting = true
_:
push_warning("effect %s unknown" % e)
diff --git a/client/player/effect.tscn b/client/player/effect.tscn
index fec019c2..1bd5bf9c 100644
--- a/client/player/effect.tscn
+++ b/client/player/effect.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://dn2ne30t81ame"]
+[gd_scene load_steps=5 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="PackedScene" uid="uid://cvty1rwt52anq" path="res://player/angry.tscn" id="4_uxxex"]
[node name="Effect" type="Node3D"]
script = ExtResource("1_aqsk6")
@@ -12,3 +13,6 @@ 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="Angry" parent="." instance=ExtResource("4_uxxex")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)