Skip to content

Partial reloads 14: Add partial reloads to the AA13 - #2300

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/90-milsofrom
stack/reload-zr68c/95-aa13
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/90-milsofrom
stack/reload-zr68c/95-aa13

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Depends on NeotokyoRebuild/neoAssets#186 (layer 14: the AA13 sources, clips, phases file and sound pieces).

Partial reloads 14: add partial reloads to the AA13. This PR builds on layer 13 (#2299, the MilSO) and pairs with
neoAssets layer 14. Next: #2301 (15, SRS).

The phase code of 03-05 is generic: a weapon gets partial reloads from its weapon script and a phases file. This PR
adds the weapon script lines and the sound entries; it has no code changes.

  • AA13: #base "weapon_aa13_reload_phases.txt", "ReloadPhases" {}, "ChamberedRound" "1", as the ZR68C has
    them. Its reload has the ZR68C's three steps (drum out, drum seat, handle) and four new sound entries,
    weapon_aa13.reload_unload, _unload_part2, _load, _cycle.
  • The flag sv_neo_reload_experimental defaults to 1 while the partial-reload stack is reviewed (Partial reloads 06: Resume a ZR68C reload after the magazine is unloaded #2293); the
    last PR of the stack sets it back to 0. With the flag at 0 the AA13 behaves as on master.

How to review

  1. weapon_aa13.txt: the three lines, as weapon_zr68c.txt has them (Partial reloads 06: Resume a ZR68C reload after the magazine is unloaded #2293, Partial reloads 08: Keep a chambered round through a partial reload #2294).
  2. game_sounds_weapons.txt: the four AA13 entries, in the weapon_zr68.reload_* pattern.
  3. The neoAssets layer 14 phases file.
  4. Test in game: "How to test".

How to test

  1. Load a map (the flag is 1 by default during review). Take the AA13: the HUD shows 15+1.
  2. Fire a few rounds and reload: no handle pull, 16+1. Fire the drum empty and reload: 16 with a dim round icon,
    then 15+1 at the handle.
  3. Reload and switch to the secondary after the old drum is out (about 1.0-3.4 s in), then back, once dry and once
    with a round chambered. Then once dry after the new drum is seated (about 3.5-4.3 s in).
  4. Repeat with sv_neo_reload_experimental 0 (set before the map loads): master behavior, 16 rounds, no +1.

Results

Layer 14 build (this PR + neoAssets layer 14), Linux Debug, ntre_engage_ctg, owner AA13 plus a bot_mimic bot:

case result
tactical from 10 (9+1) reload_skipcycle: 1 at the unload (+1.01 s) -> 17 (16+1) at the load (+3.48 s), ends +4.08 s; unload, unload_part2, load sounds once each; no handle pull
dry from 0 reload: 0 -> 16 with the round icon dim (+3.48 s) -> 15+1 at the handle (+4.38 s)
dry, switch after the unload (+1.56 s), back drawunloaded_reload: 0 -> 16 (+3.0 s) -> 15+1 (+3.9 s); load and cycle sounds
tactical, switch after the unload (+1.44 s), back drawunloaded_reload_skipcycle: 1 -> 17 (+3.0 s)
dry, switch after the load (+3.99 s), back drawtocycle_reload: 16 dim -> 15+1 (+1.88 s); cycle sound
tactical, switch after the load, back plain draw, 17 kept
flag 0: tactical, dry, dry with a switch after 1.6 s master: reload 10 -> 16 and 0 -> 16 at +4.28 s, whole sound; the switch cancels and a new reload runs
HUD (frame crops) tactical: round icon lit throughout, row 9 -> 0 at the unload -> 16; dry: icon dim with row 0, then row 16 with the icon dim, then 15 + icon lit
headless TDM, 12 Assault bots on the AA13, flag 1, 1 round PASS, match_end=True, 0 asserts; bots reloaded to 17 (16+1); one bot switched after the unload

Toolchain

  • Linux GCC Distro Native (Linux Mint 22.3, GCC 13.3.0)

Linked Issues

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.
@sunzenshen

Copy link
Copy Markdown
Contributor Author

Closing to clear the board in favor of the PR stack of sunzenshen#34

@sunzenshen sunzenshen closed this Nov 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Animations Animation stuff. Including the syncronizing of animations between client and server based on state.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants