idk anymore

2024-01-24 20:55:45 +01:00
parent e7973d6086
commit 649c83030d
63 changed files with 8112 additions and 194 deletions
--- a/scenes/audio_subtitle_system.tscn
+++ b/scenes/audio_subtitle_system.tscn
@@ -39,7 +39,6 @@ grow_vertical = 0
 theme_override_styles/panel = SubResource("StyleBoxFlat_eoq1n")

 [node name="RichTextLabel" type="RichTextLabel" parent="CanvasLayer/PanelContainer"]
-self_modulate = Color(1, 1, 1, 0.47451)
 layout_mode = 2
 bbcode_enabled = true
 scroll_active = false
--- a/scenes/close_game_confirmation.tscn
+++ b/scenes/close_game_confirmation.tscn
@@ -6,6 +6,7 @@
 title = "Beenden"
 initial_position = 2
 size = Vector2i(267, 132)
+borderless = true
 ok_button_text = "Zum Hauptmenü"
 dialog_text = "Möchtest du das Spiel beenden
 und zurrück zum Hauptmenü 
--- a/scenes/gravity_gun.tscn
+++ b/scenes/gravity_gun.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=21 format=3 uid="uid://cl6gw3huejnrl"]
+[gd_scene load_steps=24 format=3 uid="uid://cl6gw3huejnrl"]

 [ext_resource type="Script" path="res://scripts/gravity_gun.gd" id="1_0upyy"]
 [ext_resource type="ArrayMesh" uid="uid://cxw30fmp15jsd" path="res://assets/models/gun.obj" id="1_803cf"]
 [ext_resource type="Environment" uid="uid://drn5fwa4uhv4m" path="res://resources/environment.tres" id="1_vtn44"]
 [ext_resource type="Material" uid="uid://b6r8e4302xg1d" path="res://assets/materials/dark_metal.material" id="2_qrl87"]
 [ext_resource type="Shader" path="res://shaders/pbr_glass.gdshader" id="3_aeppb"]
+[ext_resource type="Texture2D" uid="uid://bjx2i53wtjair" path="res://assets/textures/crosshair.png" id="7_4s8bm"]
 [ext_resource type="Texture2D" uid="uid://b4en3dw3q324p" path="res://assets/textures/circle.png" id="8_al3c7"]

 [sub_resource type="World3D" id="World3D_wp4pn"]
@@ -101,6 +102,18 @@ section_length = 0.3
 section_segments = 2
 curve = SubResource("Curve_xucvk")

+[sub_resource type="Shader" id="Shader_3q2t2"]
+code = "shader_type canvas_item;
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture;
+
+void fragment() {
+	COLOR.rgb = 1.0 - textureLod(SCREEN_TEXTURE, SCREEN_UV, 0.0).rgb;
+	COLOR.a = texture(TEXTURE , UV).a;
+}"
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_1bkc3"]
+shader = SubResource("Shader_3q2t2")
+
 [node name="GravityGunLayer" type="CanvasLayer"]
 follow_viewport_enabled = true
 script = ExtResource("1_0upyy")
@@ -187,4 +200,21 @@ trail_lifetime = 0.8
 process_material = SubResource("ParticleProcessMaterial_5ccgj")
 draw_pass_1 = SubResource("RibbonTrailMesh_fwaab")

