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

fixed mac 10 mag spawning by just pushing the mark functions closer to each other

Browse Source
This commit is contained in:
derek
2025-04-09 15:51:48 -05:00
parent 92437ea398
commit 5d116b1a20
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/mac_10.tscn
View File

@@ -539,17 +539,17 @@ tracks/7/path = NodePath(".")
tracks/7/interp = 1 tracks/7/interp = 1
tracks/7/loop_wrap = true tracks/7/loop_wrap = true
tracks/7/keys = { tracks/7/keys = {
"times": PackedFloat32Array(0, 0.28, 0.2801, 0.95), "times": PackedFloat32Array(0, 0.17, 0.28, 0.95),
"transitions": PackedFloat32Array(1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1),
"values": [{ "values": [{
"args": [], "args": [],
"method": &"mark_anim_rot" "method": &"mark_anim_rot"
}, { }, {
"args": [], "args": [],
"method": &"spawn_mag" "method": &"mark_anim_rot"
}, { }, {
"args": [], "args": [],
"method": &"mark_anim_rot" "method": &"spawn_mag"
}, { }, {
"args": [], "args": [],
"method": &"reload_finished" "method": &"reload_finished"
@@ -748,7 +748,7 @@ audio_empty = NodePath("Audio/Empty")
audio_reload = NodePath("Audio/Reload") audio_reload = NodePath("Audio/Reload")
[node name="mac10" type="MeshInstance3D" parent="."] [node name="mac10" type="MeshInstance3D" parent="."]
transform = Transform3D(-1.086e-06, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.086e-06, 0, 0, 0) transform = Transform3D(0.00547455, 0.00277349, -0.299937, -0.0256886, 0.298889, 0.00229492, 0.298848, 0.0256413, 0.00569177, -0.0109618, 0.0121364, 9.31208e-05)
cast_shadow = 0 cast_shadow = 0
lod_bias = 10.0 lod_bias = 10.0
mesh = SubResource("ArrayMesh_pcg38") mesh = SubResource("ArrayMesh_pcg38")

3
scripts/weapon_uberscript.gd
View File

@@ -162,14 +162,13 @@ func reload():
func spawn_mag(): func spawn_mag():
var instance_mag = weapon_info.mag.instantiate() var instance_mag = weapon_info.mag.instantiate()
if spawn_av_lv.size() == 1:
await spawn_av_lv.size() ==2
var anim_velocity = solve_anim_av_lv() var anim_velocity = solve_anim_av_lv()
instance_mag.position = mag_ejector.global_position instance_mag.position = mag_ejector.global_position
instance_mag.transform.basis = mag_ejector.global_transform.basis instance_mag.transform.basis = mag_ejector.global_transform.basis
instance_mag.linear_velocity += global_transform.basis * (anim_velocity["lv"] * 5) + player.velocity instance_mag.linear_velocity += global_transform.basis * (anim_velocity["lv"] * 5) + player.velocity
instance_mag.angular_velocity += global_transform.basis * anim_velocity["av"] instance_mag.angular_velocity += global_transform.basis * anim_velocity["av"]
get_tree().get_root().add_child(instance_mag) get_tree().get_root().add_child(instance_mag)
func spawn_casing(): func spawn_casing():