2 Commits

Author SHA1 Message Date
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
Create tag and build when new code gets to main / Export (push) Successful in 2m12s
2025-08-02 23:57:02 +02:00
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
Create tag and build when new code gets to main / Export (push) Successful in 2m15s
2025-08-02 22:38:04 +02:00
15 changed files with 1757 additions and 50 deletions

View File

@ -8,7 +8,7 @@ script = ExtResource("1_7je20")
arrow_scene = ExtResource("2_ek028") arrow_scene = ExtResource("2_ek028")
[node name="SpawnTiming" type="Timer" parent="."] [node name="SpawnTiming" type="Timer" parent="."]
wait_time = 3.0 wait_time = 5.0
autostart = true autostart = true
[connection signal="timeout" from="SpawnTiming" to="." method="_on_spawn_timing_timeout"] [connection signal="timeout" from="SpawnTiming" to="." method="_on_spawn_timing_timeout"]

View File

@ -7,6 +7,7 @@ class_name Damageable
var active = true var active = true
signal got_hit signal got_hit
signal die
func set_active(new_active: bool): func set_active(new_active: bool):
active = new_active active = new_active
@ -16,5 +17,10 @@ func damage(value: int = 0, direction: Vector2 = Vector2.UP):
return return
health -= value health -= value
if health <= 0:
die.emit()
return
get_parent().velocity = hitback_velocity * direction get_parent().velocity = hitback_velocity * direction
got_hit.emit() got_hit.emit()

View File

@ -5,4 +5,5 @@
[node name="Hitbox" type="Area2D"] [node name="Hitbox" type="Area2D"]
script = ExtResource("1_n3l2p") script = ExtResource("1_n3l2p")
[connection signal="area_entered" from="." to="." method="_on_body_entered"]
[connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="body_entered" from="." to="." method="_on_body_entered"]

View File

@ -59,6 +59,8 @@ func start_choice():
next_label.visible = true next_label.visible = true
choices_container.visible = true choices_container.visible = true
bubble_label.text = choice
accept_label.text = accept_option accept_label.text = accept_option
reject_label.text = reject_option reject_label.text = reject_option

View File

@ -28,8 +28,6 @@ var is_left_speaking = false
func _ready() -> void: func _ready() -> void:
is_left_speaking = start_with_left is_left_speaking = start_with_left
left_speaker.texture = left_picture
right_speaker.texture = right_picture
e_ui_button.visible = false e_ui_button.visible = false
next_label.visible = false next_label.visible = false
@ -39,6 +37,9 @@ func _ready() -> void:
dialogue_steps.append(step.strip_edges()) dialogue_steps.append(step.strip_edges())
func display_profiles(): func display_profiles():
left_speaker.texture = left_picture
right_speaker.texture = right_picture
left_speaker.visible = is_left_speaking left_speaker.visible = is_left_speaking
right_speaker.visible = not is_left_speaking right_speaker.visible = not is_left_speaking
@ -71,7 +72,6 @@ func on_dialogue_started():
bubble_label.visible = true bubble_label.visible = true
bubbles_back.visible = true bubbles_back.visible = true
bubbles_interior.visible = true bubbles_interior.visible = true
display_profiles() display_profiles()
is_dialogue_ongoing = true is_dialogue_ongoing = true
time_between_letters.start() time_between_letters.start()

43
ennemy/skeleton.gd Normal file
View File

@ -0,0 +1,43 @@
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
var is_dying = false
func start_dancing():
play("dance")
func hit():
if is_dying:
return
hitbox.monitorable = true
hitbox.monitoring = true
play("hit")
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")
wait_to_die.start()
func _on_wait_to_die_timeout() -> void:
queue_free()

1
ennemy/skeleton.gd.uid Normal file
View File

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

477
ennemy/skeleton.tscn Normal file
View File

