feat: new dialogue with NPC

camera/camera.tscn

@@ -9,6 +9,7 @@ size = Vector2(630, 340)
 script = ExtResource("1_f5lvx")
 
 [node name="Area2D" type="Area2D" parent="."]
+visible = false
 collision_layer = 0
 collision_mask = 2
 
@@ -16,6 +17,8 @@ collision_mask = 2
 shape = SubResource("RectangleShape2D_7mycd")
 
 [node name="Camera2D" type="Camera2D" parent="."]
+position_smoothing_enabled = true
+position_smoothing_speed = 30.0
 
 [connection signal="body_entered" from="Area2D" to="." method="_on_body_entered"]
 [connection signal="body_exited" from="Area2D" to="." method="_on_body_exited"]

damageable/damageable.gd

@@ -0,0 +1,13 @@
+extends Node
+class_name Damageable
+
+
+@export var health = 3
+@export var hitback_velocity: float = 500
+
+signal got_hit
+
+func damage(value: int = 0, direction: Vector2 = Vector2.UP):
+	health -= value
+	get_parent().velocity = hitback_velocity * direction
+	got_hit.emit()

damageable/damageable.gd.uid

@@ -0,0 +1 @@
+uid://bhbn4pngdfk7w

damageable/damageable.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://djwoetcyvvofc"]
+
+[ext_resource type="Script" uid="uid://bhbn4pngdfk7w" path="res://damageable/damageable.gd" id="1_qv54c"]
+
+[node name="Damageable" type="Node"]
+script = ExtResource("1_qv54c")

damageable/hitbox.gd

@@ -0,0 +1,9 @@
+extends Area2D
+
+@export var damage = 0
+@export var hitback_direction = Vector2.UP
+
+func _on_body_entered(body: Node2D) -> void:
+	for child in body.get_children():
+		if is_instance_of(child, Damageable):
+			child.damage(damage, hitback_direction)

damageable/hitbox.gd.uid

@@ -0,0 +1 @@
+uid://dt2lsk3je41th

damageable/hitbox.tscn

@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=3 uid="uid://7sqwi3lygb1u"]
+
+[ext_resource type="Script" uid="uid://dt2lsk3je41th" path="res://damageable/hitbox.gd" id="1_n3l2p"]
+
+[node name="Hitbox" type="Area2D"]
+script = ExtResource("1_n3l2p")
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]

default_bus_layout.tres

@@ -0,0 +1,21 @@
+[gd_resource type="AudioBusLayout" format=3 uid="uid://bvbt5y18xikew"]
+
+[resource]
+bus/1/name = &"SFX"
+bus/1/solo = false
+bus/1/mute = false
+bus/1/bypass_fx = false
+bus/1/volume_db = -3.32682
+bus/1/send = &"Master"
+bus/2/name = &"Ambiance"
+bus/2/solo = false
+bus/2/mute = false
+bus/2/bypass_fx = false
+bus/2/volume_db = -10.9863
+bus/2/send = &"Master"
+bus/3/name = &"Music"
+bus/3/solo = false
+bus/3/mute = false
+bus/3/bypass_fx = false
+bus/3/volume_db = -6.25101
+bus/3/send = &"Master"

dialogues/dialogue_manager.gd

@@ -106,3 +106,7 @@ func _on_next_letter() -> void:
 			
 		next_label.visible = true
 		ui_flicker_timer.start()
+
+
+func _on_body_entered_trigger_dialogue(body: Node2D) -> void:
+	on_dialogue_started()

