Skip to content

Partial reloads 21: Add partial reloads to the MX family - #2307

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/150-m41from
stack/reload-zr68c/160-mx
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/150-m41from
stack/reload-zr68c/160-mx

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Depends on NeotokyoRebuild/neoAssets#193 (layer 21: the MX family sources, clips, phases files and sound pieces).

Partial reloads 21: add partial reloads to the MX family. This PR builds on layer 20 (#2306, the M41 family) and pairs
with neoAssets layer 21. It is the last per-gun layer. Next: #2308 (22, the flag off).

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.

  • MX (weapon_mx.txt): #base "weapon_mx_reload_phases.txt", "ReloadPhases" {}, "ChamberedRound" "1",
    as the ZR68C has them.
  • MX-S (weapon_mx_silenced.txt): the same lines with #base "weapon_mxs_reload_phases.txt".
  • Sounds: three new entries both play, weapon_mx.reload_unload, _load (the magazine tap), _cycle. The
    reload has three steps (magazine out, magazine seat, handle).
  • 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 both MXs behave as on master.

How to review

  1. weapon_mx.txt, weapon_mx_silenced.txt: the three lines each, 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 three MX entries, in the weapon_zr68.reload_* pattern.
  3. The neoAssets layer 21 phases files.
  4. Test in game: "How to test".

How to test

  1. Load a map (the flag is 1 by default during review). Take the MX (Assault or Support): the HUD shows 30+1.
  2. Fire some rounds and reload: no handle pull, 30+1. Fire it empty and reload: 30 with a dim round icon, then
    29+1 at the handle.
  3. Reload and switch to the secondary after the old magazine is out (about 0.5-1.5 s in), then back, once dry and
    once with a round chambered. Then once dry after the new magazine is seated (about 1.4-2.4 s in).
  4. Repeat with the MX-S.
  5. Repeat with sv_neo_reload_experimental 0 (set before the map loads): master behavior, 30 rounds, no +1.

Results

Layer 21 build (this PR + neoAssets layer 21), Linux Debug, ntre_engage_ctg, owner MX plus a bot_mimic bot of
the same class (Assault, secondary Tachi) with the same gun, clip and chamber state; the bot's traced sequences and
clips match the owner's in every run with a clip. Times from the reload start (resumes: from the draw).

case MX MX-S
tactical from 10 (9+1) reload_skipcycle: 1 at the unload (+0.48 s) -> 31 (30+1) at the load (+1.31 s), ends +2.34 s; unload and load (tap) sounds; no handle pull the same
dry from 0 reload: 0 -> 30 with the round icon dim (+1.31 s) -> 29+1 at the handle (+2.51 s) the same
dry, switch after the unload, back drawunloaded_reload: 0 -> 30 (+1.55 s) -> 29+1 (+2.75 s); load and cycle sounds the same
tactical, switch after the unload, back drawunloaded_reload_skipcycle: 1 -> 31 (+1.55 s) the same
dry, switch after the load, back drawtocycle_reload: 30 dim -> 29+1 (+1.55 s); cycle sound the same
flag 0: tactical, dry master: reload 10 -> 30 and 0 -> 30 at +2.46 s, whole sound the same
HUD (frame crops) dry: round icon dim from the empty magazine through the seat (row lit at 30), lit at 29+1; tactical: icon lit throughout not cropped
headless TDM, 12 Assault bots, flag 1, 1 round PASS, match_end=True, 0 asserts; the bots alive at the end hold the MX; bots kept their reloads past the magazine out (clip 0 and 1) PASS, the same with the MX-S

Toolchain

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

Linked Issues

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