From 24e25d6757284f55a8d3e902cde27c62a4b86d8b Mon Sep 17 00:00:00 2001
From: Haze Weathers <hazel.lsnider@gmail.com>
Date: Wed, 29 Nov 2023 20:11:23 -0500
Subject: [PATCH] SPARKLES OMG

---
 graphics/particles/shine.png        | Bin 0 -> 565 bytes
 graphics/particles/shine.png.import |  35 ++++++++++++++++++++++++++++
 objects/collectibles/key.tscn       |  25 ++++++++++++++++++--
 objects/collectibles/shard.tscn     |  24 ++++++++++++++++++-
 objects/collectibles/star.gd        |   2 ++
 objects/collectibles/star.tscn      |  26 +++++++++++++++++++--
 scripts/randomize_particle_start.gd |   4 ++++
 7 files changed, 111 insertions(+), 5 deletions(-)
 create mode 100644 graphics/particles/shine.png
 create mode 100644 graphics/particles/shine.png.import
 create mode 100644 scripts/randomize_particle_start.gd

diff --git a/graphics/particles/shine.png b/graphics/particles/shine.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab902114b93d93103c7ecc4640187728551d111
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000L7000LF1^@s6#8Ow&0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tl08VnKp2MKri!8!hjtJV$xxl_q9Ts93Pq?8YK2xEOfLO{CJjl7
zi=*ILaPVib>fqw6tAnc`2>yV$x;QDiNQvJig%&X$9QW|vy)WN=cYx5SFwN?U1DbA|
z>10C8=2pd?SM*~PKp0_}S;m|srQkch?h)YYU5sb>pZjwRsCkP40g*V)4AUmwAfDN@
z4bJ<-5mu5_;&b8&lL{n$<htVV8|R|S0?&+?ne;qygjg(gu+qV-WNO6I#8Fk#DPPEX
zta9GstW|2PRVTk;D6g+9bDic0l32tNB#2N@Lm3s=h|#K(Vj)fY2_OHk>zBx-kgE(v
zjs;YqL3aJ%Z}7XfR$*$=O9~}`?ia`T7z28Cfo9!tzK<QJc>)BVfh)c3uQq_$Ptxmc
zEqVkDZUYzBZB5w&E_Z;TCqp)6R|?V;3I*W(jGie+pWznhTl4zX+Q;bwkfC0sZh(VB
zV7y4#>pu7H?d;pXXIlOH0buEJpW8SRSO5S324YJ`L;wH)0002_L%V+f000SaNLh0L
z01m+b01m+cxRGn^00007bV*G`2j>eO05vp&2Bstc001#bL_t&t*PV_r3IHGg0<Zr6
zHQ#h?ArTGTA|i@VsJ5Rx*kKY|0meCXC5fut<onP9=&T)(%y6is00000NkvXXu0mjf
DxkmL2

literal 0
HcmV?d00001

diff --git a/graphics/particles/shine.png.import b/graphics/particles/shine.png.import
new file mode 100644
index 0000000..9f4a88c
--- /dev/null
+++ b/graphics/particles/shine.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/shine.png-e490d9bf1bcf9743c95719a78e9f033e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/particles/shine.png"
+dest_files=[ "res://.import/shine.png-e490d9bf1bcf9743c95719a78e9f033e.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/objects/collectibles/key.tscn b/objects/collectibles/key.tscn
index 151dd24..3b4eb22 100644
--- a/objects/collectibles/key.tscn
+++ b/objects/collectibles/key.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1]
 [ext_resource path="res://graphics/collectibles/key.png" type="Texture" id=2]
 [ext_resource path="res://graphics/collectibles/30385.png" type="Texture" id=3]
 [ext_resource path="res://objects/collectibles/key.gd" type="Script" id=4]
+[ext_resource path="res://graphics/particles/shine.png" type="Texture" id=5]
+[ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=6]
 
 [sub_resource type="ShaderMaterial" id=7]
 shader = ExtResource( 1 )
@@ -62,6 +64,9 @@ animations = [ {
 [sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 4, 4 )
 
+[sub_resource type="Curve" id=17]
+_data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.25, 1 ), 7.51724, -6.83592, 0, 0, Vector2( 0.5, 0 ), 0.0, 0.0, 0, 0 ]
+
 [node name="Key" type="Node2D" groups=["gold"]]
 pause_mode = 2
 script = ExtResource( 4 )
@@ -71,7 +76,7 @@ material = SubResource( 7 )
 position = Vector2( 0, -1 )
 frames = SubResource( 5 )
 animation = "key"
-frame = 2
+frame = 4
 playing = true
 centered = false
 
@@ -85,4 +90,20 @@ monitorable = false
 position = Vector2( 4, 4 )
 shape = SubResource( 6 )
 
+[node name="Sparkles" type="CPUParticles2D" parent="."]
+position = Vector2( 4.5, 4 )
+amount = 1
+lifetime = 1.5
+texture = ExtResource( 5 )
+emission_shape = 2
+emission_rect_extents = Vector2( 4, 4 )
+gravity = Vector2( 0, 0 )
+angular_velocity = 720.0
+angular_velocity_random = 1.0
+angle = 720.0
+angle_random = 1.0
+scale_amount_curve = SubResource( 17 )
+color = Color( 0.996078, 1, 0.760784, 1 )
+script = ExtResource( 6 )
+
 [connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn
index 1334f5b..5508323 100644
--- a/objects/collectibles/shard.tscn
+++ b/objects/collectibles/shard.tscn
@@ -1,8 +1,10 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1]
 [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=2]
 [ext_resource path="res://objects/collectibles/shard.gd" type="Script" id=3]
+[ext_resource path="res://graphics/particles/shine.png" type="Texture" id=4]
+[ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=5]
 
 [sub_resource type="ShaderMaterial" id=7]
 shader = ExtResource( 1 )
@@ -29,6 +31,9 @@ tracks/0/keys = {
 "values": [ Color( 0.329412, 0.360784, 0.847059, 1 ), Color( 1, 1, 1, 1 ), Color( 0.329412, 0.360784, 0.847059, 1 ) ]
 }
 
+[sub_resource type="Curve" id=9]
+_data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.25, 1 ), 7.51724, -6.83592, 0, 0, Vector2( 0.5, 0 ), 0.0, 0.0, 0, 0 ]
+
 [node name="Shard" type="Node2D"]
 pause_mode = 2
 script = ExtResource( 3 )
@@ -44,10 +49,27 @@ collision_layer = 0
 collision_mask = 128
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+visible = false
 position = Vector2( 4.5, 2.5 )
 shape = SubResource( 6 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/glow = SubResource( 8 )
 
+[node name="Sparkles" type="CPUParticles2D" parent="."]
+position = Vector2( 4.5, 2.5 )
+amount = 1
+lifetime = 1.5
+texture = ExtResource( 4 )
+emission_shape = 2
+emission_rect_extents = Vector2( 5, 5 )
+gravity = Vector2( 0, 0 )
+angular_velocity = 720.0
+angular_velocity_random = 1.0
+angle = 720.0
+angle_random = 1.0
+scale_amount_curve = SubResource( 9 )
+color = Color( 0.72549, 0.956863, 1, 1 )
+script = ExtResource( 5 )
+
 [connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
diff --git a/objects/collectibles/star.gd b/objects/collectibles/star.gd
index 877f977..ae9342d 100644
--- a/objects/collectibles/star.gd
+++ b/objects/collectibles/star.gd
@@ -13,6 +13,7 @@ const COLORS = [
 
 export(StarColor) var color setget _set_color
 export var value = 1
+export (Array, Color) var particle_colors := []
 onready var sprite = $AnimatedSprite
 
 func _ready():
@@ -25,6 +26,7 @@ func _set_color(value):
 	color = value
 	if is_inside_tree():
 		sprite.material.set_shader_param("palette", COLORS[color])
+		$Sparkles.color = particle_colors[color]
 
 func _on_Area2D_body_entered(body):
 	#Collect
diff --git a/objects/collectibles/star.tscn b/objects/collectibles/star.tscn
index 44a92a1..0f20aa3 100644
--- a/objects/collectibles/star.tscn
+++ b/objects/collectibles/star.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://graphics/collectibles/pal_star_red.png" type="Texture" id=1]
 [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=2]
 [ext_resource path="res://objects/collectibles/star.gd" type="Script" id=3]
 [ext_resource path="res://graphics/collectibles/star.png" type="Texture" id=4]
+[ext_resource path="res://graphics/particles/shine.png" type="Texture" id=5]
+[ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=6]
 
 [sub_resource type="ShaderMaterial" id=10]
 resource_local_to_scene = true
@@ -47,15 +49,19 @@ animations = [ {
 [sub_resource type="RectangleShape2D" id=9]
 extents = Vector2( 4, 4 )
 
+[sub_resource type="Curve" id=17]
+_data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.25, 1 ), 7.51724, -6.83592, 0, 0, Vector2( 0.5, 0 ), 0.0, 0.0, 0, 0 ]
+
 [node name="Star" type="Node2D"]
 pause_mode = 2
 script = ExtResource( 3 )
+particle_colors = [ Color( 1, 0.741176, 0.709804, 1 ), Color( 1, 0.968627, 0.709804, 1 ), Color( 0.709804, 1, 0.74902, 1 ), Color( 0.709804, 0.752941, 1, 1 ), Color( 1, 0.709804, 0.984314, 1 ) ]
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 material = SubResource( 10 )
 position = Vector2( -1, -3 )
 frames = SubResource( 8 )
-frame = 1
+frame = 3
 playing = true
 centered = false
 
@@ -68,4 +74,20 @@ visible = false
 position = Vector2( 4, 4 )
 shape = SubResource( 9 )
 
+[node name="Sparkles" type="CPUParticles2D" parent="."]
+position = Vector2( 4.5, 4 )
+amount = 1
+lifetime = 1.5
+texture = ExtResource( 5 )
+emission_shape = 2
+emission_rect_extents = Vector2( 4, 4 )
+gravity = Vector2( 0, 0 )
+angular_velocity = 720.0
+angular_velocity_random = 1.0
+angle = 720.0
+angle_random = 1.0
+scale_amount_curve = SubResource( 17 )
+color = Color( 1, 0.741176, 0.709804, 1 )
+script = ExtResource( 6 )
+
 [connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
diff --git a/scripts/randomize_particle_start.gd b/scripts/randomize_particle_start.gd
new file mode 100644
index 0000000..f9a8552
--- /dev/null
+++ b/scripts/randomize_particle_start.gd
@@ -0,0 +1,4 @@
+extends CPUParticles2D
+
+func _ready() -> void:
+	preprocess = randf() * lifetime