From e78fee0e2125900ee0d4dc3019ef61ffea4b520d Mon Sep 17 00:00:00 2001
From: Just Dzhi <YourBroSelOfficial@gmail.com>
Date: Sun, 1 Oct 2023 17:49:38 +0400
Subject: [PATCH] Trash_Can anim

---
 src/models/enemies/trash_can/TrashCan.tscn    |  11 +++++-
 .../enemies/trash_can/sprites/spawn.png       | Bin 0 -> 919 bytes
 .../trash_can/sprites/spawn.png.import        |  35 +++++++++++++++++
 .../sprites/trash_can_spriteframes.tres       |  36 +++++++++++++++++-
 src/models/enemies/trash_can/trash_can.gd     |  15 ++++++--
 5 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 src/models/enemies/trash_can/sprites/spawn.png
 create mode 100644 src/models/enemies/trash_can/sprites/spawn.png.import

diff --git a/src/models/enemies/trash_can/TrashCan.tscn b/src/models/enemies/trash_can/TrashCan.tscn
index fdec38a..8cde8e8 100644
--- a/src/models/enemies/trash_can/TrashCan.tscn
+++ b/src/models/enemies/trash_can/TrashCan.tscn
@@ -13,7 +13,8 @@ script = ExtResource( 2 )
 [node name="Sprite" type="AnimatedSprite" parent="."]
 position = Vector2( 3, 0 )
 frames = ExtResource( 1 )
-animation = "rolling"
+animation = "spawn"
+frame = 6
 playing = true
 
 [node name="EnemyCollider" type="Area2D" parent="."]
@@ -21,3 +22,11 @@ playing = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyCollider"]
 position = Vector2( 3.5, 5 )
 shape = SubResource( 1 )