@ -0,0 +1,477 @@
[gd_scene load_steps=67 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"]
[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)
[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
[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"]

11
main.gd
View File

@ -22,6 +22,7 @@ var active_camera: SuperCamera
@export var foreground = 0.2 @export var foreground = 0.2
@onready var choices_container: MarginContainer = %ChoicesContainer @onready var choices_container: MarginContainer = %ChoicesContainer
@onready var red_hood_cutscene: AnimationPlayer = $RedHoodCutscene
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
@ -54,10 +55,18 @@ func _on_start_dancing() -> void:
dance_cutscene.play("dance") dance_cutscene.play("dance")
func restart_at_first_scene(): func restart_at_first_scene():
pass get_tree().change_scene_to_file("res://main.tscn")
func to_main_menu(): func to_main_menu():
pass pass
func quit_game(): func quit_game():
pass 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")

947
main.tscn

File diff suppressed because one or more lines are too long

7
player/blue_profile.tres Normal file
View File

@ -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)

View File

@ -11,6 +11,10 @@ var jump_velocity = 400.0
@export_range(0, 10, 0.1, "or_greater") @export_range(0, 10, 0.1, "or_greater")
var gravity_modifier = 1 var gravity_modifier = 1
@onready var hitting: Timer = $Hitting
@onready var hitbox: Area2D = $Hitbox
@onready var sword: AnimatedSprite2D = $Sword
@onready var damageable: Damageable = $Damageable @onready var damageable: Damageable = $Damageable
@onready var shield: AnimatedSprite2D = $Shield @onready var shield: AnimatedSprite2D = $Shield
@onready var base: AnimatedSprite2D = $Base @onready var base: AnimatedSprite2D = $Base
@ -19,6 +23,7 @@ var current_sprite: AnimatedSprite2D
var is_in_cutscene = false # back to true on build var is_in_cutscene = false # back to true on build
var current_animation = "idle" var current_animation = "idle"
var is_hitting = false
var has_shield = false var has_shield = false
var has_sword = false var has_sword = false
var has_armor = false var has_armor = false
@ -60,7 +65,12 @@ func _physics_process(delta: float) -> void:
velocity.x = move_toward(velocity.x, 0, speed) velocity.x = move_toward(velocity.x, 0, speed)
move_and_slide() move_and_slide()
return return
if is_hitting:
current_animation = "hit"
velocity.x = move_toward(velocity.x, 0, speed)
move_and_slide()
return
if not is_on_floor(): if not is_on_floor():
velocity += get_gravity() * delta * gravity_modifier velocity += get_gravity() * delta * gravity_modifier
@ -88,9 +98,23 @@ func _physics_process(delta: float) -> void:
velocity.x = clampf(velocity.x, -speed, speed) velocity.x = clampf(velocity.x, -speed, speed)
else: else:
velocity.x = move_toward(velocity.x, 0, speed) velocity.x = move_toward(velocity.x, 0, speed)
if Input.is_action_just_pressed("hit") and has_sword:
hit()
move_and_slide() move_and_slide()
func hit():
is_hitting = true
hitting.start()
hitbox.monitorable = true
hitbox.monitoring = true
func _on_hitting_timeout() -> void:
is_hitting = false
hitbox.monitorable = false
hitbox.monitoring = false
func _on_dialogue_manager_dialogue_ended() -> void: func _on_dialogue_manager_dialogue_ended() -> void:
set_in_play() set_in_play()
@ -104,7 +128,14 @@ func _on_npc_shield_dialogue_dialogue_ended() -> void:
set_in_play() set_in_play()
current_sprite.visible = false current_sprite.visible = false
current_sprite = shield current_sprite = shield
shield.play("idle") current_sprite.play("idle")
shield.visible = true current_sprite.visible = true
has_shield = true has_shield = true
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

View File

@ -1,13 +1,16 @@
[gd_scene load_steps=40 format=3 uid="uid://yvp44oauis4n"] [gd_scene load_steps=65 format=3 uid="uid://yvp44oauis4n"]
[ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"] [ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"]
[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="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://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://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://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="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="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="Shape2D" uid="uid://6rhdwj5jxbxn" path="res://player/player_collision.tres" id="5_qjkh3"]
[ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="11_2ieo8"]
[sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"] [sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"]
atlas = ExtResource("3_hg6s5") atlas = ExtResource("3_hg6s5")
@ -73,6 +76,222 @@ region = Rect2(0, 0, 32, 32)
atlas = ExtResource("3_rgyib") atlas = ExtResource("3_rgyib")
region = Rect2(32, 0, 32, 32) 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_2ieo8"]
atlas = ExtResource("2_hg6s5")
region = Rect2(96, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ebec5"]
atlas = ExtResource("2_hg6s5")
region = Rect2(288, 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_2ieo8")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ebec5")
}],
"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"] [sub_resource type="AtlasTexture" id="AtlasTexture_wodsf"]
atlas = ExtResource("4_rgyib") atlas = ExtResource("4_rgyib")
region = Rect2(0, 0, 32, 32) region = Rect2(0, 0, 32, 32)
@ -242,6 +461,8 @@ animations = [{
"speed": 14.0 "speed": 14.0
}] }]
[sub_resource type="CircleShape2D" id="CircleShape2D_ebec5"]
[node name="Player" type="CharacterBody2D"] [node name="Player" type="CharacterBody2D"]
collision_layer = 3 collision_layer = 3
script = ExtResource("1_yw30f") script = ExtResource("1_yw30f")
@ -251,6 +472,15 @@ acceleration = 0.177
[node name="AudioListener2D" type="AudioListener2D" parent="."] [node name="AudioListener2D" type="AudioListener2D" parent="."]
current = true current = true
[node name="Sword" type="AnimatedSprite2D" parent="."]
visible = false
position = Vector2(0, -16)
sprite_frames = SubResource("SpriteFrames_jfgyi")
animation = &"hit"
autoplay = "idle"
frame = 5
frame_progress = 1.0
[node name="Shield" type="AnimatedSprite2D" parent="."] [node name="Shield" type="AnimatedSprite2D" parent="."]
visible = false visible = false
position = Vector2(0, -16) position = Vector2(0, -16)
@ -261,7 +491,7 @@ autoplay = "idle"
[node name="Base" type="AnimatedSprite2D" parent="."] [node name="Base" type="AnimatedSprite2D" parent="."]
position = Vector2(0, -16) position = Vector2(0, -16)
sprite_frames = SubResource("SpriteFrames_mmwog") sprite_frames = SubResource("SpriteFrames_mmwog")
animation = &"dance" animation = &"got_hit"
autoplay = "idle" autoplay = "idle"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
@ -271,3 +501,18 @@ shape = ExtResource("5_qjkh3")
[node name="Damageable" parent="." instance=ExtResource("5_g6k8r")] [node name="Damageable" parent="." instance=ExtResource("5_g6k8r")]
hitback_velocity = 400.0 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")]
monitoring = false
monitorable = false
damage = 10
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
position = Vector2(16, -10)
shape = SubResource("CircleShape2D_ebec5")
[connection signal="timeout" from="Hitting" to="." method="_on_hitting_timeout"]

View File

@ -0,0 +1,7 @@
[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d4lwniwokx7px"]
[ext_resource type="Texture2D" uid="uid://dsxvqsh3umw01" path="res://player/assets/RunCycle.png" id="1_1apyp"]
[resource]
atlas = ExtResource("1_1apyp")
region = Rect2(14, 9, 6, 6)

View File

@ -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)