feat: shield
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 6s
Create tag and build when new code gets to main / Export (push) Successful in 2m13s

This commit is contained in:
2025-08-02 21:34:08 +02:00
parent 12b02877bb
commit 02f04cc38a
6 changed files with 244 additions and 93 deletions

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=45 format=3 uid="uid://yvp44oauis4n"]
[gd_scene load_steps=40 format=3 uid="uid://yvp44oauis4n"]
[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"]
@ -8,7 +8,6 @@
[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"]
[sub_resource type="AtlasTexture" id="AtlasTexture_tqiix"]
atlas = ExtResource("3_hg6s5")
@ -82,22 +81,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)
@ -193,7 +176,7 @@ animations = [{
}],
"loop": true,
"name": &"dance",
"speed": 5.0
"speed": 6.0
}, {
"frames": [{
"duration": 1.0,
@ -219,23 +202,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,
@ -285,11 +251,11 @@ acceleration = 0.177
[node name="AudioListener2D" type="AudioListener2D" parent="."]
current = true
[node name="Knight" type="AnimatedSprite2D" parent="."]
[node name="Shield" type="AnimatedSprite2D" parent="."]
visible = false
position = Vector2(1, -28)
position = Vector2(0, -16)
sprite_frames = ExtResource("2_qjkh3")
animation = &"jump"
animation = &"dance"
autoplay = "idle"
[node name="Base" type="AnimatedSprite2D" parent="."]
@ -297,7 +263,6 @@ position = Vector2(0, -16)
sprite_frames = SubResource("SpriteFrames_mmwog")
animation = &"dance"
autoplay = "idle"
frame_progress = 0.0683317
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false