瀏覽代碼

Merge pull request #177 from Calinou/update-to-4.2

Update mesh format for Godot 4.2
Rémi Verschelde 1 年之前
父節點
當前提交
99f49b5be9
共有 38 個文件被更改,包括 425 次插入391 次删除
  1. 2 0
      door/model/door.dae.import
  2. 2 0
      effects_shared/BlastMesh.glb.import
  3. 二進制
      effects_shared/BlastMesh_Sphere.mesh
  4. 2 0
      enemies/red_robot/laser/BarrelSmoke.glb.import
  5. 二進制
      enemies/red_robot/laser/BarrelSmoke_Plane.mesh
  6. 二進制
      enemies/red_robot/laser/circle.mesh
  7. 2 0
      enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import
  8. 二進制
      enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh
  9. 二進制
      enemies/red_robot/laser/raymesh.mesh
  10. 2 0
      enemies/red_robot/model/red_robot.glb.import
  11. 2 0
      enemies/red_robot/parts/part_head.glb.import
  12. 2 0
      enemies/red_robot/parts/part_shield.glb.import
  13. 2 0
      enemies/red_robot/parts/ray.glb.import
  14. 2 0
      enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import
  15. 二進制
      enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh
  16. 11 11
      enemies/red_robot/red_robot.tscn
  17. 2 0
      level/forklift/flying_forklift.glb.import
  18. 2 0
      level/geometry/models/core.glb.import
  19. 2 0
      level/geometry/models/lights.glb.import
  20. 2 0
      level/geometry/models/props.glb.import
  21. 2 0
      level/geometry/models/structure.glb.import
  22. 224 224
      level/geometry/scenes/collision/radial_colliders.tscn
  23. 40 40
      level/geometry/scenes/collision/radial_player_only.tscn
  24. 90 90
      level/geometry/scenes/collision/stair_pillar.tscn
  25. 7 7
      level/geometry/scenes/core.tscn
  26. 1 1
      level/geometry/scenes/structure.tscn
  27. 2 0
      level/textures/structure/Core/CoreOutLight.glb.import
  28. 二進制
      level/textures/structure/Core/CoreOutLight_Circle.mesh
  29. 二進制
      level/textures/structure/Core/CoreOutLight_Circle001.mesh
  30. 二進制
      level/textures/structure/Core/CoreOutLight_OuterRim.mesh
  31. 二進制
      level/textures/structure/Core/CoreOutLight_Sphere.mesh
  32. 1 1
      menu/menu.tscn
  33. 2 2
      player/bullet/bullet.tscn
  34. 2 0
      player/model/muzzle_flash_particle_mesh.glb.import
  35. 二進制
      player/model/muzzle_flash_particle_mesh_Cone.mesh
  36. 2 0
      player/model/player.glb.import
  37. 12 12
      player/player.tscn
  38. 3 3
      project.godot

+ 2 - 0
door/model/door.dae.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
effects_shared/BlastMesh.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
effects_shared/BlastMesh_Sphere.mesh


+ 2 - 0
enemies/red_robot/laser/BarrelSmoke.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
enemies/red_robot/laser/BarrelSmoke_Plane.mesh


二進制
enemies/red_robot/laser/circle.mesh


+ 2 - 0
enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh


二進制
enemies/red_robot/laser/raymesh.mesh


+ 2 - 0
enemies/red_robot/model/red_robot.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
enemies/red_robot/parts/part_head.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
enemies/red_robot/parts/part_shield.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
enemies/red_robot/parts/ray.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh


+ 11 - 11
enemies/red_robot/red_robot.tscn

@@ -27,19 +27,19 @@
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_h6xi0"]
 properties/0/path = NodePath(".:global_transform")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath(".:health")
 properties/1/spawn = true
-properties/1/sync = false
+properties/1/replication_mode = 0
 properties/2/path = NodePath(".:state")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath(".:target_position")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath(".:dead")
 properties/4/spawn = true
-properties/4/sync = false
+properties/4/replication_mode = 0
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_p5m1n"]
 resource_local_to_scene = true
@@ -212,7 +212,7 @@ nodes/hit3/position = Vector2(980, 240)
 nodes/output/position = Vector2(1180, 200)
 nodes/state/node = SubResource("51")
 nodes/state/position = Vector2(60, 100)
-node_connections = [&"output", 0, &"hit3", &"aiming", 0, &"state", &"aiming", 1, &"aim", &"hit1", 0, &"aiming", &"hit1", 1, &"Animation 5", &"hit2", 0, &"hit1", &"hit2", 1, &"Animation 6", &"hit3", 0, &"hit2", &"hit3", 1, &"Animation 7", &"state", 0, &"Animation", &"state", 1, &"Animation 3", &"state", 2, &"Animation 2", &"state", 3, &"Animation 4"]
+node_connections = [&"aiming", 0, &"state", &"aiming", 1, &"aim", &"hit1", 0, &"aiming", &"hit1", 1, &"Animation 5", &"hit2", 0, &"hit1", &"hit2", 1, &"Animation 6", &"hit3", 0, &"hit2", &"hit3", 1, &"Animation 7", &"output", 0, &"hit3", &"state", 0, &"Animation", &"state", 1, &"Animation 3", &"state", 2, &"Animation 2", &"state", 3, &"Animation 4"]
 
 [sub_resource type="SphereShape3D" id="53"]
 radius = 1.11815
@@ -426,19 +426,19 @@ _data = {
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_hqtbc"]
 properties/0/path = NodePath(".:fade_value")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath(".:position")
 properties/1/spawn = true
-properties/1/sync = true
+properties/1/replication_mode = 1
 properties/2/path = NodePath(".:rotation")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath(".:linear_velocity")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath(".:angular_velocity")
 properties/4/spawn = true
-properties/4/sync = true
+properties/4/replication_mode = 1
 
 [sub_resource type="Curve" id="57"]
 _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.260504, 1), 0.0, 0.0, 0, 0]

+ 2 - 0
level/forklift/flying_forklift.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
level/geometry/models/core.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=1.0
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -152,4 +153,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
level/geometry/models/lights.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
level/geometry/models/props.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -116,4 +117,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 2 - 0
level/geometry/models/structure.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=2
 meshes/lightmap_texel_size=0.8
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=false
 animation/fps=15
@@ -160,4 +161,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 224 - 224
level/geometry/scenes/collision/radial_colliders.tscn

@@ -1,427 +1,427 @@
-[gd_scene load_steps=34 format=2]
+[gd_scene load_steps=34 format=3 uid="uid://ckpf3t16u47pu"]
 
-[sub_resource type="BoxShape3D" id=1]
-extents = Vector3( 6.5, 1.5, 4.4 )
+[sub_resource type="BoxShape3D" id="1"]
+size = Vector3(13, 3, 8.8)
 
-[sub_resource type="BoxShape3D" id=2]
-extents = Vector3( 6.5, 1, 3.3 )
+[sub_resource type="BoxShape3D" id="2"]
+size = Vector3(13, 2, 6.6)
 
-[sub_resource type="BoxShape3D" id=3]
-extents = Vector3( 3.5, 5, 3 )
+[sub_resource type="BoxShape3D" id="3"]
+size = Vector3(7, 10, 6)
 
