From bd8a5bb184bf1c11b36b8f2c809c3dc7b3f446fe Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Mon, 9 Nov 2026 06:03:56 -0700 Subject: [PATCH] Add partial reloads to the MX family Both MX scripts get the reload phases from neoAssets and a chamber slot: weapon_mx.txt #base "weapon_mx_reload_phases.txt" and weapon_mx_silenced.txt #base "weapon_mxs_reload_phases.txt", each with "ReloadPhases" {} and "ChamberedRound" "1". game_sounds_weapons.txt gets the three reload sound pieces both play (weapon_mx.reload_unload, reload_load, reload_cycle). The generic phase code then resumes a reload interrupted after the unload or the load, and a reload with a round chambered skips the handle pull. No code changes. --- game/neo/scripts/game_sounds_weapons.txt | 29 ++++++++++++++++++++++++ game/neo/scripts/weapon_mx.txt | 7 ++++++ game/neo/scripts/weapon_mx_silenced.txt | 7 ++++++ 3 files changed, 43 insertions(+) diff --git a/game/neo/scripts/game_sounds_weapons.txt b/game/neo/scripts/game_sounds_weapons.txt index 9f756c1ee7..66e2a7dd22 100644 --- a/game/neo/scripts/game_sounds_weapons.txt +++ b/game/neo/scripts/game_sounds_weapons.txt @@ -1175,6 +1175,35 @@ "wave" "weapons/mx/mx_reload.wav" } +// MX reload in per-step pieces (sv_neo_reload_experimental). + +"weapon_mx.reload_unload" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/mx/mx_reload_unload.wav" +} + +"weapon_mx.reload_load" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/mx/mx_reload_load.wav" +} + +"weapon_mx.reload_cycle" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/mx/mx_reload_cycle.wav" +} + //------------------- "weapon_mx.npc_reload" diff --git a/game/neo/scripts/weapon_mx.txt b/game/neo/scripts/weapon_mx.txt index 953c278462..75efa39c89 100644 --- a/game/neo/scripts/weapon_mx.txt +++ b/game/neo/scripts/weapon_mx.txt @@ -1,3 +1,5 @@ +#base "weapon_mx_reload_phases.txt" + // MX WeaponData @@ -17,6 +19,11 @@ WeaponData "CycleTime" "0.106060" // time between shots "ReloadReadyBeforeEnd" "0.417" // the reload is done at the last reload click, this long before its animation ends + // Reload phases (sv_neo_reload_experimental): the rows come from neoAssets, timed from its Blender markers + "ReloadPhases" {} + // Chamber capacity is gameplay data; the phase timing comes from neoAssets. + "ChamberedRound" "1" + "TPMuzzleFlashScale" "0.3" "clip_size" "30" diff --git a/game/neo/scripts/weapon_mx_silenced.txt b/game/neo/scripts/weapon_mx_silenced.txt index 918e953662..33387ecf06 100644 --- a/game/neo/scripts/weapon_mx_silenced.txt +++ b/game/neo/scripts/weapon_mx_silenced.txt @@ -1,3 +1,5 @@ +#base "weapon_mxs_reload_phases.txt" + WeaponData { // Weapon data is loaded by both the Game and Client DLLs. @@ -15,6 +17,11 @@ WeaponData "CycleTime" "0.106060" // time between shots "ReloadReadyBeforeEnd" "0.427" // the reload is done at the last reload click, this long before its animation ends + // Reload phases (sv_neo_reload_experimental): the rows come from neoAssets, timed from its Blender markers + "ReloadPhases" {} + // Chamber capacity is gameplay data; the phase timing comes from neoAssets. + "ChamberedRound" "1" + "TPMuzzleFlashScale" "0.3" "clip_size" "30"