derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks and bug fixes

Browse Source
This commit is contained in:
derek
2024-11-06 16:47:18 -06:00
parent fc00ce0fb2
commit fa054ad3ed
16 changed files with 203 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
assets/mac_10.tscn
View File

@@ -401,7 +401,7 @@ _data = {
"swap_out": SubResource("Animation_i5303")
}
[node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
[node name="mac10" node_paths=PackedStringArray("r_hand_location", "l_hand_location", "flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
script = ExtResource("2_tskiy")
gun_name = "Mac 10"
fov_zoom_amt = 0.995
@@ -409,6 +409,8 @@ recoil_amount = Vector3(0.02, 0.05, 0.05)
max_ammo = 20
bullet_damage = 2
bullet_speed = 1500
r_hand_location = NodePath("mac10/RHandLocation")
l_hand_location = NodePath("mac10/mag/LHandLocation")
flare_light = NodePath("mac10/flare")
bullet = ExtResource("3_xr8co")
bullet_fake = ExtResource("3_heo3y")
@@ -426,7 +428,10 @@ audio_reload = NodePath("Audio/Reload")
[node name="mac10" parent="." index="0"]
transform = Transform3D(-1.086e-06, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.086e-06, 0, 0, 0)
[node name="SpotLight3D" type="SpotLight3D" parent="mac10" index="0"]
[node name="RHandLocation" type="Node3D" parent="mac10" index="0"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 0.255734, -0.514002, -9.25759e-07)
[node name="SpotLight3D" type="SpotLight3D" parent="mac10" index="1"]
transform = Transform3D(-6.79394e-06, 0, 1.87678, 0, 1.87678, 0, -1.87677, 0, -6.79392e-06, -1.63231, 0, 5.90892e-06)
light_color = Color(0.965385, 0.844179, 0.572893, 1)
light_energy = 0.0
@@ -437,10 +442,10 @@ spot_range = 20.0
spot_angle = 60.0
spot_angle_attenuation = 0.353554
[node name="RayCastMag" type="RayCast3D" parent="mac10" index="1"]
[node name="RayCastMag" type="RayCast3D" parent="mac10" index="2"]
transform = Transform3D(2.1023, 0, 2.72848e-12, 0, 2.10229, 0, -5.45697e-12, 0, 2.10229, 0.234, -0.99, 0.006)
[node name="flare" parent="mac10" index="3"]
[node name="flare" parent="mac10" index="4"]
transform = Transform3D(0.71471, 9.09495e-13, -6.77626e-20, 0, -1.9745e-08, -0.451714, -1.36424e-12, 0.451713, -1.97451e-08, -2.78547, 0.0225526, 4.16584e-06)
visible = false
transparency = 1.0
@@ -452,21 +457,24 @@ cast_shadow = 0
mesh = SubResource("ArrayMesh_2s7rn")
skeleton = NodePath("")
[node name="mag" parent="mac10" index="4"]
[node name="mag" parent="mac10" index="5"]
transform = Transform3D(1, 0, 1.36424e-12, 0, 1, 0, -1.36424e-12, 0, 1, 0.183094, -0.254586, -0.000640768)
[node name="RayCastBarrel" type="RayCast3D" parent="mac10" index="5"]
[node name="LHandLocation" type="Node3D" parent="mac10/mag" index="0"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 0.0226869, -1.27721, 0.000640023)
[node name="RayCastBarrel" type="RayCast3D" parent="mac10" index="6"]
transform = Transform3D(-0.0050006, -0.00706674, 1.87676, 0.00197077, 1.87676, 0.00707202, -1.87677, 0.00198961, -0.00499312, -1.40167, 0.0234654, 0.0108915)
target_position = Vector3(0, 0, -0.1)
[node name="RayCastCasing" type="RayCast3D" parent="mac10" index="6"]
[node name="RayCastCasing" type="RayCast3D" parent="mac10" index="7"]
transform = Transform3D(-0.00171201, 5.61171e-05, 1.87678, 0.567942, 1.78878, 0.000464575, -1.78878, 0.567941, -0.00164872, 0.38, 0.169931, -0.210019)
target_position = Vector3(1, 0, 0)
[node name="Trigger" parent="mac10" index="7"]
[node name="Trigger" parent="mac10" index="8"]
transform = Transform3D(0.978226, 0.207541, 0, -0.207541, 0.978226, 0, 0, 0, 1, -0.13807, -0.230628, 0.00528617)
[node name="armStandin" type="MeshInstance3D" parent="mac10" index="8"]
[node name="armStandin" type="MeshInstance3D" parent="mac10" index="9"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 1.48458, -0.467889, 0.0751227)
visible = false
mesh = SubResource("BoxMesh_3phrt")