Fix some broken stuff (player spawn, disabled input after loading next floor)

This commit is contained in:
2026-02-04 02:04:04 -08:00
parent affa5e1f79
commit 5ae556cb4b
4 changed files with 79 additions and 20 deletions

View File

@@ -211,7 +211,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"normal_slash"]
"values": [&"Normal Slash 1"]
}
tracks/1/type = "value"
tracks/1/imported = false
@@ -309,6 +309,30 @@ tracks/8/keys = {
"update": 0,
"values": [Vector3(0.003, 2.1, -0.01)]
}
tracks/9/type = "value"
tracks/9/imported = false
tracks/9/enabled = true
tracks/9/path = NodePath("SubViewportContainer/SubViewport/Hit Wall:animation")
tracks/9/interp = 1
tracks/9/loop_wrap = true
tracks/9/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"default"]
}
tracks/10/type = "value"
tracks/10/imported = false
tracks/10/enabled = true
tracks/10/path = NodePath("SubViewportContainer/SubViewport/Hit Wall:frame")
tracks/10/interp = 1
tracks/10/loop_wrap = true
tracks/10/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [58]
}
[sub_resource type="Animation" id="Animation_es4xk"]
resource_name = "death"
@@ -376,31 +400,31 @@ tracks/4/keys = {
[sub_resource type="Animation" id="Animation_ebyyx"]
resource_name = "hit_wall"
length = 0.155558
step = 0.0222222
length = 1.20834
step = 0.0416667
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("SubViewportContainer/SubViewport/WeaponAttack:animation")
tracks/0/path = NodePath("SubViewportContainer/SubViewport/Hit Wall:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.0001),
"transitions": PackedFloat32Array(1, 1),
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"hit_wall", &"hit_wall"]
"values": [&"default"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("SubViewportContainer/SubViewport/WeaponAttack:frame")
tracks/1/path = NodePath("SubViewportContainer/SubViewport/Hit Wall:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.155556),
"times": PackedFloat32Array(0, 1.20833),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 7]
"values": [0, 29]
}
[sub_resource type="Animation" id="Animation_v5qoq"]
@@ -417,7 +441,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"normal_slash"]
"values": [&"Normal Slash 1"]
}
tracks/1/type = "value"
tracks/1/imported = false
@@ -12253,7 +12277,7 @@ position = Vector2(764, 544)
position = Vector2(720, 580)
scale = Vector2(2.25, 2.25)
sprite_frames = SubResource("SpriteFrames_jtmj1")
animation = &"normal_slash"
animation = &"Normal Slash 1"
[node name="ColorRect" type="ColorRect" parent="ScreenFX/SubViewportContainer/SubViewport"]
anchors_preset = 15
@@ -12274,7 +12298,6 @@ speed_scale = 2.0
position = Vector2(951, 498)
sprite_frames = SubResource("SpriteFrames_5rmcm")
frame = 58
frame_progress = 1.0
[node name="ENTROPIC ELEMENT1" type="AnimatedSprite2D" parent="ScreenFX/SubViewportContainer/SubViewport"]
position = Vector2(349, 200)
@@ -12305,8 +12328,3 @@ bus = &"SFX"
[node name="WalkSFX" type="AudioStreamPlayer3D" parent="."]
unique_name_in_owner = true
stream = ExtResource("6_v7rlw")
[node name="CSGBox3D" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.84353)
visible = false
size = Vector3(1, 4.2, 1)