Compare commits

..

9 commits

Author SHA1 Message Date
dcb0401738 Light fixes in entry room 2025-01-01 16:24:21 -05:00
b1d6905eb4 Updates n things 2025-01-01 16:12:37 -05:00
7321f63928 Player collision, asset update 2024-12-29 21:33:01 -05:00
944ea8b43e Door sizes 2024-12-24 13:41:13 -05:00
40aa7abcda Fixed hole texture 2024-12-24 13:10:28 -05:00
1f99318a18 Too damn loud 2024-12-24 12:57:31 -05:00
3c8a0cf1bd Fixed zombie sounds 2024-12-24 12:54:35 -05:00
a1ce9390e8 Monitor 2024-12-24 12:51:57 -05:00
d2782dea7e Fixed import compression settings 2024-12-24 12:45:47 -05:00
8 changed files with 170 additions and 84 deletions

2
assets

@ -1 +1 @@
Subproject commit 83b4c3fd951600bca5ead23a28995348ba3d1a53 Subproject commit 30aec9cd7152c0967fca91347485589202ade0e0

View file

@ -21,6 +21,12 @@ players=""
monitors="" monitors=""
can_hold="" can_hold=""
[importer_defaults]
texture={
"compress/mode": 3
}
[input] [input]
move_forward={ move_forward={

110
scenes/level2.tscn Normal file
View file

@ -0,0 +1,110 @@
[gd_scene load_steps=7 format=3 uid="uid://w8rrrxh4xjcv"]
[ext_resource type="Texture2D" uid="uid://w1hmclcq4w5h" path="res://assets/textures/dev/tiles01_orange.png" id="1_sjkrg"]
[ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_hh0hj"]
[ext_resource type="PackedScene" uid="uid://bfv04lp2tbxtd" path="res://scenes/monitor.tscn" id="3_pxt4l"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pg356"]
albedo_texture = ExtResource("1_sjkrg")
uv1_scale = Vector3(32, 32, 32)
[sub_resource type="BoxShape3D" id="BoxShape3D_103ki"]
size = Vector3(6.39343, 0.369629, 3.91266)
[sub_resource type="BoxShape3D" id="BoxShape3D_pnjbj"]
size = Vector3(0.1, 0.1, 0.1)
[node name="Node3D" type="Node3D"]
[node name="CSGBox3D" type="CSGBox3D" parent="."]
material_override = SubResource("StandardMaterial3D_pg356")
use_collision = true
size = Vector3(50, 1, 50)
[node name="Player" parent="." instance=ExtResource("2_hh0hj")]
transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, -22, 0.5, -22)
[node name="Lights" type="Node3D" parent="."]
[node name="OmniLight3D" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14, 0)
light_energy = 6.755
omni_range = 53.419
[node name="OmniLight3D2" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 14, 15)
light_energy = 6.755
omni_range = 53.419
[node name="OmniLight3D3" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 14, 15)
light_energy = 6.755
omni_range = 53.419
[node name="OmniLight3D4" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 14, -15)
light_energy = 6.755
omni_range = 53.419
[node name="OmniLight3D5" type="OmniLight3D" parent="Lights"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 14, -15)
light_energy = 6.755
omni_range = 53.419
[node name="Monitor" parent="." instance=ExtResource("3_pxt4l")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.616, 0.875, -21.4655)
[node name="Monitor2" parent="." instance=ExtResource("3_pxt4l")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5726, 0.875, -21.4655)
[node name="Monitor3" parent="." instance=ExtResource("3_pxt4l")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.68112, 0.875, -21.4655)
[node name="CSGBox3D2" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.731, 1.29547, -21.3074)
use_collision = true
size = Vector3(1, 1.59094, 6.75977)
[node name="CSGBox3D3" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.874, 1.65709, -21.3074)
use_collision = true
size = Vector3(1, 2.31418, 6.75977)
[node name="CSGBox3D4" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.54875, 2.21061, -21.3074)
use_collision = true
size = Vector3(1, 3.42122, 6.75977)
[node name="Node3D" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.04909, 2.31377, -21.3169)
[node name="RigidBody3D" type="RigidBody3D" parent="Node3D"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/RigidBody3D"]
shape = SubResource("BoxShape3D_103ki")
[node name="CSGBox3D5" type="CSGBox3D" parent="Node3D/RigidBody3D/CollisionShape3D"]
size = Vector3(6.39343, 0.369629, 3.91266)
[node name="CSGBox3D6" type="CSGBox3D" parent="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.250772, -0.705801, 2.23987)
use_collision = true
size = Vector3(0.586426, 2.21594, 0.437988)
[node name="CSGBox3D7" type="CSGBox3D" parent="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.250772, -0.705801, -2.36084)
use_collision = true
size = Vector3(0.586426, 2.21594, 0.437988)
[node name="Generic6DOFJoint3D" type="Generic6DOFJoint3D" parent="Node3D"]
node_a = NodePath("../RigidBody3D")
node_b = NodePath("../StaticBody3D")
angular_limit_z/upper_angle = 0.198968
angular_limit_z/lower_angle = -0.159698
angular_motor_z/target_velocity = 0.0872665
[node name="StaticBody3D" type="StaticBody3D" parent="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.03115)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/StaticBody3D"]
shape = SubResource("BoxShape3D_pnjbj")

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=28 format=4 uid="uid://bbqug1s083mdi"] [gd_scene load_steps=27 format=3 uid="uid://bbqug1s083mdi"]
[ext_resource type="PackedScene" uid="uid://ci2uamlnv8swy" path="res://assets/maps/levelpool.blend" id="1_cpckw"] [ext_resource type="PackedScene" uid="uid://ci2uamlnv8swy" path="res://assets/maps/levelpool.blend" id="1_cpckw"]
[ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_eggmh"] [ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_eggmh"]
@ -7,58 +7,21 @@
[ext_resource type="AudioStream" uid="uid://cieprqff0h2nm" path="res://assets/sounds/door.wav" id="5_yad6d"] [ext_resource type="AudioStream" uid="uid://cieprqff0h2nm" path="res://assets/sounds/door.wav" id="5_yad6d"]
[ext_resource type="PackedScene" uid="uid://dnq81gfo5y4oy" path="res://components/group_trigger_component.tscn" id="6_f2del"] [ext_resource type="PackedScene" uid="uid://dnq81gfo5y4oy" path="res://components/group_trigger_component.tscn" id="6_f2del"]
[ext_resource type="Script" path="res://scripts/win_box.gd" id="7_oxf41"] [ext_resource type="Script" path="res://scripts/win_box.gd" id="7_oxf41"]
[ext_resource type="AudioStream" uid="uid://d20ver6nfndbt" path="res://assets/sounds/dialog/start_dialog.wav" id="7_r1xli"]
[ext_resource type="Script" path="res://scripts/failure.gd" id="8_pee3c"] [ext_resource type="Script" path="res://scripts/failure.gd" id="8_pee3c"]
[ext_resource type="AudioStream" uid="uid://dbw14jkekqjrb" path="res://assets/sounds/dialog/win_dialog.wav" id="8_u6ajb"] [ext_resource type="Script" path="res://scripts/kreb.gd" id="9_wgbkn"]
[ext_resource type="Script" path="res://scenes/kreb.gd" id="9_wgbkn"] [ext_resource type="AudioStream" uid="uid://4ju4ca5wak7v" path="res://assets/sounds/dialog/kerbygreet.wav" id="10_ee2e2"]
[ext_resource type="AudioStream" uid="uid://cojpnupcedga" path="res://assets/sounds/dialog/kerbywhatare.wav" id="11_nnjei"]
[ext_resource type="AudioStream" uid="uid://w7jbmkwjvtvx" path="res://assets/sounds/disappoint.wav" id="11_yx3n7"] [ext_resource type="AudioStream" uid="uid://w7jbmkwjvtvx" path="res://assets/sounds/disappoint.wav" id="11_yx3n7"]
[ext_resource type="PackedScene" uid="uid://duuedavsf44c7" path="res://assets/models/general/monitor01.blend" id="12_nw67b"] [ext_resource type="PackedScene" uid="uid://duuedavsf44c7" path="res://assets/models/general/monitor01.blend" id="12_nw67b"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_soh1s"]
resource_name = "tiles01_black"
cull_mode = 2
albedo_texture = ExtResource("4_ngwgs")
[sub_resource type="ArrayMesh" id="ArrayMesh_86pmw"]
_surfaces = [{
"aabb": AABB(3.69908, -2, -6.30092, 2.60184, 0.5, 2.60184),
"format": 34896613377,
"index_count": 96,
"index_data": PackedByteArray("AgAHAAYAAgADAAcAAAAHAAQAAAADAAcAAAAFAAQAAAABAAUAAQAGAAUAAQACAAYACQAPAAsACQANAA8ACgAPAAsACgAOAA8ACgAMAAgACgAOAAwACAANAAkACAAMAA0ABwANAAYABwAPAA0ABwAOAAQABwAPAA4AAgALAAMAAgAJAAsAAAALAAMAAAAKAAsABQAOAAQABQAMAA4ABgAMAAUABgANAAwAAAAIAAEAAAAKAAgAAQAJAAIAAQAIAAkA"),
"name": "tiles01_black",
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 16,
"vertex_data": PackedByteArray("Y+IAAGPiAACbHQAAY+IAAJsdAACbHQAAY+IAAJsdAAD//wAA//8AAAAAAAD//wAAAAAAAAAAAAD//wAAAAAAAJsd//9j4gAAmx3//5sdAABj4v//Y+IAAGPi//+bHQAAAAD/////AAAAAP//AAAAAP///////wAA/////wAAAAA=")
}]
blend_shape_mode = 0
[sub_resource type="ArrayMesh" id="ArrayMesh_4vkxm"]
resource_name = "levelpool_Cube_004"
_surfaces = [{
"aabb": AABB(3.69908, -2, -6.30092, 2.60184, 0.5, 2.60184),
"attribute_data": PackedByteArray("meXQo5nlmeWZ5ZnlLDbQoyw20KMsNpnlLDbQoyw20KMsNiw2meXQo5nl0KOZ5Sw2meUsNpnl0KP//9Cj///////////HG9CjxxvQo8cb///HG9CjxxvQo8cbxxv//9Cj///Qo///xxv//8cb///Qoyw29XcsNpnlLDb1dyw29XcsNiw2meX1d5nl9XeZ5ZnlmeWZ5Sw29XeZ5fV3meUsNpnlLDaZ5fV3xxv1d8cb///HG/V3xxv1d8cbxxv///V3///1d///////////xxv1d///9Xf//8cb///HG///9Xc="),
"format": 34896613399,
"index_count": 96,
"index_data": PackedByteArray("CAAaABYACAAMABoAAQAZAA8AAQALABkAAgATABAAAgAFABMABQAWABMABQAIABYAIAA1ACcAIAAuADUAJAA2ACgAJAAyADYAIwArAB0AIwAxACsAHQAuACAAHQArAC4AGAAtABUAGAA0AC0AGwAzABEAGwA3ADMABwAmAAoABwAfACYAAwApAA0AAwAlACkAEgAwAA4AEgAqADAAFwAsABQAFwAvACwAAAAcAAQAAAAiABwABgAhAAkABgAeACEA"),
"material": SubResource("StandardMaterial3D_soh1s"),
"name": "tiles01_black",
"primitive": 3,
"uv_scale": Vector4(9.21532, 9.21532, 0, 0),
"vertex_count": 56,
"vertex_data": PackedByteArray("Y+IAAGPiAABj4gAAY+L/v2PiAABj4v8/Y+IAAGPi/7+bHQAAY+IAAJsdAABj4v8/mx0AAGPi/7+bHQAAmx0AgJsdAACbHf8/mx0AAJsd/79j4gAAmx0AgGPiAACbHf+/Y+IAAJsd/z9j4gAAmx3/v///AAD//wCA//8AAP///7///wAA////P///AAD//wAAAAAAAP//AIAAAAAA////PwAAAAD//wAAAAAAAAAAAAAAAAAAAAD/PwAAAAAAAAAA//8AAAAAAAD//wAAAAD/v///AAAAAP8///8AAAAAAACbHf//Y+IAAJsd//9j4v+/mx3//2Pi/7+bHf//mx0AgJsd//+bHf+/mx3//5sd/79j4v//Y+IAAGPi//9j4v+/Y+L//2Pi/z9j4v//Y+L/v2Pi//+bHQCAY+L//5sd/79j4v//mx3/P2Pi//+bHf+/AAD/////AIAAAP//////vwAA/////wAAAAD//wAAAAAAAP//AAD/vwAA//8AAAAA////////AID/////////v/////////8/////////AAD/////AAAAAP////8AAP+//////wAA/z//////AAAAAP///3////9/AAD/f/9/AAD///9/AAD/f/9/AAD/f///AAD/f/9/AAD/f///////fwAA/3//fwAA/3///////38AAP9//z//f/9///8AAP9//z//f////38AAP9//z//f////3////9/AAD/f/8//3////9/////f/9/AAD/f///////f/9/AAD///9/////fwAA/3//fwAA/3///////38AAP9//38AAP9///////9//z//f////3////9//z//f/9///////9/AAD/f/8//3////9/////fwAA/3//P/9/")
}]
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_86pmw")
[sub_resource type="BoxShape3D" id="BoxShape3D_yaaik"] [sub_resource type="BoxShape3D" id="BoxShape3D_yaaik"]
size = Vector3(4, 5, 1) size = Vector3(4, 4, 0.6)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gs8og"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gs8og"]
albedo_texture = ExtResource("4_ngwgs") albedo_texture = ExtResource("4_ngwgs")
[sub_resource type="BoxMesh" id="BoxMesh_ytxur"] [sub_resource type="BoxMesh" id="BoxMesh_ytxur"]
size = Vector3(4, 5, 1) size = Vector3(4, 4, 0.6)
[sub_resource type="Animation" id="Animation_lexij"] [sub_resource type="Animation" id="Animation_lexij"]
resource_name = "open" resource_name = "open"
@ -98,6 +61,12 @@ viewport_path = NodePath("Kreb/CSGMesh3D/Sprite3D/SubViewport")
font_size = 20 font_size = 20
font_color = Color(0.396889, 0.396889, 0.396889, 1) font_color = Color(0.396889, 0.396889, 0.396889, 1)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_aa4aa"]
points = PackedVector3Array(-0.3, -0.208738, -0.27433, -0.275039, -0.358724, -0.27433, -0.3, -0.208738, -0.174369, -0.3, 0.391276, -0.27433, 0.27498, -0.358724, -0.27433, -0.275039, -0.358724, 0.32567, -0.3, 0.391276, -0.174369, 0.3, 0.391276, -0.27433, 0.27498, -0.358724, 0.32567, 0.3, -0.208738, -0.27433, -0.275039, -0.283768, 0.32567, -0.200039, 0.291213, 0.32567, 0.3, 0.391276, -0.174369, 0.3, -0.208738, -0.174369, 0.27498, -0.283768, 0.32567, 0.19998, 0.291213, 0.32567)
[sub_resource type="Environment" id="Environment_alnls"]
background_mode = 1
[node name="LevelPool" type="Node3D"] [node name="LevelPool" type="Node3D"]
[node name="OmniLight3D" type="OmniLight3D" parent="."] [node name="OmniLight3D" type="OmniLight3D" parent="."]
@ -109,29 +78,28 @@ omni_range = 162.191
[node name="levelpool" parent="." instance=ExtResource("1_cpckw")] [node name="levelpool" parent="." instance=ExtResource("1_cpckw")]
[node name="Light" parent="levelpool" index="1"] [node name="player" parent="levelpool" index="1"]
visible = false visible = false
light_energy = 9.0
[node name="Text" parent="levelpool" index="6"]
visible = false
[node name="Plane" parent="levelpool" index="7"]
visible = false
[node name="thomas_dumb_ass_light" parent="levelpool" index="23"]
light_size = 0.667
shadow_enabled = true shadow_enabled = true
omni_range = 34.554
[node name="player" parent="levelpool" index="2"] [node name="thomas_dumb_ass_light_001" parent="levelpool" index="24"]
visible = false light_size = 0.667
shadow_enabled = true
[node name="holerim" parent="levelpool" index="4"]
mesh = SubResource("ArrayMesh_4vkxm")
[node name="Text" parent="levelpool" index="8"]
visible = false
[node name="Plane" parent="levelpool" index="9"]
visible = false
[node name="Player" parent="." instance=ExtResource("2_eggmh")] [node name="Player" parent="." instance=ExtResource("2_eggmh")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.012538, 19) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.17559, 0.012538, 22.4323)
[node name="EntranceDoor" parent="." instance=ExtResource("3_clecd")] [node name="EntranceDoor" parent="." instance=ExtResource("3_clecd")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, 11.5) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 11.5)
open_sound = ExtResource("5_yad6d") open_sound = ExtResource("5_yad6d")
close_sound = ExtResource("5_yad6d") close_sound = ExtResource("5_yad6d")
@ -148,7 +116,7 @@ libraries = {
} }
[node name="ExitDoor" parent="." instance=ExtResource("3_clecd")] [node name="ExitDoor" parent="." instance=ExtResource("3_clecd")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -11.5) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -11.5)
interactable = false interactable = false
open_sound = ExtResource("5_yad6d") open_sound = ExtResource("5_yad6d")
close_sound = ExtResource("5_yad6d") close_sound = ExtResource("5_yad6d")
@ -198,10 +166,12 @@ transform = Transform3D(0.797584, 0, 0.603208, 0, 1, 0, -0.603208, 0, 0.797584,
script = ExtResource("9_wgbkn") script = ExtResource("9_wgbkn")
[node name="StartDialog" type="AudioStreamPlayer3D" parent="Kreb"] [node name="StartDialog" type="AudioStreamPlayer3D" parent="Kreb"]
stream = ExtResource("7_r1xli") stream = ExtResource("10_ee2e2")
volume_db = -15.0
[node name="WinDialog" type="AudioStreamPlayer3D" parent="Kreb"] [node name="WinDialog" type="AudioStreamPlayer3D" parent="Kreb"]
stream = ExtResource("8_u6ajb") stream = ExtResource("11_nnjei")
volume_db = -15.0
[node name="Disappoint" type="AudioStreamPlayer3D" parent="Kreb"] [node name="Disappoint" type="AudioStreamPlayer3D" parent="Kreb"]
stream = ExtResource("11_yx3n7") stream = ExtResource("11_yx3n7")
@ -236,10 +206,18 @@ grow_vertical = 2
text = "Krebathan" text = "Krebathan"
label_settings = SubResource("LabelSettings_7t61y") label_settings = SubResource("LabelSettings_7t61y")
[node name="monitor01" parent="." instance=ExtResource("12_nw67b")] [node name="RigidBody3D" type="RigidBody3D" parent="." groups=["can_hold", "monitors"]]
transform = Transform3D(-0.609108, 0, -0.793088, 0, 1, 0, 0.793088, 0, -0.609108, -4.52265, 0, -3.89963) transform = Transform3D(-0.609108, 0, -0.793087, 0, 1, 0, 0.793087, 0, -0.609108, -4.50229, 0.379934, -3.88399)
[node name="monitor01_rigid" parent="monitor01" index="0" groups=["can_hold", "monitors"]] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000276208, -0.0256701)
shape = SubResource("ConvexPolygonShape3D_aa4aa")
[node name="monitor01" parent="RigidBody3D/CollisionShape3D" instance=ExtResource("12_nw67b")]
transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, 0, -0.358724, 0.0256701)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_alnls")
[connection signal="body_entered" from="WinBox" to="WinBox" method="_on_body_entered"] [connection signal="body_entered" from="WinBox" to="WinBox" method="_on_body_entered"]
[connection signal="body_entered" from="Failure" to="Failure" method="_on_body_entered"] [connection signal="body_entered" from="Failure" to="Failure" method="_on_body_entered"]
@ -247,4 +225,3 @@ transform = Transform3D(-0.609108, 0, -0.793088, 0, 1, 0, 0.793088, 0, -0.609108
[connection signal="finished" from="Kreb/WinDialog" to="ExitDoor" method="open"] [connection signal="finished" from="Kreb/WinDialog" to="ExitDoor" method="open"]
[editable path="levelpool"] [editable path="levelpool"]
[editable path="monitor01"]

View file

@ -1,26 +1,17 @@
[gd_scene load_steps=4 format=3 uid="uid://bfv04lp2tbxtd"] [gd_scene load_steps=3 format=3 uid="uid://bfv04lp2tbxtd"]
[ext_resource type="PackedScene" uid="uid://duuedavsf44c7" path="res://assets/models/general/monitor01.blend" id="1_6l6n4"] [ext_resource type="PackedScene" uid="uid://duuedavsf44c7" path="res://assets/models/general/monitor01.blend" id="1_6l6n4"]
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_tfpjr"] [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_10f2x"]
points = PackedVector3Array(-12, 6.00235, -12, -11.0016, 0, -12, -12, 6.00235, -7.99922, -12, 30, -12, -11.0016, 0, 12, 10.9992, 0, -12, -12, 30, -7.99922, 12, 30, -12, 10.9992, 0, 12, -11.0016, 3.00117, 12, 12, 6.00235, -12, 12, 30, -7.99922, -8.00157, 25.9975, 12, 10.9992, 3.00117, 12, 12, 6.00235, -7.99922, 7.99922, 25.9975, 12) points = PackedVector3Array(-0.3, -0.208738, -0.27433, -0.275039, -0.358724, -0.27433, -0.3, -0.208738, -0.174369, -0.3, 0.391276, -0.27433, 0.27498, -0.358724, -0.27433, -0.275039, -0.358724, 0.32567, -0.3, 0.391276, -0.174369, 0.3, 0.391276, -0.27433, 0.27498, -0.358724, 0.32567, 0.3, -0.208738, -0.27433, -0.275039, -0.283768, 0.32567, -0.200039, 0.291213, 0.32567, 0.3, 0.391276, -0.174369, 0.3, -0.208738, -0.174369, 0.27498, -0.283768, 0.32567, 0.19998, 0.291213, 0.32567)
[sub_resource type="BoxShape3D" id="BoxShape3D_wfrja"]
size = Vector3(0.6, 0.75, 0.6)
[node name="Monitor" type="RigidBody3D" groups=["can_hold", "monitors"]] [node name="Monitor" type="RigidBody3D" groups=["can_hold", "monitors"]]
[node name="monitor012" parent="." instance=ExtResource("1_6l6n4")] [node name="monitor012" parent="." instance=ExtResource("1_6l6n4")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.375, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.375, 0)
[node name="@StaticBody3D@17265" parent="monitor012" index="1"] [node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
visible = false transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0162762, -0.0256701)
shape = SubResource("ConvexPolygonShape3D_10f2x")
[node name="CollisionShape3D" parent="monitor012/@StaticBody3D@17265" index="0"]
shape = SubResource("ConvexPolygonShape3D_tfpjr")
disabled = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="." groups=["can_hold"]]
shape = SubResource("BoxShape3D_wfrja")
[editable path="monitor012"] [editable path="monitor012"]

View file

@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://scripts/player.gd" id="1_ocinr"] [ext_resource type="Script" path="res://scripts/player.gd" id="1_ocinr"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ljkaw"] [sub_resource type="BoxShape3D" id="BoxShape3D_ed1e8"]
size = Vector3(1, 2, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_muavk"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_muavk"]
@ -11,7 +12,7 @@ script = ExtResource("1_ocinr")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_ljkaw") shape = SubResource("BoxShape3D_ed1e8")
[node name="CSGMesh3D" type="CSGMesh3D" parent="."] [node name="CSGMesh3D" type="CSGMesh3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)

View file

@ -50,6 +50,7 @@ func _process(_delta):
func _physics_process(delta): func _physics_process(delta):
_collider.global_basis = Basis.from_euler(Vector3.ZERO)
# Shamelessly stolen code from quake :) # Shamelessly stolen code from quake :)
var fmove = 0.0 var fmove = 0.0