ennemy/IdleMechant.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://3g48672b8541"
+path="res://.godot/imported/IdleMechant.png-ced0ec4bedd0a649c483c7992abb82fc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ennemy/IdleMechant.png"
+dest_files=["res://.godot/imported/IdleMechant.png-ced0ec4bedd0a649c483c7992abb82fc.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

ennemy/MechantVol.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cjruk5xlt3tyn"
+path="res://.godot/imported/MechantVol.png-92fe77e69a79007327da2f7de078b743.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ennemy/MechantVol.png"
+dest_files=["res://.godot/imported/MechantVol.png-92fe77e69a79007327da2f7de078b743.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

ennemy/armored_ennemy.gd

@@ -1,6 +1,11 @@
 extends CharacterBody2D
 
 @onready var animated_sprite: AnimatedSprite2D = $AnimatedSprite2D
+@onready var time_to_finish_hit: Timer = $TimeToFinishHit
+@onready var hitbox: Area2D = $Hitbox
+
+func _ready() -> void:
+	hitbox.monitoring = false
 
 func play_anim_run():
 	animated_sprite.play("run")
@@ -10,3 +15,13 @@ func play_anim_idle():
 	
 func hit():
 	animated_sprite.play("hit")
+	time_to_finish_hit.start()
+	hitbox.monitoring = true
+
+func _on_trigger_hit_body_entered(body: Node2D) -> void:
+	if body.name == "Player":
+		hit()
+
+func _on_time_to_finish_hit_timeout() -> void:
+	play_anim_idle()
+	hitbox.monitoring = false

ennemy/armored_ennemy.tscn

@@ -1,18 +1,52 @@
-[gd_scene load_steps=4 format=3 uid="uid://c5ruphrd8ebuu"]
+[gd_scene load_steps=8 format=3 uid="uid://c5ruphrd8ebuu"]
 
 [ext_resource type="Script" uid="uid://dailpwkay2nu5" path="res://ennemy/armored_ennemy.gd" id="1_f4v0e"]
 [ext_resource type="SpriteFrames" uid="uid://i6035vm5ited" path="res://player/armored_spritesheet.tres" id="1_k1sc2"]
 [ext_resource type="Shape2D" uid="uid://6rhdwj5jxbxn" path="res://player/player_collision.tres" id="2_f4v0e"]
+[ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="4_e5h8j"]
+[ext_resource type="AudioStream" uid="uid://c0w61do2a1hbc" path="res://ennemy/black-magic-159868.mp3" id="5_iblih"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_f4v0e"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_e5h8j"]
 
 [node name="ArmoredEnnemy" type="CharacterBody2D"]
 script = ExtResource("1_f4v0e")
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
-position = Vector2(1, -28)
+position = Vector2(1, -16)
 sprite_frames = ExtResource("1_k1sc2")
-animation = &"jump"
+animation = &"idle"
 autoplay = "idle"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(0, -13)
 shape = ExtResource("2_f4v0e")
+
+[node name="TriggerHit" type="Area2D" parent="."]
+collision_mask = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="TriggerHit"]
+position = Vector2(17, -15)
+shape = SubResource("RectangleShape2D_f4v0e")
+
+[node name="Hitbox" parent="." instance=ExtResource("4_e5h8j")]
+collision_mask = 3
+hitback_direction = Vector2(1, -1)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+position = Vector2(17, -15)
+shape = SubResource("CircleShape2D_e5h8j")
+
+[node name="TimeToFinishHit" type="Timer" parent="."]
+wait_time = 0.5
+one_shot = true
+
+[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("5_iblih")
+autoplay = true
+max_distance = 400.0
+bus = &"SFX"
+
+[connection signal="body_entered" from="TriggerHit" to="." method="_on_trigger_hit_body_entered"]
+[connection signal="timeout" from="TimeToFinishHit" to="." method="_on_time_to_finish_hit_timeout"]

ennemy/black-magic-159868.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://c0w61do2a1hbc"
+path="res://.godot/imported/black-magic-159868.mp3-f5e04e11025cfff3fcd9a08fe133af57.mp3str"
+
+[deps]
+
+source_file="res://ennemy/black-magic-159868.mp3"
+dest_files=["res://.godot/imported/black-magic-159868.mp3-f5e04e11025cfff3fcd9a08fe133af57.mp3str"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

main.gd

@@ -5,16 +5,30 @@ extends Node2D
 @onready var bubbles_back: TileMapLayer = $BubblesBack
 @onready var bubbles_interior: TileMapLayer = $BubblesInterior
 var active_camera: SuperCamera
+@onready var opening_fade_to_black: ColorRect = $OpeningFadeToBlack
 
 @onready var opening_cutscene: AnimationPlayer = $OpeningCutscene
 
+@onready var background_far: TileMapLayer = $BackgroundFar
+@onready var background_middle: TileMapLayer = $BackgroundMiddle
+@onready var background_close: TileMapLayer = $BackgroundClose
+@onready var foreground_far: TileMapLayer = $ForegroundFar
+
+@export_group("Parallax")
+@export var parallax_far = 0.1
+@export var parallax_middle = 0.3
+@export var parallax_close = 0.5
+@export var foreground = 0.8
+
+
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	for child in get_children():
 		if is_instance_of(child, SuperCamera):
 			child.became_active.connect(on_camera_became_active)
 	
-	opening_cutscene.play("opening_cutscene")
+	#opening_cutscene.play("opening_cutscene")
+	#opening_fade_to_black.visible = true
 
 func on_camera_became_active(camera: SuperCamera):
 	active_camera = camera
@@ -26,3 +40,8 @@ func _process(delta: float) -> void:
 	bubbles_back.global_position.x = active_camera.global_position.x
 	bubbles_interior.global_position.x = active_camera.global_position.x
 	
+	background_far.global_position.x = active_camera.global_position.x * parallax_far
+	background_middle.global_position.x = active_camera.global_position.x * parallax_middle
+	background_close.global_position.x = active_camera.global_position.x * parallax_close
+	foreground_far.global_position.x = active_camera.global_position.x * foreground
+	

player/armored_spritesheet.tres

@@ -1,111 +1,70 @@
-[gd_resource type="SpriteFrames" load_steps=23 format=3 uid="uid://i6035vm5ited"]
+[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://i6035vm5ited"]
 
 [ext_resource type="Texture2D" uid="uid://dbruj2bdtjfmd" path="res://player/assets/char_blue.png" id="1_pbrcr"]
+[ext_resource type="Texture2D" uid="uid://cjruk5xlt3tyn" path="res://ennemy/MechantVol.png" id="2_pxh46"]
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_8pxes"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_pxh46"]
 atlas = ExtResource("1_pbrcr")
-region = Rect2(0, 56, 56, 56)
+region = Rect2(112, 280, 56, 56)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_fmu53"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_b2lu2"]
 atlas = ExtResource("1_pbrcr")
-region = Rect2(56, 56, 56, 56)
+region = Rect2(168, 280, 56, 56)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_w7j2h"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_3w5np"]
 atlas = ExtResource("1_pbrcr")
-region = Rect2(112, 56, 56, 56)
+region = Rect2(224, 280, 56, 56)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_n0b8q"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(168, 56, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_4wqev"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(96, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_jfgyi"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(224, 56, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_t0xqw"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(128, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_237xx"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(280, 56, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_7en50"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(64, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_wpyo2"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(0, 0, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7crtr"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(56, 0, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_vgvch"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(112, 0, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a1u5o"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(168, 0, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_3dxkp"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(224, 0, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6wior"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(280, 0, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_dcl6h"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(96, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_pbrcr"]
 atlas = ExtResource("1_pbrcr")
 region = Rect2(392, 168, 56, 56)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_p5tca"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(0, 112, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_yp8g1"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(64, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_jbx34"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(56, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_s3g0c"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(112, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_35wys"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(168, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_pjwc4"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(224, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_or4qq"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(280, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_hggc2"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(336, 112, 56, 56)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_b2j0d"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(392, 112, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_er5ay"]
+atlas = ExtResource("2_pxh46")
+region = Rect2(96, 0, 32, 32)
 
 [resource]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_8pxes")
+"texture": SubResource("AtlasTexture_pxh46")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_fmu53")
+"texture": SubResource("AtlasTexture_b2lu2")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_w7j2h")
+"texture": SubResource("AtlasTexture_3w5np")
+}],
+"loop": false,
+"name": &"got_hit",
+"speed": 12.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4wqev")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_n0b8q")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_jfgyi")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_237xx")
+"texture": SubResource("AtlasTexture_t0xqw")
 }],
 "loop": true,
 "name": &"hit",
@@ -113,26 +72,14 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_wpyo2")
+"texture": SubResource("AtlasTexture_7en50")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_7crtr")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_vgvch")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_a1u5o")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_3dxkp")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_6wior")
+"texture": SubResource("AtlasTexture_dcl6h")
 }],
 "loop": true,
 "name": &"idle",
