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