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
@@ -1,46 +1,10 @@
[gd_scene load_steps=27 format=3 uid="uid://b7111krf365x0"]
[gd_scene load_steps=24 format=3 uid="uid://b7111krf365x0"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="2_fedas"]
[ext_resource type="PackedScene" uid="uid://d4me6wfx21vug" path="res://src/map/dungeon/models/Area 1/Balcony/A1-Balcony.glb" id="2_ybo5h"]
[ext_resource type="PackedScene" uid="uid://cxwyge2s1yswu" path="res://src/map/Placeables/A1-Socket.tscn" id="5_d2a01"]
[ext_resource type="Texture2D" uid="uid://dun4dcpdgv551" path="res://src/minimap/textures/Room Maps/mi_balcony_room.png" id="5_gctlo"]
[ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="17_6jb2l"]
[sub_resource type="Curve" id="Curve_k6i88"]
_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]
point_count = 2
[sub_resource type="CurveTexture" id="CurveTexture_1up8d"]
curve = SubResource("Curve_k6i88")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_4bxb6"]
lifetime_randomness = 0.05
emission_shape = 3
emission_box_extents = Vector3(22.2, 22.505, 22)
angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_1up8d")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6jb2l"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(1, 1, 1, 0.0862745)
albedo_texture = ExtResource("17_6jb2l")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_sasor"]
material = SubResource("StandardMaterial3D_6jb2l")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
[sub_resource type="BoxShape3D" id="BoxShape3D_ybo5h"]
size = Vector3(0.25, 7.06909, 17.668)
@@ -85,151 +49,166 @@ size = Vector3(41.3612, 0.1, 35.3871)
[sub_resource type="BoxShape3D" id="BoxShape3D_1up8d"]
size = Vector3(36, 8, 32)
[sub_resource type="PlaneMesh" id="PlaneMesh_f286s"]
size = Vector2(36, 32)
[sub_resource type="Curve" id="Curve_k6i88"]
_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]
point_count = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_awhym"]
[sub_resource type="CurveTexture" id="CurveTexture_1up8d"]
curve = SubResource("Curve_k6i88")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_4bxb6"]
lifetime_randomness = 0.05
emission_shape = 3
emission_box_extents = Vector3(22.2, 22.505, 22)
angle_min = -245.3
angle_max = 417.9
orbit_velocity_min = -0.0269999
orbit_velocity_max = 0.0400001
orbit_velocity_curve = SubResource("CurveTexture_1up8d")
gravity = Vector3(0, -0.07, 0)
scale_min = 0.0
scale_max = 0.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6jb2l"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_texture = ExtResource("5_gctlo")
texture_filter = 0
albedo_color = Color(1, 1, 1, 0.0862745)
albedo_texture = ExtResource("17_6jb2l")
billboard_mode = 2
[sub_resource type="QuadMesh" id="QuadMesh_sasor"]
material = SubResource("StandardMaterial3D_6jb2l")
size = Vector2(0.1, 0.1)
subdivide_width = 1
subdivide_depth = 1
[node name="Balcony Room A" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.1836, 0, 15.8193)
script = ExtResource("2_fedas")
[node name="A1-Balcony2" parent="." instance=ExtResource("2_ybo5h")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.18503, -8.69354, -1.29919)
[node name="Model" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
visible = false
[node name="OmniLight3D" type="OmniLight3D" parent="Model"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0243759, 1.6988, -1.89605)
light_color = Color(0.796587, 0.874441, 0.885927, 1)
light_energy = 0.375
shadow_enabled = true
omni_range = 20.885
omni_attenuation = 0.063
[node name="A1-Balcony2" parent="Model" instance=ExtResource("2_ybo5h")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.18503, -10.6935, -1.29919)
[node name="GPUParticles3D2" type="GPUParticles3D" parent="Model"]
transform = Transform3D(0.924, 0, 0, 0, 0.532, 0, 0, 0, 0.812, 0.405497, 4.40841, -0.441603)
amount = 20
lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_4bxb6")
draw_pass_1 = SubResource("QuadMesh_sasor")
[node name="Node3D" parent="Model" instance=ExtResource("5_d2a01")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -28.8651, -6.36512, -4.78885)
[node name="Collision" type="Node3D" parent="."]
[node name="Node3D2" parent="Model" instance=ExtResource("5_d2a01")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 31.1809, -6.27712, -4.78666)
[node name="Collisions" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
[node name="StaticBody3D" type="StaticBody3D" parent="Collision"]
[node name="StaticBody3D" type="StaticBody3D" parent="Collisions"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.6119, 0.427856, 8.14881)
shape = SubResource("BoxShape3D_ybo5h")
[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.6079, 0.427856, -11.1409)
shape = SubResource("BoxShape3D_f286s")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.761, 0.427856, 7.98984)
shape = SubResource("BoxShape3D_d2a01")
[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.761, 0.427856, -10.981)
shape = SubResource("BoxShape3D_gctlo")
[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -11.2162, 0.427856, -18.5765)
shape = SubResource("BoxShape3D_awhym")
[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 11.086, 0.427856, -18.5765)
shape = SubResource("BoxShape3D_4q3if")
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.1026, 0.418343, 0)
shape = SubResource("BoxShape3D_4q1cx")
[node name="CollisionShape3D23" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D23" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.2168, 0.418343, 0)
shape = SubResource("BoxShape3D_4q1cx")
[node name="CollisionShape3D24" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D24" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.3775, 0.418343, -4.10081)
shape = SubResource("BoxShape3D_yhcp5")
[node name="CollisionShape3D8" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D8" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.4658, 0.10981, -4.08949)
shape = SubResource("BoxShape3D_l51vs")
[node name="CollisionShape3D9" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D9" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.72017, 0.341553, -11.0172)
shape = SubResource("BoxShape3D_sr0op")
[node name="CollisionShape3D25" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D25" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.85679, 0.341553, -11.0172)
shape = SubResource("BoxShape3D_sr0op")
[node name="CollisionShape3D10" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D10" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.14555, 0.140015, 0.278172)
shape = SubResource("CylinderShape3D_ybo5h")
[node name="CollisionShape3D22" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D22" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.18669, 0.140015, 0.278172)
shape = SubResource("CylinderShape3D_ybo5h")
[node name="CollisionShape3D11" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D11" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67914, -0.49068, 1.94613)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D12" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D12" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.64876, -0.49068, 3.59249)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D13" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D13" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.98964, -0.49068, 4.67593)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D14" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D14" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.3581, -0.49068, 5.7084)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D15" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D15" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.36965, -0.49068, 5.72114)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D16" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D16" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.62259, -0.49068, 5.72114)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D17" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D17" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.55619, -0.49068, 4.96078)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D18" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D18" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.95253, -0.49068, 3.85579)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D19" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D19" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.04969, -0.49068, 2.63281)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D20" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D20" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.60224, -0.49068, 0.843561)
shape = SubResource("CylinderShape3D_d2a01")
[node name="CollisionShape3D21" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D21" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
[node name="CollisionShape3D26" type="CollisionShape3D" parent="Collision/StaticBody3D"]
[node name="CollisionShape3D26" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.149094, -2.21952, -0.967971)
shape = SubResource("BoxShape3D_mefsp")
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
visible = false
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
@@ -262,25 +241,27 @@ collision_mask = 10
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.04566, 5.65958, 0)
shape = SubResource("BoxShape3D_1up8d")
[node name="FogVolume" type="FogVolume" parent="."]
[node name="Lights" type="Node3D" parent="."]
[node name="OmniLight3D" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0243759, 3.6988, -1.89605)
light_color = Color(0.796587, 0.874441, 0.885927, 1)
light_energy = 0.375
shadow_enabled = true
omni_range = 20.885
omni_attenuation = 0.063
[node name="VFX" type="Node3D" parent="."]
[node name="GPUParticles3D2" type="GPUParticles3D" parent="VFX"]
transform = Transform3D(0.924, 0, 0, 0, 0.532, 0, 0, 0, 0.812, 0.405497, 6.40841, -0.441603)
amount = 20
lifetime = 41.19
local_coords = true
process_material = SubResource("ParticleProcessMaterial_4bxb6")
draw_pass_1 = SubResource("QuadMesh_sasor")
[node name="FogVolume" type="FogVolume" parent="VFX"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -9.55431, 0.18298)
visible = false
size = Vector3(39.9, 16.6792, 34.6)
[node name="Minimap" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171951, -10.2003, -1.80546)
visible = false
[node name="Minimap" type="MeshInstance3D" parent="Minimap"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.1785, 1.98844)
visible = false
layers = 2
mesh = SubResource("PlaneMesh_f286s")
surface_material_override/0 = SubResource("StandardMaterial3D_awhym")
[node name="Node3D" parent="." instance=ExtResource("5_d2a01")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -28.8651, -4.36512, -4.78885)
[node name="Node3D2" parent="." instance=ExtResource("5_d2a01")]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 31.1809, -4.27712, -4.78666)