tweaks and continued gd4.4 upgrading

assets/pistol1.tscn

@@ -1,11 +1,8 @@
-[gd_scene load_steps=24 format=3 uid="uid://dslxb3psx30vp"]
+[gd_scene load_steps=21 format=3 uid="uid://dslxb3psx30vp"]
 
 [ext_resource type="PackedScene" uid="uid://svrb3n31mkag" path="res://assets/Models/gun.blend" id="1_frekg"]
-[ext_resource type="Script" uid="uid://c6npw0lul1llg" path="res://scripts/trackerGun.gd" id="2_ieev5"]
-[ext_resource type="Texture2D" uid="uid://d2fic5txnwu3u" path="res://assets/Textures/ObjectTextures/Pistol.png" id="3_gkvbi"]
-[ext_resource type="PackedScene" uid="uid://crvohhc6kgshn" path="res://assets/bullet_hole.tscn" id="4_bu1g0"]
-[ext_resource type="PackedScene" uid="uid://c1gdehrsytlkk" path="res://assets/casing.tscn" id="5_gls8p"]
-[ext_resource type="PackedScene" uid="uid://cp8563f0oxvff" path="res://assets/mag1.tscn" id="6_ysonb"]
+[ext_resource type="Script" uid="uid://dhr2xfj3qow4c" path="res://scripts/weapon_uberscript.gd" id="2_wrnws"]
+[ext_resource type="Resource" uid="uid://dpcoofjsxi10q" path="res://assets/weaponresources/pistol1.tres" id="3_er7xg"]
 [ext_resource type="AudioStream" uid="uid://bxjv50ivk3fvn" path="res://assets/Audio/Weapons/9mm Full Size Pistol/Gunshots/9mm Full Size Pistol - Gunshot B 001.wav" id="7_25stk"]
 [ext_resource type="AudioStream" uid="uid://t50i483xmj3a" path="res://assets/Audio/Weapons/toy-click-spin-SBA-300071143.wav" id="9_btm61"]
 [ext_resource type="AudioStream" uid="uid://db3iy0f1pa5lg" path="res://assets/Audio/Weapons/gun-m-16-reload-full-clip-magazine-SBA-300121257.wav" id="10_xn8pu"]
@@ -339,6 +336,20 @@ tracks/2/keys = {
 "update": 0,
 "values": [Vector3(0, 0, 0), Vector3(0.4, 0, 0), Vector3(0, 0, 0)]
 }
+tracks/3/type = "method"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath(".")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"bullet_fire"
+}]
+}
 
 [sub_resource type="Animation" id="Animation_tikvk"]
 resource_name = "sprint"
@@ -428,20 +439,12 @@ _data = {
 &"swap_out": SubResource("Animation_lleyf")
 }
 