-[sub_resource type="BoxShape3D" id=4]
-extents = Vector3( 1.4, 1, 1 )
+[sub_resource type="BoxShape3D" id="4"]
+size = Vector3(2.8, 2, 2)
 
-[sub_resource type="BoxShape3D" id=5]
-extents = Vector3( 8, 1.2, 5.5 )
+[sub_resource type="BoxShape3D" id="5"]
+size = Vector3(16, 2.4, 11)
 
-[sub_resource type="BoxShape3D" id=6]
-extents = Vector3( 1, 1.2, 5.92 )
+[sub_resource type="BoxShape3D" id="6"]
+size = Vector3(2, 2.4, 11.84)
 
-[sub_resource type="BoxShape3D" id=7]
-extents = Vector3( 3, 3, 1.2 )
+[sub_resource type="BoxShape3D" id="7"]
+size = Vector3(6, 6, 2.4)
 
-[sub_resource type="BoxShape3D" id=8]
-extents = Vector3( 3.2, 3, 5.5 )
+[sub_resource type="BoxShape3D" id="8"]
+size = Vector3(6.4, 6, 11)
 
-[sub_resource type="BoxShape3D" id=9]
-extents = Vector3( 1, 3, 4.5 )
+[sub_resource type="BoxShape3D" id="9"]
+size = Vector3(2, 6, 9)
 
-[sub_resource type="BoxShape3D" id=10]
-extents = Vector3( 2, 0.6, 0.2 )
+[sub_resource type="BoxShape3D" id="10"]
+size = Vector3(4, 1.2, 0.4)
 
-[sub_resource type="BoxShape3D" id=11]
-extents = Vector3( 0.3, 0.6, 0.5 )
+[sub_resource type="BoxShape3D" id="11"]
+size = Vector3(0.6, 1.2, 1)
 
-[sub_resource type="BoxShape3D" id=12]
-extents = Vector3( 8, 1.2, 0.3 )
+[sub_resource type="BoxShape3D" id="12"]
+size = Vector3(16, 2.4, 0.6)
 
-[sub_resource type="BoxShape3D" id=13]
-extents = Vector3( 6, 15, 9.2 )
+[sub_resource type="BoxShape3D" id="13"]
+size = Vector3(12, 30, 18.4)
 
-[sub_resource type="BoxShape3D" id=14]
-extents = Vector3( 5, 15, 6.5 )
+[sub_resource type="BoxShape3D" id="14"]
+size = Vector3(10, 30, 13)
 
-[sub_resource type="BoxShape3D" id=15]
-extents = Vector3( 5.5, 2.1, 2 )
+[sub_resource type="BoxShape3D" id="15"]
+size = Vector3(11, 4.2, 4)
 
-[sub_resource type="BoxShape3D" id=16]
-extents = Vector3( 2.5, 2.1, 3 )
+[sub_resource type="BoxShape3D" id="16"]
+size = Vector3(5, 4.2, 6)
 
-[sub_resource type="BoxShape3D" id=17]
-extents = Vector3( 0.4, 0.6, 1.5 )
+[sub_resource type="BoxShape3D" id="17"]
+size = Vector3(0.8, 1.2, 3)
 
-[sub_resource type="BoxShape3D" id=18]
-extents = Vector3( 1.6, 0.6, 0.25 )
+[sub_resource type="BoxShape3D" id="18"]
+size = Vector3(3.2, 1.2, 0.5)
 
-[sub_resource type="BoxShape3D" id=19]
-extents = Vector3( 4, 2, 2.8 )
+[sub_resource type="BoxShape3D" id="19"]
+size = Vector3(8, 4, 5.6)
 
-[sub_resource type="BoxShape3D" id=20]
-extents = Vector3( 0.6, 0.12, 0.75 )
+[sub_resource type="BoxShape3D" id="20"]
+size = Vector3(1.2, 0.24, 1.5)
 
-[sub_resource type="BoxShape3D" id=21]
-extents = Vector3( 1.2, 2, 0.892 )
+[sub_resource type="BoxShape3D" id="21"]
+size = Vector3(2.4, 4, 1.784)
 
-[sub_resource type="BoxShape3D" id=22]
-extents = Vector3( 0.8, 3, 0.8 )
+[sub_resource type="BoxShape3D" id="22"]
+size = Vector3(1.6, 6, 1.6)
 
-[sub_resource type="BoxShape3D" id=23]
-extents = Vector3( 4, 0.5, 2 )
+[sub_resource type="BoxShape3D" id="23"]
+size = Vector3(8, 1, 4)
 
-[sub_resource type="BoxShape3D" id=24]
-extents = Vector3( 2.3, 3, 2.2 )
+[sub_resource type="BoxShape3D" id="24"]
+size = Vector3(4.6, 6, 4.4)
 
-[sub_resource type="BoxShape3D" id=25]
-extents = Vector3( 0.6, 1.3, 2 )
+[sub_resource type="BoxShape3D" id="25"]
+size = Vector3(1.2, 2.6, 4)
 
-[sub_resource type="BoxShape3D" id=26]
-extents = Vector3( 1.5, 4, 2 )
+[sub_resource type="BoxShape3D" id="26"]
+size = Vector3(3, 8, 4)
 
-[sub_resource type="BoxShape3D" id=27]
-extents = Vector3( 3.1, 1.6, 2.2 )
+[sub_resource type="BoxShape3D" id="27"]
+size = Vector3(6.2, 3.2, 4.4)
 
-[sub_resource type="BoxShape3D" id=28]
-extents = Vector3( 5, 6, 2.2 )
+[sub_resource type="BoxShape3D" id="28"]
+size = Vector3(10, 12, 4.4)
 
-[sub_resource type="BoxShape3D" id=29]
-extents = Vector3( 3, 30, 2 )
+[sub_resource type="BoxShape3D" id="29"]
+size = Vector3(6, 60, 4)
 
-[sub_resource type="BoxShape3D" id=30]
-extents = Vector3( 4, 12, 2 )
+[sub_resource type="BoxShape3D" id="30"]
+size = Vector3(8, 24, 4)
 
-[sub_resource type="BoxShape3D" id=31]
-extents = Vector3( 3, 30, 7.2 )
+[sub_resource type="BoxShape3D" id="31"]
+size = Vector3(6, 60, 14.4)
 
-[sub_resource type="BoxShape3D" id=32]
-extents = Vector3( 6, 10, 6 )
+[sub_resource type="BoxShape3D" id="32"]
+size = Vector3(12, 20, 12)
 
-[sub_resource type="BoxShape3D" id=33]
-extents = Vector3( 8, 9, 2 )
+[sub_resource type="BoxShape3D" id="33"]
+size = Vector3(16, 18, 4)
 
 [node name="RadialColliders" type="StaticBody3D"]
-transform = Transform3D( 0.956305, 0, -0.292372, 0, 1, 0, 0.292372, 0, 0.956305, 0, 0, 0 )
+transform = Transform3D(0.956305, 0, -0.292372, 0, 1, 0, 0.292372, 0, 0.956305, 0, 0, 0)
 
 [node name="EntranceMainFloor" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 27, -7.9, 0 )
-shape = SubResource( 1 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27, -7.9, 0)
+shape = SubResource("1")
 
 [node name="EntranceDoorFloor" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -7.4, 0 )
