diff --git a/levels/prototype_scene.tscn b/levels/prototype_scene.tscn index 97932f5..c3dff7b 100644 --- a/levels/prototype_scene.tscn +++ b/levels/prototype_scene.tscn @@ -64,10 +64,10 @@ use_collision = true collision_mask = 9 [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.774414, 0, 1.8908081) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.774414, -16.123535, 1.8908081) material_override = ExtResource("5_bno23") use_collision = true -size = Vector3(126.25586, 1, 100.838135) +size = Vector3(126.25586, 33.24707, 100.838135) material = ExtResource("4_y6i55") [node name="CSGBox3D18" type="CSGBox3D" parent="CSGCombiner3D"] @@ -88,8 +88,25 @@ size = Vector3(4.0271816, 5.070587, 3.538221) material = ExtResource("5_bno23") [node name="CSGBox3D5" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 4.018885, 0.9641862) -size = Vector3(3.9233856, 7.2024536, 17.76538) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.558285, 4.018885, 10.9794445) +size = Vector3(3.9233856, 7.2024536, 37.7959) +material = ExtResource("5_bno23") + +[node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4021583, 3.7736359) +operation = 2 +size = Vector3(3.9233856, 4.9065094, 8.765167) +material = ExtResource("5_bno23") + +[node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.816613, 1.4951501, 14.911085) +size = Vector3(7.2811394, 2.1549835, 16.348633) +material = ExtResource("5_bno23") + +[node name="CSGBox3D9" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D6"] +transform = Transform3D(0.91243464, -0.40922245, 0, 0.40922245, 0.91243464, 0, 0, 0, 1, -2.315074, 0.8311236, 0) +operation = 2 +size = Vector3(7.1386776, 2.1549835, 16.348633) material = ExtResource("5_bno23") [node name="CSGBox3D25" type="CSGBox3D" parent="CSGCombiner3D"] @@ -97,73 +114,39 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4624505, 2.707026, -12.4306 size = Vector3(1.047142, 4.5787354, 9.918747) material = ExtResource("4_yx0ab") -[node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.707026, 24.290133) -size = Vector3(3.9233856, 4.5787354, 9.820068) -material = ExtResource("5_bno23") - -[node name="CSGBox3D23" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 3.8318734, 24.290133) -size = Vector3(3.9233856, 6.82843, 9.820068) -material = ExtResource("5_bno23") - [node name="CSGBox3D26" type="CSGBox3D" parent="CSGCombiner3D"] transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 18.061287, 5.907801, 25.213737) size = Vector3(3.9233856, 10.980286, 10.570801) material = ExtResource("5_bno23") [node name="CSGBox3D27" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 22.358187, 5.907801, 13.242789) -size = Vector3(3.9233856, 10.980286, 17.174194) +transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 26.334145, 5.907801, 23.006517) +size = Vector3(3.9233856, 10.980286, 33.98561) material = ExtResource("5_bno23") -[node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 30.807379, 5.907801, 33.162186) -size = Vector3(3.9233856, 10.980286, 9.805786) +[node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D27"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.9558008, -2.7094269, -1.7904329) +operation = 2 +size = Vector3(7.4409294, 5.561432, 8.996315) material = ExtResource("5_bno23") [node name="CSGBox3D10" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8908911, 11.176111, 39.495316) -size = Vector3(101.37683, 21.516907, 5.6578064) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8908911, 11.176111, -1.6231918) +size = Vector3(101.37683, 21.516907, 87.89482) material = ExtResource("6_8bje3") -[node name="CSGBox3D11" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 50.289783, 11.067961, 1.4346962) -size = Vector3(85.006775, 21.300598, 5.6578064) +[node name="CSGBox3D11" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D10"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.527359, -3.7662811, 0.11615372) +operation = 2 +size = Vector3(92.75583, 29.049469, 78.20011) material = ExtResource("6_8bje3") -[node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 2.2212105, 11.069246, -43.06659) -material_override = ExtResource("9_ysk2e") -size = Vector3(101.37683, 21.303177, 5.6578064) +[node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D10"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.466297, 8.756718, 19.084272) +operation = 2 +size = Vector3(53.52636, 29.049469, 61.62032) material = ExtResource("6_8bje3") -[node name="CSGBox3D13" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -46.17769, 2.7070298, -5.005974) -size = Vector3(85.006775, 4.5787354, 5.6578064) -material = ExtResource("6_8bje3") - -[node name="CSGBox3D15" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.8660254, 0, -0.5, 0, 1, 0, 0.5, 0, 0.8660254, -32.975563, 17.84463, 39.652107) -size = Vector3(41.872528, 34.853943, 27.1624) -material = ExtResource("6_8bje3") - -[node name="CSGBox3D8" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.613397, 14.892656) -size = Vector3(3.9233856, 4.391477, 14.298218) -material = ExtResource("5_bno23") - -[node name="CSGBox3D9" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.855904, 1.8220601, 14.801653) -size = Vector3(3.9233856, 2.8088036, 14.480225) -material = ExtResource("5_bno23") - -[node name="CSGPolygon3D" type="CSGPolygon3D" parent="CSGCombiner3D/CSGBox3D9"] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -3.3341227, 0, -7.254325) -polygon = PackedVector2Array(-1.3562565, -1.5799096, -1.3376074, 1.3967638, 3.4623585, -1.4471698) -depth = 14.19 -material = ExtResource("5_bno23") - [node name="CSGBox3D16" type="CSGBox3D" parent="CSGCombiner3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.345552, 11.806246, -24.122513) size = Vector3(41.466846, 22.777176, 35.36573) @@ -222,8 +205,8 @@ size = Vector3(27.032001, 1.3384781, 6.2376566) material = ExtResource("7_8bje3") [node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.225314, 11.40127, -0.67839193) -size = Vector3(22.55111, 21.967224, 14.480225) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.225314, 11.40127, 6.9663224) +size = Vector3(22.55111, 21.967224, 29.769653) material = ExtResource("5_bno23") [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"] @@ -232,19 +215,20 @@ operation = 2 size = Vector3(10.669815, 4.566284, 3.4625244) material = ExtResource("7_8bje3") -[node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"] -transform = Transform3D(0.9337244, 0, 0.35799336, 0, 1, 0, -0.35799336, 0, 0.9337244, 2.7047615, -9.61813, -0.02129364) +[node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"] +transform = Transform3D(0.7501458, 0, -0.6612725, 0, 1, 0, 0.6612725, 0, 0.7501458, -11.704424, 0.31690216, 13.1721115) operation = 2 -size = Vector3(20.339264, 4.566284, 3.4625244) -material = ExtResource("7_8bje3") - -[node name="CSGBox3D7" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.7781335, 0, 0.62809885, 0, 1, 0, -0.62809885, 0, 0.7781335, 11.133803, 11.382593, 6.4941206) -size = Vector3(17.700146, 21.92987, 14.480225) +size = Vector3(40.650864, 24.43634, 14.330154) material = ExtResource("5_bno23") -[node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D7"] -transform = Transform3D(0.95141774, 0, -0.3079045, 0, 1, 0, 0.3079045, 0, 0.95141774, 6.694298, -9.599453, -3.8414078) +[node name="CSGBox3D4" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"] +transform = Transform3D(0.7731101, 0, 0.6342719, 0, 1, 0, -0.6342719, 0, 0.7731101, 9.996494, 0.31690216, 9.775394) +operation = 2 +size = Vector3(40.650864, 24.43634, 14.330154) +material = ExtResource("5_bno23") + +[node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"] +transform = Transform3D(0.9337244, 0, 0.35799336, 0, 1, 0, -0.35799336, 0, 0.9337244, 2.7047615, -9.61813, -0.02129364) operation = 2 size = Vector3(20.339264, 4.566284, 3.4625244) material = ExtResource("7_8bje3") @@ -265,7 +249,7 @@ script = ExtResource("4_pi0y7") spawn_radius = 10.0 [node name="AttackSpawn" type="Marker3D" parent="PlayersContainer"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.595993, 0.5180037, 1.4365778) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.553003, 0.5180037, 20.371899) script = ExtResource("4_pi0y7") team = 1 spawn_radius = 5.0 @@ -290,7 +274,7 @@ spawn_path = NodePath("..") script = ExtResource("6_oujx2") [node name="Bomb" type="Node3D" parent="DynamicObjectsContainer"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.858309, 4.6431036, 12.873563) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.858309, 1.4657042, 12.873563) script = ExtResource("6_61ure") item = ExtResource("6_bno23") diff --git a/scripts/player/player_camera.gd b/scripts/player/player_camera.gd index b25d594..c17e237 100644 --- a/scripts/player/player_camera.gd +++ b/scripts/player/player_camera.gd @@ -2,7 +2,7 @@ extends Camera3D class_name PlayerCamera -@export var SENSITIVITY = 0.02 +@export var SENSITIVITY = 0.005 var vertical_compensation : float