+[node name="TextureRect" type="TextureRect" parent="."]
+material = SubResource("ShaderMaterial_1bkc3")
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -8.0
+offset_top = -8.0
+offset_right = 8.0
+offset_bottom = 8.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+texture = ExtResource("7_4s8bm")
+
 [connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
--- a/scenes/gui/menus/main_menu.tscn
+++ b/scenes/gui/menus/main_menu.tscn
@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://scripts/menus/main_menu.gd" id="1_1osxu"]

 [sub_resource type="LabelSettings" id="LabelSettings_yh38l"]
-font_size = 55
+font_size = 40

 [sub_resource type="InputEventAction" id="InputEventAction_bc05y"]
 action = &"ui_accept"
@@ -37,8 +37,10 @@ grow_vertical = 2
 [node name="Title" type="Label" parent="LogoContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
-text = "Byte of Terrror"
+text = "Project
+Thought Experiment"
 label_settings = SubResource("LabelSettings_yh38l")
+horizontal_alignment = 1

 [node name="StartGame" type="Button" parent="."]
 layout_mode = 1
--- a/scenes/gui/menus/pause_menu.tscn
+++ b/scenes/gui/menus/pause_menu.tscn
@@ -1,18 +1,37 @@
-[gd_scene load_steps=2 format=3 uid="uid://1hja6jk0k310"]
+[gd_scene load_steps=4 format=3 uid="uid://1hja6jk0k310"]

 [ext_resource type="Script" path="res://scripts/menus/pause_menu.gd" id="1_e70hy"]

-[node name="PauseMenu" type="Control"]
-layout_mode = 3
+[sub_resource type="Shader" id="Shader_1tfvw"]
+code = "shader_type canvas_item;
+
+uniform float blur_amount : hint_range(0, 5);
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
+
+void fragment() {
+	COLOR = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount);
+}"
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_bxx1r"]
+shader = SubResource("Shader_1tfvw")
+shader_parameter/blur_amount = 2.0
+
+[node name="PauseMenu" type="CanvasLayer"]
+process_mode = 3
+layer = 5
+visible = false
+script = ExtResource("1_e70hy")
+
+[node name="ColorRect" type="ColorRect" parent="."]
+material = SubResource("ShaderMaterial_bxx1r")
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-script = ExtResource("1_e70hy")

 [node name="VBoxContainer" type="VBoxContainer" parent="."]
-layout_mode = 1
+process_mode = 3
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
@@ -26,13 +45,20 @@ grow_horizontal = 2
 grow_vertical = 2

 [node name="Continue" type="Button" parent="VBoxContainer"]
+process_mode = 3
 layout_mode = 2
 text = "Weiter spielen"

 [node name="RestartLevel" type="Button" parent="VBoxContainer"]
+process_mode = 3
 layout_mode = 2
 text = "Level neu starten"

 [node name="CloseLevel" type="Button" parent="VBoxContainer"]
+process_mode = 3
 layout_mode = 2
 text = "Beenden"
+
+[connection signal="pressed" from="VBoxContainer/Continue" to="." method="_on_continue_pressed"]
+[connection signal="pressed" from="VBoxContainer/RestartLevel" to="." method="_on_restart_level_pressed"]
+[connection signal="pressed" from="VBoxContainer/CloseLevel" to="." method="_on_close_level_pressed"]
--- a/scenes/levels/lvl97FC.tmp
+++ b/scenes/levels/lvl97FC.tmp
@@ -0,0 +1,114 @@
+[gd_scene load_steps=21 format=3 uid="uid://ckad8stc13n83"]
+
+[ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://assets/models/interior.obj" id="1_xs30l"]
+[ext_resource type="Material" uid="uid://1w6e5sx6poff" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare.material" id="2_evxh1"]
+[ext_resource type="Material" uid="uid://c6rvbga7g5f4l" path="res://assets/textures/material/tiles_white/tiles_white.material" id="7_nrt8m"]
+[ext_resource type="PackedScene" uid="uid://gg5ph541e4p3" path="res://scenes/player.tscn" id="11_lls6p"]
+[ext_resource type="PackedScene" uid="uid://22blfybi6n4q" path="res://scenes/objects/completion_counter.tscn" id="12_vn8j0"]
+[ext_resource type="PackedScene" uid="uid://cy0x2nliyw8gw" path="res://scenes/objects/door.tscn" id="13_fhdru"]
+[ext_resource type="PackedScene" uid="uid://dqy8bqf1chm8c" path="res://scenes/objects/interactables/button_stand.tscn" id="14_mpdbg"]
+[ext_resource type="PackedScene" uid="uid://ced2w03t8er5k" path="res://scenes/objects/cube.tscn" id="15_40os8"]
+[ext_resource type="PackedScene" uid="uid://ce8nemacxi67m" path="res://scenes/audio_subtitle_system.tscn" id="16_2wrmg"]
+[ext_resource type="AudioStream" uid="uid://d3741vrmaeci5" path="res://assets/audio/voicelines/anouncer_intro_01.ogg" id="17_1a448"]
+[ext_resource type="Script" path="res://scripts/voiceline_resource.gd" id="18_jxpoe"]
+[ext_resource type="AudioStream" uid="uid://bi1rf1hi2fm2r" path="res://assets/audio/voicelines/anouncer_intro_02.ogg" id="19_2roq0"]
+[ext_resource type="AudioStream" uid="uid://bji3bx3umohnw" path="res://assets/audio/voicelines/anouncer_intro_03.ogg" id="20_dqpxk"]
+[ext_resource type="AudioStream" uid="uid://ddpvabd43s3p4" path="res://assets/audio/voicelines/anouncer_intro_04.ogg" id="21_n11nj"]
+
+[sub_resource type="BoxMesh" id="BoxMesh_wyr1d"]
+size = Vector3(4, 0.2, 5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_lygjd"]
+size = Vector3(4, 0.2, 5)
+
+[sub_resource type="Resource" id="Resource_u3j5u"]
+script = ExtResource("18_jxpoe")
+audio = ExtResource("17_1a448")
+text = "Hallo!"
+
+[sub_resource type="Resource" id="Resource_3g4yn"]
+script = ExtResource("18_jxpoe")
+audio = ExtResource("19_2roq0")
+text = "Und willkommen zur Gehirn Test Simulation „Project Thought Experiment“."
+
+[sub_resource type="Resource" id="Resource_6wqks"]
+script = ExtResource("18_jxpoe")
+audio = ExtResource("20_dqpxk")
+text = "Falls Sie sich nicht erinnern: Sie haben uns, der „Neura-Förderkooperation“, Ihren gesamten Körper gespendet. "
+
+[sub_resource type="Resource" id="Resource_im7qv"]
+script = ExtResource("18_jxpoe")
+audio = ExtResource("21_n11nj")
+text = "Jetzt werden Sie einige Tests durchführen, um sicherzustellen, dass Sie [rainbow][wave]keinen Hirnschaden[/wave][/rainbow] haben oder ein  [rainbow][wave]kompletter Idiot[/wave][/rainbow] sind, da es jetzt vollständig in unser digitales Simulationssystem integriert ist."
+
+[node name="LVL1" type="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1)
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(0.707107, -0.707107, 0, 0.5, 0.5, 0.707107, -0.5, -0.5, 0.707107, 0, 0, 0)
+directional_shadow_blend_splits = true
+sky_mode = 1
+
+[node name="interior" parent="." instance=ExtResource("1_xs30l")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
+
+[node name="Hallway" parent="interior" index="0"]
+surface_material_override/0 = ExtResource("2_evxh1")
+
+[node name="Room" parent="interior" index="1"]
+surface_material_override/0 = ExtResource("7_nrt8m")
+
+[node name="Player" parent="." instance=ExtResource("11_lls6p")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5.23956)
+
+[node name="CompletionCounter" parent="." node_paths=PackedStringArray("nodes_needed") instance=ExtResource("12_vn8j0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0617981, 3.05379, 6.24098)
+nodes_needed = [NodePath("../ButtonStand2"), NodePath("../ButtonStand3")]
+
+[node name="Door" parent="." instance=ExtResource("13_fhdru")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0536218, 1.58488, 6.64)
+
+[node name="ButtonStand2" parent="." instance=ExtResource("14_mpdbg")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.03802, 0.7, 4)
+
+[node name="ButtonStand3" parent="." instance=ExtResource("14_mpdbg")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.7, 0.0433838)
+
+[node name="Cube" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, 0)
+
+[node name="Cube2" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, 0)
+
+[node name="Cube3" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, -2)
+
+[node name="Cube4" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, -3.93867)
+
+[node name="Cube5" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, -2)
+
+[node name="Cube6" parent="." instance=ExtResource("15_40os8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.96977, 0.51, -2)
+
+[node name="DebugPlane" type="StaticBody3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 3.9, 0)
+collision_layer = 7
+collision_mask = 7
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="DebugPlane"]
+mesh = SubResource("BoxMesh_wyr1d")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="DebugPlane"]
+shape = SubResource("BoxShape3D_lygjd")
+
+[node name="AudioSubtitleSystem" parent="." instance=ExtResource("16_2wrmg")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.27434, 3)
+voice_lines = Array[ExtResource("18_jxpoe")]([SubResource("Resource_u3j5u"), SubResource("Resource_3g4yn"), SubResource("Resource_6wqks"), SubResource("Resource_im7qv")])
+
+[connection signal="lock" from="CompletionCounter" to="Door" method="close"]
+[connection signal="unlock" from="CompletionCounter" to="Door" method="open"]
+
+[editable path="interior"]
+[editable path="AudioSubtitleSystem"]
--- a/scenes/levels/lvl_1.tscn
+++ b/scenes/levels/lvl_1.tscn
@@ -1,15 +1,8 @@
-[gd_scene load_steps=30 format=3 uid="uid://ckad8stc13n83"]
+[gd_scene load_steps=21 format=3 uid="uid://ckad8stc13n83"]

 [ext_resource type="PackedScene" uid="uid://ddwkhfly2xyyt" path="res://assets/models/interior.obj" id="1_xs30l"]
-[ext_resource type="Texture2D" uid="uid://bu7e43m8dswwk" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_col.png" id="2_afued"]
-[ext_resource type="Texture2D" uid="uid://dkggxcnlqd2rb" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_ao.png" id="3_4uy3l"]
-[ext_resource type="Texture2D" uid="uid://bsklw2r406fc7" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_metalness.png" id="4_vi1ta"]
-[ext_resource type="Texture2D" uid="uid://cet7gsgfgw1m2" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_nrm.png" id="5_sjo1j"]
-[ext_resource type="Texture2D" uid="uid://48js50w57wk4" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare_roughness.png" id="6_os40o"]
-[ext_resource type="Texture2D" uid="uid://c72iofq6gmfaa" path="res://assets/textures/material/tiles_white/tiles_white_color.png" id="7_gqmq7"]
-[ext_resource type="Texture2D" uid="uid://bs0qseslb0ilu" path="res://assets/textures/material/tiles_white/tiles_white_ambientocclusion.png" id="8_54t4l"]
-[ext_resource type="Texture2D" uid="uid://cpw4myruauqs6" path="res://assets/textures/material/tiles_white/tiles_white_normal.png" id="9_5dnm4"]
-[ext_resource type="Texture2D" uid="uid://uy7vdufb7mhc" path="res://assets/textures/material/tiles_white/tiles_white_roughness.png" id="10_208rc"]
+[ext_resource type="Material" uid="uid://1w6e5sx6poff" path="res://assets/textures/material/tilesslatesquare/tilesslatesquare.material" id="2_evxh1"]
+[ext_resource type="Material" uid="uid://c6rvbga7g5f4l" path="res://assets/textures/material/tiles_white/tiles_white.material" id="7_nrt8m"]
 [ext_resource type="PackedScene" uid="uid://gg5ph541e4p3" path="res://scenes/player.tscn" id="11_lls6p"]
 [ext_resource type="PackedScene" uid="uid://22blfybi6n4q" path="res://scenes/objects/completion_counter.tscn" id="12_vn8j0"]
 [ext_resource type="PackedScene" uid="uid://cy0x2nliyw8gw" path="res://scenes/objects/door.tscn" id="13_fhdru"]
@@ -22,29 +15,6 @@
 [ext_resource type="AudioStream" uid="uid://bji3bx3umohnw" path="res://assets/audio/voicelines/anouncer_intro_03.ogg" id="20_dqpxk"]
 [ext_resource type="AudioStream" uid="uid://ddpvabd43s3p4" path="res://assets/audio/voicelines/anouncer_intro_04.ogg" id="21_n11nj"]

-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dkjw0"]
-albedo_texture = ExtResource("2_afued")
-metallic = 1.0
-metallic_texture = ExtResource("4_vi1ta")
-roughness_texture = ExtResource("6_os40o")
-normal_enabled = true
-normal_texture = ExtResource("5_sjo1j")
-ao_enabled = true
-ao_texture = ExtResource("3_4uy3l")
-uv1_scale = Vector3(35, 35, 35)
-uv1_triplanar_sharpness = 0.148651
-uv1_world_triplanar = true
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cl8ik"]
-albedo_texture = ExtResource("7_gqmq7")
-roughness_texture = ExtResource("10_208rc")
-normal_enabled = true
-normal_scale = 1.5
-normal_texture = ExtResource("9_5dnm4")
-ao_enabled = true
-ao_texture = ExtResource("8_54t4l")
-uv1_scale = Vector3(8, 30, 8)
-
 [sub_resource type="BoxMesh" id="BoxMesh_wyr1d"]
 size = Vector3(4, 0.2, 5)

@@ -64,7 +34,7 @@ text = "Und willkommen zur Gehirn Test Simulation „Project Thought Experiment
 [sub_resource type="Resource" id="Resource_6wqks"]
 script = ExtResource("18_jxpoe")
 audio = ExtResource("20_dqpxk")
-text = "Falls Sie sich nicht erinnern: Sie haben uns, der „Neura-Förderkooperation“, Ihren gesamten Körper gespendet. "
+text = "Falls Sie sich nicht erinnern: Sie haben uns, der „Neura Advancement Cooperation“, Ihren gesamten Körper gespendet. "

 [sub_resource type="Resource" id="Resource_im7qv"]
 script = ExtResource("18_jxpoe")
@@ -83,19 +53,10 @@ sky_mode = 1
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)

 [node name="Hallway" parent="interior" index="0"]
-surface_material_override/0 = SubResource("StandardMaterial3D_dkjw0")
+surface_material_override/0 = ExtResource("2_evxh1")

-[node name="StaticBody3D" parent="interior/Hallway" index="0"]
-collision_layer = 7
-collision_mask = 7
-
-[node name="Cube" parent="interior" index="1"]
-surface_material_override/0 = SubResource("StandardMaterial3D_cl8ik")
-
-[node name="StaticBody3D" parent="interior/Cube" index="0"]
-collision_layer = 7
-collision_mask = 7
-collision_priority = 2000.0
+[node name="Room" parent="interior" index="1"]
+surface_material_override/0 = ExtResource("7_nrt8m")

 [node name="Player" parent="." instance=ExtResource("11_lls6p")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 5.23956)
@@ -105,7 +66,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0617981, 3.05379, 6.24098)
 nodes_needed = [NodePath("../ButtonStand2"), NodePath("../ButtonStand3")]

 [node name="Door" parent="." instance=ExtResource("13_fhdru")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1, 1.58488, 6.64)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0536218, 1.58488, 6.64)

 [node name="ButtonStand2" parent="." instance=ExtResource("14_mpdbg")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.03802, 0.7, 4)
@@ -115,33 +76,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.7, 0.0433838)

 [node name="Cube" parent="." instance=ExtResource("15_40os8")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, 0)
-collision_priority = 2.0

 [node name="Cube2" parent="." instance=ExtResource("15_40os8")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, 0)
-collision_priority = 2.0

 [node name="Cube3" parent="." instance=ExtResource("15_40os8")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, -2)
-collision_priority = 2.0
-
-[node name="Cube4" parent="." instance=ExtResource("15_40os8")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.51, -3.93867)
-collision_priority = 2.0
-
-[node name="Cube5" parent="." instance=ExtResource("15_40os8")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, -2)
-collision_priority = 2.0
-
-[node name="Cube6" parent="." instance=ExtResource("15_40os8")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.96977, 0.51, -2)
-collision_priority = 2.0
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.1968, 0.51, 0)

 [node name="DebugPlane" type="StaticBody3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.9, 3.9, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 3.9, 0)
+collision_layer = 7
+collision_mask = 7

 [node name="MeshInstance3D" type="MeshInstance3D" parent="DebugPlane"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0)
 mesh = SubResource("BoxMesh_wyr1d")

 [node name="CollisionShape3D" type="CollisionShape3D" parent="DebugPlane"]
--- a/scenes/objects/cube.tscn
+++ b/scenes/objects/cube.tscn
@@ -1,20 +1,27 @@
-[gd_scene load_steps=4 format=3 uid="uid://ced2w03t8er5k"]
+[gd_scene load_steps=6 format=3 uid="uid://ced2w03t8er5k"]

-[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_b2i4c"]
+[ext_resource type="ArrayMesh" uid="uid://cfftio4fgenlo" path="res://assets/models/cube.obj" id="1_xnjii"]
+[ext_resource type="Material" uid="uid://ltq25pr37xjg" path="res://assets/textures/material/crate/crate.material" id="2_26qic"]
+[ext_resource type="Material" uid="uid://ctadhqfpd0j5u" path="res://assets/textures/material/metal/metal.material" id="2_oyd3r"]
+
+[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_rff84"]
 rough = true
+bounce = 0.1
 absorbent = true

-[sub_resource type="BoxShape3D" id="BoxShape3D_flqji"]
-
-[sub_resource type="BoxMesh" id="BoxMesh_evnha"]
+[sub_resource type="BoxShape3D" id="BoxShape3D_bsmvc"]
+size = Vector3(1.1, 1.1, 1.1)

 [node name="Cube" type="RigidBody3D" groups=["pushables"]]
+collision_priority = 2.0
 mass = 1.5
-physics_material_override = SubResource("PhysicsMaterial_b2i4c")
+physics_material_override = SubResource("PhysicsMaterial_rff84")
 continuous_cd = true

-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("BoxShape3D_flqji")
-
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("BoxMesh_evnha")
+mesh = ExtResource("1_xnjii")
+surface_material_override/0 = ExtResource("2_oyd3r")
+surface_material_override/1 = ExtResource("2_26qic")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_bsmvc")
--- a/scenes/objects/door.tscn
+++ b/scenes/objects/door.tscn
@@ -52,6 +52,8 @@ script = ExtResource("1_qix0h")
 mesh = SubResource("BoxMesh_8iti4")

 [node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"]
+collision_layer = 3
+collision_mask = 3

 [node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"]
 shape = SubResource("BoxShape3D_pejvk")
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -6,7 +6,8 @@
 [ext_resource type="Shader" path="res://shaders/ddof.gdshader" id="2_rpqdy"]

 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2qx4s"]
-height = 1.9
+radius = 0.4
+height = 1.7

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_52bjo"]
 render_priority = 0
@@ -44,7 +45,7 @@ script = ExtResource("2_jg7te")
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 collision_mask = 2
 shape = SubResource("SeparationRayShape3D_fvhib")
-spring_length = 10.0
+spring_length = 2.5

 [node name="GravityGunGoal" type="Node3D" parent="Camera3D/SpringArm3D"]
 transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -8.1134e-07, 0, 9.28065)
@@ -54,7 +55,7 @@ target_position = Vector3(0, 0, -10)
 debug_shape_custom_color = Color(0, 0, 0, 0)

 [node name="AudioListener3D" type="AudioListener3D" parent="Camera3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0)

 [node name="GravityGunLayer" parent="." node_paths=PackedStringArray("player") instance=ExtResource("2_ahuce")]
 player = NodePath("..")