Playing with level blockouts

assets/Enemy_casing.tscn

@@ -10,8 +10,8 @@ height = 0.122751
 radius = 0.0315378
 
 [node name="enemycasing" type="RigidBody3D" groups=["spawned"]]
-collision_layer = 2
-collision_mask = 7
+collision_layer = 0
+collision_mask = 5
 mass = 0.1
 continuous_cd = true
 contact_monitor = true
@@ -20,7 +20,7 @@ linear_damp = 0.1
 angular_damp = 0.1
 script = ExtResource("1_dxvh8")
 
-[node name="casing2" parent="." instance=ExtResource("2_ba08p")]
+[node name="casing2" type="Node3D" parent="." instance=ExtResource("2_ba08p")]
 transform = Transform3D(0.00523599, 9.20396e-06, -1.49999, 1.49999, 0.00261793, 0.005236, 0.00261795, -1.5, -6.55667e-08, 0, 0, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]

assets/LevelBlockouts/blockout1.blend.import

@@ -0,0 +1,51 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dbm3c0wxvjg24"
+path="res://.godot/imported/blockout1.blend-0822cb2cd5c7d5e292ab694ea17044c8.scn"
+
+[deps]
+
+source_file="res://assets/LevelBlockouts/blockout1.blend"
+dest_files=["res://.godot/imported/blockout1.blend-0822cb2cd5c7d5e292ab694ea17044c8.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=2
+meshes/lightmap_texel_size=0.01
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

assets/LevelBlockouts/blockout2.blend.import

@@ -0,0 +1,51 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bhbxoyc2lpw3m"
+path="res://.godot/imported/blockout2.blend-18ab6b91f6ddc535846b0a96d830cce6.scn"
+
+[deps]
+
+source_file="res://assets/LevelBlockouts/blockout2.blend"
+dest_files=["res://.godot/imported/blockout2.blend-18ab6b91f6ddc535846b0a96d830cce6.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=2
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

assets/LevelBlockouts/blockout_1-2.exr.import

@@ -0,0 +1,26 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+uid="uid://c5jkf0ysequnf"
+path="res://.godot/imported/blockout_1-2.exr-9c58b3831869d688016e47c19cab4e64.ctexarray"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/LevelBlockouts/blockout_1-2.exr"
+dest_files=["res://.godot/imported/blockout_1-2.exr-9c58b3831869d688016e47c19cab4e64.ctexarray"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/channel_pack=1
+mipmaps/generate=false
+mipmaps/limit=-1
+slices/horizontal=1
+slices/vertical=1

assets/LevelBlockouts/blockout_1.exr.import

@@ -0,0 +1,26 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+uid="uid://lbi4p3wiqd46"
+path="res://.godot/imported/blockout_1.exr-e15d7c329b451711560fb39a93f8d785.ctexarray"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/LevelBlockouts/blockout_1.exr"
+dest_files=["res://.godot/imported/blockout_1.exr-e15d7c329b451711560fb39a93f8d785.ctexarray"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/channel_pack=1
+mipmaps/generate=false
+mipmaps/limit=-1
+slices/horizontal=1
+slices/vertical=1

assets/LevelBlockouts/blockout_1.tscn

@@ -0,0 +1,53 @@
+[gd_scene load_steps=12 format=3 uid="uid://bn54phjibkg8i"]
+
+[ext_resource type="PackedScene" uid="uid://dbm3c0wxvjg24" path="res://assets/LevelBlockouts/blockout1.blend" id="1_blrje"]
+[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="2_jey4m"]
+[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="3_3ymim"]
+[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="3_pm4sr"]
+[ext_resource type="LightmapGIData" uid="uid://5ttwovth3867" path="res://assets/LevelBlockouts/blockout_1.lmbake" id="4_01ilt"]
+[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="6_t7mn0"]
+[ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="7_ck2ai"]
+
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_pe7vx"]
+sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
+sky_energy_multiplier = 0.0
+ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
+
+[sub_resource type="Sky" id="Sky_b1rnh"]
+sky_material = SubResource("ProceduralSkyMaterial_pe7vx")
+
+[sub_resource type="Environment" id="Environment_bhtgh"]
+background_mode = 2
+sky = SubResource("Sky_b1rnh")
+tonemap_mode = 2
+ssr_enabled = true
+ssao_enabled = true
+ssil_enabled = true
+sdfgi_enabled = true
+glow_enabled = true
+glow_bloom = 0.4
+
+[sub_resource type="NavigationMesh" id="NavigationMesh_g254y"]
+
+[node name="blockout1" node_paths=PackedStringArray("player") instance=ExtResource("1_blrje")]
+script = ExtResource("2_jey4m")
+player = NodePath("Player")
+gun_1 = ExtResource("3_3ymim")
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="0"]
+environment = SubResource("Environment_bhtgh")
+
+[node name="NavigationRegion3D" type="NavigationRegion3D" parent="." index="1"]
+navigation_mesh = SubResource("NavigationMesh_g254y")
+
+[node name="Player" parent="." index="3" instance=ExtResource("3_pm4sr")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0584686, 0.713594, 16.6392)
+
+[node name="LightmapGI" type="LightmapGI" parent="." index="4"]
+light_data = ExtResource("4_01ilt")
+
+[node name="vendingmachine" parent="." index="5" instance=ExtResource("6_t7mn0")]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -4.74477, -0.399996, -2.91752)
+
+[node name="JumpPlatform" parent="." index="6" instance=ExtResource("7_ck2ai")]
+transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 6.44298, -12.5619, -22.2135)

assets/Models/HoustonDowntown.blend.import

@@ -17,10 +17,11 @@ nodes/root_type=""
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,11 +29,11 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
-gltf/naming_version=1
-gltf/embedded_image_handling=1
 blender/nodes/visible=0
+blender/nodes/active_collection_only=false
 blender/nodes/punctual_lights=true
 blender/nodes/cameras=true
 blender/nodes/custom_properties=true

assets/casing_2.tscn

@@ -20,7 +20,7 @@ linear_damp = 0.1
 angular_damp = 0.1
 script = ExtResource("1_34yke")
 
-[node name="casing2" parent="." instance=ExtResource("1_8ox1t")]
+[node name="casing2" type="Node3D" parent="." instance=ExtResource("1_8ox1t")]
 transform = Transform3D(0.00523598, 9.20392e-06, -1.49999, 1.49999, 0.00261793, 0.00523599, 0.00261795, -1.5, -6.55667e-08, 0, 0, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]

assets/die_particles.tscn

@@ -260,7 +260,7 @@ audio_explode = NodePath("Audio/Die")
 [node name="RigidBody3D" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00161432, 1.77527, -0.0469466)
 collision_layer = 32
-collision_mask = 5
+collision_mask = 37
 mass = 30.0
 
 [node name="Turret" type="MeshInstance3D" parent="RigidBody3D"]
@@ -290,7 +290,7 @@ volume_db = 10.0
 
 [node name="body" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
 collision_layer = 32
-collision_mask = 5
+collision_mask = 37
 mass = 30.0
 
 [node name="body" type="MeshInstance3D" parent="body"]

assets/houston_map.exr.import

@@ -0,0 +1,12 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+
+[params]
+
+compress/mode=3
+compress/channel_pack=1
+mipmaps/generate=false
+slices/horizontal=1
+slices/vertical=2

assets/spider2.tscn

@@ -747,7 +747,7 @@ damage_number = ExtResource("9_rmegy")
 
 [node name="TurretLook" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00161432, 1.62046, 0.00134204)
-target_position = Vector3(0, 0, -50)
+target_position = Vector3(0, 0, -20)
 collision_mask = 5
 
 [node name="Turret" type="MeshInstance3D" parent="TurretLook"]
@@ -778,12 +778,12 @@ shape = SubResource("ConcavePolygonShape3D_kddmj")
 
 [node name="TurretLookNext" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00161432, 1.62046, 0.00134204)
-target_position = Vector3(0, 0, -50)
+target_position = Vector3(0, 0, -20)
 collision_mask = 5
 
 [node name="SpiderLookNext" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00161432, 1.62046, 0.00134204)
-target_position = Vector3(0, 0, -50)
+target_position = Vector3(0, 0, -20)
 collision_mask = 5
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

export_presets.cfg

@@ -3,10 +3,10 @@
 name="Windows Desktop"
 platform="Windows Desktop"
 runnable=true
+advanced_options=false
 dedicated_server=false
 custom_features=""
-export_filter="scenes"
-export_files=PackedStringArray("res://scenes/test_level_2v2.tscn")
+export_filter="all_resources"
 include_filter=""
 exclude_filter=""
 export_path="../../OneDrive/Desktop/gametest.exe"
@@ -14,17 +14,16 @@ encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
+script_export_mode=2
 
 [preset.0.options]
 
 custom_template/debug=""
 custom_template/release=""
 debug/export_console_wrapper=1
-binary_format/embed_pck=false
-texture_format/bptc=true
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
+binary_format/embed_pck=true
+texture_format/s3tc_bptc=true
+texture_format/etc2_astc=false
 binary_format/architecture="x86_64"
 codesign/enable=false
 codesign/timestamp=true
@@ -44,6 +43,8 @@ application/file_description=""
 application/copyright=""
 application/trademarks=""
 application/export_angle=0
+application/export_d3d12=0
+application/d3d12_agility_sdk_multiarch=true
 ssh_remote_deploy/enabled=false
 ssh_remote_deploy/host="user@host_ip"
 ssh_remote_deploy/port="22"
@@ -61,3 +62,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
 ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
 Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
 Remove-Item -Recurse -Force '{temp_dir}'"
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false

levels/blockout_1.exr.import

@@ -0,0 +1,26 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+uid="uid://crttlw20s81qj"
+path="res://.godot/imported/blockout_1.exr-35ee5c18432bf891d2e54c535a653c10.ctexarray"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://levels/blockout_1.exr"
+dest_files=["res://.godot/imported/blockout_1.exr-35ee5c18432bf891d2e54c535a653c10.ctexarray"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/channel_pack=1
+mipmaps/generate=false
+mipmaps/limit=-1
+slices/horizontal=1
+slices/vertical=1

levels/blockout_2.exr.import

@@ -0,0 +1,26 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+uid="uid://wwhqmc7nd4kp"
+path="res://.godot/imported/blockout_2.exr-a10a0ad42fbb29889e13b51c4d7cf70b.ctexarray"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://levels/blockout_2.exr"
+dest_files=["res://.godot/imported/blockout_2.exr-a10a0ad42fbb29889e13b51c4d7cf70b.ctexarray"]
+
+[params]
+
+compress/mode=3
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/channel_pack=1
+mipmaps/generate=false
+mipmaps/limit=-1
+slices/horizontal=1
+slices/vertical=1

levels/houston_map.exr.import

@@ -0,0 +1,12 @@
+[remap]
+
+importer="2d_array_texture"
+type="CompressedTexture2DArray"
+
+[params]
+
+compress/mode=3
+compress/channel_pack=1
+mipmaps/generate=false
+slices/horizontal=1
+slices/vertical=2

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="First Person Test"
-run/main_scene="res://scenes/test_level_2v2NOENEMIES.tscn"
+run/main_scene="res://levels/blockout_2.tscn"
 config/features=PackedStringArray("4.3", "Forward Plus")
 config/icon="res://icon.svg"
 

scenes/enemy_working_scene.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=3 uid="uid://dsnddbrlqkav2"]
+[gd_scene load_steps=21 format=3 uid="uid://dsnddbrlqkav2"]
 
 [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_laua1"]
 [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_poauc"]
@@ -9,7 +9,6 @@
 [ext_resource type="Material" uid="uid://bjryln3so1lgw" path="res://assets/materials/prototype/prototype_green.tres" id="7_1bmnm"]
 [ext_resource type="Material" uid="uid://br2pyyyl2n3cx" path="res://assets/materials/prototype/prototype1.tres" id="7_l3crk"]
 [ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="7_pr7m0"]
-[ext_resource type="Material" uid="uid://b765yni4pd83c" path="res://assets/materials/prototype/prototype_light.tres" id="8_faibh"]
 [ext_resource type="PackedScene" uid="uid://dws4iro7820fc" path="res://assets/pistol1_pickup.tscn" id="8_qwtxj"]
 [ext_resource type="PackedScene" uid="uid://clu76sc4uoswn" path="res://assets/rocketlauncher_pickup.tscn" id="9_r8miu"]
 [ext_resource type="PackedScene" uid="uid://dyu46bns8mesv" path="res://assets/mac10_pickup.tscn" id="10_pos4p"]
@@ -49,7 +48,6 @@ gun_2 = ExtResource("3_xdb5c")
 [node name="Player" parent="." instance=ExtResource("4_a8lcp")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.4194, 1.40016, -29.1943)
 AUDIO = false
-JUMP_VELOCITY = 6
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_klp4b")
@@ -149,7 +147,7 @@ material = ExtResource("7_l3crk")
 
 [node name="CSGBox3D8" type="CSGBox3D" parent="NavigationRegion3D"]
 transform = Transform3D(0.790048, 0, -0.613045, 0, 1, 0, 0.613045, 0, 0.790048, 14.5597, 2.4345, -27.4493)
-material_override = ExtResource("8_faibh")
+material_override = ExtResource("7_l3crk")
 use_collision = true
 size = Vector3(16.626, 5.39923, 1)
 
@@ -216,7 +214,6 @@ transform = Transform3D(0.813009, 0, -0.582251, 0, 1, 0, 0.582251, 0, 0.813009,
 
 [node name="pistol1_pickup" parent="." instance=ExtResource("8_qwtxj")]
 transform = Transform3D(0.649528, -0.760338, 0, 0.760338, 0.649528, 0, 0, 0, 1, -24.7534, 1.09587, 5.88603)
-pickupType = 0
 
 [node name="rocketlauncher1_pickup" parent="." instance=ExtResource("9_r8miu")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25, 1, 8)

scenes/test_level_2v2.tscn

@@ -1170,7 +1170,6 @@ health_drop_enabled = false
 [node name="Player" parent="." instance=ExtResource("2_f87c2")]
 transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
 AUDIO = false
-JUMP_VELOCITY = 6
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(0.420794, 0.292511, -0.858703, -0.23587, 0.949309, 0.207791, 0.875956, 0.115105, 0.468458, 0, 0, 0)
@@ -1565,48 +1564,36 @@ script = ExtResource("39_g18ck")
 
 [node name="spider" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.5109, -0.218914, 25.6043)
-player_path = NodePath("../../Player")
 
 [node name="spider2" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34.3556, -0.218914, 27.769)
-player_path = NodePath("../../Player")
 
 [node name="spider3" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -29.77, -0.218914, 27.1464)
-player_path = NodePath("../../Player")
 
 [node name="spider4" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.6624, -0.218914, 29.4627)
-player_path = NodePath("../../Player")
 
 [node name="spider5" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.8404, -0.218914, 27.0213)
-player_path = NodePath("../../Player")
 
 [node name="spider8" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.3672, -0.218914, 24.0515)
-player_path = NodePath("../../Player")
 
 [node name="spider9" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2119, -0.218914, 26.2162)
-player_path = NodePath("../../Player")
 
 [node name="spider10" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.6263, -0.218914, 25.5936)
-player_path = NodePath("../../Player")
 
 [node name="spider11" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5187, -0.218914, 27.9099)
-player_path = NodePath("../../Player")
 
 [node name="spider12" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.69667, -0.218914, 25.4685)
-player_path = NodePath("../../Player")
 
 [node name="spider6" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.103, 0.292451, 10.0313)
-player_path = NodePath("../../Player")
 
 [node name="spider7" parent="EnemyHivemind" instance=ExtResource("40_a0e3y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45.6218, 0.324552, 7.47129)
-player_path = NodePath("../../Player")

scenes/test_level_2v2NOENEMIES.tscn

@@ -1169,7 +1169,6 @@ health_drop_enabled = false
 [node name="Player" parent="." instance=ExtResource("4_1cxxb")]
 transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
 AUDIO = false
-JUMP_VELOCITY = 6
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(0.420794, 0.292511, -0.858703, -0.23587, 0.949309, 0.207791, 0.875956, 0.115105, 0.468458, 0, 0, 0)

scripts/item_pickup.gd

@@ -46,7 +46,7 @@ func picked_up():
 	match pickupType:
 		# Ammo
 		0:
-			var ammo_add_amount : int = (rand_amt * .01) * player.gun.max_ammo #this is ugly and I don't like it but it works to force the random amount into being treated as float
+			var ammo_add_amount : int = (rand_amt * .01) * player.gun.max_ammo 
 			level_control.ammo_reserve[level_control.current_gun_index] += ammo_add_amount
 			print("ammo + " +str(ammo_add_amount))
 		# Stamina

scripts/player.gd

@@ -24,7 +24,7 @@ var rng = RandomNumberGenerator.new()
 @export var DASH_SPEED = 40
 @export var DASH_STAM_REQ = 10
 @export var MAX_STAMINA = 1800
-@export var JUMP_VELOCITY = 10
+@export var JUMP_VELOCITY = 6
 @export var SENSITIVITY = .01
 @export var sensitivity_shift = true
 var start_sensitivity
@@ -125,7 +125,10 @@ func _physics_process(delta):
 		# Add the gravity.
 		if not is_on_floor():
 			velocity.y -= gravity * delta
+			if velocity.y >= JUMP_VELOCITY/2:
+				moving_fast = true
 		else:
+			ear_wind.stop()
 			double_jump = true
 			air_dash = MAX_AIR_DASH
 		
@@ -180,12 +183,12 @@ func _physics_process(delta):
 		
 		# Health Indicator
 		var health_opacity = 1.5 - level_control.health / level_control.start_health
-		health_indicator.color = lerp(Color(0.471, 0, 0, 0), Color(0.471, 0, 0, .25),health_opacity)
+		if level_control.health < (level_control.start_health/2):
+			health_indicator.color = lerp(Color(0.471, 0, 0, 0), Color(0.471, 0, 0, .25),health_opacity)
 		
 		# Moving Fast Sound
 		#initiate fast movement
 		if velocity.y >= JUMP_VELOCITY and !moving_fast:
-			moving_fast = true
 			ear_wind.play()
 		#change sounds with speed
 		if moving_fast: