Add collisions to A2 corridors

Start implementation of fading ambient audio in/out on level load
This commit is contained in:
2026-02-05 14:17:45 -08:00
parent 147f04d2ff
commit 36b851254e
58 changed files with 1523 additions and 3666 deletions
@@ -1,8 +1,9 @@
[gd_scene load_steps=18 format=3 uid="uid://dl6h1djc27ddl"]
[gd_scene load_steps=19 format=3 uid="uid://dl6h1djc27ddl"]
[ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Altar.cs" id="1_5jip8"]
[ext_resource type="Resource" uid="uid://bqnfw6r4085yv" path="res://src/dialog/Altar.dialogue" id="2_7xfp0"]
[ext_resource type="PackedScene" uid="uid://co0fmuno2pjc7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER.1.glb" id="2_xpi6o"]
[ext_resource type="Script" uid="uid://cstc8tdapyrst" path="res://src/audio/AmbientSFXPlayer.cs" id="5_7xfp0"]
[ext_resource type="Shader" uid="uid://c4a68uhm5o2h4" path="res://src/map/map shaders/Altar Sky Environment.gdshader" id="27_lb4gb"]
[ext_resource type="AudioStream" uid="uid://c4ud110da8efp" path="res://src/audio/AMB/amb_wind_loop_altar.wav" id="28_je2oh"]
@@ -29,6 +30,9 @@ size = Vector3(369.423, 20, 47.9875)
[sub_resource type="BoxShape3D" id="BoxShape3D_db2o3"]
size = Vector3(2.97754, 2.34912, 3.79205)
[sub_resource type="BoxShape3D" id="BoxShape3D_tp2pi"]
size = Vector3(4.52301, 7.56061, 15.4608)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_6iwuh"]
shader = ExtResource("27_lb4gb")
shader_parameter/day_top_color = Color(0.110511, 0.211694, 0.207729, 1)
@@ -92,9 +96,6 @@ auto_exposure_enabled = true
dof_blur_far_distance = 29.84
dof_blur_amount = 0.06
[sub_resource type="BoxShape3D" id="BoxShape3D_tp2pi"]
size = Vector3(4.52301, 7.56061, 15.4608)
[node name="Floor0" type="Node3D"]
script = ExtResource("1_5jip8")
Dialogue = ExtResource("2_7xfp0")
@@ -159,10 +160,6 @@ transform = Transform3D(1.8, 0, 0, 0, 1.8, 0, 0, 0, 1.8, 0, 3.88968, 0)
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.3951, -2.89376, -1.035)
[node name="ExitSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.4308, -1.94189, -0.268161)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1.8, 0, 0, 0, 1.8, 0, 0, 0, 1.8, 0, 3.88968, 0)
@@ -185,12 +182,14 @@ collision_mask = 256
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1171, -2.1779, -0.0887146)
shape = SubResource("BoxShape3D_db2o3")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
process_mode = 3
stream = ExtResource("28_je2oh")
volume_db = -8.0
autoplay = true
bus = &"AMBIENT"
[node name="NoExitArea" type="Area3D" parent="Room"]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 64
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/NoExitArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 72.5243, -2.06593, -2.02953)
shape = SubResource("BoxShape3D_tp2pi")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.80799, 0.209228, 0.550796, 1.41155e-07, -0.934826, 0.355107, 0.589197, -0.286923, -0.755329, 0, 3.88968, -89.3095)
@@ -203,12 +202,12 @@ shadow_blur = 2.832
environment = SubResource("Environment_c86uk")
camera_attributes = SubResource("CameraAttributesPractical_ojbcg")
[node name="NoExitArea" type="Area3D" parent="."]
[node name="DimmableAudio" type="Node3D" parent="."]
unique_name_in_owner = true
transform = Transform3D(1.8, 0, 0, 0, 1.8, 0, 0, 0, 1.8, 0, 3.88968, 0)
collision_layer = 0
collision_mask = 64
[node name="CollisionShape3D" type="CollisionShape3D" parent="NoExitArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 72.5243, -2.06593, -2.02953)
shape = SubResource("BoxShape3D_tp2pi")
[node name="AmbientWind" type="AudioStreamPlayer" parent="DimmableAudio"]
process_mode = 3
stream = ExtResource("28_je2oh")
volume_db = -8.0
bus = &"AMBIENT"
script = ExtResource("5_7xfp0")
@@ -456,7 +456,7 @@ shape = SubResource("CylinderShape3D_1pour")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, 0, 0.52099, -66.2332)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1.3, 0, 0, 0, 1.3, 0, 0, 0, 1.3, -1.87173, -1.07068, -13.6911)
File diff suppressed because one or more lines are too long
@@ -376,7 +376,7 @@ shape = SubResource("CylinderShape3D_1pour")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -66.2332)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.87173, -1.37707, 75.3399)
@@ -1379,7 +1379,7 @@ shape = SubResource("CylinderShape3D_1ijgn")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -52.6848, 0, 16.939)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.72795, -2.29748, 0.329851)
@@ -1418,7 +1418,18 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.2518,
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5263, -2.15637, -2.35483)
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
InitialHP = 125
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="HorseHead" type="Node3D" parent="Bosses"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.348, 0, -88.391)
@@ -1427,7 +1438,18 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.3
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.714, -1.38925, 10.8406)
visible = false
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
InitialHP = 125
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="HorseHeadStatue" parent="Bosses/HorseHead" instance=ExtResource("15_1ijgn")]
unique_name_in_owner = true
@@ -149,7 +149,7 @@ shape = SubResource("ConcavePolygonShape3D_s7h55")
[node name="Spawn Points" type="Node3D" parent="."]
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.953, 0, 149.677)
@@ -182,6 +182,17 @@ shape = SubResource("BoxShape3D_s7h55")
[node name="DemonWall" parent="." instance=ExtResource("25_k2q0o")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.747, 3.84071, 55.334)
_maximumWallMoveAmount = null
InitialHP = null
InitialAttack = null
InitialDefense = null
ExpGiven = null
AeolicResistance = null
HydricResistance = null
IgenousResistance = null
FerrumResistance = null
TelluricResistance = null
HolyResistance = null
[node name="Lights" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
@@ -2,9 +2,9 @@
[ext_resource type="Script" uid="uid://cuhfkyh3d7noa" path="res://src/map/dungeon/code/Overworld.cs" id="1_5hmt3"]
[ext_resource type="Texture2D" uid="uid://co6h8vyi11sl2" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_63.png" id="2_g6b7b"]
[ext_resource type="AudioStream" uid="uid://dv045ax11vybl" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"]
[ext_resource type="AudioStream" uid="uid://dsc8xu78llst6" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"]
[ext_resource type="AudioStream" uid="uid://7hb71ilkd7qh" path="res://src/audio/AMB/amb_beach.wav" id="3_pvi8n"]
[ext_resource type="AudioStream" uid="uid://dqmsaok6fyhe7" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"]
[ext_resource type="AudioStream" uid="uid://dl07vg00se7hd" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"]
[ext_resource type="AudioStream" uid="uid://boypvgaweep8a" path="res://src/audio/AMB/amb_beach.wav" id="3_pvi8n"]
[ext_resource type="Texture2D" uid="uid://w33fr6exryiy" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_37.png" id="3_uyygh"]
[ext_resource type="Texture2D" uid="uid://dv10yaqvp3mub" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_71.png" id="4_r8r3k"]
[ext_resource type="Shader" uid="uid://brhf7s3riyag5" path="res://src/map/map shaders/Metal.gdshader" id="5_d1qcb"]
File diff suppressed because one or more lines are too long