reticle moves when firing, stunned enemies have stars now

assets/Models/star1.blend.import

@@ -0,0 +1,51 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bkxgvvt7mdjhe"
+path="res://.godot/imported/star1.blend-12ce158c88218826803829de5e42deed.scn"
+
+[deps]
+
+source_file="res://assets/Models/star1.blend"
+dest_files=["res://.godot/imported/star1.blend-12ce158c88218826803829de5e42deed.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=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
+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/UI/Crosshair/SVG/Reticle 1_svg.svg.import

@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -32,6 +32,6 @@ process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
 detect_3d/compress_to=1
-svg/scale=1.0
+svg/scale=5.0
 editor/scale_with_editor_scale=false
 editor/convert_colors_with_editor_theme=false

assets/UI/Crosshair/SVG/Stamina_White.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92.53 92.53">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #fff;
+        stroke-miterlimit: 10;
+        stroke-width: 20px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1-2" data-name="Layer 1">
+    <circle class="cls-1" cx="46.27" cy="46.27" r="36.27"/>
+  </g>
+</svg>

assets/UI/Crosshair/SVG/Stamina_White.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://h2tp42xntorm"
+path="res://.godot/imported/Stamina_White.svg-49f454709daedfc3ce4b38c781d7f4a3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/UI/Crosshair/SVG/Stamina_White.svg"
+dest_files=["res://.godot/imported/Stamina_White.svg-49f454709daedfc3ce4b38c781d7f4a3.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
+svg/scale=4.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

assets/UI/Crosshair/SVG/reticle_inner.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 6.97 6.97">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #000;
+        stroke-miterlimit: 10;
+        stroke-width: .25px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_2-2" data-name="Layer 2">
+    <circle class="cls-1" cx="3.49" cy="3.49" r="3.36"/>
+  </g>
+</svg>

assets/UI/Crosshair/SVG/reticle_inner.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cpe2ehq1vtj25"
+path="res://.godot/imported/reticle_inner.svg-55627ddc5200d199a492ce582229ca65.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/UI/Crosshair/SVG/reticle_inner.svg"
+dest_files=["res://.godot/imported/reticle_inner.svg-55627ddc5200d199a492ce582229ca65.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
+svg/scale=5.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

assets/UI/Crosshair/SVG/reticle_outer.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 39.59 39.59">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke: #000;
+        stroke-miterlimit: 10;
+        stroke-width: .25px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_2-2" data-name="Layer 2">
+    <path class="cls-1" d="M19.8,39.46C8.95,39.46.12,30.63.12,19.8S8.95.12,19.8.12s19.67,8.82,19.67,19.67-8.82,19.67-19.67,19.67ZM19.8,3.13c-9.19,0-16.67,7.47-16.67,16.66s7.48,16.67,16.67,16.67,16.67-7.48,16.67-16.67S28.98,3.12,19.8,3.12h0Z"/>
+  </g>
+</svg>

assets/UI/Crosshair/SVG/reticle_outer.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dumgg4fq1ngbj"
+path="res://.godot/imported/reticle_outer.svg-21ae5ac2f3e1c6066c57e075f6e328b0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/UI/Crosshair/SVG/reticle_outer.svg"
+dest_files=["res://.godot/imported/reticle_outer.svg-21ae5ac2f3e1c6066c57e075f6e328b0.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
+svg/scale=5.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

assets/oil_drum_explosion.tscn

@@ -61,13 +61,13 @@ points = PackedVector3Array(1.02121, 0.335057, -0.0550804, 1.0208, 0.331569, -0.
 _data = [Vector2(0, 0), 0.0, 1.4, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_csbqc"]
+[sub_resource type="CurveTexture" id="CurveTexture_ojymx"]
 curve = SubResource("Curve_m4k82")
 
 [sub_resource type="Gradient" id="Gradient_nisqe"]
 colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
 
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_rly2i"]
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_4n4bc"]
 gradient = SubResource("Gradient_nisqe")
 
 [sub_resource type="Curve" id="Curve_ddeei"]
@@ -75,7 +75,7 @@ min_value = -1.0
 _data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_6yvtl"]
+[sub_resource type="CurveTexture" id="CurveTexture_es573"]
 curve = SubResource("Curve_ddeei")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_awcur"]
@@ -89,14 +89,14 @@ initial_velocity_min = 10.0
 initial_velocity_max = 30.0
 gravity = Vector3(0, 0.5, 0)
 scale_min = 0.1
-color_ramp = SubResource("GradientTexture1D_rly2i")
-alpha_curve = SubResource("CurveTexture_csbqc")
-hue_variation_curve = SubResource("CurveTexture_6yvtl")
+color_ramp = SubResource("GradientTexture1D_4n4bc")
+alpha_curve = SubResource("CurveTexture_ojymx")
+hue_variation_curve = SubResource("CurveTexture_es573")
 turbulence_enabled = true
 turbulence_noise_strength = 0.0
 turbulence_noise_scale = 0.5
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dk2fi"]
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vi7dl"]
 transparency = 1
 blend_mode = 1
 shading_mode = 0
@@ -105,7 +105,7 @@ albedo_texture = ExtResource("1_wii2f")
 billboard_mode = 1
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_a0k8c"]
-material = SubResource("StandardMaterial3D_dk2fi")
+material = SubResource("StandardMaterial3D_vi7dl")
 size = Vector2(10, 10)
 orientation = 2
 

assets/oildrum1.tscn

@@ -1,13 +1,14 @@
-[gd_scene load_steps=16 format=4 uid="uid://dlhjacsike5a4"]
+[gd_scene load_steps=26 format=4 uid="uid://dlhjacsike5a4"]
 
 [ext_resource type="Texture2D" uid="uid://ch7jxw5ghkgij" path="res://assets/Models/oildrum1.albedo.png" id="1_uppfj"]
 [ext_resource type="Script" path="res://scripts/oildrum.gd" id="1_yvhou"]
 [ext_resource type="Texture2D" uid="uid://coy85a3x5unp8" path="res://assets/Models/oildrum1.metallic.png" id="2_ip3os"]
-[ext_resource type="PackedScene" uid="uid://b2e6q2gs3alc3" path="res://assets/barrel_explosion.tscn" id="2_ww2l7"]
+[ext_resource type="PackedScene" uid="uid://b2e6q2gs3alc3" path="res://assets/oil_drum_explosion.tscn" id="2_ww2l7"]
 [ext_resource type="Texture2D" uid="uid://ioiy6cm2ypl7" path="res://assets/Models/oildrum1.normal.png" id="3_ouyr7"]
 [ext_resource type="Texture2D" uid="uid://dhm0fgqc3nx2t" path="res://assets/Models/oildrum1.rough.png" id="4_t4407"]
 [ext_resource type="AudioStream" uid="uid://8w8imybwyxxa" path="res://assets/Audio/Various SFX/gas-leak-SBA-300149983.mp3" id="6_iai82"]
 [ext_resource type="AudioStream" uid="uid://dmt6bxnm00wfg" path="res://assets/Audio/Dropped Object/metal-heavy-drop-fall-SBA-300117028.wav" id="8_u73t3"]
+[ext_resource type="Texture2D" uid="uid://dn3b6uw8xr63m" path="res://assets/Textures/Smoke/smoketest_v1_0043.png" id="9_oqr3q"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ah05b"]
 resource_name = "oildrum1"
@@ -72,6 +73,57 @@ radius = 10.0
 height = 1.26931
 radius = 0.425725
 
+[sub_resource type="Curve" id="Curve_nyfhs"]
+_data = [Vector2(0, 0), 0.0, 1.4, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_csbqc"]
+curve = SubResource("Curve_nyfhs")
+
+[sub_resource type="Gradient" id="Gradient_2etkt"]
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
+
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_rly2i"]
+gradient = SubResource("Gradient_2etkt")
+
+[sub_resource type="Curve" id="Curve_4gp8s"]
+min_value = -1.0
+_data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_6yvtl"]
+curve = SubResource("Curve_4gp8s")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_nu0ea"]
+particle_flag_rotate_y = true
+emission_shape = 1
+emission_sphere_radius = 1.0
+velocity_pivot = Vector3(0, 1, 0)
+direction = Vector3(0, 1, 0)
+initial_velocity_min = 1.0
+initial_velocity_max = 1.0
+gravity = Vector3(0, 1, 0)
+scale_min = 0.1
+color_ramp = SubResource("GradientTexture1D_rly2i")
+alpha_curve = SubResource("CurveTexture_csbqc")
+hue_variation_curve = SubResource("CurveTexture_6yvtl")
+turbulence_noise_strength = 0.0
+turbulence_noise_scale = 1.0
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2e7oy"]
+transparency = 1
+blend_mode = 1
+shading_mode = 0
+albedo_color = Color(0.93, 0.5735, 0, 1)
+albedo_texture = ExtResource("9_oqr3q")
+billboard_mode = 1
+billboard_keep_scale = true
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_hi6ep"]
+material = SubResource("StandardMaterial3D_2e7oy")
+size = Vector2(3, 3)
+orientation = 2
+
 [node name="Oildrum1" type="RigidBody3D" groups=["leak"]]
 collision_layer = 32
 collision_mask = 253
@@ -106,4 +158,13 @@ shape = SubResource("SphereShape3D_p1wn3")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0143872, 0)
 shape = SubResource("CylinderShape3D_uiqtq")
 
+[node name="Flames" type="GPUParticles3D" parent="."]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 0, 0)
+emitting = false
+amount = 50
+lifetime = 4.0
+fixed_fps = 60
+process_material = SubResource("ParticleProcessMaterial_nu0ea")
+draw_pass_1 = SubResource("PlaneMesh_hi6ep")
+
 [connection signal="body_entered" from="." to="." method="_on_body_entered"]

assets/revolver_1.tscn

@@ -1098,7 +1098,7 @@ gun_name = ".44 Galore"
 gun_icon = ExtResource("3_nl201")
 fire_mode = 1
 fov_zoom_amt = 25
-recoil_amount = Vector3(0.25, 0.1, 0.1)
+recoil_amount = Vector3(0.125, 0.1, 0.1)
 max_ammo = 6
 bullet_damage = 5
 kick_amount = 2

assets/spider2.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=75 format=4 uid="uid://djr7vnr1hcx82"]
+[gd_scene load_steps=76 format=4 uid="uid://djr7vnr1hcx82"]
 
 [ext_resource type="Script" path="res://scripts/spider.gd" id="1_7e7fe"]
 [ext_resource type="Texture2D" uid="uid://dmyn4eq2r12ue" path="res://assets/Models/spider1.albedoRAW.png" id="1_di6b8"]
@@ -18,6 +18,7 @@
 [ext_resource type="AudioStream" uid="uid://0n251thxlnnp" path="res://assets/Audio/cannon-fire-single-shot-blast-explosion-SBA-300098885.wav" id="10_2qmhc"]
 [ext_resource type="Material" uid="uid://cc0el8wu0au85" path="res://assets/materials/OutlineMat.tres" id="13_ee4im"]
 [ext_resource type="Texture2D" uid="uid://dn3b6uw8xr63m" path="res://assets/Textures/Smoke/smoketest_v1_0043.png" id="14_alcfd"]
+[ext_resource type="PackedScene" uid="uid://2mct75k6xcia" path="res://assets/stunned_stars.tscn" id="18_ippdt"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rgii8"]
 resource_name = "spider1.turret"
@@ -1006,6 +1007,9 @@ shape = SubResource("SphereShape3D_n7n6o")
 visible = false
 mesh = SubResource("ArrayMesh_v85cv")
 
+[node name="StunnedStars" parent="body" instance=ExtResource("18_ippdt")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.803357, 0)
+
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0258179, 1.03281, 0.00894165)
 shape = SubResource("BoxShape3D_xxx55")