Mini trucs worldbuilding

Merge branch 'main' of https://git.game-dev.space/minimata/GMTK25
World building transition
2025-08-03 16:23:25 +02:00 · 2025-08-03 16:14:05 +02:00 · 2025-08-03 16:13:54 +02:00 · 2025-08-03 16:06:31 +02:00 · 2025-08-03 15:46:04 +02:00 · 2025-08-03 15:34:34 +02:00
103 changed files with 20669 additions and 174 deletions
--- a/arrow/arrow.gd
+++ b/arrow/arrow.gd
@ -0,0 +1,38 @@
+extends RigidBody2D
+
+@onready var area_2d: Area2D = $Area2D
+@onready var kill_after: Timer = $KillAfter
+@onready var kill_audio: AudioStreamPlayer2D = $KillAudio
+
+@export var speed = 100
+@export var rotation_speed = 1
+@export var jump_strength_on_death = 100
+var is_moving = true
+var first_frame_available = true
+
+func _ready() -> void:
+	freeze = true
+
+func _physics_process(delta: float) -> void:
+	if is_moving:
+		position.x -= speed
+	else:
+		freeze = false
+		area_2d.monitoring = false
+		area_2d.monitorable = false
+		
+		linear_velocity.x = 0
+		linear_velocity += get_gravity() * delta
+		angular_velocity = rotation_speed
+		
+		if first_frame_available:
+			apply_impulse(Vector2.UP * jump_strength_on_death)
+			first_frame_available = false
+
+func _on_kill_after_timeout() -> void:
+	queue_free()
+
+func _on_body_entered(body: Node) -> void:
+	is_moving = false
+	kill_audio.play()
+	kill_after.start()
--- a/arrow/arrow.gd.uid
+++ b/arrow/arrow.gd.uid
@ -0,0 +1 @@
+uid://127t4dvlp6tv
--- a/arrow/arrow.tscn
+++ b/arrow/arrow.tscn
@ -0,0 +1,62 @@
+[gd_scene load_steps=10 format=3 uid="uid://4bfkbcr7v8tj"]
+
+[ext_resource type="Script" uid="uid://127t4dvlp6tv" path="res://arrow/arrow.gd" id="1_d2qln"]
+[ext_resource type="Script" uid="uid://dt2lsk3je41th" path="res://damageable/hitbox.gd" id="2_d2qln"]
+[ext_resource type="Texture2D" uid="uid://lhq6h8f81qrr" path="res://player/assets/Fleche.png" id="2_ofxgm"]
+[ext_resource type="AudioStream" uid="uid://ca5ip2v4sbw8r" path="res://world_assets/audio/384912__ali_6868__arrow-impact-3.wav" id="4_lo0oj"]
+[ext_resource type="AudioStream" uid="uid://cl171ph84g5t2" path="res://world_assets/audio/384913__ali_6868__arrow-impact-2.wav" id="5_nl01e"]
+[ext_resource type="AudioStream" uid="uid://ejdkgkgh1arq" path="res://world_assets/audio/384914__ali_6868__arrow-impact-1.wav" id="6_e3mw3"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_d2qln"]
+size = Vector2(2, 2)
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_yaehf"]
+size = Vector2(12, 5)
+
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_l8mgh"]
+streams_count = 3
+stream_0/stream = ExtResource("4_lo0oj")
+stream_1/stream = ExtResource("5_nl01e")
+stream_2/stream = ExtResource("6_e3mw3")
+
+[node name="Arrow" type="RigidBody2D"]
+collision_layer = 0
+collision_mask = 0
+freeze_mode = 1
+linear_velocity = Vector2(-100, 0)
+script = ExtResource("1_d2qln")
+speed = 1
+rotation_speed = 10
+jump_strength_on_death = 500
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_d2qln")
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture = ExtResource("2_ofxgm")
+region_rect = Rect2(717, 6, 35, 9)
+
+[node name="Area2D" type="Area2D" parent="."]
+collision_layer = 4
+collision_mask = 5
+script = ExtResource("2_d2qln")
+hitback_direction = Vector2(-1, -1)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+position = Vector2(1, 0.5)
+shape = SubResource("RectangleShape2D_yaehf")
+
+[node name="KillAfter" type="Timer" parent="."]
+wait_time = 3.0
+one_shot = true
+ignore_time_scale = true
+
+[node name="KillAudio" type="AudioStreamPlayer2D" parent="."]
+stream = SubResource("AudioStreamRandomizer_l8mgh")
+max_distance = 100.0
+bus = &"SFX"
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]
+[connection signal="body_entered" from="Area2D" to="." method="_on_body_entered"]
+[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]
+[connection signal="timeout" from="KillAfter" to="." method="_on_kill_after_timeout"]
--- a/arrow/arrow_spawner.gd
+++ b/arrow/arrow_spawner.gd
@ -0,0 +1,10 @@
+extends Node2D
+
+@export var arrow_scene: PackedScene
+@onready var spawn_timing: Timer = $SpawnTiming
+
+
+func _on_spawn_timing_timeout() -> void:
+	var arrow: Node2D = arrow_scene.instantiate()
+	arrow.global_position = global_position
+	add_sibling(arrow)
--- a/arrow/arrow_spawner.gd.uid
+++ b/arrow/arrow_spawner.gd.uid
@ -0,0 +1 @@
+uid://bej0paudsyd7h
--- a/arrow/arrow_spawner.tscn
+++ b/arrow/arrow_spawner.tscn
@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=3 uid="uid://c5tp7c70qkxe3"]
+
+[ext_resource type="Script" uid="uid://bej0paudsyd7h" path="res://arrow/arrow_spawner.gd" id="1_7je20"]
+[ext_resource type="PackedScene" uid="uid://4bfkbcr7v8tj" path="res://arrow/arrow.tscn" id="2_ek028"]
+
+[node name="ArrowSpawner" type="Node2D"]
+script = ExtResource("1_7je20")
+arrow_scene = ExtResource("2_ek028")
+
+[node name="SpawnTiming" type="Timer" parent="."]
+wait_time = 5.0
+autostart = true
+
+[connection signal="timeout" from="SpawnTiming" to="." method="_on_spawn_timing_timeout"]
--- a/cover.png
+++ b/cover.png
--- a/cover.png.import
+++ b/cover.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dvsb5xh1m7svl"
+path="res://.godot/imported/cover.png-7415a2400197f69905d305dff229e3ab.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://cover.png"
+dest_files=["res://.godot/imported/cover.png-7415a2400197f69905d305dff229e3ab.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
--- a/damageable/damageable.gd
+++ b/damageable/damageable.gd
@ -1,13 +1,26 @@
 extends Node
 class_name Damageable

-
@export var health = 3
@export var hitback_velocity: float = 500

+var active = true
+
+signal die
 signal got_hit

+func set_active(new_active: bool):
+	active = new_active
+
 func damage(value: int = 0, direction: Vector2 = Vector2.UP):
-	health -= value
-	get_parent().velocity = hitback_velocity * direction
+	if not active:
+		return
+	
 	got_hit.emit()
+	if hitback_velocity > 0:
+		get_parent().velocity = hitback_velocity * direction
+	
+	health -= value
+	if health <= 0:
+		die.emit()
+	
--- a/damageable/hitbox.tscn
+++ b/damageable/hitbox.tscn
@ -5,4 +5,5 @@
 [node name="Hitbox" type="Area2D"]
 script = ExtResource("1_n3l2p")

+[connection signal="area_entered" from="." to="." method="_on_body_entered"]
 [connection signal="body_entered" from="." to="." method="_on_body_entered"]
--- a/default_bus_layout.tres
+++ b/default_bus_layout.tres
@ -5,17 +5,41 @@ 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/volume_db = -12.4611
 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/volume_db = -16.4004
 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/volume_db = -16.4004
 bus/3/send = &"Master"
+bus/4/name = &"Gearup"
+bus/4/solo = false
+bus/4/mute = false
+bus/4/bypass_fx = false
+bus/4/volume_db = -6.25101
+bus/4/send = &"Master"
+bus/5/name = &"Steps"
+bus/5/solo = false
+bus/5/mute = false
+bus/5/bypass_fx = false
+bus/5/volume_db = -23.3524
+bus/5/send = &"Master"
+bus/6/name = &"Dialogue"
+bus/6/solo = false
+bus/6/mute = false
+bus/6/bypass_fx = false
+bus/6/volume_db = -10.9863
+bus/6/send = &"Master"
+bus/7/name = &"BadGuy"
+bus/7/solo = false
+bus/7/mute = false
+bus/7/bypass_fx = false
+bus/7/volume_db = -0.526013
+bus/7/send = &"Master"
--- a/dialogues/choice.gd
+++ b/dialogues/choice.gd
@ -0,0 +1,92 @@
+extends Node
+
+@onready var bubbles: HBoxContainer = %Bubbles
+@onready var bubbles_back: TileMapLayer = %BubblesBack
+@onready var bubbles_interior: TileMapLayer = %BubblesInterior
+@onready var bubble_label: RichTextLabel = %BubbleLabel
+
+@onready var ui_flicker_timer: Timer = $UIFlickerTimer
+@onready var e_ui_button: TextureRect = %E
+@onready var next_label: Label = %NextLabel
+
+@onready var choices_container: MarginContainer = %ChoicesContainer
+@onready var accept_indicator: ColorRect = %AcceptIndicator
+@onready var accept_label: Label = %AcceptLabel
+@onready var reject_indicator: ColorRect = %RejectIndicator
+@onready var reject_label: Label = %RejectLabel
+
+@export_multiline var choice = ""
+@export var accept_option = ""
+@export var reject_option = ""
+
+@onready var wait_a_sec: Timer = $WaitASec
+
+signal accepted
+signal rejected
+
+var is_accept_selected = true
+var is_choice_happening = false
+
+func _process(delta: float) -> void:
+	if not is_choice_happening:
+		return
+	
+	if Input.is_action_just_pressed("move_right"):
+		is_accept_selected = false
+		update_ui()
+	
+	if Input.is_action_just_pressed("move_left"):
+		is_accept_selected = true
+		update_ui()
+	
+	if Input.is_action_just_pressed("interact"):
+		stop_choice()
+		
+
+func update_ui():
+	accept_indicator.visible = is_accept_selected
+	reject_indicator.visible = not is_accept_selected
+
+func toggle_ui():
+	e_ui_button.visible = not e_ui_button.visible
+
+func start_choice():
+	bubbles.visible = true
+	bubbles_back.visible = true
+	bubbles_interior.visible = true
+	bubble_label.visible = true
+	e_ui_button.visible = true
+	next_label.visible = true
+	choices_container.visible = true
+	
+	bubble_label.text = choice
+	
+	accept_label.text = accept_option
+	reject_label.text = reject_option
+	
+	is_accept_selected = true
+	update_ui()
+	
+	wait_a_sec.start()
+
+func stop_choice():
+	is_choice_happening = false
+	
+	ui_flicker_timer.stop()
+	
+	bubbles.visible = false
+	bubbles_back.visible = false
+	bubbles_interior.visible = false
+	bubble_label.visible = false
+	e_ui_button.visible = false
+	next_label.visible = false
+	choices_container.visible = false
+	
+	if is_accept_selected:
+		accepted.emit()
+	else:
+		rejected.emit()
+
+func _on_wait_a_sec_timeout() -> void:
+	is_choice_happening = true
+	ui_flicker_timer.start()
--- a/dialogues/choice.gd.uid
+++ b/dialogues/choice.gd.uid
@ -0,0 +1 @@
+uid://b65dvbdgyplnm
--- a/dialogues/choice.tscn
+++ b/dialogues/choice.tscn
@ -0,0 +1,17 @@
+[gd_scene load_steps=2 format=3 uid="uid://c2axd06m2g28y"]
+
+[ext_resource type="Script" uid="uid://b65dvbdgyplnm" path="res://dialogues/choice.gd" id="1_ht8c8"]
+
+[node name="Choice" type="Node"]
+script = ExtResource("1_ht8c8")
+
+[node name="UIFlickerTimer" type="Timer" parent="."]
+wait_time = 0.5
+ignore_time_scale = true
+
+[node name="WaitASec" type="Timer" parent="."]
+wait_time = 0.5
+one_shot = true
+
+[connection signal="timeout" from="UIFlickerTimer" to="." method="toggle_ui"]
+[connection signal="timeout" from="WaitASec" to="." method="_on_wait_a_sec_timeout"]
--- a/dialogues/dialogue_manager.gd
+++ b/dialogues/dialogue_manager.gd
@ -13,11 +13,11 @@ extends Node
@onready var e_ui_button: TextureRect = %E
@onready var next_label: Label = %NextLabel

-
@export_multiline var dialogue = ""
@export var start_with_left = false
@export var left_picture: Texture2D
@export var right_picture: Texture2D
+@onready var dialogue_player: AudioStreamPlayer = $DialoguePlayer

 signal dialogue_ended

@ -29,9 +29,6 @@ var is_left_speaking = false

 func _ready() -> void:
 	is_left_speaking = start_with_left
-	left_speaker.texture = left_picture
-	right_speaker.texture = right_picture
-	display_profiles()
 	
 	e_ui_button.visible = false
 	next_label.visible = false
@ -41,6 +38,9 @@ func _ready() -> void:
 		dialogue_steps.append(step.strip_edges())
 		
 func display_profiles():
+	left_speaker.texture = left_picture
+	right_speaker.texture = right_picture
+	
 	left_speaker.visible = is_left_speaking
 	right_speaker.visible = not is_left_speaking

@ -70,15 +70,17 @@ func load_next_dialogue():
 	
 func on_dialogue_started():
 	bubbles.visible = true
+	bubble_label.visible = true
 	bubbles_back.visible = true
 	bubbles_interior.visible = true
-	
+	display_profiles()
 	is_dialogue_ongoing = true
 	time_between_letters.start()
 	load_next_dialogue()
 	
 func end_dialogue():
 	bubbles.visible = false
+	bubble_label.visible = false
 	bubbles_back.visible = false
 	bubbles_interior.visible = false
 	e_ui_button.visible = false
@ -95,7 +97,8 @@ func _on_next_letter() -> void:
 		ui_flicker_timer.stop()
 		e_ui_button.visible = false
 		next_label.visible = false
-		
+		dialogue_player.pitch_scale = randf_range(5, 6)
+		dialogue_player.play()
 		var next_letter = current_dialogue_split.get(0)
 		current_dialogue_split.remove_at(0)
 		current_dialogue += next_letter
@ -106,3 +109,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()
--- a/dialogues/dialogue_manager.tscn
+++ b/dialogues/dialogue_manager.tscn
@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://bmng6wjt0paof"]
+[gd_scene load_steps=3 format=3 uid="uid://bmng6wjt0paof"]

 [ext_resource type="Script" uid="uid://k2r3aatbbyie" path="res://dialogues/dialogue_manager.gd" id="1_6nn6f"]
+[ext_resource type="AudioStream" uid="uid://cx7g00rpjodv3" path="res://world_assets/audio/speech.wav" id="2_8cgcf"]

 [node name="DialogueManager" type="Node"]
 script = ExtResource("1_6nn6f")
@ -13,5 +14,9 @@ ignore_time_scale = true
 wait_time = 0.05
 ignore_time_scale = true

+[node name="DialoguePlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("2_8cgcf")
+bus = &"Dialogue"
+
 [connection signal="timeout" from="UIFlickerTimer" to="." method="toggle_ui"]
 [connection signal="timeout" from="TimeBetweenLetters" to="." method="_on_next_letter"]
--- a/ennemy/Flammes.png
+++ b/ennemy/Flammes.png
--- a/ennemy/Flammes.png.import
+++ b/ennemy/Flammes.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dut0ru3y8rung"
+path="res://.godot/imported/Flammes.png-6539d30ca9b68fe1b06de69547ee6ef1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ennemy/Flammes.png"
+dest_files=["res://.godot/imported/Flammes.png-6539d30ca9b68fe1b06de69547ee6ef1.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
--- a/ennemy/MechantVol.png
+++ b/ennemy/MechantVol.png
--- a/ennemy/armored_ennemy.gd
+++ b/ennemy/armored_ennemy.gd
@ -8,7 +8,7 @@ func _ready() -> void:
 	hitbox.monitoring = false

 func play_anim_run():
-	animated_sprite.play("run")
+	animated_sprite.play("idle")

 func play_anim_idle():
 	animated_sprite.play("idle")
--- a/ennemy/armored_ennemy.tscn
+++ b/ennemy/armored_ennemy.tscn
@ -1,11 +1,52 @@
-[gd_scene load_steps=8 format=3 uid="uid://c5ruphrd8ebuu"]
+[gd_scene load_steps=13 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="Texture2D" uid="uid://cjruk5xlt3tyn" path="res://ennemy/MechantVol.png" id="2_iblih"]
 [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="AtlasTexture" id="AtlasTexture_iblih"]
+atlas = ExtResource("2_iblih")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vaovl"]
+atlas = ExtResource("2_iblih")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i1xbb"]
+atlas = ExtResource("2_iblih")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0a3sv"]
+atlas = ExtResource("2_iblih")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_vaovl"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_iblih")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vaovl")
+}],
+"loop": true,
+"name": &"hit",
+"speed": 6.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_i1xbb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0a3sv")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 2.0
+}]
+
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_f4v0e"]

 [sub_resource type="CircleShape2D" id="CircleShape2D_e5h8j"]
