enemy tweaks

assets/Audio/cannon-fire-single-shot-blast-explosion-SBA-300098885.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://0n251thxlnnp"
+path="res://.godot/imported/cannon-fire-single-shot-blast-explosion-SBA-300098885.wav-786efd9e79c431cccac5d7ea5111b65e.sample"
+
+[deps]
+
+source_file="res://assets/Audio/cannon-fire-single-shot-blast-explosion-SBA-300098885.wav"
+dest_files=["res://.godot/imported/cannon-fire-single-shot-blast-explosion-SBA-300098885.wav-786efd9e79c431cccac5d7ea5111b65e.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/Audio/cartoon-voice-male-yeouch-ouch-SBA-300115097.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bn1w77gvx07ph"
+path="res://.godot/imported/cartoon-voice-male-yeouch-ouch-SBA-300115097.wav-be8a7d20de3f90eff8b261870603054a.sample"
+
+[deps]
+
+source_file="res://assets/Audio/cartoon-voice-male-yeouch-ouch-SBA-300115097.wav"
+dest_files=["res://.godot/imported/cartoon-voice-male-yeouch-ouch-SBA-300115097.wav-be8a7d20de3f90eff8b261870603054a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=2
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=0

assets/Audio/grunt-male-SBA-300282985.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cy150nsjqp7lt"
+path="res://.godot/imported/grunt-male-SBA-300282985.wav-987e3357bf2afe268f3cb8cfbe71fad2.sample"
+
+[deps]
+
+source_file="res://assets/Audio/grunt-male-SBA-300282985.wav"
+dest_files=["res://.godot/imported/grunt-male-SBA-300282985.wav-987e3357bf2afe268f3cb8cfbe71fad2.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/Models/Lamp.blend.import

@@ -0,0 +1,50 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://caeci2trufwxg"
+path="res://.godot/imported/Lamp.blend-75cba093a551ce37d4fa7e8c6ab73b20.scn"
+
+[deps]
+
+source_file="res://assets/Models/Lamp.blend"
+dest_files=["res://.godot/imported/Lamp.blend-75cba093a551ce37d4fa7e8c6ab73b20.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+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
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1
+blender/nodes/visible=0
+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/bottle_1.tscn

@@ -43,7 +43,7 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_31808")
 
-[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_m626c"]
+[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_cymse"]
 points = PackedVector3Array(0.202827, -0.297797, 0.00403334, -0.192761, -0.358884, -0.0287528, -0.173827, 0.327577, -0.0768052, -0.0122833, 0.378837, 0.200603, 0.138545, 0.401308, -0.147351, 0.0402858, -0.414367, -0.213567, 0.149043, -0.414367, 0.167233, 0.0765383, 0.746167, 0.0402858, -0.147295, -0.372155, 0.138494, -0.147351, 0.401308, 0.138544, -0.144509, 0.396888, -0.144509, 0.150261, 0.393288, 0.133962, -0.0684716, 0.746167, -0.0684716, -0.213567, -0.414367, 0.0402858, 0.200602, 0.378837, -0.0122833, -0.0289072, 0.396497, -0.193687, -0.143839, -0.359867, -0.143839, -0.0503667, 0.746167, 0.0765383, -0.193691, 0.396501, -0.0289078, 0.138495, -0.372156, -0.147295, 0.00403334, -0.297797, 0.202827, 0.0584333, 0.746167, -0.0684716, 0.167233, -0.414367, 0.149043, -0.190615, 0.392913, 0.036462, 0.036462, 0.392913, -0.190615, -0.0866191, 0.746167, 0.0220957, 0.0402858, 0.746167, 0.0765383, 0.0200816, 0.375335, 0.197369, 0.19737, 0.375336, 0.0200817, 0.133962, 0.393288, 0.15026, 0.0220957, 0.746167, -0.0866191, -0.0455433, -0.362918, 0.185802)
 
 [node name="bottle1" type="RigidBody3D" groups=["breakable", "scene_rigidbody"]]
@@ -57,4 +57,4 @@ mesh = SubResource("ArrayMesh_jc7cp")
 skeleton = NodePath("")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("ConvexPolygonShape3D_m626c")
+shape = SubResource("ConvexPolygonShape3D_cymse")

assets/bullet_enemy.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=12 format=3 uid="uid://h5ojldugfyyu"]
+[gd_scene load_steps=13 format=3 uid="uid://h5ojldugfyyu"]
 
 [ext_resource type="Script" path="res://scripts/bullet_enemy.gd" id="1_so2e8"]
 [ext_resource type="PackedScene" uid="uid://crvohhc6kgshn" path="res://assets/bullet_hole.tscn" id="2_8iodt"]
 [ext_resource type="Texture2D" uid="uid://dqytegxsmb5kg" path="res://assets/Models/bullet.transparency.png" id="2_gihte"]
 [ext_resource type="AudioStream" uid="uid://dqj4cx05f25jj" path="res://assets/Audio/punch-body-hard-SBA-300156881.wav" id="3_1ujcu"]
+[ext_resource type="AudioStream" uid="uid://bl8yg1d3bsxs3" path="res://assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav" id="5_gxgsq"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mfpbf"]
 resource_name = "bullet"
@@ -123,4 +124,9 @@ autostart = true
 [node name="HitIndicator" type="AudioStreamPlayer" parent="Audio"]
 stream = ExtResource("3_1ujcu")
 
+[node name="movingsound" type="AudioStreamPlayer3D" parent="Audio"]
+stream = ExtResource("5_gxgsq")
+unit_size = 3.0
+doppler_tracking = 2
+
 [connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

assets/dead_announce.tscn

@@ -0,0 +1,28 @@
+[gd_scene load_steps=4 format=3 uid="uid://dl1r5co5je5hp"]
+
+[ext_resource type="FontFile" uid="uid://d2h2tjhxiv5wo" path="res://assets/fonts/White On Black.ttf" id="1_7a4sr"]
+[ext_resource type="Script" path="res://scripts/dead_announce.gd" id="2_d54cv"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_ic2ps"]
+font = ExtResource("1_7a4sr")
+font_size = 500
+
+[node name="PickupAnnounce" type="Label"]
+offset_right = 3440.0
+offset_bottom = 1440.0
+size_flags_horizontal = 3
+size_flags_vertical = 6
+text = "DEAD"
+label_settings = SubResource("LabelSettings_ic2ps")
+horizontal_alignment = 1
+vertical_alignment = 1
+script = ExtResource("2_d54cv")
+
+[node name="ColorRect" type="ColorRect" parent="."]
+visible = false
+y_sort_enabled = true
+layout_mode = 0
+offset_top = 1.0
+offset_right = 3840.0
+offset_bottom = 2161.0
+color = Color(0.615686, 0, 0.0980392, 0.356863)

assets/lamp.tscn

@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://d2nm4gad1nupw"]
+
+[ext_resource type="PackedScene" uid="uid://caeci2trufwxg" path="res://assets/Models/Lamp.blend" id="1_4gd4b"]
+
+[node name="Lamp" instance=ExtResource("1_4gd4b")]
+
+[node name="SpotLight3D" type="SpotLight3D" parent="." index="1"]
+transform = Transform3D(1, 0, 0, 0, -0.005201, 0.999986, 0, -0.999986, -0.005201, 0, 5.73871, 0.856955)
+light_energy = 5.0
+spot_range = 8.96177

assets/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://drwae3loscbw7"]
+[gd_scene load_steps=18 format=3 uid="uid://drwae3loscbw7"]
 
 [ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
 [ext_resource type="PackedScene" uid="uid://dcmno6wafk5hg" path="res://assets/dead_player.tscn" id="2_4hoys"]
@@ -11,6 +11,7 @@
 [ext_resource type="Texture2D" uid="uid://dhgyj08g1ge2o" path="res://assets/UI/SVG/hitmarkersvg.svg" id="8_kupqh"]
 [ext_resource type="AudioStream" uid="uid://dyd272r7n2ecd" path="res://assets/Audio/footsteps-shoes-jump-land-beach-sand-SBA-300118001.wav" id="10_tn0pn"]
 [ext_resource type="AudioStream" uid="uid://bl8yg1d3bsxs3" path="res://assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav" id="11_he7p5"]
+[ext_resource type="AudioStream" uid="uid://cy150nsjqp7lt" path="res://assets/Audio/grunt-male-SBA-300282985.wav" id="12_f51u4"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_n7uf3"]
 
@@ -33,7 +34,7 @@ radius = 6.0
 [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["player"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0)
 collision_layer = 3
-safe_margin = 0.2
+safe_margin = 0.5
 script = ExtResource("1_x7wms")
 dead_player = ExtResource("2_4hoys")
 SENSITIVITY = 0.008
@@ -143,6 +144,9 @@ stream = ExtResource("10_tn0pn")
 [node name="EarWind" type="AudioStreamPlayer" parent="Audio"]
 stream = ExtResource("11_he7p5")
 
+[node name="Hurt" type="AudioStreamPlayer" parent="Audio"]
+stream = ExtResource("12_f51u4")
+
 [connection signal="tree_entered" from="." to="." method="_on_tree_entered"]
 [connection signal="body_entered" from="pick_up_detection" to="." method="_on_pick_up_detection_body_entered"]
 [connection signal="body_entered" from="pick_up_magnet" to="." method="_on_pick_up_magnet_body_entered"]

assets/revolver_1.tscn

@@ -429,7 +429,7 @@ recoil_amount = 2.0
 max_ammo = 6
 bullet_damage = 5
 bullet_force_mod = 100
-bullet_speed = 300
+bullet_speed = 200
 bullet_drop = 0.0
 random_spread_amt = 0.1
 chamber = NodePath("revolver1/Chamber")

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall DEMO.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://1exrcca207of"
+path="res://.godot/imported/39_black brick wall DEMO.jpg-bd85294c4e8e5cddaec2e32e7f4c726f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall DEMO.jpg"
+dest_files=["res://.godot/imported/39_black brick wall DEMO.jpg-bd85294c4e8e5cddaec2e32e7f4c726f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall-AO.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bph61os78ao4t"
+path="res://.godot/imported/39_black brick wall-AO.jpg-c8e3e37e832d9798513c7f1331806b5e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall-AO.jpg"
+dest_files=["res://.godot/imported/39_black brick wall-AO.jpg-c8e3e37e832d9798513c7f1331806b5e.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_DIFF.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cja0x0gof7rga"
+path.s3tc="res://.godot/imported/39_black brick wall_DIFF.jpg-edb86a587b74d5730d808cb7750218e5.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_DIFF.jpg"
+dest_files=["res://.godot/imported/39_black brick wall_DIFF.jpg-edb86a587b74d5730d808cb7750218e5.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_DISPL.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://tub6f7ji1ula"
+path="res://.godot/imported/39_black brick wall_DISPL.jpg-f448bc570dd3ea932446e34f7d009142.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_DISPL.jpg"
+dest_files=["res://.godot/imported/39_black brick wall_DISPL.jpg-f448bc570dd3ea932446e34f7d009142.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_NORM.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://crydypl8x7b1"
+path="res://.godot/imported/39_black brick wall_NORM.jpg-ce43de00d53c429d32673ed624e3e4d4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_NORM.jpg"
+dest_files=["res://.godot/imported/39_black brick wall_NORM.jpg-ce43de00d53c429d32673ed624e3e4d4.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_SPEC.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cqqm1k7qu7cwu"
+path="res://.godot/imported/39_black brick wall_SPEC.jpg-676e83fbedc715421ca9362368ff480a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/39_black brick wall PBR texture-seamless_hr/39_black brick wall_SPEC.jpg"
+dest_files=["res://.godot/imported/39_black brick wall_SPEC.jpg-676e83fbedc715421ca9362368ff480a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

export_presets.cfg

@@ -0,0 +1,63 @@
+[preset.0]
+
+name="Windows Desktop"
+platform="Windows Desktop"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="scenes"
+export_files=PackedStringArray("res://scenes/test_level_2v2.tscn")
+include_filter=""
+exclude_filter=""
+export_path="../../OneDrive/Desktop/gametest.exe"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[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/architecture="x86_64"
+codesign/enable=false
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon=""
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+application/export_angle=0
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+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}'"

scripts/StaminaCounter.gd

@@ -18,4 +18,4 @@ func _ready():
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	text = "$" + str(int(level_control.money)) + "\nStamina: " + str(int((player.remaining_stamina/player.MAX_STAMINA)*100)) + "%"
+	text = "health " + str(clamp(level_control.health,0,100))+ "\n$" + str(int(level_control.money)) + "\nStamina: " + str(int((player.remaining_stamina/player.MAX_STAMINA)*100)) + "%"

scripts/bullet.gd

@@ -7,7 +7,7 @@ var bullet_damage
 var instance_bullethole
 var bullet_force_mod = 1.0
 var distance_from_player
-var player
+var player_position
 
 @onready var mesh = $gunbullet1
 @onready var ray = $RayCast3D
@@ -41,7 +41,7 @@ func _process(delta):
 	position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
 	rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
 	
-	distance_from_player = abs(self.global_position - player.global_position)
+	distance_from_player = abs(self.global_position - player_position)
 	
 	if distance_from_player.x > 2 or  distance_from_player.y > 2 or distance_from_player.z > 2:
 		visible = true

scripts/bullet_enemy.gd

@@ -41,6 +41,8 @@ func _process(delta):
 	if ray.is_colliding() and ray.get_collider().is_in_group("player"):
 		var player = ray.get_collider()
 		player.level_control.health -= bullet_damage
+		player.hurt_audio.play()
+		queue_free()
 		print(player.level_control.health)
 	
 	if ray.is_colliding() and !ray.get_collider().is_in_group("player"):

scripts/dead_announce.gd

@@ -0,0 +1,22 @@
+extends Label
+
+var rng = RandomNumberGenerator.new()
+const WIGGLE_SPEED = 100
+var pickuptext
+var viewportWidth
+var viewportHeight
+var start_size
+var changed_size
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	viewportWidth = get_viewport().size.x
+	viewportHeight = get_viewport().size.y
+	start_size = Vector2(size.x, size.y)
+	changed_size = start_size
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	var lv_x = rng.randf_range(-10,10.0) 
+	var lv_y = rng.randf_range(-10.0,10.0)
+	position = Vector2(viewportWidth/2 - (size.x/2), viewportHeight/2 - (size.y/2))

scripts/gun.gd

@@ -105,7 +105,7 @@ func shoot(delta):
 			instance_bullet.bullet_damage = bullet_damage
 			instance_bullet.bullet_force_mod = bullet_force_mod
 			instance_bullet.instance_bullethole = bullethole.instantiate()
-			instance_bullet.player = player
+			instance_bullet.player_position = player.global_position
 			get_tree().get_root().add_child(instance_bullet)
 			
 			# Casing transform

scripts/player.gd

@@ -60,6 +60,7 @@ var remaining_stamina = MAX_STAMINA
 var picked_up = false
 var picked_up_text
 var pickup_announce = load("res://assets/pickup_announce.tscn")
+var dead_announce = load("res://assets/dead_announce.tscn")
 var pickupmsg
 
 @onready var crosshair = $Head/Camera3D/Crosshair
@@ -68,6 +69,8 @@ var pickupmsg
 @onready var world_environment = $"../WorldEnvironment"
 @onready var pickup_sound = $Audio/PickupSound
 @onready var ear_wind = $Audio/EarWind
+@onready var hurt_audio = $Audio/Hurt
+
 @onready var weapon_spawner = $Head/Camera3D/WeaponHolder/WeaponSpawner
 @onready var pick_up_detection = $pick_up_detection
 
@@ -303,6 +306,8 @@ func weapon_recoil(delta):
 
 func die():
 	Engine.time_scale = .05
+	var deadmsg = dead_announce.instantiate()
+	get_parent().add_child(deadmsg)
 	await get_tree().create_timer(.3).timeout
 	get_tree().reload_current_scene()
 	#var instance_dead = dead_player.instantiate()

scripts/revolver_1.gd

@@ -152,7 +152,7 @@ func fire(delta):
 	instance_bullet.bullet_damage = bullet_damage
 	instance_bullet.random_spread_amt = random_spread_amt
 	instance_bullet.bullet_force_mod = bullet_force_mod
-	instance_bullet.player = player
+	instance_bullet.player_position = player.global_position
 	instance_bullet.instance_bullethole = bullethole.instantiate()
 	get_tree().get_root().add_child(instance_bullet)
 	player.weapon_recoil(delta)

scripts/spider.gd

@@ -29,6 +29,7 @@ const MAX_AV = 10
 @onready var turret_look_next = $TurretLookNext
 @onready var spider_look_next = $SpiderLookNext
 @onready var body = $body
+@onready var audio_fire = $AUIDO/Fire
 
 
 @onready var turret = $TurretLook/Turret
@@ -65,7 +66,7 @@ func _process(delta):
 	
 	#FIX BODY ROTATION
 	#spider_look_next.look_at(Vector3(player.global_position.x, global_position.y, player.global_position.z), Vector3.UP)
-	#self.rotation = lerp(self.rotation, spider_look_next.rotation, delta * 1)
+	#body.rotation = lerp(body.rotation, spider_look_next.rotation.y, delta * 1)
 	
 	turret_look_next.look_at(player.global_position,Vector3.UP)
 	turret_look.rotation = lerp(turret_look.rotation,turret_look_next.rotation,delta * turret_look_speed)
@@ -144,11 +145,12 @@ func _on_prefire_timer_timeout():
 	get_tree().get_root().add_child(instance_casing)
 	get_tree().get_root().add_child(instance_casing2)
 	
+	audio_fire.play()
+	
 	prefire_timer.stop()
 	postfire_timer.start()
 
 
 func _on_postfire_timer_timeout():
-	#if turret_look_next.is_colliding() and turret_look_next.get_collider().is_in_group("player"):
 	prefire_timer.start()
 	turret_material.emission_enabled = true

vendingmahcine.tscn

@@ -154,7 +154,7 @@ transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0
 transform = Transform3D(-0.0215597, -0.106081, 0.225348, 0.010103, -0.226377, -0.105599, 0.248864, 4.49794e-10, 0.0238094, 0.164161, 2.55643, 0.471795)
 
 [node name="revolver14" parent="." index="7" instance=ExtResource("2_goj2p")]
-transform = Transform3D(0.0700553, 0.0956774, 0.220086, 0.0104575, -0.230271, 0.0967764, 0.239756, -0.0179125, -0.0685289, -0.016, 0.53, 0.956)
+transform = Transform3D(-0.0215595, -0.106081, 0.225348, 0.0101037, -0.226377, -0.105599, 0.248864, 7.5437e-07, 0.0238095, -0.0237292, 1.94229, 0.717401)
 
 [node name="revolver15" parent="." index="8" instance=ExtResource("2_goj2p")]
 transform = Transform3D(0.0215597, 0.106081, -0.225348, -0.010103, 0.226377, 0.105599, 0.248864, 2.08348e-09, 0.0238094, -0.135839, 1.79441, 0.471795)
@@ -187,7 +187,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182373, 1.45037, 0.997813)
 shape = SubResource("BoxShape3D_te7mh")
 
 [node name="vendingmachine_coil" parent="." index="14"]
-transform = Transform3D(-1, 1.9312e-06, 0, -1.9312e-06, -1, 0, 0, 0, 1, -0.0259684, 1.80304, 0.628036)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0259684, 1.80304, 0.628036)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="15"]
 libraries = {