From 6355c31a7c3876601ebe664ff0abf61c34527d00 Mon Sep 17 00:00:00 2001
From: OddlyTimbot <timbot@oddlystudios.com>
Date: Mon, 7 Oct 2024 14:24:38 -0400
Subject: [PATCH] player hurt working with signals

---
 .../player/hurt/Player Hurt 48x48.png         | Bin 0 -> 1448 bytes
 .../player/hurt/Player Hurt 48x48.png.import  |  34 +++++++++++++++
 augustgamecourse/scenes/player.tscn           |  40 +++++++++++++++++-
 augustgamecourse/scripts/game_controller.gd   |   3 ++
 augustgamecourse/scripts/player.gd            |  20 ++++++++-
 augustgamecourse/scripts/scene_manager.gd     |  12 ++++--
 6 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png
 create mode 100644 augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png.import

diff --git a/augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png b/augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..57d878395e3581c75dc07562589c4c209606485d
GIT binary patch
literal 1448
zcmV;Z1y}lsP)<h;3K|Lk000e1NJLTq006)M001xu1^@s6M^1Gf00001b5ch_0Itp)
z=>Px)Vo5|nRCt{2n@>y}RUF4ZkJerOE#kjMStQgHNr?OjDhY`uTxqn~MsGFI8%cX2
z#+wHZ-nkf)9-7#Lo=hNMy_gUWrUz6Ku)&lxmefL8tXe6HK*8r>dAl>i%(BbQ?!JNF
zC)s3n-t6r6_vZI~zxQT#K@bE%5ClOG1VIo4K@bE%5ClOG1VIo4;mDxEKB3kcfQ3g}
z+PS|g5mx|8h5nVH@&3<uU7D}H+G?-Z03?Ru2=&B4$#1aP1l~?JL@9wJhT^FS`-DNs
ze^6UB3F`EN+H68%I2@rHKoFvY7(h7IhyjFSP00q(T4!I7Tj=_cudSLi{PR{|TND<M
z7pMDl)MJ4BI?ENqp-*ZO9^mHRGaBHTl^p;YVv5_(_q&d_^$yU*>Aq|r=_kK&wGEuT
zmfemKQw=rs)TufE&aa%SkiuY`+5tYA+TfG-rd`JjoV~_c_tUEBm%q4lf25-N3dI?R
zUkp~>2EDsErvcVCHeLJM9_;Qr_Ro850JOfDbbVj7&EV|#;VTb$<y6eo{_R&Ey56^(
zc)@IDg;&c6e#!5}sXw6_RiY*V*kN8np>bTgKVnw}Fa`j(3H%HIITHZHRh;MEc($q)
z;h^L<m?Ux}zl-xL=PDk+<>izHn7g?I6s=!@9VRFw`3-w<C?M2I7Rn;HvA&khrv{Xn
z0_7vF;sE^d!-J~bo4&l9(!HJS1s&VbeO=Y6TD7IO{1Uxt$q&%m+0O8lhk1{G>CCUn
zV_s{X2{^C8L2>M%6RMH%mPy82CPUG1@~|IF#(UKA)_k@zm$&A1JmA>6jzQJhk=b@8
z{@!-g=0Uxk?TjQR)aSs|g?8;7MNf|{Dp&-rnq5{cU`CP?%1^fg)m*>By^L;W;#alb
zA!lTB4TdkY2O85gm8(gZ<J5S|WXYARqzaIX_qaN7>r5l*ZT~pTRL4wxs)cg|^>Sl%
zyOL6hCP;fe-GkqKW;U%dZ!vUqUso|=WvOI`t^i6YwATA70YG|N(-6z_cU{Mz@_we;
zCNPX7C-&*E-2?`&cCYTYzg+TLs9VwRP9vKt2ALTAs_^YmNH4qtWvFB&RRA-pC*wUT
zeruiht@UhMdRu3!fpej&lybdnU@D;e2JNpFeuh12+*sXqy#P*+Etbv1hpqqyGpa|K
zw$UK~?u>m8Kr-FuXkDtboV<8V;MH!JO{H}IM6?a#tYT1}N>;J~47D#d1F-pfZZ#j@
zZ3Hq8&1@O%^NpfyqeJX|TF~7H>u?&uZD4yb*P?B7XrF;AMJPXoaAJ&LlK;{Cd}PW)
z)RKShrw{h^Z4{D!Bsrn{Dw#1cWa5}j1>dj;i%^~etgkJ&gqq}!0w#%~mi&H1F$S-R
z+eU|6CN8%L<kz5ii258_IGBnVAnFU{C{l?jMARvZ0TMm#2V}Oc1N`RDhNzAHy{~-{
zDZSv||9)|l)5s+mz;9G<Z0b^wF~Pr^o0ymFocOpoyZzgpJAB>WZ>4FSbiKUbdha!@
z?QwYZo8<S4qg<3UYG|$bZ|6r1u(8pQO@8OIfz_GJe+5nr3|RGlfX8bC8en0u3&?f8
zH(}nLowY--2csV{F*rxg*;Gn<lg73<^658J;#!pahZwH`oC&VA&KdwRCa}!_08cc{
zxI{(41o`wEY>uN4{ZRfGN}2+h<cHkU$BP;Hql8U~QVK^Q4sQ%$Pw7Hk1bat!TSj{?
zg^WHnCr_cHC)gQBG5VprF&z5DyN`2Io0^la2hQ)k3uPNjQS1e<jpM4{jQ(L7BDCKE
z1tqo(2`?NCY^-L2AP9mW2!bF8f*=TjAP9mW*vtPTsd%pJWe1)B0000<MNUMnLSTY{
CalNSk

literal 0
HcmV?d00001

diff --git a/augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png.import b/augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png.import
new file mode 100644
index 0000000..60c8dfd
--- /dev/null
+++ b/augustgamecourse/assets/graphics/player/hurt/Player Hurt 48x48.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b2brlauvni08o"
+path="res://.godot/imported/Player Hurt 48x48.png-a720e51cb19103e76b22ab6c1b81302d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/graphics/player/hurt/Player Hurt 48x48.png"
+dest_files=["res://.godot/imported/Player Hurt 48x48.png-a720e51cb19103e76b22ab6c1b81302d.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
diff --git a/augustgamecourse/scenes/player.tscn b/augustgamecourse/scenes/player.tscn
index 8b8266d..c1c8535 100644
--- a/augustgamecourse/scenes/player.tscn
+++ b/augustgamecourse/scenes/player.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=39 format=3 uid="uid://dbgc24hrbtvxm"]
+[gd_scene load_steps=44 format=3 uid="uid://dbgc24hrbtvxm"]
 
 [ext_resource type="Script" path="res://scripts/player.gd" id="1_5qpif"]
 [ext_resource type="Texture2D" uid="uid://d6d3re6epsh4" path="res://assets/graphics/player/death/Player Death 64x64.png" id="2_t1yra"]
 [ext_resource type="Texture2D" uid="uid://pdvgf3y1lquv" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_vcmr0"]
 [ext_resource type="Texture2D" uid="uid://cvh48exhs1ir1" path="res://assets/graphics/player/run/player run 48x48.png" id="3_a03rx"]
+[ext_resource type="Texture2D" uid="uid://b2brlauvni08o" path="res://assets/graphics/player/hurt/Player Hurt 48x48.png" id="3_a70o5"]
 [ext_resource type="Texture2D" uid="uid://d0kfe5ms2vjbr" path="res://assets/graphics/player/jump/player jump 48x48.png" id="3_mvdmt"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_uru55"]
@@ -46,6 +47,22 @@ region = Rect2(384, 0, 48, 48)
 atlas = ExtResource("2_t1yra")
 region = Rect2(432, 0, 48, 48)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_me361"]
+atlas = ExtResource("3_a70o5")
+region = Rect2(0, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5yslj"]
+atlas = ExtResource("3_a70o5")
+region = Rect2(48, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_l8y4s"]
+atlas = ExtResource("3_a70o5")
+region = Rect2(96, 0, 48, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vc70i"]
+atlas = ExtResource("3_a70o5")
+region = Rect2(144, 0, 48, 48)
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_etdvv"]
 atlas = ExtResource("2_vcmr0")
 region = Rect2(0, 0, 48, 48)
@@ -169,6 +186,23 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
+"texture": SubResource("AtlasTexture_me361")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5yslj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l8y4s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vc70i")
+}],
+"loop": false,
+"name": &"hurt",
+"speed": 12.0
+}, {
+"frames": [{
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_etdvv")
 }, {
 "duration": 1.0,
@@ -256,7 +290,7 @@ metadata/_edit_group_ = true
 texture_filter = 1
 position = Vector2(0, -7)
 sprite_frames = SubResource("SpriteFrames_wlxdo")
-animation = &"death"
+animation = &"hurt"
 autoplay = "idle"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
@@ -274,3 +308,5 @@ position = Vector2(12, -5)
 
 [node name="MarkerLeft" type="Node2D" parent="."]
 position = Vector2(-15, -5)
+
+[connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]
diff --git a/augustgamecourse/scripts/game_controller.gd b/augustgamecourse/scripts/game_controller.gd
index 290de5b..55313b0 100644
--- a/augustgamecourse/scripts/game_controller.gd
+++ b/augustgamecourse/scripts/game_controller.gd
@@ -4,6 +4,7 @@ var coinsCollected:int = 0
 var player:Resource
 
 signal playerDeath
+signal playerHurt
 
 func _ready() -> void:
 	print("Game controller is ready")
@@ -25,4 +26,6 @@ func playerDamage():
 		if player.health <= 0:
 			#kill him
 			playerDeath.emit()
+		else:
+			playerHurt.emit()
 		
diff --git a/augustgamecourse/scripts/player.gd b/augustgamecourse/scripts/player.gd
index 2b11021..f048a14 100644
--- a/augustgamecourse/scripts/player.gd
+++ b/augustgamecourse/scripts/player.gd
@@ -8,6 +8,8 @@ const PUSH_FORCE = 700
 var faceLeft = false
 var living = true
 
+signal playerDead
+
 # can i push right or left
 var pushLeftEnabled = false
 var pushRightEnabled = false
@@ -18,18 +20,24 @@ var pushRightEnabled = false
 @onready var playerSprite: AnimatedSprite2D = $AnimatedSprite2D
 
 var pushTarget
+var animPlaying = "idle"
 
 var bullet = preload("res://scenes/bullet.tscn")
 
 func killPlayer():
-	print("kill the player")
 	if living:
 		living = false
+		animPlaying = "death"
 		#play death animation
 		playerSprite.play("death")
+		
+func hurtPlayer():
+	animPlaying="hurt"
+	print("player should get hurt")
+	playerSprite.play("hurt")
 	
 func _physics_process(delta: float) -> void:
-	if living:
+	if living and not animPlaying=="hurt":
 		# Add the gravity.
 		if not is_on_floor():
 			velocity += get_gravity() * delta
@@ -102,3 +110,11 @@ func _physics_process(delta: float) -> void:
 					pushTarget = collider
 		else:
 			pushRightEnabled = false
+
+
+func _on_animation_finished() -> void:
+	print(animPlaying + " finished playing.")
+	if animPlaying == "hurt":
+		animPlaying="idle"
+	if animPlaying=="death":
+		playerDead.emit()
diff --git a/augustgamecourse/scripts/scene_manager.gd b/augustgamecourse/scripts/scene_manager.gd
index a4fda1d..d1da8b5 100644
--- a/augustgamecourse/scripts/scene_manager.gd
+++ b/augustgamecourse/scripts/scene_manager.gd
@@ -28,6 +28,8 @@ func _ready() -> void:
 			n.playerDamage.connect(GameController.playerDamage)
 	#GameController signals
 	GameController.playerDeath.connect(killPlayer)
+	GameController.playerHurt.connect(hurtPlayer)
+	player.playerDead.connect(deadPlayer)
 
 func boxTrap():
 	print("Trigger a box trap!")
@@ -66,11 +68,13 @@ func crateFactory():
 func killPlayer():
 	# tell player to die - starts death animation
 	player.killPlayer()
-	if timer.is_stopped():
-		timer.start(4)
-	
+func hurtPlayer():
+	player.hurtPlayer()
 
+func deadPlayer():
+	if timer.is_stopped():
+		timer.start(1)
+		
 func resetWorld():
-	print("screne manager resetting world")
 	GameController.resetPlayer()
 	get_tree().reload_current_scene()