+
+[node name="Spawn_Animation_Start" type="Timer" parent="."]
+wait_time = 0.5
+one_shot = true
+autostart = true
+
+[connection signal="animation_finished" from="Sprite" to="." method="_on_sprite_animation_finished"]
+[connection signal="timeout" from="Spawn_Animation_Start" to="." method="_on_Spawn_Animation_Start_timeout"]
diff --git a/src/models/enemies/trash_can/sprites/spawn.png b/src/models/enemies/trash_can/sprites/spawn.png
new file mode 100644
index 0000000000000000000000000000000000000000..be2ca210b58561f51872bc86af506da370ffdfc5
GIT binary patch
literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq005c*000;W1^@s60*B<p00001b5ch_0Itp)
z=>Px&QAtEWRA_<iS-q~>Fc>|q`V8G+X&06*t$Bzmbzuk_16v2wrB`C_$PQB2Qi*3^
zcXyT!RU-8@D%BmZbDdn{5c~5Dq&X7G4{-eD%klSP0|N#O7|<86t_^4lDdp9_6+%b=
zjB^eEVC?eaw&AUhF`Z5?5;yS*ApoFaXYD%xz;rro&C5AAkL4IK{9wYy|JwBjia{?y
z2qBB2U`dkbYXCr#Bd$S~Wzf8uyZ#a>AcT;dbBf8z07&HnvdM3IZd1H3iC3MB3P8P}
zC`vX(MujZP%5xz^DKf$r$J8g@?CucGh!z`3k}xAGNJL2GI(>v<G#Z(g5&)UVYBrMk
zf;yTvJhPr8&us53qG|BuhUxkNs78(;OlAPeIxU!2i@~s!Eb`REVDgiU5yNH$X&m(!
z)(O(N&~Q4GX_RwLm-bEveZ~N?bZSN#27oMD)FPTb28%=47qjVe3QVJWp(&_(=Vt2@
zo#JCO6%Ftb8|OSq1Ee?`BUl}s)@T+~(kKO}YBaO(??`Okpz;AwNyDw+jA*t9BZQE#
zT4Xf~NyB^$Td6r?MIWH-kSQs>-j7pgMNu#%ENO_2wrDpHK@?GH6D<m&NZBX`UlCe5
zPSQ-#2F}!}3h1+OlNrSJsa8mmB;4r9>>P$w;T|-r&s@Oiz)IfjDvVciDqg<aD0?{>
zuh^~_Uv8w>uBiN3<0TN6=?70<=Z{@G13JQyrMk&X;&fnu-&WD%yN~4;-+umhBJkx^
z&VBszySx>P_hG*&32dUX?Usb_*0-~$?X~ecMe_CS2R!UI7u6ObGFOKgxOYgyJDEwt
zxy<E<SiHIcxmIYmVy{hTja}z%x2s%_$7AGqj`4ULl<Hi(At2<fEGu-u+tR-`ZLc#T
zeSh;Fe>Yz)DtI&+d9N#FS$2_kKA(F>v_A2g{%wqCEqG(wYbzxh7i^EmBLjdu&tV>q
z$79gqrHj{_v}e5c=3ke+PNDt!{0V8AR_<xyG);q+I9$9T=o9a~`PXHyvqoF5*Ut#e
zbMu}rY`hfc1Mj{0*TsL;UMHo21MmOIdo!Er1Nx1|1>419A$1FD`@e6_ck%A`d+)BO
tPrNYv+qUcM(q6Bw6S%DqJn-Hp??1J`|D;-IWFP<l002ovPDHLkV1hhcupIyZ

literal 0
HcmV?d00001

diff --git a/src/models/enemies/trash_can/sprites/spawn.png.import b/src/models/enemies/trash_can/sprites/spawn.png.import
new file mode 100644
index 0000000..6f3c9ff
--- /dev/null
+++ b/src/models/enemies/trash_can/sprites/spawn.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/spawn.png-cd75f3f5bf1649bb857c394b2ea0cfad.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/models/enemies/trash_can/sprites/spawn.png"
+dest_files=[ "res://.import/spawn.png-cd75f3f5bf1649bb857c394b2ea0cfad.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=false
+svg/scale=1.0
diff --git a/src/models/enemies/trash_can/sprites/trash_can_spriteframes.tres b/src/models/enemies/trash_can/sprites/trash_can_spriteframes.tres
index 37ff401..f80699a 100644
--- a/src/models/enemies/trash_can/sprites/trash_can_spriteframes.tres
+++ b/src/models/enemies/trash_can/sprites/trash_can_spriteframes.tres
@@ -1,6 +1,7 @@
-[gd_resource type="SpriteFrames" load_steps=6 format=2]
+[gd_resource type="SpriteFrames" load_steps=14 format=2]
 
 [ext_resource path="res://src/models/enemies/trash_can/sprites/rolling.png" type="Texture" id=1]
+[ext_resource path="res://src/models/enemies/trash_can/sprites/spawn.png" type="Texture" id=2]
 
 [sub_resource type="AtlasTexture" id=1]
 atlas = ExtResource( 1 )
@@ -18,10 +19,43 @@ region = Rect2( 44, 0, 22, 24 )
 atlas = ExtResource( 1 )
 region = Rect2( 66, 0, 22, 24 )
 
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 2 )
+region = Rect2( 0, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 2 )
+region = Rect2( 22, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 2 )
+region = Rect2( 44, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 2 )
+region = Rect2( 66, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 2 )
+region = Rect2( 88, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 2 )
+region = Rect2( 110, 0, 22, 24 )
+
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 2 )
+region = Rect2( 132, 0, 22, 24 )
+
 [resource]
 animations = [ {
 "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ],
 "loop": true,
 "name": "rolling",
 "speed": 16.0
+}, {
+"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ) ],
+"loop": false,
+"name": "spawn",
+"speed": 12.0
 } ]
diff --git a/src/models/enemies/trash_can/trash_can.gd b/src/models/enemies/trash_can/trash_can.gd
index e616c5f..f7c2cb8 100644
--- a/src/models/enemies/trash_can/trash_can.gd
+++ b/src/models/enemies/trash_can/trash_can.gd
@@ -24,7 +24,7 @@ func _ready():
 		movement_start = "top"
 		randomize()
 		global_position.x = randi()%248 + 40 # 320 - 12 - 40
-		global_position.y = -20
+		global_position.y = 4
 		
 		path_sprite.texture = load("res://src/models/enemies/trash_can/sprites/path/vertical.png")
 		path_sprite.global_position.y = 21
@@ -35,7 +35,7 @@ func _ready():
 		movement_start = ["left", "right"][randi()%2]
 		randomize()
 		global_position.y = randi()%60 + 20
-		global_position.x = 360 if movement_start == "right" else -20
+		global_position.x = 310 if movement_start == "right" else 10
 		
 		path_sprite.texture = load("res://src/models/enemies/trash_can/sprites/path/horizontal.png")
 		path_sprite.global_position.y = self.global_position.y
@@ -54,8 +54,8 @@ func drop_trash():
 	get_parent().call_deferred("add_child", trash_drop)
 
 func _physics_process(delta):
-	if start_timer < 2:
-		path_sprite.modulate.a = (2 - start_timer) / 2
+	if start_timer < 1:
+		path_sprite.modulate.a = (1 - start_timer) / 2
 		start_timer += delta
 		return
 	drop_timer += delta
@@ -89,3 +89,10 @@ func _physics_process(delta):
 			drop_trash()
 		
 	velocity = move_and_slide(velocity)
+
+func _on_sprite_animation_finished():
+	if $Sprite.animation == "spawn":
+		$Sprite.play("rolling")
+
+func _on_Spawn_Animation_Start_timeout():
+	$Sprite.play("spawn")