-[node name="Pistol" node_paths=PackedStringArray("tracker_indicator", "flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_frekg")]
+[node name="Pistol" node_paths=PackedStringArray("anim_player", "barrel_ray", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_frekg")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0145504, -0.0460228)
-script = ExtResource("2_ieev5")
-gun_name = "Tracker Pistol"
-gun_icon = ExtResource("3_gkvbi")
-recoil_amount = Vector3(0, 0.05, 0.05)
-bullet_speed = 50
-tracker_indicator = NodePath("gun/slide/TrackerIndicator")
-flare_light = NodePath("SpotLight3D")
-bullethole = ExtResource("4_bu1g0")
-casing = ExtResource("5_gls8p")
-mag = ExtResource("6_ysonb")
+script = ExtResource("2_wrnws")
+weapon_info = ExtResource("3_er7xg")
 anim_player = NodePath("AnimationPlayer")
-barrel_raycast = NodePath("gun/RayCastBarrel")
+barrel_ray = NodePath("gun/RayCastBarrel")
 casing_ejector = NodePath("gun/RayCastCasing")
 mag_ejector = NodePath("gun/RayCastMag")
 audio_fire = NodePath("Audio/Fire")
@@ -477,7 +480,7 @@ target_position = Vector3(1, 0, 0)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="1"]
 libraries = {
-"": SubResource("AnimationLibrary_vkrtt")
+&"": SubResource("AnimationLibrary_vkrtt")
 }
 
 [node name="Audio" type="Node3D" parent="." index="2"]

assets/weaponresources/mac10_uberresource.tres

@@ -15,7 +15,6 @@ weapon_type = 0
 reload_type = 0
 bullet = ExtResource("1_y4ehq")
 fire_mode = 0
-hitscan_range = 100.0
 fov_zoom_amt = 0.98
 ads = false
 recoil_amount = Vector3(0.05, 0.05, 0.05)
@@ -28,6 +27,11 @@ bullet_force_mod = 5.0
 bullet_speed = 600
 casing = ExtResource("2_7wxcs")
 mag = ExtResource("4_fiujt")
+vibration_weak_magnitude = 0.1
+vibration_strong_magnitude = 0.5
+vibration_duration = 0.1
+chamber_rot_amount = 60.0
 shotgun_spread = Vector3(0.1, 0.1, 0.1)
 pellets_per_shot = 20
 blast_power = 50.0
+hitscan_range = 100.0

assets/weaponresources/machete.tres

@@ -11,7 +11,6 @@ path = "res://assets/machete.tscn"
 weapon_type = 1
 reload_type = 0
 fire_mode = 1
-hitscan_range = 100.0
 fov_zoom_amt = 0.98
 ads = false
 recoil_amount = Vector3(0, 0.05, 0.05)
@@ -22,6 +21,11 @@ bullet_damage = 5
 smoke_enabled = false
 bullet_force_mod = 5.0
 bullet_speed = 600
+vibration_weak_magnitude = 0.1
+vibration_strong_magnitude = 0.5
+vibration_duration = 0.1
+chamber_rot_amount = 60.0
 shotgun_spread = Vector3(0.1, 0.1, 0.1)
 pellets_per_shot = 20
 blast_power = 50.0
+hitscan_range = 100.0

assets/weaponresources/pistol1.tres

@@ -0,0 +1,38 @@
+[gd_resource type="Resource" script_class="weapon_resource" load_steps=6 format=3 uid="uid://dpcoofjsxi10q"]
+
+[ext_resource type="Resource" uid="uid://covnkagmv8b1x" path="res://assets/weaponresources/light_ammo.tres" id="1_oqs71"]
+[ext_resource type="PackedScene" uid="uid://c1gdehrsytlkk" path="res://assets/casing.tscn" id="2_g6owq"]
+[ext_resource type="Texture2D" uid="uid://d2fic5txnwu3u" path="res://assets/Textures/ObjectTextures/Pistol.png" id="3_fbxkm"]
+[ext_resource type="PackedScene" uid="uid://cp8563f0oxvff" path="res://assets/mag1.tscn" id="4_xovdq"]
+[ext_resource type="Script" uid="uid://d0cf6xsxkf0h" path="res://scripts/weapon_resource.gd" id="5_mkwdh"]
+
+[resource]
+script = ExtResource("5_mkwdh")
+gun_name = "pistol 1"
+gun_icon = ExtResource("3_fbxkm")
+path = "res://assets/pistol1.tscn"
+weapon_type = 0
+reload_type = 0
+bullet = ExtResource("1_oqs71")
+fire_mode = 2
+fov_zoom_amt = 0.98
+ads = false
+recoil_amount = Vector3(0.05, 0.05, 0.05)
+kick_amount = 0.1
+max_ammo = 15
+start_mags = 3
+bullet_damage = 1
+smoke_enabled = false
+bullet_force_mod = 5.0
+bullet_speed = 600
+casing = ExtResource("2_g6owq")
+mag = ExtResource("4_xovdq")
+vibration_weak_magnitude = 0.1
+vibration_strong_magnitude = 0.5
+vibration_duration = 0.1
+chamber_rot_amount = 60.0
+shotgun_spread = Vector3(0.1, 0.1, 0.1)
+pellets_per_shot = 20
+blast_power = 50.0
+hitscan_range = 100.0
+metadata/_custom_type_script = "uid://d0cf6xsxkf0h"

assets/weaponresources/revolver1.tres

@@ -14,7 +14,6 @@ weapon_type = 0
 reload_type = 1
 bullet = ExtResource("1_53e42")
 fire_mode = 1
-hitscan_range = 100.0
 fov_zoom_amt = 0.98
 ads = false
 recoil_amount = Vector3(0.05, 0.05, 0.05)
@@ -26,6 +25,11 @@ smoke_enabled = false
 bullet_force_mod = 5.0
 bullet_speed = 1200
 casing = ExtResource("2_ylruw")
+vibration_weak_magnitude = 0.1
+vibration_strong_magnitude = 0.5
+vibration_duration = 0.1
+chamber_rot_amount = 60.0
 shotgun_spread = Vector3(0.1, 0.1, 0.1)
 pellets_per_shot = 20
 blast_power = 50.0
+hitscan_range = 100.0