-"speed": 8.0
+"speed": 2.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -144,30 +91,12 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_p5tca")
+"texture": SubResource("AtlasTexture_yp8g1")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_jbx34")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_s3g0c")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_35wys")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_pjwc4")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_or4qq")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_hggc2")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_b2j0d")
+"texture": SubResource("AtlasTexture_er5ay")
 }],
 "loop": true,
 "name": &"run",
-"speed": 14.0
+"speed": 2.0
 }]

player/assets/DebutIdle.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dr5ypp4q8n2xm"
+path="res://.godot/imported/DebutIdle.png-d20fa9d40d66390fd8f04dab8c840cf9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/DebutIdle.png"
+dest_files=["res://.godot/imported/DebutIdle.png-d20fa9d40d66390fd8f04dab8c840cf9.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

player/assets/Outch.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dwn548x0n4bpd"
+path="res://.godot/imported/Outch.png-fb0d67fa327c4c83d19c4122b53475dc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Outch.png"
+dest_files=["res://.godot/imported/Outch.png-fb0d67fa327c4c83d19c4122b53475dc.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

player/assets/RunCycle.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dsxvqsh3umw01"
+path="res://.godot/imported/RunCycle.png-669737da4bd32c93f4786dff9477bb56.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/RunCycle.png"
+dest_files=["res://.godot/imported/RunCycle.png-669737da4bd32c93f4786dff9477bb56.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

player/assets/WalkCycle.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dw6tn0grt2ajc"
+path="res://.godot/imported/WalkCycle.png-3dcfa4941b274ed62a1c28413d027e7e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/WalkCycle.png"
+dest_files=["res://.godot/imported/WalkCycle.png-3dcfa4941b274ed62a1c28413d027e7e.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

player/player.gd

@@ -12,15 +12,15 @@ var jump_velocity = 400.0
 var gravity_modifier = 1
 
 @onready var knight: AnimatedSprite2D = $Knight
-@onready var red_hood: AnimatedSprite2D = $RedHood
+@onready var base: AnimatedSprite2D = $Base
 
 var animated_sprites = []
 
-var is_in_cutscene = false
+var is_in_cutscene = false  # back to true on build
 var current_animation = "idle"
 
 func play_anim():
-	for sprite in animated_sprites:
+	for sprite: AnimatedSprite2D in animated_sprites:
 		sprite.play(current_animation)
 
 func play_anim_run():
@@ -49,12 +49,14 @@ func look_right():
 func _ready() -> void:
 	animated_sprites = [
 		knight,
-		red_hood
+		base
 	]
 
 func _physics_process(delta: float) -> void:
 	play_anim()
 	if is_in_cutscene:
+		play_anim_idle()
+		velocity.x = move_toward(velocity.x, 0, speed)
 		move_and_slide()
 		return
 		
@@ -62,30 +64,33 @@ func _physics_process(delta: float) -> void:
 	if not is_on_floor():
 		velocity += get_gravity() * delta * gravity_modifier
 
-	# Handle jump.
-	# if Input.is_action_just_pressed("ui_accept") and is_on_floor():
-	#	velocity.y = -jump_velocity
-
 	var direction := Input.get_axis("move_left", "move_right")
-	if direction > 0:
+	if direction > 0 and is_on_floor():
 		look_right()
-	if direction < 0:
+	if direction < 0 and is_on_floor():
 		look_left()
 	
-	if velocity.x !=  0:
-		play_anim_run()
-	else:
-		play_anim_idle()
 	
-	if direction:
-		var smoothed_speed = speed * smoothstep(0, 1, acceleration)
-		velocity.x += direction * smoothed_speed
-		velocity.x = clampf(velocity.x, -speed, speed)
+	if not is_on_floor():
+		current_animation = "got_hit"
 	else:
-		velocity.x = move_toward(velocity.x, 0, speed)
+		if velocity.x !=  0:
+			play_anim_run()
+		else:
+			play_anim_idle()
+	
+	if is_on_floor():
+		if direction:
+			var smoothed_speed = speed * smoothstep(0, 1, acceleration)
+			velocity.x += direction * smoothed_speed
+			velocity.x = clampf(velocity.x, -speed, speed)
+		else:
+			velocity.x = move_toward(velocity.x, 0, speed)
 
 	move_and_slide()
 
-
 func _on_dialogue_manager_dialogue_ended() -> void:
 	set_in_play()
+
+func _on_trigger_dialogue_body_entered(body: Node2D) -> void:
+	set_in_cutscene()

player/player.tscn

@@ -1,242 +1,119 @@
-[gd_scene load_steps=61 format=3 uid="uid://yvp44oauis4n"]
+[gd_scene load_steps=30 format=3 uid="uid://yvp44oauis4n"]
 
-[ext_resource type="Texture2D" uid="uid://d3t1fn35skpip" path="res://player/assets/idle sheet-Sheet.png" id="1_g1dw6"]
 [ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"]
 [ext_resource type="SpriteFrames" uid="uid://i6035vm5ited" path="res://player/armored_spritesheet.tres" id="2_qjkh3"]
-[ext_resource type="Texture2D" uid="uid://besci6tw4jtou" path="res://player/assets/itch run-Sheet sheet.png" id="2_yw30f"]
-[ext_resource type="Texture2D" uid="uid://lew1m4dpw2ss" path="res://player/assets/itch jump sheet-Sheet.png" id="4_g6k8r"]
+[ext_resource type="Texture2D" uid="uid://dwn548x0n4bpd" path="res://player/assets/Outch.png" id="3_rgyib"]
+[ext_resource type="Texture2D" uid="uid://dr5ypp4q8n2xm" path="res://player/assets/DebutIdle.png" id="4_rgyib"]
+[ext_resource type="Texture2D" uid="uid://dsxvqsh3umw01" path="res://player/assets/RunCycle.png" id="5_boad6"]
+[ext_resource type="PackedScene" uid="uid://djwoetcyvvofc" path="res://damageable/damageable.tscn" id="5_g6k8r"]
 [ext_resource type="Shape2D" uid="uid://6rhdwj5jxbxn" path="res://player/player_collision.tres" id="5_qjkh3"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_g6k8r"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(0, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_boad6"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(80, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_rgyib"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(160, 0, 80, 80)
+[ext_resource type="Texture2D" uid="uid://dw6tn0grt2ajc" path="res://player/assets/WalkCycle.png" id="5_rgyib"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_hg6s5"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(240, 0, 80, 80)
+atlas = ExtResource("3_rgyib")
+region = Rect2(0, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_8t03j"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(320, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2ieo8"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(400, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ebec5"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(480, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(560, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kb6p2"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(640, 0, 80, 80)
+atlas = ExtResource("3_rgyib")
+region = Rect2(32, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_wodsf"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(720, 0, 80, 80)
+atlas = ExtResource("4_rgyib")
+region = Rect2(0, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_32hag"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(800, 0, 80, 80)
+atlas = ExtResource("4_rgyib")
+region = Rect2(32, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(880, 0, 80, 80)
+[sub_resource type="AtlasTexture" id="AtlasTexture_2ieo8"]
+atlas = ExtResource("5_rgyib")
+region = Rect2(0, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_e7oew"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(960, 0, 80, 80)
+[sub_resource type="AtlasTexture" id="AtlasTexture_ebec5"]
+atlas = ExtResource("5_rgyib")
+region = Rect2(32, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_c35mf"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(1040, 0, 80, 80)
+[sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"]
+atlas = ExtResource("5_rgyib")
+region = Rect2(64, 0, 32, 32)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_65viv"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(1120, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_x7c3f"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(1200, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_bjvpn"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(1280, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_s7qer"]
-atlas = ExtResource("1_g1dw6")
-region = Rect2(1360, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mmwog"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(0, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_8pxes"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(80, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_fmu53"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(320, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_w7j2h"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(400, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_n0b8q"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(480, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_jfgyi"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(640, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_237xx"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(720, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_wpyo2"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(960, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7crtr"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(1120, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_vgvch"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(1200, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a1u5o"]
-atlas = ExtResource("4_g6k8r")
-region = Rect2(1360, 0, 80, 80)
+[sub_resource type="AtlasTexture" id="AtlasTexture_kb6p2"]
+atlas = ExtResource("5_rgyib")
+region = Rect2(96, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_g4c7l"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(0, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(0, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_knn7v"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(80, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(32, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_7pqkx"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(160, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(64, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_uw77l"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(240, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(96, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_rptt4"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(320, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(128, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_r7pn3"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(400, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(160, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_b8hi5"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(480, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(192, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_2uvqg"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(560, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(224, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_1s1yo"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(640, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(256, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_5ejfk"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(720, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(288, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_jd2rm"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(800, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(320, 0, 32, 32)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_q28gw"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(880, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ge24q"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(960, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_pnw6m"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1040, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1so5t"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1120, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_55jnj"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1200, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_dx5ib"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1280, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a2xo5"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1360, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_art4l"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1440, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_fjxoa"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1520, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_gswnw"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1600, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_xcnuv"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1680, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j55il"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1760, 0, 80, 80)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_hjies"]
-atlas = ExtResource("2_yw30f")
-region = Rect2(1840, 0, 80, 80)
+atlas = ExtResource("5_boad6")
+region = Rect2(352, 0, 32, 32)
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_mmwog"]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_g6k8r")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_boad6")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_rgyib")
-}, {
-"duration": 1.0,
 "texture": SubResource("AtlasTexture_hg6s5")
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_8t03j")
+}],
+"loop": true,
+"name": &"got_hit",
+"speed": 8.0
 }, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_wodsf")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_32hag")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 3.0
+}, {
+"frames": [{
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_2ieo8")
 }, {
@@ -248,75 +125,10 @@ animations = [{
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_kb6p2")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_wodsf")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_32hag")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_tqiix")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_e7oew")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_c35mf")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_65viv")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_x7c3f")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_bjvpn")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_s7qer")
-}],
-"loop": true,
-"name": &"idle",
-"speed": 13.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_mmwog")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_8pxes")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_fmu53")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_w7j2h")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_n0b8q")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_jfgyi")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_237xx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_wpyo2")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_7crtr")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_vgvch")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_a1u5o")
 }],
 "loop": true,
 "name": &"jump",
-"speed": 10.0
+"speed": 4.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -354,69 +166,39 @@ animations = [{
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_q28gw")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ge24q")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_pnw6m")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_1so5t")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_55jnj")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_dx5ib")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_a2xo5")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_art4l")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_fjxoa")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_gswnw")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_xcnuv")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j55il")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_hjies")
 }],
 "loop": true,
 "name": &"run",
-"speed": 30.0
+"speed": 14.0
 }]
 
 [node name="Player" type="CharacterBody2D"]
 collision_layer = 3
 script = ExtResource("1_yw30f")
-speed = 200.0
+speed = 180.0
 acceleration = 0.177
 
+[node name="AudioListener2D" type="AudioListener2D" parent="."]
+current = true
+
 [node name="Knight" type="AnimatedSprite2D" parent="."]
 visible = false
 position = Vector2(1, -28)
 sprite_frames = ExtResource("2_qjkh3")
-animation = &"idle"
-autoplay = "idle"
-
-[node name="RedHood" type="AnimatedSprite2D" parent="."]
-position = Vector2(11, -19)
-sprite_frames = SubResource("SpriteFrames_mmwog")
 animation = &"jump"
 autoplay = "idle"
-frame_progress = 0.749354
+
+[node name="Base" type="AnimatedSprite2D" parent="."]
+position = Vector2(0, -16)
+sprite_frames = SubResource("SpriteFrames_mmwog")
+animation = &"got_hit"
+autoplay = "idle"
+frame_progress = 0.993718
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
 position = Vector2(0, -13)
 shape = ExtResource("5_qjkh3")
+
+[node name="Damageable" parent="." instance=ExtResource("5_g6k8r")]
+hitback_velocity = 400.0