feat: integrated some assets and made a hitbox and damage reaction system
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 2m5s

This commit is contained in:
2025-08-01 17:17:00 +02:00
parent 44f083fbce
commit 6e017197f6
26 changed files with 484 additions and 449 deletions

View File

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