diff --git a/assets/LevelBlockouts/hub_1.tscn b/assets/LevelBlockouts/hub_1.tscn index dcbdf92..0a4ce2a 100644 --- a/assets/LevelBlockouts/hub_1.tscn +++ b/assets/LevelBlockouts/hub_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=4 uid="uid://otkecr0hcyon"] +[gd_scene load_steps=26 format=4 uid="uid://otkecr0hcyon"] [ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="1_48lr2"] [ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="1_ibypk"] @@ -16,6 +16,9 @@ [ext_resource type="PackedScene" uid="uid://eujx0yilqqcp" path="res://assets/level_sign.tscn" id="13_ng05k"] [ext_resource type="PackedScene" uid="uid://bcmd7elfjhppe" path="res://assets/tree_1.tscn" id="15_mucqr"] [ext_resource type="Texture2D" uid="uid://cyhvgk0vnb8ir" path="res://assets/Models/TerrainAlbedo.exr" id="16_h075e"] +[ext_resource type="PackedScene" uid="uid://bycbdb5u5ewgl" path="res://assets/tree_2.tscn" id="17_0m8yy"] +[ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="18_e0i8x"] +[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="19_brrhm"] [sub_resource type="Animation" id="Animation_v0ka4"] length = 0.001 @@ -134,7 +137,6 @@ gamemode = ExtResource("2_pxx7p") [node name="Realtime Day Night Cycle" parent="." instance=ExtResource("3_cyqa2")] transform = Transform3D(-0.513781, 0, -0.857921, 0, 1, 0, 0.857921, 0, -0.513781, 0, 0, 0) -realtime = false set_time = 12.0 [node name="LEVEL UTILS" type="Node" parent="."] @@ -276,64 +278,40 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.6736, 6.57787, -17.6494) [node name="Tubes" type="Node3D" parent="."] [node name="Scene Changer" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, -64.2195, -11.6417) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, 121.128, -16.6069) [node name="Level Sign" parent="Tubes/Scene Changer" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.1473, -116.532, 0.926201) [node name="Scene Changer2" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, -64.2195, -19.1273) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.82225, 121.128, -28.4086) [node name="Level Sign" parent="Tubes/Scene Changer2" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -1.75876, -116.862, 0.36809) [node name="Scene Changer3" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, -64.2195, -27.1599) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.5162, 121.128, -37.3171) [node name="Level Sign" parent="Tubes/Scene Changer3" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -1.84139, -117.121, -0.559673) [node name="Scene Changer4" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, -64.2195, -34.7607) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.67952, 121.128, -39.1949) [node name="Level Sign" parent="Tubes/Scene Changer4" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(-0.104893, 0, -0.994484, 0, 1, 0, 0.994484, 0, -0.104893, 2.5791, -118.774, 0.193653) [node name="Scene Changer5" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.07024, -64.2195, -42.1311) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5486, 121.128, -28.3873) [node name="Level Sign" parent="Tubes/Scene Changer5" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(0.000872742, 0, -1, 0, 1, 0, 1, 0, 0.000872742, 1.24594, -119.116, 0.455086) [node name="Scene Changer6" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.17812, -64.2195, -42.2864) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 10.4383, 121.128, -17.0011) [node name="Level Sign" parent="Tubes/Scene Changer6" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) - -[node name="Scene Changer7" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.21706, -64.2195, -34.8009) - -[node name="Level Sign" parent="Tubes/Scene Changer7" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) - -[node name="Scene Changer8" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.25883, -64.2195, -26.7684) - -[node name="Level Sign" parent="Tubes/Scene Changer8" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) - -[node name="Scene Changer9" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.29837, -64.2195, -19.1677) - -[node name="Level Sign" parent="Tubes/Scene Changer9" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) - -[node name="Scene Changer10" parent="Tubes" instance=ExtResource("11_titu4")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.3367, -64.2195, -11.7974) - -[node name="Level Sign" parent="Tubes/Scene Changer10" instance=ExtResource("13_ng05k")] -transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.91949, 65.7011, -0.162403) +transform = Transform3D(-0.00479963, 0, 0.999989, 0, 1, 0, -0.999989, 0, -0.00479963, -2.059, -119.116, -0.128061) [node name="Tree1" parent="." instance=ExtResource("15_mucqr")] transform = Transform3D(2.32459, 0, 3.49204, 0, 4.195, 0, -3.49204, 0, 2.32459, -4.84405, 0.460491, 9.93028) @@ -348,3 +326,37 @@ transform = Transform3D(-1.13165, 0, -4.03948, 0, 4.195, 0, 4.03948, 0, -1.13165 transform = Transform3D(5000, 0, 0, 0, 5000, 0, 0, 0, 5000, 808.771, -59.62, 108.786) mesh = SubResource("ArrayMesh_2pdmy") skeleton = NodePath("") + +[node name="Tree4" parent="." instance=ExtResource("17_0m8yy")] +transform = Transform3D(0.410609, 0, 0.285307, 0, 0.5, 0, -0.285307, 0, 0.410609, 9.59042, -0.23711, 2.98266) + +[node name="Tree5" parent="." instance=ExtResource("17_0m8yy")] +transform = Transform3D(0.603596, 0, 0.419401, 0, 0.735, 0, -0.419401, 0, 0.603596, 0.373024, -0.23711, -21.8524) + +[node name="JumpPlatform" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 9.367, -0.108128, -37.9591) +jump_amount = 125 + +[node name="JumpPlatform2" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 9.367, -0.108128, -28.0669) +jump_amount = 125 + +[node name="JumpPlatform3" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 9.367, -0.108128, -16.5705) +jump_amount = 125 + +[node name="JumpPlatform4" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -9.39259, -0.108128, -37.9591) +jump_amount = 125 + +[node name="JumpPlatform5" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -9.39259, -0.108128, -28.0669) +jump_amount = 125 + +[node name="JumpPlatform6" parent="." instance=ExtResource("18_e0i8x")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -9.39259, -0.108128, -16.5705) +jump_amount = 125 + +[node name="vendingmachine" parent="." instance=ExtResource("19_brrhm")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 15.7521, -0.13327, -23.4152) +item_name = "revolver" diff --git a/assets/level_bounds.tscn b/assets/level_bounds.tscn new file mode 100644 index 0000000..ed57199 --- /dev/null +++ b/assets/level_bounds.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://24slv0pyxcd5"] + +[ext_resource type="Script" uid="uid://bdxonkxnmxe6n" path="res://scripts/level_bounds.gd" id="1_k48kn"] + +[node name="LevelBounds" type="Area3D"] +collision_layer = 4 +collision_mask = 4 +script = ExtResource("1_k48kn") + +[connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/assets/materials/FrostedGlass.tres b/assets/materials/FrostedGlass.tres new file mode 100644 index 0000000..312f5bb --- /dev/null +++ b/assets/materials/FrostedGlass.tres @@ -0,0 +1,18 @@ +[gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://bb0beroi2p3gd"] + +[ext_resource type="Shader" uid="uid://igy6srcqsvi8" path="res://assets/materials/frostedGlass.gdshader" id="1_thve0"] + +[sub_resource type="Gradient" id="Gradient_thve0"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_748hl"] + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_0bs8y"] +color_ramp = SubResource("Gradient_thve0") +noise = SubResource("FastNoiseLite_748hl") + +[resource] +shader = ExtResource("1_thve0") +shader_parameter/warp_texture = SubResource("NoiseTexture2D_0bs8y") +shader_parameter/intensity = 0.01 +shader_parameter/tint_color = Color(0, 0, 0, 0) +shader_parameter/tint_amount = 0.4 diff --git a/assets/materials/frostedGlass.gdshader b/assets/materials/frostedGlass.gdshader new file mode 100644 index 0000000..e96769d --- /dev/null +++ b/assets/materials/frostedGlass.gdshader @@ -0,0 +1,29 @@ +shader_type canvas_item; + +// mipmap is neaded for textureLod +uniform sampler2D screen_texture: hint_screen_texture, repeat_disable, filter_nearest_mipmap; +// works better as a normal with warping +uniform sampler2D warp_texture: repeat_enable; + +uniform float intensity: hint_range(0.0, 0.3) = 0.01; +uniform vec4 tint_color: source_color = vec4(0.0, 0.0, 0.0, 1.0); +uniform float tint_amount: hint_range(0.0, 1.0) = 0.4; + +void fragment() { + // get our normal warp + vec2 warp = texture(warp_texture, UV).xy - 0.5; + // sample based on warp and intensity and blur based on intensity + vec4 screen = textureLod(screen_texture, UV + warp * intensity, intensity * 4.0); + // tint our image + screen = mix(screen, tint_color, tint_amount); + // get a random-ish value for some speckle noise + float noise = fract(sin(dot(UV, vec2(12.9898, 78.233))) * 43758.5453); + // light diffusion for glass shape highlights + float diff = max(dot(warp, normalize(vec2(1.0, 1.0))), 0.0); + // apply diffusion based on intensity + screen += diff * intensity; + // apply speckle noise based on intensity + screen += noise * intensity; + // yarp + COLOR = screen; +} \ No newline at end of file diff --git a/assets/materials/frostedGlass.gdshader.uid b/assets/materials/frostedGlass.gdshader.uid new file mode 100644 index 0000000..032b3d3 --- /dev/null +++ b/assets/materials/frostedGlass.gdshader.uid @@ -0,0 +1 @@ +uid://igy6srcqsvi8 diff --git a/assets/materials/glass.tres b/assets/materials/glass.tres index 6f23aa4..947d798 100644 --- a/assets/materials/glass.tres +++ b/assets/materials/glass.tres @@ -1,11 +1,39 @@ -[gd_resource type="StandardMaterial3D" format=3 uid="uid://hg5phpsguoh5"] +[gd_resource type="StandardMaterial3D" load_steps=7 format=3 uid="uid://hg5phpsguoh5"] + +[sub_resource type="Gradient" id="Gradient_wmskm"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_cprqi"] +noise_type = 2 + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_twkyn"] +width = 1024 +height = 1024 +as_normal_map = true +color_ramp = SubResource("Gradient_wmskm") +noise = SubResource("FastNoiseLite_cprqi") + +[sub_resource type="Gradient" id="Gradient_vbylo"] +offsets = PackedFloat32Array(0.42069, 0.993103, 1) +colors = PackedColorArray(0, 0, 0, 1, 0.926175, 0.926175, 0.926175, 1, 1, 1, 1, 1) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_wmskm"] + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_cprqi"] +width = 1024 +height = 1024 +seamless = true +color_ramp = SubResource("Gradient_vbylo") +noise = SubResource("FastNoiseLite_wmskm") [resource] -transparency = 1 -cull_mode = 2 -albedo_color = Color(0.6364, 0.763107, 0.86, 0.352941) +albedo_color = Color(0.1782, 0.55728, 0.81, 0.568627) metallic = 1.0 -roughness = 0.0 -backlight_enabled = true +metallic_specular = 1.0 +roughness_texture = SubResource("NoiseTexture2D_cprqi") +normal_enabled = true +normal_scale = 0.1 +normal_texture = SubResource("NoiseTexture2D_twkyn") backlight = Color(1, 1, 1, 1) refraction_enabled = true +uv1_scale = Vector3(0.08, 0.08, 0.08) +uv1_triplanar = true diff --git a/levels/LevelModels/Hub1.blend b/levels/LevelModels/Hub1.blend index 2cdbe09..d0bedea 100644 Binary files a/levels/LevelModels/Hub1.blend and b/levels/LevelModels/Hub1.blend differ diff --git a/levels/LevelModels/Hub1.blend.import b/levels/LevelModels/Hub1.blend.import index e954900..51f392a 100644 --- a/levels/LevelModels/Hub1.blend.import +++ b/levels/LevelModels/Hub1.blend.import @@ -34,10 +34,6 @@ animation/import_rest_as_RESET=false import_script/path="" _subresources={ "materials": { -"Ceiling": { -"use_external/enabled": true, -"use_external/path": "uid://b6hhomp4kcjvb" -}, "FootLight": { "use_external/enabled": true, "use_external/path": "uid://cg4kr88nfqx13" diff --git a/levels/LevelModels/Hub1.blend1 b/levels/LevelModels/Hub1.blend1 index 541374b..fc0b27f 100644 Binary files a/levels/LevelModels/Hub1.blend1 and b/levels/LevelModels/Hub1.blend1 differ diff --git a/scenes/highwire.tscn b/scenes/highwire.tscn index 8b20440..7596552 100644 --- a/scenes/highwire.tscn +++ b/scenes/highwire.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://uo43j7bomkf3"] +[gd_scene load_steps=20 format=3 uid="uid://uo43j7bomkf3"] [ext_resource type="Script" uid="uid://b81yg4r8e5ecj" path="res://scripts/subscene.gd" id="1_ie2kr"] [ext_resource type="PackedScene" uid="uid://cwy8iv8nlwqrc" path="res://assets/realtime_day_night_cycle.tscn" id="3_uc3ig"] @@ -8,6 +8,7 @@ [ext_resource type="Material" uid="uid://tvyunfk6vvya" path="res://assets/materials/prototype/prototype_orange.tres" id="9_qcaui"] [ext_resource type="PackedScene" uid="uid://df34olntmk0wl" path="res://assets/vent_1.tscn" id="11_0hcft"] [ext_resource type="PackedScene" uid="uid://dlhjacsike5a4" path="res://assets/oildrum1.tscn" id="15_tuvfy"] +[ext_resource type="PackedScene" uid="uid://24slv0pyxcd5" path="res://assets/level_bounds.tscn" id="16_8ulfh"] [ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="17_6thjn"] [ext_resource type="PackedScene" uid="uid://dt4t2a48204v1" path="res://assets/spikes_1.tscn" id="17_hpnr5"] [ext_resource type="PackedScene" uid="uid://db7xqf12sayj0" path="res://assets/chest_spawner.tscn" id="17_mw655"] @@ -23,14 +24,18 @@ polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1), PackedInt32Arr [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6yrih"] albedo_color = Color(0.300579, 0.462784, 0.249767, 1) +[sub_resource type="BoxShape3D" id="BoxShape3D_57hjo"] +size = Vector3(722.834, 603.636, 420.508) + [node name="Highwire" type="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0566635, 0.403625, 0.0430908) script = ExtResource("1_ie2kr") [node name="Realtime Day Night Cycle" parent="." instance=ExtResource("3_uc3ig")] -transform = Transform3D(0.510503, -0.00501647, 0.859861, 0.00982605, 0.999952, 1.08313e-09, -0.85982, 0.00844904, 0.510527, -27.2217, 0, 32.4834) +transform = Transform3D(0.510503, -0.00501647, 0.859861, 0.00982605, 0.999952, 1.08313e-09, -0.85982, 0.00844904, 0.510527, -41.021, 0, 40.533) [node name="Level" type="Node3D" parent="." groups=["enemy_hivemind"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.2217, 0, 32.4834) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.021, 0, 40.533) script = ExtResource("4_iqtg8") room_lockdown = true number_of_drops = 30 @@ -84,16 +89,25 @@ script = ExtResource("7_3a6nw") one_way = true [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.2217, 0, 32.4834) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.021, 0, 40.533) navigation_mesh = SubResource("NavigationMesh_8aw3d") [node name="CSGBox3D" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.4365, -317.308, -31.8781) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.4365, -87.637, -31.8781) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 174.933, 23.1565) +material = SubResource("StandardMaterial3D_6yrih") + +[node name="CSGBox3D17" type="CSGBox3D" parent="NavigationRegion3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 49.0235, 29.2644, -28.6267) +material_override = ExtResource("9_qcaui") +use_collision = true +collision_layer = 7 +collision_mask = 7 +size = Vector3(39.0317, 1.5267, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D12" type="CSGBox3D" parent="NavigationRegion3D"] @@ -142,57 +156,57 @@ size = Vector3(183.525, 0.539207, 5.23206) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D4" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -155.195, -317.308, -24.1579) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -155.195, -89.1909, -24.1579) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 178.041, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D5" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -317.308, -79.0612) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -84.0391, -79.0612) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 167.737, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D9" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -317.308, -145.526) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -80.7169, -145.526) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 161.093, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D10" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -317.308, -109.91) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.107, -83.3359, -109.91) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 166.331, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D6" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -190.684, -173.189, -31.163) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -190.684, -14.1593, -31.163) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 316.216, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D7" type="CSGBox3D" parent="NavigationRegion3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -156.797, -291.164, -61.4566) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -156.797, -63.1214, -61.4566) material_override = ExtResource("9_qcaui") use_collision = true collision_layer = 7 collision_mask = 7 -size = Vector3(25.2539, 634.275, 23.1565) +size = Vector3(25.2539, 178.19, 23.1565) material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D8" type="CSGBox3D" parent="NavigationRegion3D"] @@ -238,68 +252,75 @@ transform = Transform3D(0.610047, -1.32451, -1.36876, 1.81658, 0.836683, -7.9915 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 16.9673, 0.57067, -31.7536) [node name="PostProcessing" parent="." instance=ExtResource("17_6thjn")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.2217, 0, 32.4834) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.021, 0, 40.533) [node name="Stats" parent="." instance=ExtResource("19_p7jxd")] -transform = Transform3D(-0.98212, 0, 0.188255, 0, 1, 0, -0.188255, 0, -0.98212, -5.22191, 1.4638, 6.51766) +transform = Transform3D(-0.98212, 0, 0.188255, 0, 1, 0, -0.188255, 0, -0.98212, -19.0212, 1.4638, 14.5672) [node name="JumpPlatform3" parent="." instance=ExtResource("18_1ool5")] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0.0107899, -0.170555, -0.00993741) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -13.7885, -0.170555, 8.03962) jump_amount = 100 [node name="Scene Changer" parent="." instance=ExtResource("22_6kw07")] -transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, 1.91409, 544.113, -0.554535) +transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, -11.8852, 544.113, 7.49502) [node name="Oildrum1" parent="." instance=ExtResource("15_tuvfy")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -175.722, 26.7937, -19.2012) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -189.521, 26.7937, -11.1516) [node name="Oildrum2" parent="." instance=ExtResource("15_tuvfy")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -181.362, 26.6991, -19.6536) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -195.161, 26.6991, -11.604) [node name="Oildrum3" parent="." instance=ExtResource("15_tuvfy")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -177.155, 0.60477, 5.23406) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -190.954, 0.60477, 13.2836) [node name="Spikes 1" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -176.734, -0.1705, 11.3799) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -190.533, -0.1705, 19.4295) [node name="Spikes 2" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -176.734, -0.1705, 7.19236) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -190.533, -0.1705, 15.2419) [node name="Spikes 3" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -182.339, -0.1705, 3.43586) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.138, -0.1705, 11.4854) [node name="Spikes 4" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -180.593, -0.1705, 13.9937) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -194.392, -0.1705, 22.0433) [node name="Spikes 6" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -189.087, -0.1705, 12.4354) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -202.886, -0.1705, 20.485) [node name="Spikes 7" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -182.341, -0.1705, 9.09626) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.14, -0.1705, 17.1458) [node name="Spikes 8" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -192.423, -0.1705, 8.19826) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -206.222, -0.1705, 16.2478) [node name="Spikes 9" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.10791, -0.1705, 4.02816) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.9072, -0.1705, 12.0777) [node name="Spikes 5" parent="." instance=ExtResource("17_hpnr5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -189.38, -0.1705, 3.02636) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -203.179, -0.1705, 11.0759) [node name="ChestSpawner" parent="." instance=ExtResource("17_mw655")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -183.256, 28.7598, -31.187) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -197.055, 28.7598, -23.1374) [node name="ChestSpawner2" parent="." instance=ExtResource("17_mw655")] -transform = Transform3D(0.326146, 0, 0.94532, 0, 1, 0, -0.94532, 0, 0.326146, -232.164, 17.0575, -34.9973) +transform = Transform3D(0.326146, 0, 0.94532, 0, 1, 0, -0.94532, 0, 0.326146, -245.963, 17.0575, -26.9477) [node name="ChestSpawner3" parent="." instance=ExtResource("17_mw655")] -transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -223.401, 1.26645, -47.3853) +transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -237.2, 1.26645, -39.3357) [node name="ChestSpawner4" parent="." instance=ExtResource("17_mw655")] -transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -223.401, 1.26645, -78.9686) +transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -237.2, 1.26645, -70.919) [node name="ChestSpawner5" parent="." instance=ExtResource("17_mw655")] -transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -223.401, 1.26645, -106.476) +transform = Transform3D(0.419579, 0, 0.907719, 0, 1, 0, -0.907719, 0, 0.419579, -237.2, 1.26645, -98.4264) [node name="GarbageBin" parent="." instance=ExtResource("18_r6s5q")] -transform = Transform3D(-0.714729, 0, -0.699401, 0, 1, 0, 0.699401, 0, -0.714729, 8.83119, -0.170516, 10.1525) +transform = Transform3D(-0.714729, 0, -0.699401, 0, 1, 0, 0.699401, 0, -0.714729, -4.96806, -0.170516, 18.2021) + +[node name="LevelBounds" parent="." instance=ExtResource("16_8ulfh")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.7992, 0, 8.04956) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="LevelBounds"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -104.537, -61.8811, -39.2754) +shape = SubResource("BoxShape3D_57hjo") diff --git a/scripts/JumpPlatform.gd b/scripts/JumpPlatform.gd index 805910e..bf02c38 100644 --- a/scripts/JumpPlatform.gd +++ b/scripts/JumpPlatform.gd @@ -1,8 +1,6 @@ extends Node3D @export var jump_amount = 20 -@export var stamina_replenish = true -@export var ammo_amount = 20 @onready var jump_sound = $JumpSound var can_jump = false diff --git a/scripts/level_bounds.gd b/scripts/level_bounds.gd index a03b7f8..d31e355 100644 --- a/scripts/level_bounds.gd +++ b/scripts/level_bounds.gd @@ -1,7 +1,6 @@ extends Area3D func _on_body_exited(body: Node3D) -> void: - print("PLAYER OUT OF BOUNDS") var level_control = get_tree().current_scene if level_control.gamemode.die_on_leaving_bounds == true: get_tree().current_scene.die() diff --git a/scripts/projectile.gd b/scripts/projectile.gd index 74b6456..9a9dd6c 100644 --- a/scripts/projectile.gd +++ b/scripts/projectile.gd @@ -51,8 +51,8 @@ func damage(body): body.add_marker(collision_raycast_3d.get_collision_point(),collision_raycast_3d.global_rotation) #start leaking effect - if body.is_in_group("leak") and body.water_leak != null: - add_normal_decal(body,body.water_leak) + #if body.is_in_group("leak") and body.water_leak != null: + #add_normal_decal(body,body.water_leak) #break breakables if body.is_in_group("breakable"): diff --git a/scripts/save_load.gd b/scripts/save_load.gd index a3971fd..d348d15 100644 --- a/scripts/save_load.gd +++ b/scripts/save_load.gd @@ -268,5 +268,5 @@ func load_resource_path(array): else: return [] -func shot_fired(): +func shot_fired(variable): GameGlobals.shots_fired += null_data_check(GameGlobals.shots_fired, 1) diff --git a/scripts/scene_changer.gd b/scripts/scene_changer.gd index 8cecaa6..dcafb43 100644 --- a/scripts/scene_changer.gd +++ b/scripts/scene_changer.gd @@ -8,7 +8,7 @@ var timer_active = false var active = true var index : int -const SCENE_SPAWN_OFFSET = Vector3(0,-150,0) +const SCENE_SPAWN_OFFSET = Vector3(0,400,0) # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -25,10 +25,7 @@ func _on_body_entered(body: Node3D) -> void: if active and timer_active: active = false var scene = load(level_info["level_path"]).instantiate() - - if scene.sky_type != null: - SignalBus.emit_signal("update_sky",scene.sky_type) - + get_tree().current_scene.add_child(scene) scene.global_position = global_position + SCENE_SPAWN_OFFSET diff --git a/scripts/target_1.gd b/scripts/target_1.gd index 703ccab..b710a4c 100644 --- a/scripts/target_1.gd +++ b/scripts/target_1.gd @@ -1,7 +1,6 @@ extends StaticBody3D @export var remove_targets_on_reload = false -@onready var ray_cast_3d: RayCast3D = $RayCast3D const TARGET_MARKER = preload("res://assets/target_marker.tscn")