Started implementing SFX

Fixed Shield animation jumps and secondary attack
Fixed demon wall stone behavior
Made overworld ambient sounds unpausable
This commit is contained in:
2025-11-25 03:04:07 -08:00
parent 3e8c11d55d
commit db7a1df1f7
122 changed files with 2313 additions and 1687 deletions

View File

@@ -1,9 +1,10 @@
[gd_scene load_steps=34 format=3 uid="uid://cfecvvav8kkp6"]
[gd_scene load_steps=54 format=3 uid="uid://cfecvvav8kkp6"]
[ext_resource type="Script" uid="uid://yxmiqy7i0t7r" path="res://src/player/Player.cs" id="1_xcol5"]
[ext_resource type="AudioStream" uid="uid://cth2xgoqhdf0m" path="res://src/audio/sfx/player_hit_wall.ogg" id="3_565yv"]
[ext_resource type="Texture2D" uid="uid://c4ps26w7h3vpq" path="res://src/minimap/textures/player_map_icon.png" id="4_3ojaj"]
[ext_resource type="Texture2D" uid="uid://qhxl3nejqlk1" path="res://src/vfx/World/DUST_1.png" id="4_565yv"]
[ext_resource type="Texture2D" uid="uid://b5qjlbcesth53" path="res://src/vfx/Weapon Strikes/NON ELEMENTAL SLASH.png" id="6_p34sl"]
[ext_resource type="Texture2D" uid="uid://2ig1arptr1e8" path="res://src/vfx/Items Etc/slash_2.png" id="4_v7rlw"]
[ext_resource type="Texture2D" uid="uid://qhxl3nejqlk1" path="res://src/vfx/World/DUST_1.png" id="5_v5qoq"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dw45s"]
radius = 1.0
@@ -37,15 +38,15 @@ _data = {
&"RESET": SubResource("Animation_565yv")
}
[sub_resource type="BoxShape3D" id="BoxShape3D_g641l"]
size = Vector3(1, 1, 1.80176)
[sub_resource type="BoxShape3D" id="BoxShape3D_hs4wf"]
size = Vector3(2, 3, 1)
size = Vector3(2, 4.3291, 1)
[sub_resource type="SphereShape3D" id="SphereShape3D_g641l"]
radius = 0.6
[sub_resource type="BoxShape3D" id="BoxShape3D_565yv"]
size = Vector3(1, 1, 1.80176)
[sub_resource type="Animation" id="Animation_v7rlw"]
length = 0.001
tracks/0/type = "value"
@@ -61,7 +62,7 @@ tracks/0/keys = {
"values": [true]
}
[sub_resource type="Animation" id="Animation_g641l"]
[sub_resource type="Animation" id="Animation_mbasf"]
resource_name = "attack"
tracks/0/type = "animation"
tracks/0/imported = false
@@ -80,16 +81,18 @@ tracks/1/path = NodePath("Collision/Hitbox/HitboxCollision:disabled")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.0833333, 0.333333),
"times": PackedFloat32Array(0.0333333, 0.166667, 0.333333),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [true, false, true]
}
[sub_resource type="Animation" id="Animation_bj1ma"]
resource_name = "crit"
[sub_resource type="Animation" id="Animation_qgbg1"]
resource_name = "hit_wall"
length = 0.583342
step = 0.0833333
step = 0.0222222
tracks/0/type = "animation"
tracks/0/imported = false
tracks/0/enabled = true
@@ -100,24 +103,28 @@ tracks/0/keys = {
"clips": PackedStringArray("hit_wall"),
"times": PackedFloat32Array(0)
}
tracks/1/type = "value"
tracks/1/type = "audio"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Collision/Hitbox/HitboxCollision:disabled")
tracks/1/path = NodePath("HitWallSound")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("3_565yv")
}],
"times": PackedFloat32Array(0.0888889)
}
tracks/1/use_blend = true
[sub_resource type="AnimationLibrary" id="AnimationLibrary_3ojaj"]
[sub_resource type="AnimationLibrary" id="AnimationLibrary_u8qj4"]
_data = {
&"RESET": SubResource("Animation_v7rlw"),
&"attack": SubResource("Animation_g641l"),
&"hit_wall": SubResource("Animation_bj1ma")
&"attack": SubResource("Animation_mbasf"),
&"crit": SubResource("Animation_bj1ma"),
&"hit_wall": SubResource("Animation_qgbg1")
}
[sub_resource type="Animation" id="Animation_jtmj1"]
@@ -144,13 +151,13 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [11]
"values": [0]
}
[sub_resource type="Animation" id="Animation_ebyyx"]
resource_name = "hit_wall"
length = 0.583342
step = 0.0833333
length = 0.155558
step = 0.0222222
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
@@ -170,7 +177,7 @@ tracks/1/path = NodePath("SubViewportContainer/SubViewport/WeaponAttack:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.583333),
"times": PackedFloat32Array(0, 0.155556),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 7]
@@ -178,8 +185,8 @@ tracks/1/keys = {
[sub_resource type="Animation" id="Animation_v5qoq"]
resource_name = "normal_attack"
length = 0.916675
step = 0.0833333
length = 0.666669
step = 0.0222222
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
@@ -199,10 +206,10 @@ tracks/1/path = NodePath("SubViewportContainer/SubViewport/WeaponAttack:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.916667),
"times": PackedFloat32Array(0, 0.666667),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 11]
"values": [0, 30]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ebyyx"]
@@ -212,135 +219,264 @@ _data = {
&"normal_attack": SubResource("Animation_v5qoq")
}
[sub_resource type="AtlasTexture" id="AtlasTexture_g641l"]
atlas = ExtResource("6_p34sl")
region = Rect2(0, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_3ojaj"]
atlas = ExtResource("6_p34sl")
region = Rect2(300, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_ebyyx"]
atlas = ExtResource("6_p34sl")
region = Rect2(1800, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_bj1ma"]
atlas = ExtResource("6_p34sl")
region = Rect2(2100, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_es4xk"]
atlas = ExtResource("6_p34sl")
region = Rect2(2400, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_g183x"]
atlas = ExtResource("6_p34sl")
region = Rect2(2700, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_ojh85"]
atlas = ExtResource("6_p34sl")
region = Rect2(3000, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_wvcio"]
atlas = ExtResource("6_p34sl")
region = Rect2(3300, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_565yv"]
atlas = ExtResource("6_p34sl")
region = Rect2(600, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_v7rlw"]
atlas = ExtResource("6_p34sl")
region = Rect2(900, 0, 300, 300)
[sub_resource type="AtlasTexture" id="AtlasTexture_v5qoq"]
atlas = ExtResource("6_p34sl")
region = Rect2(1200, 0, 300, 300)
atlas = ExtResource("4_v7rlw")
region = Rect2(0, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jtmj1"]
atlas = ExtResource("6_p34sl")
region = Rect2(1500, 0, 300, 300)
atlas = ExtResource("4_v7rlw")
region = Rect2(512, 0, 512, 512)
[sub_resource type="SpriteFrames" id="SpriteFrames_lnh6v"]
[sub_resource type="AtlasTexture" id="AtlasTexture_lnh6v"]
atlas = ExtResource("4_v7rlw")
region = Rect2(1024, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_bmp5p"]
atlas = ExtResource("4_v7rlw")
region = Rect2(1536, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_1wxdb"]
atlas = ExtResource("4_v7rlw")
region = Rect2(2048, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_tm4vc"]
atlas = ExtResource("4_v7rlw")
region = Rect2(2560, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ledjb"]
atlas = ExtResource("4_v7rlw")
region = Rect2(3072, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jsrl5"]
atlas = ExtResource("4_v7rlw")
region = Rect2(3584, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_v32vt"]
atlas = ExtResource("4_v7rlw")
region = Rect2(4096, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_scfvx"]
atlas = ExtResource("4_v7rlw")
region = Rect2(4608, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_po5jt"]
atlas = ExtResource("4_v7rlw")
region = Rect2(5120, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jj045"]
atlas = ExtResource("4_v7rlw")
region = Rect2(5632, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_7wf8o"]
atlas = ExtResource("4_v7rlw")
region = Rect2(6144, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_afsxn"]
atlas = ExtResource("4_v7rlw")
region = Rect2(6656, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_b1ckw"]
atlas = ExtResource("4_v7rlw")
region = Rect2(7168, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_3vieb"]
atlas = ExtResource("4_v7rlw")
region = Rect2(7680, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_imkep"]
atlas = ExtResource("4_v7rlw")
region = Rect2(8192, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_bngr8"]
atlas = ExtResource("4_v7rlw")
region = Rect2(8704, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ct55r"]
atlas = ExtResource("4_v7rlw")
region = Rect2(9216, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_hkhu1"]
atlas = ExtResource("4_v7rlw")
region = Rect2(9728, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_2njrj"]
atlas = ExtResource("4_v7rlw")
region = Rect2(10240, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_f0ff4"]
atlas = ExtResource("4_v7rlw")
region = Rect2(10752, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_74hqa"]
atlas = ExtResource("4_v7rlw")
region = Rect2(11264, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_pbthl"]
atlas = ExtResource("4_v7rlw")
region = Rect2(11776, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jhq84"]
atlas = ExtResource("4_v7rlw")
region = Rect2(12288, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_flmxu"]
atlas = ExtResource("4_v7rlw")
region = Rect2(12800, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ymsks"]
atlas = ExtResource("4_v7rlw")
region = Rect2(13312, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_cssau"]
atlas = ExtResource("4_v7rlw")
region = Rect2(13824, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_bjon0"]
atlas = ExtResource("4_v7rlw")
region = Rect2(14336, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_toqbu"]
atlas = ExtResource("4_v7rlw")
region = Rect2(14848, 0, 512, 512)
[sub_resource type="SpriteFrames" id="SpriteFrames_jtmj1"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_g641l")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3ojaj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ebyyx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bj1ma")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_es4xk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_g183x")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ojh85")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_wvcio")
}],
"loop": false,
"name": &"hit_wall",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_g641l")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3ojaj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_565yv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v7rlw")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v5qoq")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jtmj1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ebyyx")
"texture": SubResource("AtlasTexture_lnh6v")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bj1ma")
"texture": SubResource("AtlasTexture_bmp5p")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_es4xk")
"texture": SubResource("AtlasTexture_1wxdb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_g183x")
"texture": SubResource("AtlasTexture_tm4vc")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ojh85")
"texture": SubResource("AtlasTexture_ledjb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_wvcio")
"texture": null
}],
"loop": false,
"name": &"hit_wall",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_v5qoq")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jtmj1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_lnh6v")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bmp5p")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_1wxdb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tm4vc")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ledjb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jsrl5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v32vt")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_scfvx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_po5jt")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jj045")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7wf8o")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_afsxn")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_b1ckw")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3vieb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_imkep")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bngr8")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ct55r")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_hkhu1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_2njrj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f0ff4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_74hqa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_pbthl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jhq84")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_flmxu")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ymsks")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_cssau")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bjon0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_toqbu")
}, {
"duration": 1.0,
"texture": null
}],
"loop": false,
"name": &"normal_slash",
"speed": 12.0
"speed": 45.0
}]
[sub_resource type="SpriteFrames" id="SpriteFrames_g641l"]
[sub_resource type="SpriteFrames" id="SpriteFrames_ebyyx"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": null
}, {
"duration": 1.0,
"texture": ExtResource("4_565yv")
"texture": ExtResource("5_v5qoq")
}, {
"duration": 1.0,
"texture": null
@@ -413,17 +549,6 @@ autoplay = "IconAnimation"
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.301443, 0)
[node name="Hitbox" type="Area3D" parent="Collision"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.12691, -1)
collision_layer = 2048
collision_mask = 2048
[node name="HitboxCollision" type="CollisionShape3D" parent="Collision/Hitbox"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.177762)
shape = SubResource("BoxShape3D_g641l")
disabled = true
[node name="CollisionDetector" type="Area3D" parent="Collision"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.126903, 0)
@@ -431,14 +556,14 @@ collision_layer = 448
collision_mask = 388
[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/CollisionDetector"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0479561, 0.509249, 0.0101219)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0479561, 0.427706, -0.811867)
shape = SubResource("BoxShape3D_hs4wf")
disabled = true
[node name="WallCheck" type="RigidBody3D" parent="Collision"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.507, 0, 0)
collision_layer = 0
collision_mask = 0
axis_lock_linear_x = true
axis_lock_linear_y = true
axis_lock_linear_z = true
@@ -452,14 +577,26 @@ max_contacts_reported = 100
transform = Transform3D(1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.51238, 1.03938, -1.08421)
shape = SubResource("SphereShape3D_g641l")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
[node name="Hitbox" type="Area3D" parent="Collision"]
unique_name_in_owner = true
libraries = {
&"": SubResource("AnimationLibrary_3ojaj")
}
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.12691, -1)
collision_layer = 2048
collision_mask = 2048
[node name="HitboxCollision" type="CollisionShape3D" parent="Collision/Hitbox"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.177762)
shape = SubResource("BoxShape3D_565yv")
disabled = true
[node name="ScreenFX" type="Node3D" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="ScreenFX"]
unique_name_in_owner = true
root_node = NodePath("../..")
libraries = {
&"": SubResource("AnimationLibrary_u8qj4")
}
[node name="PlayerFXAnimations" type="AnimationPlayer" parent="ScreenFX"]
unique_name_in_owner = true
libraries = {
@@ -473,7 +610,6 @@ anchor_right = 0.748
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
stretch = true
[node name="SubViewport" type="SubViewport" parent="ScreenFX/SubViewportContainer"]
transparent_bg = true
@@ -482,29 +618,17 @@ size = Vector2i(1440, 1080)
render_target_update_mode = 4
[node name="WeaponAttack" type="AnimatedSprite2D" parent="ScreenFX/SubViewportContainer/SubViewport"]
position = Vector2(720, 540)
scale = Vector2(3, 3)
sprite_frames = SubResource("SpriteFrames_lnh6v")
position = Vector2(720, 580)
scale = Vector2(2.25, 2.25)
sprite_frames = SubResource("SpriteFrames_jtmj1")
animation = &"normal_slash"
frame = 11
flip_h = true
flip_v = true
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="ScreenFX/SubViewportContainer/SubViewport"]
position = Vector2(720, 540)
scale = Vector2(36.5, 36.5)
sprite_frames = SubResource("SpriteFrames_g641l")
sprite_frames = SubResource("SpriteFrames_ebyyx")
animation = &"sample"
frame = 2
frame_progress = 1.0
[node name="Control" type="ColorRect" parent="ScreenFX"]
custom_minimum_size = Vector2(480, 0)
anchors_preset = 11
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -480.0
grow_horizontal = 0
grow_vertical = 2
color = Color(0.158472, 0.158472, 0.158472, 1)
[node name="HitWallSound" type="AudioStreamPlayer" parent="."]
unique_name_in_owner = true
bus = &"SFX"