@ -15,7 +56,7 @@ script = ExtResource("1_f4v0e")

 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 position = Vector2(1, -16)
-sprite_frames = ExtResource("1_k1sc2")
+sprite_frames = SubResource("SpriteFrames_vaovl")
 animation = &"idle"
 autoplay = "idle"

@ -46,7 +87,7 @@ one_shot = true
 stream = ExtResource("5_iblih")
 autoplay = true
 max_distance = 400.0
-bus = &"SFX"
+bus = &"BadGuy"

 [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"]
--- a/ennemy/skeleton.gd
+++ b/ennemy/skeleton.gd
@ -0,0 +1,47 @@
+extends AnimatedSprite2D
+
+@onready var hitbox_2: Area2D = $Hitbox2
+@onready var hitbox: Area2D = $Hitbox
+@onready var wait_to_die: Timer = $WaitToDie
+@onready var hitting: Timer = $Hitting
+@onready var wait_to_hit: Timer = $WaitToHit
+@onready var die_audio: AudioStreamPlayer = $DieAudio
+@onready var hitsound: AudioStreamPlayer = $Hit
+
+var is_dying = false
+	
+func start_dancing():
+	play("dance")
+
+func hit():
+	if is_dying:
+		return
+	
+	hitbox.monitorable = true
+	hitbox.monitoring = true
+	play("hit")
+	hitsound.play()
+	hitting.start()
+	
+func stop_hitting():
+	if is_dying:
+		return
+	
+	hitbox.monitorable = false
+	hitbox.monitoring = false 
+	
+	play("idle")
+	wait_to_hit.start()
+
+func _on_damageable_die() -> void:
+	hitbox.set_deferred("monitorable", false)
+	hitbox.set_deferred("monitoring", false)
+	hitbox_2.set_deferred("monitorable", false)
+	hitbox_2.set_deferred("monitoring", false)
+	is_dying = true
+	play("die")
+	die_audio.play()
+	wait_to_die.start()
+
+func _on_wait_to_die_timeout() -> void:
+	queue_free()
--- a/ennemy/skeleton.gd.uid
+++ b/ennemy/skeleton.gd.uid
@ -0,0 +1 @@
+uid://b0ewbthpfsy7t
--- a/ennemy/skeleton.tscn
+++ b/ennemy/skeleton.tscn
@ -0,0 +1,492 @@
+[gd_scene load_steps=71 format=3 uid="uid://b2fyaj2fmrug7"]
+
+[ext_resource type="Texture2D" uid="uid://din26pdtyka1n" path="res://ennemy/Skeleton/Sprite Sheets/Skeleton Hit.png" id="1_yndcr"]
+[ext_resource type="Texture2D" uid="uid://bpxn5oa3r3121" path="res://ennemy/Skeleton/Sprite Sheets/Skeleton Dead.png" id="2_sx7nw"]
+[ext_resource type="Texture2D" uid="uid://kd8wotp135ud" path="res://ennemy/Skeleton/Sprite Sheets/Skeleton Attack.png" id="3_whaqf"]
+[ext_resource type="Texture2D" uid="uid://d4hj35wb0pm2b" path="res://ennemy/Skeleton/Sprite Sheets/Skeleton Idle.png" id="4_g7r65"]
+[ext_resource type="Script" uid="uid://bhbn4pngdfk7w" path="res://damageable/damageable.gd" id="5_oqxir"]
+[ext_resource type="Script" uid="uid://b0ewbthpfsy7t" path="res://ennemy/skeleton.gd" id="5_sx7nw"]
+[ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="6_kopbd"]
+[ext_resource type="AudioStream" uid="uid://cwnf4q8286apo" path="res://world_assets/audio/446013__slavicmagic__sword-hit.wav" id="8_whaqf"]
+[ext_resource type="AudioStream" uid="uid://k3nqsuybwrlf" path="res://world_assets/audio/swordhit2.wav" id="9_oqxir"]
+[ext_resource type="AudioStream" uid="uid://c4crs3etujcdo" path="res://world_assets/audio/swordhit.wav" id="10_kopbd"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yvsr8"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(0, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tko6h"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(60, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_am8a1"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(90, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8dc3g"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(120, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_htgcl"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(0, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_smeu8"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(33, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_f3y11"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(66, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_cpm2s"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(99, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_u81y6"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(132, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rt5wr"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(165, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mnw77"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(198, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vjgyh"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(231, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_d5iia"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(264, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_asu84"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(297, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qwt6e"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(330, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_off2o"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(363, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tttfs"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(396, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1iygd"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(429, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_g5xqc"]
+atlas = ExtResource("2_sx7nw")
+region = Rect2(462, 0, 33, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s4o1y"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(0, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7mmqq"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(30, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3exxq"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(60, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5aa3q"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(90, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bmvma"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(120, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_shlp4"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(150, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2n44k"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(180, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_86lig"]
+atlas = ExtResource("1_yndcr")
+region = Rect2(210, 0, 30, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ldnlw"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(0, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qe8ju"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(43, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bnk2o"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(86, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_oosfy"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(129, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_nf4f2"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(172, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_xkvoa"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(215, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_t5kpo"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(258, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pw0td"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(301, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_37eu1"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(344, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0wkqm"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(387, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ve5sr"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(430, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5s44m"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(473, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ibca3"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(516, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_g3y5b"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(559, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1slqb"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(602, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_uo83y"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(645, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_y0aao"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(688, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wm5rm"]
+atlas = ExtResource("3_whaqf")
+region = Rect2(731, 0, 43, 37)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vieuh"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(0, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yjja3"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(24, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_l0gw7"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(48, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_inymm"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(72, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jcxqu"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(96, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0arob"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(120, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dij0e"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(144, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_k1udn"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(168, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wat4s"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(192, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ywjan"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(216, 0, 24, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_m74q3"]
+atlas = ExtResource("4_g7r65")
+region = Rect2(240, 0, 24, 32)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_getpj"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yvsr8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tko6h")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_am8a1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8dc3g")
+}],
+"loop": true,
+"name": &"dance",
+"speed": 15.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_htgcl")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_smeu8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_f3y11")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_cpm2s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_u81y6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rt5wr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mnw77")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vjgyh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_d5iia")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_asu84")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qwt6e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_off2o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tttfs")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1iygd")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_g5xqc")
+}],
+"loop": false,
+"name": &"die",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_s4o1y")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7mmqq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3exxq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5aa3q")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bmvma")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_shlp4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2n44k")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_86lig")
+}],
+"loop": false,
+"name": &"got_hit",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ldnlw")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qe8ju")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bnk2o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_oosfy")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_nf4f2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_xkvoa")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_t5kpo")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pw0td")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_37eu1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0wkqm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ve5sr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5s44m")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ibca3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_g3y5b")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1slqb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_uo83y")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_y0aao")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_wm5rm")
+}],
+"loop": false,
+"name": &"hit",
+"speed": 17.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vieuh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yjja3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l0gw7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_inymm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jcxqu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0arob")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dij0e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_k1udn")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_wat4s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ywjan")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_m74q3")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 10.0
+}]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_qsp4k"]
+radius = 6.08276
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_kq58d"]
+size = Vector2(6, 21)
+
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_qeio8"]
+streams_count = 2
+stream_0/stream = ExtResource("9_oqxir")
+stream_1/stream = ExtResource("10_kopbd")
+
+[node name="Skeleton" type="AnimatedSprite2D"]
+sprite_frames = SubResource("SpriteFrames_getpj")
+animation = &"die"
+autoplay = "idle"
+flip_h = true
+script = ExtResource("5_sx7nw")
+
+[node name="Hitbox" parent="." instance=ExtResource("6_kopbd")]
+hitback_direction = Vector2(-1, -1)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+position = Vector2(-8, 8)
+shape = SubResource("CircleShape2D_qsp4k")
+
+[node name="Hitbox2" parent="." instance=ExtResource("6_kopbd")]
+hitback_direction = Vector2(-1, -1)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox2"]
+position = Vector2(4, 5.5)
+shape = SubResource("RectangleShape2D_kq58d")
+
+[node name="Damageable" type="Node" parent="Hitbox2"]
+script = ExtResource("5_oqxir")
+health = 1
+hitback_velocity = 0.0
+metadata/_custom_type_script = "uid://bhbn4pngdfk7w"
+
+[node name="WaitToDie" type="Timer" parent="."]
+wait_time = 3.0
+one_shot = true
+
+[node name="Hitting" type="Timer" parent="."]
+one_shot = true
+
+[node name="WaitToHit" type="Timer" parent="."]
+wait_time = 3.0
+
+[node name="DieAudio" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_whaqf")
+bus = &"SFX"
+
+[node name="Hit" type="AudioStreamPlayer" parent="."]
+stream = SubResource("AudioStreamRandomizer_qeio8")
+
+[connection signal="die" from="Hitbox2/Damageable" to="." method="_on_damageable_die"]
+[connection signal="timeout" from="WaitToDie" to="." method="_on_wait_to_die_timeout"]
+[connection signal="timeout" from="Hitting" to="." method="stop_hitting"]
+[connection signal="timeout" from="WaitToHit" to="." method="hit"]
--- a/main.gd
+++ b/main.gd
@ -8,6 +8,7 @@ var active_camera: SuperCamera
@onready var opening_fade_to_black: ColorRect = $OpeningFadeToBlack

@onready var opening_cutscene: AnimationPlayer = $OpeningCutscene
+@onready var dance_cutscene: AnimationPlayer = $DanceCutscene

@onready var background_far: TileMapLayer = $BackgroundFar
@onready var background_middle: TileMapLayer = $BackgroundMiddle
@ -15,11 +16,17 @@ var active_camera: SuperCamera
@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
+@export var parallax_far = 0.5
+@export var parallax_middle = 0.4
+@export var parallax_close = 0.3
+@export var foreground = 0.2

+@onready var choices_container: MarginContainer = %ChoicesContainer
+@onready var red_hood_cutscene: AnimationPlayer = $RedHoodCutscene
+@onready var final_cutscene: AnimationPlayer = $FinalCutscene
+
+@onready var ambiance: AudioStreamPlayer = $Ambiance
+var ambiance_stream: AudioStreamInteractive

 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
@ -27,8 +34,9 @@ func _ready() -> void:
 		if is_instance_of(child, SuperCamera):
 			child.became_active.connect(on_camera_became_active)
 	
-	#opening_cutscene.play("opening_cutscene")
-	#opening_fade_to_black.visible = true
+	ambiance.get_stream_playback().switch_to_clip_by_name("Start")
+	opening_cutscene.play("opening_cutscene")
+	opening_fade_to_black.visible = true

 func on_camera_became_active(camera: SuperCamera):
 	active_camera = camera
@ -39,9 +47,53 @@ func _process(delta: float) -> void:
 	next_dialogue.global_position.x = active_camera.global_position.x + 133.0
 	bubbles_back.global_position.x = active_camera.global_position.x
 	bubbles_interior.global_position.x = active_camera.global_position.x
+	choices_container.global_position.x = active_camera.global_position.x - 100
+	opening_fade_to_black.global_position.x = active_camera.global_position.x - 320.0
 	
 	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
+	# foreground_far.global_position.x = active_camera.global_position.x * foreground
 	
+@onready var dance_music: AudioStreamPlayer = $DanceMusic
+
+func _on_start_dancing() -> void:
+	dance_cutscene.play("dance")
+	ambiance.stop()
+	
+func restart_at_first_scene():
+	get_tree().change_scene_to_file("res://main.tscn")
+	
+func to_main_menu():
+	pass
+	
+func quit_game():
+	pass
+
+
+func _on_trigger_second_npc_dialogue_body_entered(body: Node2D) -> void:
+	red_hood_cutscene.play("cutscene")
+
+
+func _on_red_hood_sword_dialogue_dialogue_ended() -> void:
+	red_hood_cutscene.play("flee")
+
+
+func _on_final_armor_dialogue_ended() -> void:
+	red_hood_cutscene.play("final")
+
+
+func _on_final_cinematic_body_entered(body: Node2D) -> void:
+	final_cutscene.play("cutscene")
+
+
+func _on_balade_ambiance_body_entered(body: Node2D) -> void:
+	ambiance.get_stream_playback().switch_to_clip_by_name("Forest")
+
+
+func _on_squelettes_ambiance_body_entered(body: Node2D) -> void:
+	ambiance.get_stream_playback().switch_to_clip_by_name("Squelettes")
+
+
+func _on_cave_ambiance_body_entered(body: Node2D) -> void:
+	ambiance.get_stream_playback().switch_to_clip_by_name("Cave")
--- a/main.tscn
+++ b/main.tscn
--- a/player/armored_spritesheet.tres
+++ b/player/armored_spritesheet.tres
@ -1,59 +1,181 @@
-[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://i6035vm5ited"]
+[gd_resource type="SpriteFrames" load_steps=34 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"]
+[ext_resource type="Texture2D" uid="uid://dv7jhtoptk12r" path="res://player/assets/Danse.png" id="1_4wqev"]
+[ext_resource type="Texture2D" uid="uid://dcyawv770lkhp" path="res://player/assets/Défense.png" id="2_b2lu2"]
+[ext_resource type="Texture2D" uid="uid://dwn548x0n4bpd" path="res://player/assets/Outch.png" id="2_t0xqw"]
+[ext_resource type="Texture2D" uid="uid://dpy6espwka35l" path="res://player/assets/RunArme.png" id="4_3w5np"]

-[sub_resource type="AtlasTexture" id="AtlasTexture_pxh46"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(112, 280, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(0, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_b2lu2"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(168, 280, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_e7oew"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(32, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_3w5np"]
-atlas = ExtResource("1_pbrcr")
-region = Rect2(224, 280, 56, 56)
+[sub_resource type="AtlasTexture" id="AtlasTexture_c35mf"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(64, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_4wqev"]
-atlas = ExtResource("2_pxh46")
+[sub_resource type="AtlasTexture" id="AtlasTexture_65viv"]
+atlas = ExtResource("1_4wqev")
 region = Rect2(96, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_t0xqw"]
-atlas = ExtResource("2_pxh46")
+[sub_resource type="AtlasTexture" id="AtlasTexture_x7c3f"]
+atlas = ExtResource("1_4wqev")
 region = Rect2(128, 0, 32, 32)

+[sub_resource type="AtlasTexture" id="AtlasTexture_bjvpn"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s7qer"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ge24q"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pnw6m"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1so5t"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(288, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_55jnj"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(320, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dx5ib"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(352, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_a2xo5"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(384, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_art4l"]
+atlas = ExtResource("1_4wqev")
+region = Rect2(416, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hg6s5"]
+atlas = ExtResource("2_t0xqw")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8t03j"]
+atlas = ExtResource("2_t0xqw")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3w5np"]
+atlas = ExtResource("2_b2lu2")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4wqev"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_t0xqw"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(32, 0, 32, 32)
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_7en50"]
-atlas = ExtResource("2_pxh46")
+atlas = ExtResource("4_3w5np")
 region = Rect2(64, 0, 32, 32)

 [sub_resource type="AtlasTexture" id="AtlasTexture_dcl6h"]
-atlas = ExtResource("2_pxh46")
+atlas = ExtResource("4_3w5np")
 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_yp8g1"]
-atlas = ExtResource("2_pxh46")
-region = Rect2(64, 0, 32, 32)
+atlas = ExtResource("4_3w5np")
+region = Rect2(128, 0, 32, 32)

 [sub_resource type="AtlasTexture" id="AtlasTexture_er5ay"]
-atlas = ExtResource("2_pxh46")
-region = Rect2(96, 0, 32, 32)
+atlas = ExtResource("4_3w5np")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_x3djp"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ko4fi"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i5cp7"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0mkg8"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(288, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5lqr2"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(320, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_nq0ey"]
+atlas = ExtResource("4_3w5np")
+region = Rect2(352, 0, 32, 32)

 [resource]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_pxh46")
+"texture": SubResource("AtlasTexture_tqiix")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_b2lu2")
+"texture": SubResource("AtlasTexture_e7oew")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_3w5np")
+"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")
+}, {
+"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")
+}],
+"loop": true,
+"name": &"dance",
+"speed": 6.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hg6s5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8t03j")
 }],
 "loop": false,
 "name": &"got_hit",
@ -61,21 +183,7 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_4wqev")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_t0xqw")
-}],
-"loop": true,
-"name": &"hit",
-"speed": 12.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_7en50")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_dcl6h")
+"texture": SubResource("AtlasTexture_3w5np")
 }],
 "loop": true,
 "name": &"idle",
@ -83,20 +191,42 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_pbrcr")
-}],
-"loop": true,
-"name": &"jump",
-"speed": 5.0
+"texture": SubResource("AtlasTexture_4wqev")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_t0xqw")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7en50")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dcl6h")
 }, {
-"frames": [{
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_yp8g1")
 }, {
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_er5ay")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_x3djp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ko4fi")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_i5cp7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0mkg8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5lqr2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_nq0ey")
 }],
 "loop": true,
 "name": &"run",
