Fix up Set A room collisions more and organize node structure

This commit is contained in:
2026-01-28 00:53:35 -08:00
parent 4ffe04fcff
commit f346f0f529
39 changed files with 2088 additions and 2020 deletions

View File

@@ -1,12 +1,10 @@
[gd_scene load_steps=68 format=3 uid="uid://cihbmyo0ltq4m"]
[gd_scene load_steps=64 format=3 uid="uid://cihbmyo0ltq4m"]
[ext_resource type="PackedScene" uid="uid://c77acs4px36hq" path="res://src/map/dungeon/models/Area 1/Exit/A1-Exit.glb" id="2_54fgm"]
[ext_resource type="Script" uid="uid://bd824eigybu51" path="res://src/map/dungeon/code/ExitRoom.cs" id="2_umdkt"]
[ext_resource type="Texture2D" uid="uid://bdd4abxejp4n0" path="res://src/minimap/textures/EXIT.png" id="4_ljhl3"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="5_54fgm"]
[ext_resource type="Texture2D" uid="uid://b7kj1pxt7wx1g" path="res://src/vfx/World/BLUE_FLAME.png" id="6_5n72k"]
[ext_resource type="AudioStream" uid="uid://b306wov6yfaan" path="res://src/audio/sfx/amb_flame_burning.ogg" id="6_54fgm"]
[ext_resource type="Texture2D" uid="uid://dw8vvn66qqfj2" path="res://src/minimap/textures/Room Maps/mi_exit.png" id="6_ljhl3"]
[sub_resource type="BoxShape3D" id="BoxShape3D_ljhl3"]
size = Vector3(6.65894, 0.1, 9.03726)
@@ -30,15 +28,6 @@ size = Vector3(5.96239, 4.04241, 0.991822)
[sub_resource type="BoxShape3D" id="BoxShape3D_tgauh"]
size = Vector3(20, 20, 36)
[sub_resource type="PlaneMesh" id="PlaneMesh_5n72k"]
size = Vector2(36, 15.7)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l1s1j"]
transparency = 1
shading_mode = 0
albedo_texture = ExtResource("6_ljhl3")
texture_filter = 0
[sub_resource type="Curve" id="Curve_l1s1j"]
_limits = [-2.0, 2.0, 0.0, 1.0]
_data = [Vector2(0.00358423, 0.230769), 0.0, 0.0, 0, 0, Vector2(0.982079, -1.03846), 0.0, 0.0, 0, 0]
@@ -455,7 +444,9 @@ animations = [{
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 3.397, 0, -14.255)
script = ExtResource("2_umdkt")
[node name="A1-Exit" parent="." instance=ExtResource("2_54fgm")]
[node name="Model" type="Node3D" parent="."]
[node name="A1-Exit" parent="Model" instance=ExtResource("2_54fgm")]
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.46985, -2.01312)
@@ -524,23 +515,17 @@ collision_mask = 10
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.04566, -4.02862, -1.19209e-07)
shape = SubResource("BoxShape3D_tgauh")
[node name="Minimap" type="Node3D" parent="."]
[node name="Lights" type="Node3D" parent="."]
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, -1.986)
visible = false
layers = 2
mesh = SubResource("PlaneMesh_5n72k")
surface_material_override/0 = SubResource("StandardMaterial3D_l1s1j")
[node name="OmniLight3D3" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13.623, -5.91127)
light_color = Color(0, 0.768998, 0.560773, 1)
light_energy = 4.7
omni_range = 14.399
[node name="Sprite3D" type="Sprite3D" parent="Minimap/Minimap"]
transform = Transform3D(-2.47844e-07, -5.67, -2.47844e-07, 0, -2.47844e-07, 5.67, -5.67, 2.47844e-07, 1.08336e-14, -2.4288, 3.94786, 0)
layers = 2
texture_filter = 0
texture = ExtResource("4_ljhl3")
[node name="VFX" type="Node3D" parent="."]
[node name="GPUParticles3D2" type="GPUParticles3D" parent="."]
[node name="GPUParticles3D2" type="GPUParticles3D" parent="VFX"]
transform = Transform3D(0.464, 0, 0, 0, 0.227, 0, 0, 0, 0.462, -0.5361, 5.40841, 6.92556)
amount = 20
lifetime = 41.19
@@ -548,30 +533,24 @@ local_coords = true
process_material = SubResource("ParticleProcessMaterial_63u6y")
draw_pass_1 = SubResource("QuadMesh_fwdls")
[node name="OmniLight3D3" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13.623, -5.91127)
light_color = Color(0, 0.768998, 0.560773, 1)
light_energy = 4.7
omni_range = 14.399
[node name="FogVolume" type="FogVolume" parent="."]
[node name="FogVolume" type="FogVolume" parent="VFX"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.482666, 20.6513, -16.0869)
size = Vector3(30.7642, 10.3584, 24.915)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
[node name="AnimationPlayer" type="AnimationPlayer" parent="VFX"]
root_node = NodePath("../Flame1")
libraries = {
&"": SubResource("AnimationLibrary_ljhl3")
}
autoplay = "Flame Flicker"
[node name="Flame1" type="AnimatedSprite3D" parent="."]
[node name="Flame1" type="AnimatedSprite3D" parent="VFX"]
transform = Transform3D(0.387, 0, 0, 0, 0.28, 0, 0, 0, 0.28, -2.85658, 2.38856, 6.23744)
billboard = 2
sprite_frames = SubResource("SpriteFrames_s0p2a")
autoplay = "default"
[node name="FLAME1" type="AudioStreamPlayer3D" parent="Flame1"]
[node name="FLAME1" type="AudioStreamPlayer3D" parent="VFX/Flame1"]
transform = Transform3D(1.62602, 0, 0, 0, 2.24719, 0, 0, 0, 2.24719, -0.237626, -1.0051, -0.623936)
stream = ExtResource("6_54fgm")
autoplay = true
@@ -579,7 +558,7 @@ max_distance = 25.0
bus = &"AMBIENT"
parameters/looping = true
[node name="OmniLight3D2" type="OmniLight3D" parent="Flame1"]
[node name="OmniLight3D2" type="OmniLight3D" parent="VFX/Flame1"]
transform = Transform3D(1.62602, 0, 0, 0, 2.24719, 0, 0, 0, 2.24719, -0.180455, -0.538921, -0.0176468)
light_color = Color(0.414176, 0.813573, 0.948183, 1)
light_energy = 6.436
@@ -588,13 +567,13 @@ shadow_blur = 10.0
omni_range = 19.166
omni_attenuation = 1.106
[node name="Flame2" type="AnimatedSprite3D" parent="."]
[node name="Flame2" type="AnimatedSprite3D" parent="VFX"]
transform = Transform3D(0.38, 0, 0, 0, 0.275, 0, 0, 0, 0.275, 2.72699, 2.36507, 6.23744)
billboard = 2
sprite_frames = SubResource("SpriteFrames_s0p2a")
autoplay = "default"
[node name="FLAME2" type="AudioStreamPlayer3D" parent="Flame2"]
[node name="FLAME2" type="AudioStreamPlayer3D" parent="VFX/Flame2"]
transform = Transform3D(1.62602, 0, 0, 0, 2.24719, 0, 0, 0, 2.24719, -0.237626, -1.0051, -0.623936)
stream = ExtResource("6_54fgm")
autoplay = true
@@ -602,7 +581,7 @@ max_distance = 25.0
bus = &"AMBIENT"
parameters/looping = true
[node name="OmniLight3D2" type="OmniLight3D" parent="Flame2"]
[node name="OmniLight3D2" type="OmniLight3D" parent="VFX/Flame2"]
transform = Transform3D(1.62602, 0, 0, 0, 2.24719, 0, 0, 0, 2.24719, -0.180455, -0.538921, -0.0176468)
light_color = Color(0.414176, 0.813573, 0.948183, 1)
light_energy = 6.436
@@ -611,4 +590,4 @@ shadow_blur = 10.0
omni_range = 19.166
omni_attenuation = 1.106
[editable path="A1-Exit"]
[editable path="Model/A1-Exit"]