fixed revolver with new weapon script

This commit is contained in:
derek
2025-03-04 14:28:38 -06:00
parent cc1500e7fd
commit 88d9f0743a
9 changed files with 140 additions and 1097 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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", "chamber")]
[node name="revolver1" type="Node3D" node_paths=PackedStringArray("anim_player", "barrel_ray", "audio_fire", "audio_empty", "audio_reload", "casing_array", "bullet_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")
@@ -1366,6 +1366,7 @@ 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")]
chamber = NodePath("revolver1/Chamber")
[node name="revolver1" type="MeshInstance3D" parent="."]
@@ -1478,13 +1479,14 @@ mesh = SubResource("ArrayMesh_0w43n")
skeleton = NodePath("")
[node name="Trigger" type="MeshInstance3D" parent="revolver1"]
transform = Transform3D(-0.86282, -0.50551, 1.82994e-06, 0, -3.61999e-06, -1, 0.50551, -0.86282, 3.1234e-06, 0.226752, 0, -0.00209358)
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)
cast_shadow = 0
mesh = SubResource("ArrayMesh_ahftj")
skeleton = NodePath("")
[node name="flare" type="MeshInstance3D" parent="revolver1"]
transform = Transform3D(-2.72424e-08, 0.381822, -1.11212e-08, 6.77626e-21, -1.66903e-08, -0.254424, -0.623234, -1.669e-08, 4.86124e-16, -0.109069, 0.0424353, -2.70625)
visible = false
transparency = 1.0
cast_shadow = 0
mesh = SubResource("ArrayMesh_t14cq")
@@ -1504,7 +1506,7 @@ target_position = Vector3(0, 0, -0.1)
transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37115e-08, 0, 0, 0, 1, 0, 0, -1.94881)
visible = false
light_color = Color(0.965385, 0.844179, 0.572893, 1)
light_energy = 20.0
light_energy = 0.0
light_projector = ExtResource("3_q41fl")
light_size = 0.229
shadow_enabled = true

View File

@@ -28,3 +28,4 @@ casing = ExtResource("2_7wxcs")
mag = ExtResource("4_fiujt")
shotgun_spread = Vector3(0.1, 0.1, 0.1)
pellets_per_shot = 20
blast_power = 50.0

View File

@@ -11,6 +11,7 @@ gun_name = "revolver"
gun_icon = ExtResource("2_n6mhi")
path = "res://assets/revolver_1.tscn"
weapon_type = 0
reload_type = 1
bullet = ExtResource("1_53e42")
fire_mode = 1
fov_zoom_amt = 0.98
@@ -18,7 +19,7 @@ ads = false
recoil_amount = Vector3(0.05, 0.05, 0.05)
kick_amount = 0.1
max_ammo = 6
start_mags = 3
start_mags = 30
bullet_damage = 1
smoke_enabled = false
bullet_force_mod = 5.0
@@ -26,3 +27,4 @@ bullet_speed = 1200
casing = ExtResource("2_ylruw")
shotgun_spread = Vector3(0.1, 0.1, 0.1)
pellets_per_shot = 20
blast_power = 50.0