tweaks and continued gd4.4 upgrading

This commit is contained in:
derek
2025-03-06 16:28:52 -06:00
parent 326351a595
commit cba8e22fb4
13 changed files with 2210 additions and 2672 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -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