diff --git a/assets/mac_10.tscn b/assets/mac_10.tscn index 6702e52..365ecb9 100644 --- a/assets/mac_10.tscn +++ b/assets/mac_10.tscn @@ -539,17 +539,17 @@ tracks/7/path = NodePath(".") tracks/7/interp = 1 tracks/7/loop_wrap = true 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), "values": [{ "args": [], "method": &"mark_anim_rot" }, { "args": [], -"method": &"spawn_mag" +"method": &"mark_anim_rot" }, { "args": [], -"method": &"mark_anim_rot" +"method": &"spawn_mag" }, { "args": [], "method": &"reload_finished" @@ -748,7 +748,7 @@ audio_empty = NodePath("Audio/Empty") audio_reload = NodePath("Audio/Reload") [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 lod_bias = 10.0 mesh = SubResource("ArrayMesh_pcg38") diff --git a/scripts/weapon_uberscript.gd b/scripts/weapon_uberscript.gd index 1125751..7d838e4 100644 --- a/scripts/weapon_uberscript.gd +++ b/scripts/weapon_uberscript.gd @@ -162,14 +162,13 @@ func reload(): func spawn_mag(): 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() instance_mag.position = mag_ejector.global_position instance_mag.transform.basis = mag_ejector.global_transform.basis instance_mag.linear_velocity += global_transform.basis * (anim_velocity["lv"] * 5) + player.velocity instance_mag.angular_velocity += global_transform.basis * anim_velocity["av"] + get_tree().get_root().add_child(instance_mag) func spawn_casing():