-shape = SubResource( 2 )
+transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -7.4, 0)
+shape = SubResource("2")
 
 [node name="EntranceWall1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -4, 6.2 )
-shape = SubResource( 3 )
+transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -4, 6.2)
+shape = SubResource("3")
 
 [node name="EntranceWall2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -4, -6.2 )
-shape = SubResource( 3 )
+transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 40, -4, -6.2)
+shape = SubResource("3")
 
 [node name="EntranceWall3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809017, 0, -0.587785, 0, 1, 0, 0.587785, 0, 0.809017, 38.2, -4, 10 )
-shape = SubResource( 3 )
+transform = Transform3D(0.809017, 0, -0.587785, 0, 1, 0, 0.587785, 0, 0.809017, 38.2, -4, 10)
+shape = SubResource("3")
 
 [node name="EntranceWall4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809017, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809017, 38.2, -4, -10 )
-shape = SubResource( 3 )
+transform = Transform3D(0.809017, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809017, 38.2, -4, -10)
+shape = SubResource("3")
 
 [node name="EntranceSlant1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 34.295, -7.4, -2.873 )
-shape = SubResource( 4 )
+transform = Transform3D(0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 34.295, -7.4, -2.873)
+shape = SubResource("4")
 
 [node name="EntranceSlant2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 34.295, -7.4, 2.873 )
-shape = SubResource( 4 )
+transform = Transform3D(0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 34.295, -7.4, 2.873)
+shape = SubResource("4")
 
 [node name="EntranceSide1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 31, -8, -6 )
-shape = SubResource( 5 )
+transform = Transform3D(0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 31, -8, -6)
+shape = SubResource("5")
 
 [node name="EntranceSide2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 31, -8, 6 )
-shape = SubResource( 5 )
+transform = Transform3D(0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 31, -8, 6)
+shape = SubResource("5")
 
 [node name="EntranceFloorEnd" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.29, -8, 0 )
-shape = SubResource( 6 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.29, -8, 0)
+shape = SubResource("6")
 
 [node name="EntranceEndCapCube" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.2, -10, 0 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.2, -10, 0)
+shape = SubResource("7")
 
 [node name="EntranceUnderside1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 26.5, -10, 0 )
-shape = SubResource( 8 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.5, -10, 0)
+shape = SubResource("8")
 
 [node name="EntranceUnderside2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.5, -10, 0 )
-shape = SubResource( 9 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.5, -10, 0)
+shape = SubResource("9")
 
 [node name="EntranceSideRailing3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 23, -5.8, -4.2 )
-shape = SubResource( 10 )
+transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 23, -5.8, -4.2)
+shape = SubResource("10")
 
 [node name="EntranceSideRailing4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 23, -5.8, 4.2 )
-shape = SubResource( 10 )
+transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 23, -5.8, 4.2)
+shape = SubResource("10")
 
 [node name="EntranceSideRailing5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, 20.7, -5.8, -3.9 )
-shape = SubResource( 11 )
+transform = Transform3D(1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, 20.7, -5.8, -3.9)
+shape = SubResource("11")
 
 [node name="EntranceSideRailing6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, 20.7, -5.8, 3.9 )
-shape = SubResource( 11 )
+transform = Transform3D(1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, 20.7, -5.8, 3.9)
+shape = SubResource("11")
 
 [node name="EntranceSideRailing7" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 31, -8, -13 )
-shape = SubResource( 12 )
+transform = Transform3D(0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 31, -8, -13)
+shape = SubResource("12")
 
 [node name="EntranceSideRailing8" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 31, -8, 13 )
-shape = SubResource( 12 )
+transform = Transform3D(0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 31, -8, 13)
+shape = SubResource("12")
 
 [node name="EntranceCeiling1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 35.5, 14, 0 )
-shape = SubResource( 13 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35.5, 14, 0)
+shape = SubResource("13")
 
 [node name="EntranceCeiling2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 37, 13.2, 0 )
-shape = SubResource( 14 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 37, 13.2, 0)
+shape = SubResource("14")
 
 [node name="MainFloor1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21.7, -14.5, 0 )
-shape = SubResource( 15 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.7, -14.5, 0)
+shape = SubResource("15")
 
 [node name="MainFloor2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.987689, 0, -0.156435, 0, 1, 0, 0.156435, 0, 0.987689, 21.6304, -14.5, 3.42592 )
-shape = SubResource( 15 )
+transform = Transform3D(0.987689, 0, -0.156435, 0, 1, 0, 0.156435, 0, 0.987689, 21.6304, -14.5, 3.42592)
+shape = SubResource("15")
 
 [node name="MainFloor3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951057, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951057, 20.8281, -14.5, 6.76747 )
-shape = SubResource( 15 )
+transform = Transform3D(0.951057, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951057, 20.8281, -14.5, 6.76747)
+shape = SubResource("15")
 
 [node name="MainFloor4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 19.513, -14.5, 9.9424 )
-shape = SubResource( 15 )
+transform = Transform3D(0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 19.513, -14.5, 9.9424)
+shape = SubResource("15")
 
 [node name="MainFloor5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809017, 0, -0.587785, 0, 1, 0, 0.587785, 0, 0.809017, 17.7175, -14.5, 12.8725 )
-shape = SubResource( 15 )
+transform = Transform3D(0.809017, 0, -0.587785, 0, 1, 0, 0.587785, 0, 0.809017, 17.7175, -14.5, 12.8725)
+shape = SubResource("15")
 
 [node name="MainFloor6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 15.4856, -14.5, 15.4856 )
-shape = SubResource( 15 )
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 15.4856, -14.5, 15.4856)
+shape = SubResource("15")
 
 [node name="MainFloor7" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.987689, 0, 0.156434, 0, 1, 0, -0.156434, 0, 0.987689, 21.6304, -14.5, -3.42592 )
-shape = SubResource( 15 )
+transform = Transform3D(0.987689, 0, 0.156434, 0, 1, 0, -0.156434, 0, 0.987689, 21.6304, -14.5, -3.42592)
+shape = SubResource("15")
 
 [node name="MainFloor8" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951057, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951057, 20.8281, -14.5, -6.76747 )
-shape = SubResource( 15 )
+transform = Transform3D(0.951057, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951057, 20.8281, -14.5, -6.76747)
+shape = SubResource("15")
 
 [node name="MainFloor9" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 19.513, -14.5, -9.94239 )
-shape = SubResource( 15 )
+transform = Transform3D(0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 19.513, -14.5, -9.94239)
+shape = SubResource("15")
 
 [node name="MainFloor10" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809017, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809017, 17.7175, -14.5, -12.8725 )
-shape = SubResource( 15 )
+transform = Transform3D(0.809017, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809017, 17.7175, -14.5, -12.8725)
+shape = SubResource("15")
 
 [node name="MainFloor11" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 15.4856, -14.5, -15.4856 )
-shape = SubResource( 15 )
+transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 15.4856, -14.5, -15.4856)
+shape = SubResource("15")
 
 [node name="MainFloor12" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, 0.5, 14.5, -14.5, 16.5 )
-shape = SubResource( 15 )
+transform = Transform3D(0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, 0.5, 14.5, -14.5, 16.5)
+shape = SubResource("15")
 
 [node name="MainFloor13" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, 0.5, 14.5, -14.5, -16.5 )
-shape = SubResource( 15 )
+transform = Transform3D(0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, 0.5, 14.5, -14.5, -16.5)
+shape = SubResource("15")
 
 [node name="MainFloor14" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 12.2, -14.5, -21.2 )
-shape = SubResource( 16 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 12.2, -14.5, -21.2)
+shape = SubResource("16")
 
 [node name="MainFloorRailing14" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 11.6, -11.8, -12 )
-shape = SubResource( 17 )
+transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 11.6, -11.8, -12)
+shape = SubResource("17")
 
 [node name="MainFloorRailing15" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 11.6, -11.8, 12 )
-shape = SubResource( 17 )
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 11.6, -11.8, 12)
+shape = SubResource("17")
 
 [node name="MainFloorRailing16" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, 0.5, 10.95, -11.8, -13.85 )
-shape = SubResource( 18 )
+transform = Transform3D(0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, 0.5, 10.95, -11.8, -13.85)
+shape = SubResource("18")
 
 [node name="MainFloorRailing17" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, 0.5, 10.95, -11.8, 13.85 )
-shape = SubResource( 18 )
+transform = Transform3D(0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, 0.5, 10.95, -11.8, 13.85)
+shape = SubResource("18")
 
 [node name="ReactorElevator1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 9.8, -15.8, -16.9 )
-shape = SubResource( 19 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 9.8, -15.8, -16.9)
+shape = SubResource("19")
 
 [node name="ReactorElevator2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 6.2, -13.92, -13.8 )
-shape = SubResource( 20 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 6.2, -13.92, -13.8)
+shape = SubResource("20")
 
 [node name="ReactorElevator3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 8.91543, -13.92, -12.2319 )
-shape = SubResource( 20 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 8.91543, -13.92, -12.2319)
+shape = SubResource("20")
 
 [node name="ReactorElevator4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 6.4, -15.8, -15 )
-shape = SubResource( 21 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 6.4, -15.8, -15)
+shape = SubResource("21")
 
 [node name="ReactorElevator5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 9.85436, -15.8, -13.0061 )
-shape = SubResource( 21 )
+transform = Transform3D(0.5, 0, 0.866027, 0, 1, 0, -0.866027, 0, 0.5, 9.85436, -15.8, -13.0061)
+shape = SubResource("21")
 
 [node name="CenterBlock" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 4.85, -14.5, -8.40045 )
-shape = SubResource( 22 )
+transform = Transform3D(0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 4.85, -14.5, -8.40045)
+shape = SubResource("22")
 
 [node name="ArmFloor" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, -13.4, 0 )
-shape = SubResource( 23 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, -13.4, 0)
+shape = SubResource("23")
 
 [node name="ArmBase1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.1, -11, 0 )
-shape = SubResource( 24 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.1, -11, 0)
+shape = SubResource("24")
 
 [node name="ArmBase2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.766044, -0.642788, 0, 0.642788, 0.766044, 0, 0, 0, 1, 12, -12.5, 0 )
-shape = SubResource( 25 )
+transform = Transform3D(0.766044, -0.642788, 0, 0.642788, 0.766044, 0, 0, 0, 1, 12, -12.5, 0)
+shape = SubResource("25")
 
 [node name="ArmShaft" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, 0, 0, 1, 6, -6.5, 0 )
-shape = SubResource( 26 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, 0, 0, 1, 6, -6.5, 0)
+shape = SubResource("26")
 
 [node name="ArmTopBase" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 4.9, 6.2, -8.48705 )
-shape = SubResource( 27 )
+transform = Transform3D(-0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 4.9, 6.2, -8.48705)
+shape = SubResource("27")
 
 [node name="ArmTopBase2" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 4.9, 15.2, -8.487 )
-shape = SubResource( 28 )
+transform = Transform3D(-0.5, 0, -0.866025, 0, 1, 0, 0.866025, 0, -0.5, 4.9, 15.2, -8.487)
+shape = SubResource("28")
 
 [node name="ArmTopShaft" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.353553, 0.353553, -0.866026, 0.707107, 0.707106, -3.79321e-07, 0.612372, -0.612373, -0.5, 3, 1.7, -5.19615 )
-shape = SubResource( 26 )
+transform = Transform3D(-0.353553, 0.353553, -0.866026, 0.707107, 0.707106, -3.79321e-07, 0.612372, -0.612373, -0.5, 3, 1.7, -5.19615)
+shape = SubResource("26")
 
 [node name="WallPillar1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951056, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951056, 33.7625, 0, 10.9701 )
-shape = SubResource( 29 )
+transform = Transform3D(0.951056, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951056, 33.7625, 0, 10.9701)
+shape = SubResource("29")
 
 [node name="WallPillar2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.793353, 0, -0.608761, 0, 1, 0, 0.608761, 0, 0.793353, 28.164, 0, 21.611 )
-shape = SubResource( 29 )
+transform = Transform3D(0.793353, 0, -0.608761, 0, 1, 0, 0.608761, 0, 0.793353, 28.164, 0, 21.611)
+shape = SubResource("29")
 
 [node name="WallPillar3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951056, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951056, 33.7625, 0, -10.9701 )
-shape = SubResource( 29 )
+transform = Transform3D(0.951056, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951056, 33.7625, 0, -10.9701)
+shape = SubResource("29")
 
 [node name="WallPillar4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.793353, 0, 0.608761, 0, 1, 0, -0.608761, 0, 0.793353, 28.164, 0, -21.611 )
-shape = SubResource( 29 )
+transform = Transform3D(0.793353, 0, 0.608761, 0, 1, 0, -0.608761, 0, 0.793353, 28.164, 0, -21.611)
+shape = SubResource("29")
 
 [node name="WallPillar5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 17.75, 0, -30.7439 )
-shape = SubResource( 29 )
+transform = Transform3D(0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 17.75, 0, -30.7439)
+shape = SubResource("29")
 
 [node name="WallPillar6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.77906, -0.545503, -0.309017, 0.573577, 0.819152, 0, 0.253132, -0.177245, 0.951056, 29.0072, 11.5, 9.42501 )
-shape = SubResource( 30 )
+transform = Transform3D(0.77906, -0.545503, -0.309017, 0.573577, 0.819152, 0, 0.253132, -0.177245, 0.951056, 29.0072, 11.5, 9.42501)
+shape = SubResource("30")
 
 [node name="WallPillar7" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.649877, -0.455049, -0.608761, 0.573577, 0.819152, 0, 0.498668, -0.349171, 0.793353, 24.1973, 11.5, 18.5672 )
-shape = SubResource( 30 )
+transform = Transform3D(0.649877, -0.455049, -0.608761, 0.573577, 0.819152, 0, 0.498668, -0.349171, 0.793353, 24.1973, 11.5, 18.5672)
+shape = SubResource("30")
 __meta__ = {
 "_editor_description_": ""
 }
 
 [node name="WallPillar8" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.77906, -0.545503, 0.309017, 0.573577, 0.819152, 0, -0.253132, 0.177245, 0.951056, 29.0072, 11.5, -9.42502 )
-shape = SubResource( 30 )
+transform = Transform3D(0.77906, -0.545503, 0.309017, 0.573577, 0.819152, 0, -0.253132, 0.177245, 0.951056, 29.0072, 11.5, -9.42502)
+shape = SubResource("30")
 __meta__ = {
 "_editor_description_": ""
 }
 
 [node name="WallPillar9" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.649877, -0.455049, 0.608761, 0.573577, 0.819152, 0, -0.498668, 0.349171, 0.793353, 24.1973, 11.5, -18.5672 )
-shape = SubResource( 30 )
+transform = Transform3D(0.649877, -0.455049, 0.608761, 0.573577, 0.819152, 0, -0.498668, 0.349171, 0.793353, 24.1973, 11.5, -18.5672)
+shape = SubResource("30")
 __meta__ = {
 "_editor_description_": ""
 }
 
 [node name="WallPillar10" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.409576, -0.286788, 0.866025, 0.573577, 0.819152, 0, -0.709406, 0.496732, 0.5, 15.25, 11.5, -26.4138 )
-shape = SubResource( 30 )
+transform = Transform3D(0.409576, -0.286788, 0.866025, 0.573577, 0.819152, 0, -0.709406, 0.496732, 0.5, 15.25, 11.5, -26.4138)
+shape = SubResource("30")
 __meta__ = {
 "_editor_description_": ""
 }
 
 [node name="Wall1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.884988, 0, -0.465615, 0, 1, 0, 0.465615, 0, 0.884988, 34.5588, 0, 18.1822 )
-shape = SubResource( 31 )
+transform = Transform3D(0.884988, 0, -0.465615, 0, 1, 0, 0.465615, 0, 0.884988, 34.5588, 0, 18.1822)
+shape = SubResource("31")
 
 [node name="Wall2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 25.7469, 0, 29.3589 )
-shape = SubResource( 31 )
+transform = Transform3D(0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 25.7469, 0, 29.3589)
+shape = SubResource("31")
 
 [node name="Wall3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.665882, 0, 0.746057, 0, 1, 0, -0.746057, 0, 0.665882, 26.0027, 0, -29.1335 )
-shape = SubResource( 31 )
+transform = Transform3D(0.665882, 0, 0.746057, 0, 1, 0, -0.746057, 0, 0.665882, 26.0027, 0, -29.1335)
+shape = SubResource("31")
 
 [node name="Wall4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 34.7155, 0, -17.8796 )
-shape = SubResource( 31 )
+transform = Transform3D(0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 34.7155, 0, -17.8796)
+shape = SubResource("31")
 
 [node name="Wall5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.884988, 2.59277e-15, -0.465615, -1.93784e-14, 1, -3.12639e-14, 0.465615, 3.6691e-14, 0.884988, 34.5588, -20, 18.1822 )
-shape = SubResource( 32 )
+transform = Transform3D(0.884988, 2.59277e-15, -0.465615, -1.93784e-14, 1, -3.12639e-14, 0.465615, 3.6691e-14, 0.884988, 34.5588, -20, 18.1822)
+shape = SubResource("32")
 
 [node name="Wall6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 25.7469, -20, 29.3589 )
-shape = SubResource( 32 )
+transform = Transform3D(0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 25.7469, -20, 29.3589)
+shape = SubResource("32")
 
 [node name="Wall7" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.665882, 0, 0.746057, 0, 1, 0, -0.746057, 0, 0.665882, 26.0027, -20, -29.1335 )
-shape = SubResource( 32 )
+transform = Transform3D(0.665882, 0, 0.746057, 0, 1, 0, -0.746057, 0, 0.665882, 26.0027, -20, -29.1335)
+shape = SubResource("32")
 
 [node name="Wall8" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 34.7155, -20, -17.8796 )
-shape = SubResource( 32 )
+transform = Transform3D(0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 34.7155, -20, -17.8796)
+shape = SubResource("32")
 
 [node name="Wall9" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.884988, 5.63108e-15, -0.465615, -2.13163e-14, 1, -2.84217e-14, 0.465615, 3.5078e-14, 0.884988, 32.7888, 14, 17.251 )
-shape = SubResource( 32 )
+transform = Transform3D(0.884988, 5.63108e-15, -0.465615, -2.13163e-14, 1, -2.84217e-14, 0.465615, 3.5078e-14, 0.884988, 32.7888, 14, 17.251)
+shape = SubResource("32")
 
 [node name="Wall10" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 24.4282, 14, 27.8552 )
-shape = SubResource( 32 )
+transform = Transform3D(0.659346, 0, -0.75184, 0, 1, 0, 0.75184, 0, 0.659346, 24.4282, 14, 27.8552)
+shape = SubResource("32")
 
 [node name="Wall11" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.665882, 0, 0.746058, 0, 1, 0, -0.746058, 0, 0.665882, 24.6709, 14, -27.6414 )
-shape = SubResource( 32 )
+transform = Transform3D(0.665882, 0, 0.746058, 0, 1, 0, -0.746058, 0, 0.665882, 24.6709, 14, -27.6414)
+shape = SubResource("32")
 
 [node name="Wall12" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 32.7597, 14, -16.8723 )
-shape = SubResource( 32 )
+transform = Transform3D(0.889017, 0, 0.457874, 0, 1, 0, -0.457874, 0, 0.889017, 32.7597, 14, -16.8723)
+shape = SubResource("32")
 
 [node name="Wall13" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 32.76, 14, 0 )
-shape = SubResource( 32 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.76, 14, 0)
+shape = SubResource("32")
 
 [node name="CeilingPipes1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 13, 0 )
-shape = SubResource( 33 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 13, 0)
+shape = SubResource("33")
 
 [node name="CeilingPipes2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 16, 0 )
-shape = SubResource( 33 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 16, 0)
+shape = SubResource("33")

+ 40 - 40
level/geometry/scenes/collision/radial_player_only.tscn

@@ -1,82 +1,82 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://bewdyyyqeciso"]
 
-[sub_resource type="BoxShape3D" id=1]
-extents = Vector3( 7, 2, 0.5 )
+[sub_resource type="BoxShape3D" id="1"]
+size = Vector3(14, 4, 1)
 
-[sub_resource type="BoxShape3D" id=2]
-extents = Vector3( 0.3, 4, 2.5 )
+[sub_resource type="BoxShape3D" id="2"]
+size = Vector3(0.6, 8, 5)
 
-[sub_resource type="BoxShape3D" id=3]
-extents = Vector3( 3.1, 1.6, 2.2 )
+[sub_resource type="BoxShape3D" id="3"]
+size = Vector3(6.2, 3.2, 4.4)
 
 [node name="RadialPlayerOnly" type="StaticBody3D"]
-transform = Transform3D( 0.956305, 0, -0.292372, 0, 1, 0, 0.292372, 0, 0.956305, 0, 0, 0 )
+transform = Transform3D(0.956305, 0, -0.292372, 0, 1, 0, 0.292372, 0, 0.956305, 0, 0, 0)
 collision_layer = 4
 collision_mask = 4
 
 [node name="EntranceSideRailing1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 30, -5, -13.5 )
-shape = SubResource( 1 )
+transform = Transform3D(0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 30, -5, -13.5)
+shape = SubResource("1")
 
 [node name="EntranceSideRailing2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 30, -5, 13.5 )
-shape = SubResource( 1 )
+transform = Transform3D(0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 30, -5, 13.5)
+shape = SubResource("1")
 
 [node name="MainFloorRailing1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.987689, 0, -0.156435, 0, 1, 0, 0.156435, 0, 0.987689, 26.4701, -11, 4.19245 )
-shape = SubResource( 2 )
+transform = Transform3D(0.987689, 0, -0.156435, 0, 1, 0, 0.156435, 0, 0.987689, 26.4701, -11, 4.19245)
+shape = SubResource("2")
 
 [node name="MainFloorRailing2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951057, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951057, 25.4883, -11, 8.28166 )
-shape = SubResource( 2 )
+transform = Transform3D(0.951057, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951057, 25.4883, -11, 8.28166)
+shape = SubResource("2")
 
 [node name="MainFloorRailing3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 23.879, -11, 12.167 )
-shape = SubResource( 2 )
+transform = Transform3D(0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 23.879, -11, 12.167)
+shape = SubResource("2")
 
 [node name="MainFloorRailing4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809017, 0, -0.587786, 0, 1, 0, 0.587786, 0, 0.809017, 21.6817, -11, 15.7527 )
-shape = SubResource( 2 )
+transform = Transform3D(0.809017, 0, -0.587786, 0, 1, 0, 0.587786, 0, 0.809017, 21.6817, -11, 15.7527)
+shape = SubResource("2")
 
 [node name="MainFloorRailing5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 18.9505, -11, 18.9505 )
-shape = SubResource( 2 )
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 18.9505, -11, 18.9505)
+shape = SubResource("2")
 
 [node name="MainFloorRailing6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.587785, 0, -0.809018, 0, 1, 0, 0.809018, 0, 0.587785, 15.7526, -11, 21.6817 )
-shape = SubResource( 2 )
+transform = Transform3D(0.587785, 0, -0.809018, 0, 1, 0, 0.809018, 0, 0.587785, 15.7526, -11, 21.6817)
+shape = SubResource("2")
 
 [node name="MainFloorRailing7" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.987689, 0, 0.156434, 0, 1, 0, -0.156434, 0, 0.987689, 26.4701, -11, -4.19244 )
-shape = SubResource( 2 )
+transform = Transform3D(0.987689, 0, 0.156434, 0, 1, 0, -0.156434, 0, 0.987689, 26.4701, -11, -4.19244)
+shape = SubResource("2")
 
 [node name="MainFloorRailing8" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.951057, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951057, 25.4883, -11, -8.28166 )
-shape = SubResource( 2 )
+transform = Transform3D(0.951057, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951057, 25.4883, -11, -8.28166)
+shape = SubResource("2")
 
 [node name="MainFloorRailing9" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 23.879, -11, -12.1669 )
-shape = SubResource( 2 )
+transform = Transform3D(0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 23.879, -11, -12.1669)
+shape = SubResource("2")
 
 [node name="MainFloorRailing10" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.809018, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809018, 21.6817, -11, -15.7526 )
-shape = SubResource( 2 )
+transform = Transform3D(0.809018, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809018, 21.6817, -11, -15.7526)
+shape = SubResource("2")
 
 [node name="MainFloorRailing11" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 18.9505, -11, -18.9505 )
-shape = SubResource( 2 )
+transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 18.9505, -11, -18.9505)
+shape = SubResource("2")
 
 [node name="MainFloorRailing12" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.587785, 0, 0.809017, 0, 1, 0, -0.809017, 0, 0.587785, 15.7527, -11, -21.6817 )
-shape = SubResource( 2 )
+transform = Transform3D(0.587785, 0, 0.809017, 0, 1, 0, -0.809017, 0, 0.587785, 15.7527, -11, -21.6817)
+shape = SubResource("2")
 
 [node name="MainFloorRailing13" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.453991, 0, 0.891007, 0, 1, 0, -0.891007, 0, 0.453991, 12.167, -11, -23.879 )
-shape = SubResource( 2 )
+transform = Transform3D(0.453991, 0, 0.891007, 0, 1, 0, -0.891007, 0, 0.453991, 12.167, -11, -23.879)
+shape = SubResource("2")
 
 [node name="ArmBasePlayerOnly" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.9, -12.4, 0 )
-shape = SubResource( 3 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.9, -12.4, 0)
+shape = SubResource("3")
 __meta__ = {
 "_editor_description_": ""
 }

+ 90 - 90
level/geometry/scenes/collision/stair_pillar.tscn

@@ -1,175 +1,175 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=9 format=3 uid="uid://babdc0gjbduw"]
 
-[sub_resource type="BoxShape3D" id=1]
-extents = Vector3( 3, 10, 1.8 )
+[sub_resource type="BoxShape3D" id="1"]
+size = Vector3(6, 20, 3.6)
 
-[sub_resource type="CylinderShape3D" id=2]
+[sub_resource type="CylinderShape3D" id="2"]
 radius = 1.8
 
-[sub_resource type="BoxShape3D" id=3]
-extents = Vector3( 1.8, 0.4, 0.8 )
+[sub_resource type="BoxShape3D" id="3"]
+size = Vector3(3.6, 0.8, 1.6)
 
-[sub_resource type="BoxShape3D" id=4]
-extents = Vector3( 1.8, 0.4, 3.2 )
+[sub_resource type="BoxShape3D" id="4"]
+size = Vector3(3.6, 0.8, 6.4)
 
-[sub_resource type="BoxShape3D" id=5]
-extents = Vector3( 2.285, 0.4, 0.8 )
+[sub_resource type="BoxShape3D" id="5"]
+size = Vector3(4.57, 0.8, 1.6)
 
-[sub_resource type="BoxShape3D" id=6]
-extents = Vector3( 0.1, 0.5, 0.8 )
+[sub_resource type="BoxShape3D" id="6"]
+size = Vector3(0.2, 1, 1.6)
 
-[sub_resource type="BoxShape3D" id=7]
-extents = Vector3( 2, 0.5, 0.1 )
+[sub_resource type="BoxShape3D" id="7"]
+size = Vector3(4, 1, 0.2)
 
-[sub_resource type="BoxShape3D" id=8]
-extents = Vector3( 0.1, 0.5, 3.2 )
+[sub_resource type="BoxShape3D" id="8"]
+size = Vector3(0.2, 1, 6.4)
 
 [node name="StairPillar" type="StaticBody3D"]
 
 [node name="CenterCube" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
-shape = SubResource( 1 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
+shape = SubResource("1")
 
 [node name="CenterCylinder" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -9, 0 )
-shape = SubResource( 2 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -9, 0)
+shape = SubResource("2")
 
 [node name="LowestPlatform" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1, -9.9, 2.4 )
-shape = SubResource( 3 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.1, -9.9, 2.4)
+shape = SubResource("3")
 
 [node name="MainPlatform1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, -6.9, 0 )
-shape = SubResource( 4 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, -6.9, 0)
+shape = SubResource("4")
 
 [node name="MainPlatform2" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -3.1, -3.9, 0 )
-shape = SubResource( 4 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -3.1, -3.9, 0)
+shape = SubResource("4")
 
 [node name="MainPlatform3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, -0.9, 0 )
-shape = SubResource( 4 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, -0.9, 0)
+shape = SubResource("4")
 
 [node name="MainPlatform4" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -3.1, 2.1, 0 )
-shape = SubResource( 4 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -3.1, 2.1, 0)
+shape = SubResource("4")
 
 [node name="MainPlatform5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, 5.1, 0 )
-shape = SubResource( 4 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1, 5.1, 0)
+shape = SubResource("4")
 
 [node name="Stair1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, -8.4, 2.4 )
-shape = SubResource( 5 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, -8.4, 2.4)
+shape = SubResource("5")
 
 [node name="Stair2" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.98023e-07, -2.38419e-07, -1, 0.0299988, -5.4, -2.4 )
-shape = SubResource( 5 )
+transform = Transform3D(-0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.98023e-07, -2.38419e-07, -1, 0.0299988, -5.4, -2.4)
+shape = SubResource("5")
 
 [node name="Stair3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, -2.4, 2.4 )
-shape = SubResource( 5 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, -2.4, 2.4)
+shape = SubResource("5")
 
 [node name="Stair4" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.98023e-07, -2.38419e-07, -1, 0.0299988, 0.599999, -2.4 )
-shape = SubResource( 5 )
+transform = Transform3D(-0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.98023e-07, -2.38419e-07, -1, 0.0299988, 0.599999, -2.4)
+shape = SubResource("5")
 
 [node name="Stair5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, 3.6, 2.4 )
-shape = SubResource( 5 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.0300026, 3.6, 2.4)
+shape = SubResource("5")
 
 [node name="Railing1" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.8, -9, 2.4 )
-shape = SubResource( 6 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.8, -9, 2.4)
+shape = SubResource("6")
 
 [node name="Railing2" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, -9, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, -9, 3.2)
+shape = SubResource("7")
 
 [node name="Railing3" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, -7.3, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, -7.3, 3.2)
+shape = SubResource("7")
 
 [node name="Railing4" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, -6, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, -6, 3.2)
+shape = SubResource("7")
 
 [node name="Railing5" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, -6, -9.53674e-07 )
-shape = SubResource( 8 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, -6, -9.53674e-07)
+shape = SubResource("8")
 
 [node name="Railing6" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -9, 1.68 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -9, 1.68)
+shape = SubResource("7")
 
 [node name="Railing7" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, -6, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, -6, -3.2)
+shape = SubResource("7")
 
 [node name="Railing8" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.68221e-07, -2.38419e-07, -1, 0.399998, -4.3, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.68221e-07, -2.38419e-07, -1, 0.399998, -4.3, -3.2)
+shape = SubResource("7")
 
 [node name="Railing9" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -2.7, -3, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -2.7, -3, -3.2)
+shape = SubResource("7")
 
 [node name="Railing10" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -4.8, -3, -9.53674e-07 )
-shape = SubResource( 8 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -4.8, -3, -9.53674e-07)
+shape = SubResource("8")
 
 [node name="Railing11" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, -3, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, -3, 3.2)
+shape = SubResource("7")
 
 [node name="Railing12" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, -1.3, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, -1.3, 3.2)
+shape = SubResource("7")
 
 [node name="Railing13" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, -4.76837e-07, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, -4.76837e-07, 3.2)
+shape = SubResource("7")
 
 [node name="Railing14" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, -4.76837e-07, -9.53674e-07 )
-shape = SubResource( 8 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, -4.76837e-07, -9.53674e-07)
+shape = SubResource("8")
 
 [node name="Railing16" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 0, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 0, -3.2)
+shape = SubResource("7")
 
 [node name="Railing17" type="CollisionShape3D" parent="."]
-transform = Transform3D( -0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.68221e-07, -2.38419e-07, -1, 0.399998, 1.7, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-0.707107, 0.707107, -3.57628e-07, 0.707107, 0.707107, 0, 2.68221e-07, -2.38419e-07, -1, 0.399998, 1.7, -3.2)
+shape = SubResource("7")
 
 [node name="Railing18" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -2.7, 3, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -2.7, 3, -3.2)
+shape = SubResource("7")
 
 [node name="Railing19" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -4.8, 3, -9.53674e-07 )
-shape = SubResource( 8 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, -4.8, 3, -9.53674e-07)
+shape = SubResource("8")
 
 [node name="Railing20" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, 3, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7, 3, 3.2)
+shape = SubResource("7")
 
 [node name="Railing21" type="CollisionShape3D" parent="."]
-transform = Transform3D( 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, 4.7, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(0.707107, -0.707107, 0, 0.707107, 0.707107, 0, -2.98023e-08, 0, 1, -0.400003, 4.7, 3.2)
+shape = SubResource("7")
 
 [node name="Railing22" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, 6, 3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.7, 6, 3.2)
+shape = SubResource("7")
 
 [node name="Railing23" type="CollisionShape3D" parent="."]
-transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, 6, -9.53674e-07 )
-shape = SubResource( 8 )
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8, 6, -9.53674e-07)
+shape = SubResource("8")
 
 [node name="Railing24" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 6, 1.5 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 6, 1.5)
+shape = SubResource("7")
 
 [node name="Railing25" type="CollisionShape3D" parent="."]
-transform = Transform3D( -1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 6, -3.2 )
-shape = SubResource( 7 )
+transform = Transform3D(-1, 0, -3.57628e-07, 0, 1, 0, 3.57628e-07, 0, -1, 2.7, 6, -3.2)
+shape = SubResource("7")

+ 7 - 7
level/geometry/scenes/core.tscn

@@ -1,17 +1,17 @@
 [gd_scene load_steps=37 format=3 uid="uid://ddbnmy6um5fjg"]
 
-[ext_resource type="PackedScene" path="res://level/geometry/scenes/collision/radial_colliders.tscn" id="1"]
-[ext_resource type="PackedScene" path="res://level/geometry/scenes/collision/stair_pillar.tscn" id="2"]
+[ext_resource type="PackedScene" uid="uid://ckpf3t16u47pu" path="res://level/geometry/scenes/collision/radial_colliders.tscn" id="1"]
+[ext_resource type="PackedScene" uid="uid://babdc0gjbduw" path="res://level/geometry/scenes/collision/stair_pillar.tscn" id="2"]
 [ext_resource type="PackedScene" uid="uid://bt78arqovue7l" path="res://level/geometry/models/core.glb" id="3"]
-[ext_resource type="PackedScene" path="res://level/geometry/scenes/collision/radial_player_only.tscn" id="4"]
-[ext_resource type="ArrayMesh" path="res://level/textures/structure/Core/CoreOutLight_Circle.mesh" id="5"]
+[ext_resource type="PackedScene" uid="uid://bewdyyyqeciso" path="res://level/geometry/scenes/collision/radial_player_only.tscn" id="4"]
+[ext_resource type="ArrayMesh" uid="uid://ct4jqkd0sbv8a" path="res://level/textures/structure/Core/CoreOutLight_Circle.mesh" id="5"]
 [ext_resource type="Texture2D" uid="uid://cya4tlbkeiulm" path="res://level/textures/structure/Core/core_out_light.png" id="6"]
-[ext_resource type="ArrayMesh" path="res://level/textures/structure/Core/CoreOutLight_Sphere.mesh" id="7"]
+[ext_resource type="ArrayMesh" uid="uid://dvuy1ol0fydnn" path="res://level/textures/structure/Core/CoreOutLight_Sphere.mesh" id="7"]
 [ext_resource type="Texture2D" uid="uid://c7bvf8m1hnj0c" path="res://level/textures/structure/Core/core_inner_noise.png" id="8"]
 [ext_resource type="Texture2D" uid="uid://ngxmgkl4quic" path="res://level/textures/structure/Core/core_inner_noise2.png" id="9"]
-[ext_resource type="ArrayMesh" path="res://level/textures/structure/Core/CoreOutLight_OuterRim.mesh" id="10"]
+[ext_resource type="ArrayMesh" uid="uid://1viy4qetdmw8" path="res://level/textures/structure/Core/CoreOutLight_OuterRim.mesh" id="10"]
 [ext_resource type="Texture2D" uid="uid://ma1pkwpr1tbq" path="res://level/textures/structure/Core/core_laval_spotches.png" id="11"]
-[ext_resource type="ArrayMesh" path="res://level/textures/structure/Core/CoreOutLight_Circle001.mesh" id="12"]
+[ext_resource type="ArrayMesh" uid="uid://c3jq2yvvaa8k3" path="res://level/textures/structure/Core/CoreOutLight_Circle001.mesh" id="12"]
 [ext_resource type="Texture2D" uid="uid://drdkjk8qau4mq" path="res://level/textures/structure/Core/core_fire_noise.png" id="13"]
 
 [sub_resource type="Shader" id="11"]

+ 1 - 1
level/geometry/scenes/structure.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=35 format=3 uid="uid://bh1lh032pmey2"]
 
-[ext_resource type="PackedScene" path="res://level/geometry/scenes/collision/stair_pillar.tscn" id="1"]
+[ext_resource type="PackedScene" uid="uid://babdc0gjbduw" path="res://level/geometry/scenes/collision/stair_pillar.tscn" id="1"]
 [ext_resource type="PackedScene" uid="uid://8fujwb58dav7" path="res://level/geometry/models/structure.glb" id="2"]
 [ext_resource type="ArrayOccluder3D" uid="uid://d20dpr3pj0fn6" path="res://level/geometry/scenes/occluder.occ" id="3_2aako"]
 

+ 2 - 0
level/textures/structure/Core/CoreOutLight.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
level/textures/structure/Core/CoreOutLight_Circle.mesh


二進制
level/textures/structure/Core/CoreOutLight_Circle001.mesh


二進制
level/textures/structure/Core/CoreOutLight_OuterRim.mesh


二進制
level/textures/structure/Core/CoreOutLight_Sphere.mesh


+ 1 - 1
menu/menu.tscn

@@ -58,7 +58,7 @@ nodes/CombatRest/position = Vector2(-120, 100)
 nodes/Eyes/node = SubResource("7")
 nodes/Eyes/position = Vector2(-40, 220)
 nodes/output/position = Vector2(420, 120)
-node_connections = [&"output", 0, &"Blend", &"Blend", 0, &"CombatRest", &"Blend", 1, &"Eyes"]
+node_connections = [&"Blend", 0, &"CombatRest", &"Blend", 1, &"Eyes", &"output", 0, &"Blend"]
 
 [sub_resource type="Theme" id="9"]
 Button/colors/font_color = Color(1, 1, 1, 1)

+ 2 - 2
player/bullet/bullet.tscn

@@ -11,7 +11,7 @@
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_peqai"]
 properties/0/path = NodePath(".:global_transform")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 
 [sub_resource type="SphereMesh" id="SphereMesh_ku2wu"]
 radial_segments = 9
@@ -314,8 +314,8 @@ curve = SubResource("Curve_5e7et")
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_rdv14"]
 emission_shape = 1
 emission_sphere_radius = 0.4
-gravity = Vector3(0, 2, 0)
 angular_velocity_curve = SubResource("CurveTexture_160ax")
+gravity = Vector3(0, 2, 0)
 scale_curve = SubResource("CurveTexture_v5ggx")
 color_ramp = SubResource("GradientTexture2D_hfu4w")
 

+ 2 - 0
player/model/muzzle_flash_particle_mesh.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -29,4 +30,5 @@ animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
 _subresources={}
+gltf/naming_version=0
 gltf/embedded_image_handling=1

二進制
player/model/muzzle_flash_particle_mesh_Cone.mesh


+ 2 - 0
player/model/player.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=15
@@ -40,4 +41,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

+ 12 - 12
player/player.tscn

@@ -16,39 +16,39 @@
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_o4rt5"]
 properties/0/path = NodePath(".:transform")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath(".:player_id")
 properties/1/spawn = true
-properties/1/sync = false
+properties/1/replication_mode = 0
 properties/2/path = NodePath("PlayerModel:transform")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath(".:motion")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath(".:current_animation")
 properties/4/spawn = true
-properties/4/sync = true
+properties/4/replication_mode = 1
 
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_8yuxf"]
 properties/0/path = NodePath("CameraBase:rotation")
 properties/0/spawn = true
-properties/0/sync = true
+properties/0/replication_mode = 1
 properties/1/path = NodePath("CameraBase/CameraRot:rotation")
 properties/1/spawn = true
-properties/1/sync = true
+properties/1/replication_mode = 1
 properties/2/path = NodePath("InputSynchronizer:shoot_target")
 properties/2/spawn = true
-properties/2/sync = true
+properties/2/replication_mode = 1
 properties/3/path = NodePath("InputSynchronizer:motion")
 properties/3/spawn = true
-properties/3/sync = true
+properties/3/replication_mode = 1
 properties/4/path = NodePath("InputSynchronizer:shooting")
 properties/4/spawn = true
-properties/4/sync = true
+properties/4/replication_mode = 1
 properties/5/path = NodePath("InputSynchronizer:aiming")
 properties/5/spawn = true
-properties/5/sync = true
+properties/5/replication_mode = 1
 
 [sub_resource type="SphereMesh" id="2"]
 radius = 0.003
@@ -219,7 +219,7 @@ nodes/walk/node = SubResource("29")
 nodes/walk/position = Vector2(140, 1640)
 nodes/walk_speed/node = SubResource("36")
 nodes/walk_speed/position = Vector2(440, 1600)
-node_connections = [&"output", 0, &"eye_blend", &"aim", 0, &"aimdown", &"aim", 1, &"land", &"aim", 2, &"aimup", &"eye_blend", 0, &"aim", &"eye_blend", 1, &"eyes", &"land", 0, &"state", &"land", 1, &"hardland", &"state", 0, &"strafe_speed", &"state", 1, &"walk_speed", &"state", 2, &"jumpup", &"state", 3, &"jumpdown", &"strafe_speed", 0, &"strafe", &"walk_speed", 0, &"walk"]
+node_connections = [&"aim", 0, &"aimdown", &"aim", 1, &"land", &"aim", 2, &"aimup", &"eye_blend", 0, &"aim", &"eye_blend", 1, &"eyes", &"land", 0, &"state", &"land", 1, &"hardland", &"output", 0, &"eye_blend", &"state", 0, &"strafe_speed", &"state", 1, &"walk_speed", &"state", 2, &"jumpup", &"state", 3, &"jumpdown", &"strafe_speed", 0, &"strafe", &"walk_speed", 0, &"walk"]
 
 [sub_resource type="CapsuleShape3D" id="31"]
 

+ 3 - 3
project.godot

@@ -13,7 +13,7 @@ config_version=5
 config/name="Godot Third-Person Shooter Demo"
 config/description="Godot Third Person Shooter with high quality assets and lighting"
 run/main_scene="res://main/main.tscn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.2")
 config/icon="res://icon.png"
 
 [autoload]
@@ -154,13 +154,13 @@ jump={
 }
 aim={
 "deadzone": 0.5,
-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null)
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":6,"pressure":0.0,"pressed":false,"script":null)
 ]
 }
 shoot={
 "deadzone": 0.5,
-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null)
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null)
 ]
 }