Merge branch 'main' of codeberg.org:code-your-friends/gmtk2022

1 files changed, 25 insertions, 123 deletions

diff --git a/godot/scenes/levels/level2/level2.tscn b/godot/scenes/levels/level2/level2.tscn
index 55f1cfb..3878582 100644
--- a/godot/scenes/levels/level2/level2.tscn
+++ b/godot/scenes/levels/level2/level2.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://assets/game_objects/lightBack.material" type="Material" id=1]
 [ext_resource path="res://assets/game_objects/level2_track.glb" type="PackedScene" id=2]
 [ext_resource path="res://assets/game_objects/level2_BG.glb" type="PackedScene" id=3]
-[ext_resource path="res://assets/game_objects/window(Clone).material" type="Material" id=4]
-[ext_resource path="res://assets/game_objects/beamTurret.glb" type="PackedScene" id=5]
+[ext_resource path="res://assets/game_objects/plastic(Clone).material" type="Material" id=4]
 [ext_resource path="res://scenes/levels/GoalTriggerZone.tscn" type="PackedScene" id=6]
 [ext_resource path="res://scenes/objects/GroundCollision.tscn" type="PackedScene" id=7]
 
@@ -15,11 +14,10 @@ data = PoolVector3Array( 3.5, -1.3, 6.5001, 3.5, -1.5, 6.5001, 2.5, -1.5, 6.5001
 
 [sub_resource type="BoxShape" id=3]
 
-[sub_resource type="BoxShape" id=4]
+[sub_resource type="CubeMesh" id=4]
 
-[sub_resource type="CylinderMesh" id=5]
-
-[sub_resource type="BoxShape" id=6]
+[sub_resource type="ConvexPolygonShape" id=5]
+points = PoolVector3Array( -1, -1, -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, 1, -1, -1, -1, -1, 1, -1, 1, -1 )
 
 [node name="Spatial" type="Spatial"]
 
@@ -112,10 +110,6 @@ shape = SubResource( 3 )
 transform = Transform( 0.0478391, 0, 1.55158e-07, 0, 0.733724, 0, 1.9345e-09, 0, 0.515799, -0.451192, 0.108815, 0.251795 )
 shape = SubResource( 3 )
 
-[node name="CollisionShape23" type="CollisionShape" parent="Spatial/BoundingCage"]
-transform = Transform( 0.0478391, 0, 1.55158e-07, 0, 0.733724, 0, 1.9345e-09, 0, 0.515799, -0.504079, 2.72784, 0.25628 )
-shape = SubResource( 3 )
-
 [node name="CollisionShape7" type="CollisionShape" parent="Spatial/BoundingCage"]
 transform = Transform( -5.35562e-10, 0, 1.0269, 0, 2.86765, 0, -0.0478391, 0, -1.75264e-07, -0.476107, -0.159291, -2.18351 )
 shape = SubResource( 3 )
@@ -136,140 +130,34 @@ shape = SubResource( 3 )
 transform = Transform( -1.33423e-09, 0, 2.5583, 0, 2.68919, 0, -0.0478391, 0, -1.75264e-07, -0.0593648, 0.013909, 0.721579 )
 shape = SubResource( 3 )
 
-[node name="StaticBody turret" type="StaticBody" parent="Spatial"]
-transform = Transform( -1, 0, 4.37114e-08, 0, 1, 0, -4.37114e-08, 0, -1, -0.505752, 0.836223, -0.14281 )
-
-[node name="beamTurret" parent="Spatial/StaticBody turret" instance=ExtResource( 5 )]
-transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/StaticBody turret"]
-transform = Transform( 0.0499999, 0, 0, 0, 0.308197, 0, 0, 0, 0.0494507, 0, 0.300292, 0 )
-shape = SubResource( 4 )
-
-[node name="StaticBody turret2" type="StaticBody" parent="Spatial"]
-transform = Transform( 1, 0, -4.37114e-08, 0, 1, 0, 4.37114e-08, 0, 1, -0.504464, 0.836223, 0.667344 )
-
-[node name="beamTurret" parent="Spatial/StaticBody turret2" instance=ExtResource( 5 )]
-transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/StaticBody turret2"]
-transform = Transform( 0.0499999, 0, 0, 0, 0.308197, 0, 0, 0, 0.0494507, 0, 0.300292, 0 )
-shape = SubResource( 4 )
-
-[node name="Beams1" type="StaticBody" parent="Spatial"]
-transform = Transform( -2.0189e-08, -1.30573e-17, -0.015, -5.58794e-09, 0.015, 0, 0.461869, 2.98715e-10, -6.55671e-10, -0.504745, 1.38407, 0.261908 )
-collision_layer = 2
-collision_mask = 3
-
-[node name="MeshInstance" type="MeshInstance" parent="Spatial/Beams1"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, 0, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/Beams1"]
-transform = Transform( -9.11831e-08, 0.8, 0, -19.6137, -2.49121e-06, 0, 0, 0, 0.8, 0, -17.0625, 0 )
-shape = SubResource( 6 )
-
-[node name="MeshInstance2" type="MeshInstance" parent="Spatial/Beams1"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -6.61217, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance3" type="MeshInstance" parent="Spatial/Beams1"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -13.2652, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance4" type="MeshInstance" parent="Spatial/Beams1"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -19.9824, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance5" type="MeshInstance" parent="Spatial/Beams1"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -26.6277, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="StaticBody turret3" type="StaticBody" parent="Spatial"]
-transform = Transform( -1, 0, 4.37114e-08, 0, 1, 0, -4.37114e-08, 0, -1, -0.505752, 1.39012, -0.14281 )
-
-[node name="beamTurret" parent="Spatial/StaticBody turret3" instance=ExtResource( 5 )]
-transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/StaticBody turret3"]
-transform = Transform( 0.0499999, 0, 0, 0, 0.308197, 0, 0, 0, 0.0494507, 0, 0.300292, 0 )
-shape = SubResource( 4 )
-
-[node name="StaticBody turret4" type="StaticBody" parent="Spatial"]
-transform = Transform( 1, 0, -4.37114e-08, 0, 1, 0, 4.37114e-08, 0, 1, -0.504464, 1.39012, 0.667344 )
-
-[node name="beamTurret" parent="Spatial/StaticBody turret4" instance=ExtResource( 5 )]
-transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/StaticBody turret4"]
-transform = Transform( 0.0499999, 0, 0, 0, 0.308197, 0, 0, 0, 0.0494507, 0, 0.300292, 0 )
-shape = SubResource( 4 )
-
-[node name="Beams2" type="StaticBody" parent="Spatial"]
-transform = Transform( -2.0189e-08, -1.30573e-17, -0.015, -5.58794e-09, 0.015, 0, 0.461869, 2.98715e-10, -6.55671e-10, -0.504745, 1.93797, 0.261908 )
-collision_layer = 2
-collision_mask = 3
-
-[node name="MeshInstance" type="MeshInstance" parent="Spatial/Beams2"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, 0, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="CollisionShape" type="CollisionShape" parent="Spatial/Beams2"]
-transform = Transform( -9.11831e-08, 0.8, 0, -19.6137, -2.49121e-06, 0, 0, 0, 0.8, 0, -17.0625, 0 )
-shape = SubResource( 6 )
-
-[node name="MeshInstance2" type="MeshInstance" parent="Spatial/Beams2"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -6.61217, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance3" type="MeshInstance" parent="Spatial/Beams2"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -13.2652, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance4" type="MeshInstance" parent="Spatial/Beams2"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -19.9824, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
-[node name="MeshInstance5" type="MeshInstance" parent="Spatial/Beams2"]
-transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, -26.6277, 0 )
-mesh = SubResource( 5 )
-material/0 = ExtResource( 4 )
-
 [node name="SpotLight" type="SpotLight" parent="Spatial"]
 transform = Transform( -0.892697, -0.379659, -0.242797, -0.371602, 0.315328, 0.873201, -0.254958, 0.869728, -0.422575, -3.14347, 1.92999, -4.2813 )
 light_energy = 4.0
+spot_range = 75.8509
 spot_angle = 24.108
 
 [node name="SpotLight2" type="SpotLight" parent="Spatial"]
-transform = Transform( 0.0481986, -0.457972, 0.887659, -0.507607, 0.754147, 0.416651, -0.860239, -0.470664, -0.196121, 3.32993, 0.817703, -0.535306 )
+transform = Transform( 0.00478268, -0.0228986, 0.0441903, -0.0242286, 0.0377073, 0.0221615, -0.0434753, -0.0235332, -0.00748918, 3.32993, 0.817703, -0.535306 )
 light_energy = 4.0
+spot_range = 96.2522
 spot_angle = 24.108
 
 [node name="SpotLight3" type="SpotLight" parent="Spatial"]
 transform = Transform( -0.183533, -0.982803, 0.0203658, -0.927356, 0.179977, 0.328052, -0.326076, 0.0413221, -0.94444, 2.98683, -1.00599, -0.00549507 )
 light_energy = 4.0
-spot_range = 3.20474
+spot_range = 75.6952
 spot_angle = 13.7882
 
 [node name="SpotLight4" type="SpotLight" parent="Spatial"]
 transform = Transform( -0.0482236, -0.941566, -0.333358, -0.579275, -0.245524, 0.777277, -0.813705, 0.230589, -0.533585, 2.50869, -0.0168409, 3.21228 )
 light_energy = 4.0
-spot_range = 3.20474
+spot_range = 56.3415
 spot_angle = 26.676
 
 [node name="SpotLight5" type="SpotLight" parent="Spatial"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.98106, 0.142118, 8.28457 )
 light_energy = 4.0
-spot_range = 3.20474
+spot_range = 53.9723
 spot_angle = 26.676
 
 [node name="DirectionalLight" type="DirectionalLight" parent="Spatial"]
@@ -297,6 +185,9 @@ transform = Transform( 2.57931, 0, 0, 0, 0.979705, -0.499156, 0, 0.200445, 2.439
 [node name="GroundCollision6" parent="Spatial" instance=ExtResource( 7 )]
 transform = Transform( 2.57931, 0, 0, 0, 1, 0, 0, 0, 5.55343, -2.14587, 0.732764, -0.270391 )
 
+[node name="GroundCollision13" parent="Spatial" instance=ExtResource( 7 )]
+transform = Transform( 2.53504, 0, 0, 0, 2.04019, 0, 0, 0, 2.00877, -1.94143, 0.892786, 0.264581 )
+
 [node name="GroundCollision7" parent="Spatial" instance=ExtResource( 7 )]
 transform = Transform( 1.3494, 0.344069, 0, -0.494477, 0.938944, 0, 0, 0, 2.95529, -1.32556, 0.758024, 0.312636 )
 
@@ -314,3 +205,14 @@ transform = Transform( 2.50001, 0.246052, 0, -0.634644, 0.969257, 0, 0, 0, 2.490
 
 [node name="GroundCollision3" parent="Spatial" instance=ExtResource( 7 )]
 transform = Transform( 2.99346, 0.605415, 0.0268445, -2.27756, 0.795666, 0.0412734, 0.00548041, -0.0197176, 2.48975, 1.96978, -1.26471, 0.293206 )
+
+[node name="shortcutblocker" type="StaticBody" parent="Spatial"]
+
+[node name="MeshInstance" type="MeshInstance" parent="Spatial/shortcutblocker"]
+transform = Transform( 0.52606, 0, 0, 0, 0.203445, 0, 0, 0, 0.425427, -1.94179, 1.08621, 0.261926 )
+mesh = SubResource( 4 )
+material/0 = ExtResource( 4 )
+
+[node name="CollisionShape" type="CollisionShape" parent="Spatial/shortcutblocker"]
+transform = Transform( 0.52606, 0, 0, 0, 0.203445, 0, 0, 0, 0.425427, -1.93579, 1.07804, 0.272909 )
+shape = SubResource( 5 )