more tweaks to weapon script and revolvers

This commit is contained in:
derek
2025-03-04 15:27:37 -06:00
parent 88d9f0743a
commit e84aea9ef7
6 changed files with 40 additions and 47 deletions

View File

@@ -1356,7 +1356,7 @@ _data = {
"swap_out": SubResource("Animation_nvmxj")
}
[node name="revolver1" type="Node3D" node_paths=PackedStringArray("anim_player", "barrel_ray", "audio_fire", "audio_empty", "audio_reload", "casing_array", "bullet_array", "chamber")]
[node name="revolver1" type="Node3D" node_paths=PackedStringArray("anim_player", "barrel_ray", "audio_fire", "audio_empty", "audio_reload", "casing_array", "chamber")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0718293, 0)
script = ExtResource("2_boy4r")
weapon_info = ExtResource("3_oxh61")
@@ -1365,8 +1365,7 @@ barrel_ray = NodePath("revolver1/RayCastBarrel")
audio_fire = NodePath("Audio/Fire")
audio_empty = NodePath("Audio/Empty")
audio_reload = NodePath("Audio/Reload")
casing_array = [NodePath("revolver1/Chamber/RayCastCasing1"), NodePath("revolver1/Chamber/RayCastCasing2"), NodePath("revolver1/Chamber/RayCastCasing3"), NodePath("revolver1/Chamber/RayCastCasing4"), NodePath("revolver1/Chamber/RayCastCasing5"), NodePath("revolver1/Chamber/RayCastCasing6")]
bullet_array = [NodePath("revolver1/Chamber/bullet"), NodePath("revolver1/Chamber/bullet_001"), NodePath("revolver1/Chamber/bullet_002"), NodePath("revolver1/Chamber/bullet_003"), NodePath("revolver1/Chamber/bullet_004"), NodePath("revolver1/Chamber/bullet_005")]
casing_array = [NodePath("revolver1/Chamber/casing"), NodePath("revolver1/Chamber/casing_001"), NodePath("revolver1/Chamber/casing_002"), NodePath("revolver1/Chamber/casing_003"), NodePath("revolver1/Chamber/casing_004"), NodePath("revolver1/Chamber/casing_005")]
chamber = NodePath("revolver1/Chamber")
[node name="revolver1" type="MeshInstance3D" parent="."]
@@ -1479,7 +1478,7 @@ mesh = SubResource("ArrayMesh_0w43n")
skeleton = NodePath("")
[node name="Trigger" type="MeshInstance3D" parent="revolver1"]
transform = Transform3D(0.207537, -0.978227, 3.54117e-06, 0, -3.61999e-06, -1, 0.978227, 0.207537, -7.51281e-07, 0.226752, 0, -0.00209358)
transform = Transform3D(0.207537, -0.978227, 4.27597e-08, 0, -4.37114e-08, -1, 0.978227, 0.207537, -9.07173e-09, 0.226752, 0, -0.00209358)
cast_shadow = 0
mesh = SubResource("ArrayMesh_ahftj")
skeleton = NodePath("")

View File

@@ -12,6 +12,7 @@ gun_name = "Mac 10"
gun_icon = ExtResource("2_a3oyj")
path = "res://assets/mac_10_uber.tscn"
weapon_type = 0
reload_type = 0
bullet = ExtResource("1_y4ehq")
fire_mode = 0
fov_zoom_amt = 0.98

View File

@@ -9,6 +9,7 @@ gun_name = "machete"
gun_icon = ExtResource("1_c6dni")
path = "res://assets/machete.tscn"
weapon_type = 1
reload_type = 0
fire_mode = 1
fov_zoom_amt = 0.98
ads = false
@@ -22,3 +23,4 @@ bullet_force_mod = 5.0
bullet_speed = 600
shotgun_spread = Vector3(0.1, 0.1, 0.1)
pellets_per_shot = 20
blast_power = 50.0

View File

@@ -19,7 +19,7 @@ ads = false
recoil_amount = Vector3(0.05, 0.05, 0.05)
kick_amount = 0.1
max_ammo = 6
start_mags = 30
start_mags = 1
bullet_damage = 1
smoke_enabled = false
bullet_force_mod = 5.0