Refactor scene configurations and add z-index properties for better layering; implement grace period logic in DeadliftSystem

This commit is contained in:
2026-01-24 22:19:10 +01:00
parent cdfd4cbbd2
commit 4931cb159a
9 changed files with 153 additions and 54 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=5 format=3 uid="uid://dxq2510ywj1hy"]
[gd_scene load_steps=4 format=3 uid="uid://dxq2510ywj1hy"]
[ext_resource type="PackedScene" uid="uid://dn8y3bgovnh4a" path="res://Objects/bench_press_stickman.tscn" id="2_0c1tm"]
[ext_resource type="Texture2D" uid="uid://dsovna2tmb4o3" path="res://Sprites/bench.png" id="2_ky8t4"]
@@ -9,14 +9,17 @@
[node name="System" type="BenchPressSystem" parent="."]
[node name="Bench" type="Sprite2D" parent="."]
position = Vector2(11, 1)
z_index = 1
position = Vector2(11, 128.5)
scale = Vector2(2.086, 2.086)
texture = ExtResource("2_ky8t4")
[node name="BenchPressStickman" parent="." instance=ExtResource("2_0c1tm")]
position = Vector2(0, 127.5)
[node name="Barbell" type="Sprite2D" parent="."]
position = Vector2(22, -5)
z_index = 1
position = Vector2(22, 122.5)
scale = Vector2(2.432, 2.432)
texture = ExtResource("3_ky8t4")
@@ -24,4 +27,4 @@ texture = ExtResource("3_ky8t4")
player_anim = NodePath("../BenchPressStickman")
barbell = NodePath("../Barbell")
animation_name = "default"
bar_positions = Array[Vector2]([Vector2(19, -5), Vector2(19, -19), Vector2(21, -36), Vector2(21, -15), Vector2(23, 3), Vector2(22, 11), Vector2(22, -1), Vector2(22, -1)])
bar_positions = Array[Vector2]([Vector2(19, 123), Vector2(19, 109), Vector2(21, 92), Vector2(21, 113), Vector2(23, 131), Vector2(22, 139), Vector2(22, 127), Vector2(22, 127)])

View File

@@ -42,5 +42,6 @@ animations = [{
}]
[node name="BenchPressStickman" type="AnimatedSprite2D"]
z_index = 1
sprite_frames = SubResource("SpriteFrames_edqll")
speed_scale = 0.0

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=3 format=3 uid="uid://dx1k40qfioaas"]
[gd_scene load_steps=2 format=3 uid="uid://dx1k40qfioaas"]
[ext_resource type="Texture2D" uid="uid://cbgn8aspf7oi0" path="res://Sprites/barbell.png" id="2_ltxro"]
@@ -10,5 +10,6 @@ bar_visual = NodePath("../Barbell")
end_pos = Vector2(0, -30)
[node name="Barbell" type="Sprite2D" parent="."]
z_index = 1
scale = Vector2(2, 2)
texture = ExtResource("2_ltxro")

View File

@@ -4,6 +4,7 @@
anim_sprite = NodePath("AnimatedSprite2D")
click_area = NodePath("Area2D")
click_shape = NodePath("Area2D/CollisionShape2D")
z_index = 1
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]