From 7edf5ab74cd693897e8fdeb90f02a3a57a55f1ef Mon Sep 17 00:00:00 2001 From: Alan Shen Date: Mon, 9 Nov 2026 03:25:27 -0700 Subject: [PATCH] Add partial reloads to the AA13 The AA13 script gets the reload phases from neoAssets and a chamber slot: #base "weapon_aa13_reload_phases.txt", "ReloadPhases" {} and "ChamberedRound" "1", as the ZR68C has them, and game_sounds_weapons.txt the four reload sound pieces the phases play (weapon_aa13.reload_unload, reload_unload_part2, 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 | 38 ++++++++++++++++++++++++ game/neo/scripts/weapon_aa13.txt | 7 +++++ 2 files changed, 45 insertions(+) diff --git a/game/neo/scripts/game_sounds_weapons.txt b/game/neo/scripts/game_sounds_weapons.txt index bd0ea5bbc9..73d25518bd 100644 --- a/game/neo/scripts/game_sounds_weapons.txt +++ b/game/neo/scripts/game_sounds_weapons.txt @@ -207,6 +207,44 @@ "wave" "weapons/aa13/aa13_reload.wav" } +// AA13 reload in per-step pieces (sv_neo_reload_experimental). + +"weapon_aa13.reload_unload" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/aa13/aa13_reload_unload.wav" +} + +"weapon_aa13.reload_unload_part2" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/aa13/aa13_reload_unload_part2.wav" +} + +"weapon_aa13.reload_load" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/aa13/aa13_reload_load.wav" +} + +"weapon_aa13.reload_cycle" +{ + "channel" "CHAN_ITEM" + "soundlevel" "SNDLVL_NORM" + "volume" "1.0" + "pitch" "PITCH_NORM" + "wave" ")weapons/aa13/aa13_reload_cycle.wav" +} + //------------------ "weapon_aa13.npc_reload" diff --git a/game/neo/scripts/weapon_aa13.txt b/game/neo/scripts/weapon_aa13.txt index ab2ba7f116..7c688cf38c 100644 --- a/game/neo/scripts/weapon_aa13.txt +++ b/game/neo/scripts/weapon_aa13.txt @@ -1,3 +1,5 @@ +#base "weapon_aa13_reload_phases.txt" + //AA13 WeaponData @@ -8,6 +10,11 @@ WeaponData "CycleTime" "0.333" "ReloadReadyBeforeEnd" "0.395" // the reload is done at the last reload click, this long before its animation ends // the charging handle is home 0.333 before the end, the alternative value + + // 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" // Weapon data is loaded by both the Game and Client DLLs. "printname" "AA13"