-"speed": 2.0
+"speed": 14.0
 }]
--- a/player/assets/Bouclier.png
+++ b/player/assets/Bouclier.png
--- a/player/assets/Bouclier.png.import
+++ b/player/assets/Bouclier.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bfxgjrja1ah60"
+path="res://.godot/imported/Bouclier.png-e7c965646f348bf410efb0824b431e45.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Bouclier.png"
+dest_files=["res://.godot/imported/Bouclier.png-e7c965646f348bf410efb0824b431e45.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
--- a/player/assets/Danse.png
+++ b/player/assets/Danse.png
--- a/player/assets/Danse.png.import
+++ b/player/assets/Danse.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dv7jhtoptk12r"
+path="res://.godot/imported/Danse.png-360f9d75971dc28cdb901fbcce9ab403.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Danse.png"
+dest_files=["res://.godot/imported/Danse.png-360f9d75971dc28cdb901fbcce9ab403.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
--- a/player/assets/Défense.png
+++ b/player/assets/Défense.png
--- a/player/assets/Défense.png.import
+++ b/player/assets/Défense.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dcyawv770lkhp"
+path="res://.godot/imported/Défense.png-c9911fdbdfe0bbcdb6f1b11801052875.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Défense.png"
+dest_files=["res://.godot/imported/Défense.png-c9911fdbdfe0bbcdb6f1b11801052875.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
--- a/player/assets/Epee.png
+++ b/player/assets/Epee.png
--- a/player/assets/Epee.png.import
+++ b/player/assets/Epee.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://db3oaynrhd7wg"
+path="res://.godot/imported/Epee.png-2f948674a42be1d4f0f32c5289e9c5d8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Epee.png"
+dest_files=["res://.godot/imported/Epee.png-2f948674a42be1d4f0f32c5289e9c5d8.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
--- a/player/assets/Fleche.png
+++ b/player/assets/Fleche.png
--- a/player/assets/Fleche.png.import
+++ b/player/assets/Fleche.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://lhq6h8f81qrr"
+path="res://.godot/imported/Fleche.png-fd23037ecccb3463f4413f9430b058a1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Fleche.png"
+dest_files=["res://.godot/imported/Fleche.png-fd23037ecccb3463f4413f9430b058a1.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
--- a/player/assets/IdleArmes.png
+++ b/player/assets/IdleArmes.png
--- a/player/assets/IdleArmes.png.import
+++ b/player/assets/IdleArmes.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bhrqdo0cadpf4"
+path="res://.godot/imported/IdleArmes.png-4b0b1618004fdb09b94c469795d19762.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/IdleArmes.png"
+dest_files=["res://.godot/imported/IdleArmes.png-4b0b1618004fdb09b94c469795d19762.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
--- a/player/assets/RunArme.png
+++ b/player/assets/RunArme.png
--- a/player/assets/RunArme.png.import
+++ b/player/assets/RunArme.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dpy6espwka35l"
+path="res://.godot/imported/RunArme.png-0ddf4bccde5c36d31728f6dfcc6c39c0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/RunArme.png"
+dest_files=["res://.godot/imported/RunArme.png-0ddf4bccde5c36d31728f6dfcc6c39c0.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
--- a/player/assets/RunArmeEpee.png
+++ b/player/assets/RunArmeEpee.png
--- a/player/assets/RunArmeEpee.png.import
+++ b/player/assets/RunArmeEpee.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dxsbbcagqkiid"
+path="res://.godot/imported/RunArmeEpee.png-53c014bb63270f9d7b7a1a264ad4311e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/RunArmeEpee.png"
+dest_files=["res://.godot/imported/RunArmeEpee.png-53c014bb63270f9d7b7a1a264ad4311e.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
--- a/player/assets/Stab
+++ b/player/assets/Stab
--- a/player/assets/Stab
+++ b/player/assets/Stab
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d2rfo6ilwusak"
+path="res://.godot/imported/Stab .png-066cf9b96545ad05213c48d15dd6666a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Stab .png"
+dest_files=["res://.godot/imported/Stab .png-066cf9b96545ad05213c48d15dd6666a.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
--- a/player/assets/Tete.png
+++ b/player/assets/Tete.png
--- a/player/assets/Tete.png.import
+++ b/player/assets/Tete.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://drjrcocrm4bpw"
+path="res://.godot/imported/Tete.png-d9734c8572ccd9529363aece42849208.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player/assets/Tete.png"
+dest_files=["res://.godot/imported/Tete.png-d9734c8572ccd9529363aece42849208.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
--- a/player/blue_profile.tres
+++ b/player/blue_profile.tres
@ -0,0 +1,7 @@
+[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://b6ivps1v5bwc7"]
+
+[ext_resource type="Texture2D" uid="uid://dbruj2bdtjfmd" path="res://player/assets/char_blue.png" id="1_jjpkp"]
+
+[resource]
+atlas = ExtResource("1_jjpkp")
+region = Rect2(22, 24, 11, 12)
--- a/player/player.gd
+++ b/player/player.gd
@ -11,64 +11,95 @@ var jump_velocity = 400.0
@export_range(0, 10, 0.1, "or_greater")
 var gravity_modifier = 1

-@onready var knight: AnimatedSprite2D = $Knight
+@onready var hitting: Timer = $Hitting
+@onready var hitbox: Area2D = $Hitbox
+
+@onready var armor: AnimatedSprite2D = $Armor
+@onready var sword: AnimatedSprite2D = $Sword
+@onready var damageable: Damageable = $Damageable
+@onready var shield: AnimatedSprite2D = $Shield
@onready var base: AnimatedSprite2D = $Base
+var current_sprite: AnimatedSprite2D

-var animated_sprites = []
-
-var is_in_cutscene = false  # back to true on build
+var is_in_cutscene = true  # back to true on build
 var current_animation = "idle"

+var is_hitting = false
+var has_shield = false
+var has_sword = false
+var has_armor = false
+
+@onready var steps_player: AudioStreamPlayer = $StepsPlayer
+@onready var gearup_armor: AudioStreamPlayer = $GearupArmor
+@onready var gearup_sword: AudioStreamPlayer = $GearupSword
+@onready var gearup_shield: AudioStreamPlayer = $GearupShield
+@onready var sword_hit: AudioStreamPlayer = $SwordHit
+@onready var got_hit_audio: AudioStreamPlayer = $GotHitAudio
+
+
 func play_anim():
-	for sprite: AnimatedSprite2D in animated_sprites:
-		sprite.play(current_animation)
+	current_sprite.play(current_animation)

 func play_anim_run():
 	current_animation = "run"
+	current_sprite.play("run")

 func play_anim_idle():
 	current_animation = "idle"
+	current_sprite.play("idle")
 	
 func play_anim_jump():
-	current_animation = "jump"
+	current_animation = "walk"
+	current_sprite.play("walk")
+	
+func play_anim_dance():
+	current_animation = "dance"
+	current_sprite.play("dance")
 		
 func set_in_cutscene():
 	is_in_cutscene = true
+	play_anim_idle()
 	
 func set_in_play():
 	is_in_cutscene = false
 	
 func look_left():
-	for sprite in animated_sprites:
-		sprite.flip_h = true
+	current_sprite.flip_h = true
 	
 func look_right():
-	for sprite in animated_sprites:
-		sprite.flip_h = false
+	current_sprite.flip_h = false
 	
 func _ready() -> void:
-	animated_sprites = [
-		knight,
-		base
-	]
+	current_sprite = base

 func _physics_process(delta: float) -> void:
-	play_anim()
 	if is_in_cutscene:
+		velocity.x = move_toward(velocity.x, 0, speed)
+		move_and_slide()
+		return
+	play_anim()
+	
+	if is_hitting:
+		current_animation = "hit"
+		velocity.x = move_toward(velocity.x, 0, speed)
 		move_and_slide()
 		return
-		
 	
 	if not is_on_floor():
 		velocity += get_gravity() * delta * gravity_modifier

 	var direction := Input.get_axis("move_left", "move_right")
+	
+	if(has_shield and not has_sword and direction == 0):
+		damageable.set_active(false)
+	else:
+		damageable.set_active(true)
+	
 	if direction > 0 and is_on_floor():
 		look_right()
 	if direction < 0 and is_on_floor():
 		look_left()
 	
-	
 	if not is_on_floor():
 		current_animation = "got_hit"
 	else:
@ -84,8 +115,73 @@ func _physics_process(delta: float) -> void:
 			velocity.x = clampf(velocity.x, -speed, speed)
 		else:
 			velocity.x = move_toward(velocity.x, 0, speed)
-
+	
+	if Input.is_action_just_pressed("hit") and has_sword:
+		hit()
+		
 	move_and_slide()

+func hit():
+	is_hitting = true
+	sword_hit.play()
+	hitting.start()
+	hitbox.monitoring = true
+
+func _on_hitting_timeout() -> void:
+	is_hitting = false
+	hitbox.monitoring = false
+	damageable.set_active(true)
+
 func _on_dialogue_manager_dialogue_ended() -> void:
 	set_in_play()
+
+func _on_trigger_dialogue_body_entered(body: Node2D) -> void:
+	set_in_cutscene()
+
+func _on_start_dancing() -> void:
+	play_anim_dance()
+
+func _on_npc_shield_dialogue_dialogue_ended() -> void:
+	set_in_play()
+	current_sprite.visible = false
+	current_sprite = shield
+	current_sprite.play("idle")
+	current_sprite.visible = true
+	has_shield = true
+	gearup_shield.play()
+
+func _on_red_hood_sword_dialogue_dialogue_ended() -> void:
+	set_in_play()
+	current_sprite.visible = false
+	current_sprite = sword
+	current_sprite.play("idle")
+	current_sprite.visible = true
+	has_sword = true
+	gearup_sword.play()
+
+func _on_put_on_armor() -> void:
+	gearup_armor.play()
+	current_sprite.visible = false
+	current_sprite = armor
+	current_sprite.play("power_up")
+	current_sprite.visible = true
+	has_armor = true
+
+func _on_final_armor_dialogue_ended() -> void:
+	set_in_play()
+	current_sprite.play("idle")
+
+func _on_trigger_final_dialogue_body_entered(body: Node2D) -> void:
+	set_in_cutscene()
+
+
+func _on_step_sound_interval_timeout() -> void:
+	if velocity.x == 0:
+		return
+	if not is_on_floor():
+		return
+	steps_player.play()
+
+
+func _on_damageable_got_hit() -> void:
+	got_hit_audio.play()
--- a/player/player.tscn
+++ b/player/player.tscn
@ -1,13 +1,157 @@
-[gd_scene load_steps=30 format=3 uid="uid://yvp44oauis4n"]
+[gd_scene load_steps=91 format=3 uid="uid://yvp44oauis4n"]

 [ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"]
+[ext_resource type="Texture2D" uid="uid://cjruk5xlt3tyn" path="res://ennemy/MechantVol.png" id="2_ebec5"]
+[ext_resource type="Texture2D" uid="uid://dxsbbcagqkiid" path="res://player/assets/RunArmeEpee.png" id="2_hg6s5"]
 [ext_resource type="SpriteFrames" uid="uid://i6035vm5ited" path="res://player/armored_spritesheet.tres" id="2_qjkh3"]
+[ext_resource type="Texture2D" uid="uid://dv7jhtoptk12r" path="res://player/assets/Danse.png" id="3_hg6s5"]
 [ext_resource type="Texture2D" uid="uid://dwn548x0n4bpd" path="res://player/assets/Outch.png" id="3_rgyib"]
+[ext_resource type="Texture2D" uid="uid://d2rfo6ilwusak" path="res://player/assets/Stab .png" id="4_8t03j"]
 [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"]
-[ext_resource type="Texture2D" uid="uid://dw6tn0grt2ajc" path="res://player/assets/WalkCycle.png" id="5_rgyib"]
+[ext_resource type="Texture2D" uid="uid://bhrqdo0cadpf4" path="res://player/assets/IdleArmes.png" id="6_s7qer"]
+[ext_resource type="Texture2D" uid="uid://dw6tn0grt2ajc" path="res://player/assets/WalkCycle.png" id="10_yllr7"]
+[ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="11_2ieo8"]
+[ext_resource type="AudioStream" uid="uid://cw85p1vga71gf" path="res://world_assets/audio/443275__loscolt890__regularfootstep001.wav" id="14_32hag"]
+[ext_resource type="AudioStream" uid="uid://dui2a6u3ulit4" path="res://world_assets/audio/443279__loscolt890__regularfootstep003.wav" id="15_tqiix"]
+[ext_resource type="AudioStream" uid="uid://b5r486lhi7jnj" path="res://world_assets/audio/443280__loscolt890__regularfootstep002.wav" id="16_e7oew"]
+[ext_resource type="AudioStream" uid="uid://brkkvx06htfsi" path="res://world_assets/audio/gearuparmor.wav" id="17_c35mf"]
+[ext_resource type="AudioStream" uid="uid://d2ic760ktymkc" path="res://world_assets/audio/gearupsword.wav" id="18_65viv"]
+[ext_resource type="AudioStream" uid="uid://bx1m1b8l5j0cc" path="res://world_assets/audio/gearupshield.wav" id="19_x7c3f"]
+[ext_resource type="AudioStream" uid="uid://k3nqsuybwrlf" path="res://world_assets/audio/swordhit2.wav" id="20_x7c3f"]
+[ext_resource type="AudioStream" uid="uid://c4crs3etujcdo" path="res://world_assets/audio/swordhit.wav" id="21_bjvpn"]
+[ext_resource type="AudioStream" uid="uid://cwnf4q8286apo" path="res://world_assets/audio/446013__slavicmagic__sword-hit.wav" id="22_bjvpn"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3dxkp"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6wior"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_p5tca"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jbx34"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s3g0c"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_35wys"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pjwc4"]
+atlas = ExtResource("2_ebec5")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_or4qq"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3dxkp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6wior")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 2.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_p5tca")
+}, {
+"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")
+}],
+"loop": false,
+"name": &"power_up",
+"speed": 4.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3dxkp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6wior")
+}],
+"loop": true,
+"name": &"run",
+"speed": 2.0
+}]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_e7oew"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_c35mf"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_65viv"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_x7c3f"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bjvpn"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s7qer"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ge24q"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pnw6m"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1so5t"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(288, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_55jnj"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(320, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dx5ib"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(352, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_a2xo5"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(384, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_art4l"]
+atlas = ExtResource("3_hg6s5")
+region = Rect2(416, 0, 32, 32)

 [sub_resource type="AtlasTexture" id="AtlasTexture_hg6s5"]
 atlas = ExtResource("3_rgyib")
@ -17,6 +161,222 @@ region = Rect2(0, 0, 32, 32)
 atlas = ExtResource("3_rgyib")
 region = Rect2(32, 0, 32, 32)

+[sub_resource type="AtlasTexture" id="AtlasTexture_jfgyi"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_237xx"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wpyo2"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7crtr"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vgvch"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_a1u5o"]
+atlas = ExtResource("4_8t03j")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j3r50"]
+atlas = ExtResource("6_s7qer")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_utr5e"]
+atlas = ExtResource("6_s7qer")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kb6p2"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_fjxoa"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_gswnw"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_xcnuv"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j55il"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hjies"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mmwog"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8pxes"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_fmu53"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(288, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_w7j2h"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(320, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n0b8q"]
+atlas = ExtResource("2_hg6s5")
+region = Rect2(352, 0, 32, 32)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_jfgyi"]
+animations = [{
+"frames": [{
+"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")
+}, {
+"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")
+}],
+"loop": true,
+"name": &"dance",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hg6s5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8t03j")
+}],
+"loop": true,
+"name": &"got_hit",
+"speed": 5.0
+}, {
+"frames": [{
+"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": false,
+"name": &"hit",
+"speed": 12.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j3r50")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_utr5e")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 2.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yllr7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kb6p2")
+}, {
+"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")
+}, {
+"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")
+}],
+"loop": true,
+"name": &"run",
+"speed": 14.0
+}]
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_wodsf"]
 atlas = ExtResource("4_rgyib")
 region = Rect2(0, 0, 32, 32)
@ -25,22 +385,6 @@ region = Rect2(0, 0, 32, 32)
 atlas = ExtResource("4_rgyib")
 region = Rect2(32, 0, 32, 32)

-[sub_resource type="AtlasTexture" id="AtlasTexture_2ieo8"]
-atlas = ExtResource("5_rgyib")
-region = Rect2(0, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ebec5"]
-atlas = ExtResource("5_rgyib")
-region = Rect2(32, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"]
-atlas = ExtResource("5_rgyib")
-region = Rect2(64, 0, 32, 32)
-
-[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("5_boad6")
 region = Rect2(0, 0, 32, 32)
@ -89,10 +433,73 @@ region = Rect2(320, 0, 32, 32)
 atlas = ExtResource("5_boad6")
 region = Rect2(352, 0, 32, 32)

+[sub_resource type="AtlasTexture" id="AtlasTexture_or4qq"]
+atlas = ExtResource("10_yllr7")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hggc2"]
+atlas = ExtResource("10_yllr7")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_b2j0d"]
+atlas = ExtResource("10_yllr7")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7l6ig"]
+atlas = ExtResource("10_yllr7")
+region = Rect2(96, 0, 32, 32)
+
 [sub_resource type="SpriteFrames" id="SpriteFrames_mmwog"]
 animations = [{
 "frames": [{
 "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")
+}, {
+"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")
+}],
+"loop": true,
+"name": &"dance",
+"speed": 6.0
+}, {
+"frames": [{
+"duration": 1.0,
 "texture": SubResource("AtlasTexture_hg6s5")
 }, {
 "duration": 1.0,
@ -115,23 +522,6 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_2ieo8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ebec5")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_yllr7")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_kb6p2")
-}],
-"loop": true,
-"name": &"jump",
-"speed": 4.0
-}, {
-"frames": [{
-"duration": 1.0,
 "texture": SubResource("AtlasTexture_g4c7l")
 }, {
 "duration": 1.0,
@ -170,8 +560,38 @@ animations = [{
 "loop": true,
 "name": &"run",
 "speed": 14.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_or4qq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hggc2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_b2j0d")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7l6ig")
+}],
+"loop": true,
+"name": &"walk",
+"speed": 4.0
 }]

+[sub_resource type="CircleShape2D" id="CircleShape2D_ebec5"]
+
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_c35mf"]
+streams_count = 3
+stream_0/stream = ExtResource("14_32hag")
+stream_1/stream = ExtResource("15_tqiix")
+stream_2/stream = ExtResource("16_e7oew")
+
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_s7qer"]
+streams_count = 2
+stream_0/stream = ExtResource("20_x7c3f")
+stream_1/stream = ExtResource("21_bjvpn")
+
 [node name="Player" type="CharacterBody2D"]
 collision_layer = 3
 script = ExtResource("1_yw30f")
@ -181,24 +601,82 @@ acceleration = 0.177
 [node name="AudioListener2D" type="AudioListener2D" parent="."]
 current = true

-[node name="Knight" type="AnimatedSprite2D" parent="."]
+[node name="Armor" type="AnimatedSprite2D" parent="."]
 visible = false
-position = Vector2(1, -28)
+position = Vector2(0, -16)
+sprite_frames = SubResource("SpriteFrames_or4qq")
+animation = &"run"
+autoplay = "power_up"
+
+[node name="Sword" type="AnimatedSprite2D" parent="."]
+visible = false
+position = Vector2(0, -16)
+sprite_frames = SubResource("SpriteFrames_jfgyi")
+animation = &"idle"
+autoplay = "idle"
+
+[node name="Shield" type="AnimatedSprite2D" parent="."]
+visible = false
+position = Vector2(0, -16)
 sprite_frames = ExtResource("2_qjkh3")
-animation = &"jump"
+animation = &"dance"
 autoplay = "idle"

 [node name="Base" type="AnimatedSprite2D" parent="."]
 position = Vector2(0, -16)
 sprite_frames = SubResource("SpriteFrames_mmwog")
-animation = &"got_hit"
+animation = &"walk"
 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
+
+[node name="Hitting" type="Timer" parent="."]
+wait_time = 0.5
+one_shot = true
+
+[node name="Hitbox" parent="." instance=ExtResource("11_2ieo8")]
+position = Vector2(2, -1)
+monitoring = false
+monitorable = false
+damage = 10
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+position = Vector2(16, -10)
+shape = SubResource("CircleShape2D_ebec5")
+
+[node name="StepsPlayer" type="AudioStreamPlayer" parent="."]
+stream = SubResource("AudioStreamRandomizer_c35mf")
+bus = &"Steps"
+
+[node name="GearupArmor" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("17_c35mf")
+bus = &"Gearup"
+
+[node name="GearupSword" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("18_65viv")
+bus = &"Gearup"
+
+[node name="GearupShield" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("19_x7c3f")
+bus = &"Gearup"
+
+[node name="SwordHit" type="AudioStreamPlayer" parent="."]
+stream = SubResource("AudioStreamRandomizer_s7qer")
+bus = &"SFX"
+
+[node name="StepSoundInterval" type="Timer" parent="."]
+wait_time = 0.5
+autostart = true
+
+[node name="GotHitAudio" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("22_bjvpn")
+bus = &"SFX"
+
+[connection signal="got_hit" from="Damageable" to="." method="_on_damageable_got_hit"]
+[connection signal="timeout" from="Hitting" to="." method="_on_hitting_timeout"]
+[connection signal="timeout" from="StepSoundInterval" to="." method="_on_step_sound_interval_timeout"]
--- a/player/player_left_profile.tres
+++ b/player/player_left_profile.tres
@ -0,0 +1,7 @@
+[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d4lwniwokx7px"]
+
+[ext_resource type="Texture2D" uid="uid://drjrcocrm4bpw" path="res://player/assets/Tete.png" id="1_1apyp"]
+
+[resource]
+atlas = ExtResource("1_1apyp")
+region = Rect2(3, 4, 10, 10)
--- a/player/red_hood_profile.tres
+++ b/player/red_hood_profile.tres
@ -0,0 +1,7 @@
+[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://oocxl803i4aa"]
+
+[ext_resource type="Texture2D" uid="uid://d3t1fn35skpip" path="res://player/assets/idle sheet-Sheet.png" id="1_0t2s6"]
+
+[resource]
+atlas = ExtResource("1_0t2s6")
+region = Rect2(663, 28, 14, 13)
--- a/world_assets/Armoire.png
+++ b/world_assets/Armoire.png
--- a/world_assets/Armoire.png.import
+++ b/world_assets/Armoire.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://rbj0av8dvm2e"
+path="res://.godot/imported/Armoire.png-62a56be0dd5d8aab64da1c1f213a9e8a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://world_assets/Armoire.png"
+dest_files=["res://.godot/imported/Armoire.png-62a56be0dd5d8aab64da1c1f213a9e8a.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
--- a/world_assets/Shine.png
+++ b/world_assets/Shine.png
--- a/world_assets/Shine.png.import
+++ b/world_assets/Shine.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dm1hlmja718pi"
+path="res://.godot/imported/Shine.png-9945bc49169a86dd8f20ca53bc00ddaf.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://world_assets/Shine.png"
+dest_files=["res://.godot/imported/Shine.png-9945bc49169a86dd8f20ca53bc00ddaf.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
--- a/world_assets/audio/17549dynamicellwater_synthetic_glacial_cave.aiff.aif
+++ b/world_assets/audio/17549dynamicellwater_synthetic_glacial_cave.aiff.aif
--- a/world_assets/audio/384912__ali_6868__arrow-impact-3.wav
+++ b/world_assets/audio/384912__ali_6868__arrow-impact-3.wav
--- a/world_assets/audio/384912__ali_6868__arrow-impact-3.wav.import
+++ b/world_assets/audio/384912__ali_6868__arrow-impact-3.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ca5ip2v4sbw8r"
+path="res://.godot/imported/384912__ali_6868__arrow-impact-3.wav-963e64a5bc30a3287fed2592b760db32.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/384912__ali_6868__arrow-impact-3.wav"
+dest_files=["res://.godot/imported/384912__ali_6868__arrow-impact-3.wav-963e64a5bc30a3287fed2592b760db32.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/384913__ali_6868__arrow-impact-2.wav
+++ b/world_assets/audio/384913__ali_6868__arrow-impact-2.wav
--- a/world_assets/audio/384913__ali_6868__arrow-impact-2.wav.import
+++ b/world_assets/audio/384913__ali_6868__arrow-impact-2.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cl171ph84g5t2"
+path="res://.godot/imported/384913__ali_6868__arrow-impact-2.wav-c7cf0b3a64632b7e438195bbacfc9009.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/384913__ali_6868__arrow-impact-2.wav"
+dest_files=["res://.godot/imported/384913__ali_6868__arrow-impact-2.wav-c7cf0b3a64632b7e438195bbacfc9009.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/384914__ali_6868__arrow-impact-1.wav
+++ b/world_assets/audio/384914__ali_6868__arrow-impact-1.wav
--- a/world_assets/audio/384914__ali_6868__arrow-impact-1.wav.import
+++ b/world_assets/audio/384914__ali_6868__arrow-impact-1.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ejdkgkgh1arq"
+path="res://.godot/imported/384914__ali_6868__arrow-impact-1.wav-c3e82eef41a8ab1d174c53fe2a1e0e6d.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/384914__ali_6868__arrow-impact-1.wav"
+dest_files=["res://.godot/imported/384914__ali_6868__arrow-impact-1.wav-c3e82eef41a8ab1d174c53fe2a1e0e6d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/443275loscolt890regularfootstep001.wav
+++ b/world_assets/audio/443275loscolt890regularfootstep001.wav
--- a/world_assets/audio/443275loscolt890regularfootstep001.wav.import
+++ b/world_assets/audio/443275loscolt890regularfootstep001.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cw85p1vga71gf"
+path="res://.godot/imported/443275__loscolt890__regularfootstep001.wav-58f51340feb2469fd5a5bdfa902eb764.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/443275__loscolt890__regularfootstep001.wav"
+dest_files=["res://.godot/imported/443275__loscolt890__regularfootstep001.wav-58f51340feb2469fd5a5bdfa902eb764.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/443279loscolt890regularfootstep003.wav
+++ b/world_assets/audio/443279loscolt890regularfootstep003.wav
--- a/world_assets/audio/443279loscolt890regularfootstep003.wav.import
+++ b/world_assets/audio/443279loscolt890regularfootstep003.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dui2a6u3ulit4"
+path="res://.godot/imported/443279__loscolt890__regularfootstep003.wav-ad123bc23594d5026d78f331f1a0640a.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/443279__loscolt890__regularfootstep003.wav"
+dest_files=["res://.godot/imported/443279__loscolt890__regularfootstep003.wav-ad123bc23594d5026d78f331f1a0640a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/443280loscolt890regularfootstep002.wav
+++ b/world_assets/audio/443280loscolt890regularfootstep002.wav
--- a/world_assets/audio/443280loscolt890regularfootstep002.wav.import
+++ b/world_assets/audio/443280loscolt890regularfootstep002.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b5r486lhi7jnj"
+path="res://.godot/imported/443280__loscolt890__regularfootstep002.wav-bfc63baea60bffa10f0283f19396a9ed.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/443280__loscolt890__regularfootstep002.wav"
+dest_files=["res://.godot/imported/443280__loscolt890__regularfootstep002.wav-bfc63baea60bffa10f0283f19396a9ed.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/446013slavicmagicsword-hit.wav
+++ b/world_assets/audio/446013slavicmagicsword-hit.wav
--- a/world_assets/audio/446013slavicmagicsword-hit.wav.import
+++ b/world_assets/audio/446013slavicmagicsword-hit.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cwnf4q8286apo"
+path="res://.godot/imported/446013__slavicmagic__sword-hit.wav-855cd710e9d0137dad496c6b33c60516.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/446013__slavicmagic__sword-hit.wav"
+dest_files=["res://.godot/imported/446013__slavicmagic__sword-hit.wav-855cd710e9d0137dad496c6b33c60516.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav
+++ b/world_assets/audio/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav
--- a/world_assets/audio/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav.import
+++ b/world_assets/audio/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dfmfve4c3l4fb"
+path="res://.godot/imported/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav-38cf0e808d4f9e650b8b7738296b657d.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav"
+dest_files=["res://.godot/imported/564024__gertraut_hecher__harp-arpeggio-medieval-tune.wav-38cf0e808d4f9e650b8b7738296b657d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav
+++ b/world_assets/audio/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav
--- a/world_assets/audio/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav.import
+++ b/world_assets/audio/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cqqa1wa2qs8ib"
+path="res://.godot/imported/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav-dcd82b38c6885d68627a5ebac358c22b.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav"
+dest_files=["res://.godot/imported/575585_gertraut_hecher_medieval_life_minstrels_and_jugglers.wav-dcd82b38c6885d68627a5ebac358c22b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/787351__gertraut_hecher__medieval-dance-saltarello.wav
+++ b/world_assets/audio/787351__gertraut_hecher__medieval-dance-saltarello.wav
--- a/world_assets/audio/787351__gertraut_hecher__medieval-dance-saltarello.wav.import
+++ b/world_assets/audio/787351__gertraut_hecher__medieval-dance-saltarello.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ohxncjlv12wy"
+path="res://.godot/imported/787351__gertraut_hecher__medieval-dance-saltarello.wav-438786f07bc5f8e5907b8c4a8eddfb11.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/787351__gertraut_hecher__medieval-dance-saltarello.wav"
+dest_files=["res://.godot/imported/787351__gertraut_hecher__medieval-dance-saltarello.wav-438786f07bc5f8e5907b8c4a8eddfb11.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/ambiance/cave.aif
+++ b/world_assets/audio/ambiance/cave.aif
--- a/world_assets/audio/ambiance/cave.wav
+++ b/world_assets/audio/ambiance/cave.wav
--- a/world_assets/audio/ambiance/cave.wav.import
+++ b/world_assets/audio/ambiance/cave.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://o8kcbs7gk61y"
+path="res://.godot/imported/cave.wav-071e4e9db8b82e78f5761bb71d5d3a50.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/ambiance/cave.wav"
+dest_files=["res://.godot/imported/cave.wav-071e4e9db8b82e78f5761bb71d5d3a50.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=2
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/ambiance/forestBalade.wav
+++ b/world_assets/audio/ambiance/forestBalade.wav
--- a/world_assets/audio/ambiance/forestBalade.wav.import
+++ b/world_assets/audio/ambiance/forestBalade.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cp2acg3q53jia"
+path="res://.godot/imported/forestBalade.wav-9617cba8117af19ba773ed0a8684bf46.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/ambiance/forestBalade.wav"
+dest_files=["res://.godot/imported/forestBalade.wav-9617cba8117af19ba773ed0a8684bf46.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=2
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/ambiance/forestStart.wav
+++ b/world_assets/audio/ambiance/forestStart.wav
--- a/world_assets/audio/ambiance/forestStart.wav.import
+++ b/world_assets/audio/ambiance/forestStart.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://d2vbc5xbu67no"
+path="res://.godot/imported/forestStart.wav-2520218bd0752b21dd94fed54c0e8eb5.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/ambiance/forestStart.wav"
+dest_files=["res://.godot/imported/forestStart.wav-2520218bd0752b21dd94fed54c0e8eb5.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/ambiance/squelettes.mp3
+++ b/world_assets/audio/ambiance/squelettes.mp3
--- a/world_assets/audio/ambiance/squelettes.mp3.import
+++ b/world_assets/audio/ambiance/squelettes.mp3.import
@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bsosrbr0tgg25"
+path="res://.godot/imported/squelettes.mp3-9027dfbd5e5cfc4a67500f4d603f2764.mp3str"
+
+[deps]
+
+source_file="res://world_assets/audio/ambiance/squelettes.mp3"
+dest_files=["res://.godot/imported/squelettes.mp3-9027dfbd5e5cfc4a67500f4d603f2764.mp3str"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4
--- a/world_assets/audio/gearuparmor.wav
+++ b/world_assets/audio/gearuparmor.wav
--- a/world_assets/audio/gearuparmor.wav.import
+++ b/world_assets/audio/gearuparmor.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://brkkvx06htfsi"
+path="res://.godot/imported/gearuparmor.wav-cdf2ef9102eaa87d2e7ac8aaff5a1150.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/gearuparmor.wav"
+dest_files=["res://.godot/imported/gearuparmor.wav-cdf2ef9102eaa87d2e7ac8aaff5a1150.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/gearupshield.wav
+++ b/world_assets/audio/gearupshield.wav
--- a/world_assets/audio/gearupshield.wav.import
+++ b/world_assets/audio/gearupshield.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bx1m1b8l5j0cc"
+path="res://.godot/imported/gearupshield.wav-ac760fb20e97e194f68df7b450a85651.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/gearupshield.wav"
+dest_files=["res://.godot/imported/gearupshield.wav-ac760fb20e97e194f68df7b450a85651.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/gearupsword.wav
+++ b/world_assets/audio/gearupsword.wav
--- a/world_assets/audio/gearupsword.wav.import
+++ b/world_assets/audio/gearupsword.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://d2ic760ktymkc"
+path="res://.godot/imported/gearupsword.wav-c8c173fac35107ee8feed319c7c19145.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/gearupsword.wav"
+dest_files=["res://.godot/imported/gearupsword.wav-c8c173fac35107ee8feed319c7c19145.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/speech.wav
+++ b/world_assets/audio/speech.wav
--- a/world_assets/audio/speech.wav.import
+++ b/world_assets/audio/speech.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cx7g00rpjodv3"
+path="res://.godot/imported/speech.wav-bc0a9d9ada1c2a9d6bbebfb9544b3b3b.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/speech.wav"
+dest_files=["res://.godot/imported/speech.wav-bc0a9d9ada1c2a9d6bbebfb9544b3b3b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/swordhit.wav
+++ b/world_assets/audio/swordhit.wav
--- a/world_assets/audio/swordhit.wav.import
+++ b/world_assets/audio/swordhit.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c4crs3etujcdo"
+path="res://.godot/imported/swordhit.wav-96c188010001eda7b4ce0d400a2fd2b6.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/swordhit.wav"
+dest_files=["res://.godot/imported/swordhit.wav-96c188010001eda7b4ce0d400a2fd2b6.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/audio/swordhit2.wav
+++ b/world_assets/audio/swordhit2.wav
--- a/world_assets/audio/swordhit2.wav.import
+++ b/world_assets/audio/swordhit2.wav.import
@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://k3nqsuybwrlf"
+path="res://.godot/imported/swordhit2.wav-44c623efb895b86a63c635bd0aa7846d.sample"
+
+[deps]
+
+source_file="res://world_assets/audio/swordhit2.wav"
+dest_files=["res://.godot/imported/swordhit2.wav-44c623efb895b86a63c635bd0aa7846d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2
--- a/world_assets/bubbles.tres
+++ b/world_assets/bubbles.tres
@ -1,8 +1,10 @@
-[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://tyrwsjeq31vu"]
+[gd_resource type="TileSet" load_steps=11 format=3 uid="uid://tyrwsjeq31vu"]

 [ext_resource type="Texture2D" uid="uid://cjo4jkl6vrlnr" path="res://world_assets/stringstar fields/background_0.png" id="1_oufsv"]
 [ext_resource type="Texture2D" uid="uid://867g736r74nf" path="res://world_assets/Cave/mainlev_build.png" id="2_01dhf"]
 [ext_resource type="Texture2D" uid="uid://cmfneyajqyim4" path="res://world_assets/oak_woods/oak_woods_tileset.png" id="3_01dhf"]
+[ext_resource type="Texture2D" uid="uid://bwccijuqq2uxj" path="res://world_assets/oak_woods/background/background_layer_3.png" id="4_i4k15"]
+[ext_resource type="Texture2D" uid="uid://bs66qg0effkb5" path="res://world_assets/stringstar fields/background_2.png" id="5_dsouv"]

 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_i4k15"]
 texture = ExtResource("1_oufsv")
@ -1520,7 +1522,217 @@ texture = ExtResource("3_01dhf")
 29:21/0 = 0
 30:21/0 = 0

+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_h1iwu"]
+texture = ExtResource("4_i4k15")
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+5:0/0 = 0
+6:0/0 = 0
+7:0/0 = 0
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+14:0/0 = 0
+15:0/0 = 0
+16:0/0 = 0
+17:0/0 = 0
+18:0/0 = 0
+19:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+5:1/0 = 0
+6:1/0 = 0
+7:1/0 = 0
+8:1/0 = 0
+9:1/0 = 0
+10:1/0 = 0
+11:1/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:1/0 = 0
+15:1/0 = 0
+16:1/0 = 0
+17:1/0 = 0
+18:1/0 = 0
+19:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+4:2/0 = 0
+5:2/0 = 0
+6:2/0 = 0
+7:2/0 = 0
+8:2/0 = 0
+9:2/0 = 0
+10:2/0 = 0
+11:2/0 = 0
+12:2/0 = 0
+13:2/0 = 0
+14:2/0 = 0
+15:2/0 = 0
+16:2/0 = 0
+17:2/0 = 0
+18:2/0 = 0
+19:2/0 = 0
+0:3/0 = 0
+5:3/0 = 0
+6:3/0 = 0
+7:3/0 = 0
+8:3/0 = 0
+9:3/0 = 0
+10:3/0 = 0
+11:3/0 = 0
+12:3/0 = 0
+16:3/0 = 0
+17:3/0 = 0
+18:3/0 = 0
+19:3/0 = 0
+5:4/0 = 0
+6:4/0 = 0
+7:4/0 = 0
+8:4/0 = 0
+9:4/0 = 0
+10:4/0 = 0
+11:4/0 = 0
+17:4/0 = 0
+18:4/0 = 0
+19:4/0 = 0
+7:5/0 = 0
+8:5/0 = 0
+9:5/0 = 0
+10:5/0 = 0
+16:5/0 = 0
+17:5/0 = 0
+18:5/0 = 0
+19:5/0 = 0
+0:6/0 = 0
+7:6/0 = 0
+8:6/0 = 0
+9:6/0 = 0
+10:6/0 = 0
+17:6/0 = 0
+18:6/0 = 0
+19:6/0 = 0
+7:7/0 = 0
+8:7/0 = 0
+9:7/0 = 0
+10:7/0 = 0
+16:7/0 = 0
+17:7/0 = 0
+18:7/0 = 0
+19:7/0 = 0
+0:8/0 = 0
+7:8/0 = 0
+8:8/0 = 0
+9:8/0 = 0
+10:8/0 = 0
+16:8/0 = 0
+17:8/0 = 0
+18:8/0 = 0
+19:8/0 = 0
+0:9/0 = 0
+1:9/0 = 0
+2:9/0 = 0
+3:9/0 = 0
+4:9/0 = 0
+5:9/0 = 0
+6:9/0 = 0
+7:9/0 = 0
+8:9/0 = 0
+9:9/0 = 0
+10:9/0 = 0
+11:9/0 = 0
+12:9/0 = 0
+13:9/0 = 0
+14:9/0 = 0
+15:9/0 = 0
+16:9/0 = 0
+17:9/0 = 0
+18:9/0 = 0
+19:9/0 = 0
+0:10/0 = 0
+1:10/0 = 0
+2:10/0 = 0
+3:10/0 = 0
+4:10/0 = 0
+5:10/0 = 0
+6:10/0 = 0
+7:10/0 = 0
+8:10/0 = 0
+9:10/0 = 0
+10:10/0 = 0
+11:10/0 = 0
+12:10/0 = 0
+13:10/0 = 0
+14:10/0 = 0
+15:10/0 = 0
+16:10/0 = 0
+17:10/0 = 0
+18:10/0 = 0
+19:10/0 = 0
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_q6ngd"]
+texture = ExtResource("5_dsouv")
+15:7/0 = 0
+16:7/0 = 0
+0:8/0 = 0
+1:8/0 = 0
+2:8/0 = 0
+4:8/0 = 0
+5:8/0 = 0
+13:8/0 = 0
+14:8/0 = 0
+15:8/0 = 0
+16:8/0 = 0
+17:8/0 = 0
+0:9/0 = 0
+1:9/0 = 0
+2:9/0 = 0
+3:9/0 = 0
+4:9/0 = 0
+5:9/0 = 0
+6:9/0 = 0
+7:9/0 = 0
+9:9/0 = 0
+10:9/0 = 0
+11:9/0 = 0
+12:9/0 = 0
+13:9/0 = 0
+14:9/0 = 0
+15:9/0 = 0
+16:9/0 = 0
+17:9/0 = 0
+0:10/0 = 0
+1:10/0 = 0
+2:10/0 = 0
+3:10/0 = 0
+4:10/0 = 0
+5:10/0 = 0
+6:10/0 = 0
+7:10/0 = 0
+8:10/0 = 0
+9:10/0 = 0
+10:10/0 = 0
+11:10/0 = 0
+12:10/0 = 0
+13:10/0 = 0
+14:10/0 = 0
+15:10/0 = 0
+16:10/0 = 0
+17:10/0 = 0
+
 [resource]
 sources/0 = SubResource("TileSetAtlasSource_i4k15")
 sources/1 = SubResource("TileSetAtlasSource_dsouv")
 sources/2 = SubResource("TileSetAtlasSource_nwg7v")
+sources/3 = SubResource("TileSetAtlasSource_h1iwu")
+sources/4 = SubResource("TileSetAtlasSource_q6ngd")
--- a/world_assets/light.webp
+++ b/world_assets/light.webp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
minimata	17feb5f493	Mini trucs worldbuilding All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m28s Details	2025-08-03 16:23:25 +02:00
minimata	25948a793a	Merge branch 'main' of https://git.game-dev.space/minimata/GMTK25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m31s Details	2025-08-03 16:14:05 +02:00
minimata	b41a91f67a	World building transition	2025-08-03 16:13:54 +02:00
Minimata	aa19e8386c	feat: lights All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m32s Details	2025-08-03 16:06:31 +02:00
Minimata	d36e35eb6e	fic: bubble color All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m26s Details	2025-08-03 15:46:04 +02:00
Minimata	5f0a48e96d	fix: new dialogue All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m29s Details	2025-08-03 15:34:34 +02:00
Minimata	cfe154e754	fix: sound tweaks All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m31s Details	2025-08-03 15:27:43 +02:00
Minimata	8775e17258	feat:ambiance All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Successful in 2m42s Details	2025-08-03 14:43:49 +02:00
Minimata	49ede4a46b	feat: sound integration All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m17s Details	2025-08-03 12:41:19 +02:00
Minimata	130334d315	audio files All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Successful in 2m38s Details	2025-08-03 12:01:15 +02:00
Minimata	67ed2d5ed5	wip: world building All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 5s Details Create tag and build when new code gets to main / Export (push) Successful in 2m15s Details	2025-08-03 11:47:05 +02:00
Minimata	2d44a2da05	feat: final cutscene and full game loop All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 2m26s Details	2025-08-03 11:25:21 +02:00
Minimata	3e0f1c99d5	feat: them skeletons man + reload after dancing All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 5s Details Create tag and build when new code gets to main / Export (push) Successful in 2m12s Details	2025-08-02 23:57:02 +02:00
Minimata	eda35b4e9b	feat"redhood interaction and sword getting All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Successful in 2m15s Details	2025-08-02 22:38:04 +02:00
Minimata	02f04cc38a	feat: shield All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 2m13s Details	2025-08-02 21:34:08 +02:00
Minimata	12b02877bb	feat: choice system All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 2m24s Details	2025-08-02 20:01:01 +02:00
Minimata	3450c463f9	feat: arrows and stuff All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 2m22s Details	2025-08-02 15:51:29 +02:00
Minimata	e3545a5087	feat: new dialogue with NPC All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 2m5s Details	2025-08-02 12:16:27 +02:00