Skip to content

Partial reloads 09: Add partial reloads to the ZR68-S - #2295

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/50-cyclefrom
stack/reload-zr68c/55-zr68-family
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/50-cyclefrom
stack/reload-zr68c/55-zr68-family

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Depends on NeotokyoRebuild/neoAssets#181 (layer 09: the ZR68-S sources, the family tooling, its phases file).

Partial reloads 09: add partial reloads to the ZR68-S. This PR builds on #2294 (08: the chambered round) and pairs
with neoAssets layer 09. Next: #2296 (10, the ZR68-L).

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; it has no code changes and no new sound entries.

  • ZR68-S: #base "weapon_zr68s_reload_phases.txt", "ReloadPhases" {}, "ChamberedRound" "1". The ZR68-S
    compiles the ZR68C's glued clips (neoAssets "Gun families") and plays the ZR68C's sound pieces
    (weapon_zr68.reload_*). Its own step markers time its phases file (unload 0.667 s, load 1.400 s).
  • 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 ZR68-S behaves as on master.

How to review

  1. weapon_zr68s.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. The neoAssets layer 09 phases file.
  3. Test in game: "How to test".

How to test

  1. Load a map (the flag is 1 by default during review). Take the ZR68-S: the HUD shows 29+1.
  2. Fire a few rounds and reload: no bolt pull, 30+1. Fire the magazine empty and reload: 30 with a dim round icon,
    then 29+1 at the bolt pull.
  3. Reload and switch to the secondary after the old magazine is out (about 0.7-1.4 s in), then back, once dry and once
    with a round chambered.
  4. Repeat with sv_neo_reload_experimental 0 (set before the map loads): master behavior, 30 rounds, no +1.

Results

Layer 09 build (this PR + neoAssets layer 09), Linux Debug, ntre_engage_ctg, owner ZR68-S plus a bot_mimic bot:

case result
tactical from 20 reload_skipcycle: 20 -> 1 at the unload (+0.68 s) -> 31 at the load (+1.41 s); sounds unload, load, load_part2 once each; no bolt pull
dry from 0 reload: 0 -> 30 with the round icon dim (+1.41 s) -> 29+1 at the bolt pull (+2.28 s)
tactical, switch after the unload the draw plays drawunloaded_reload_skipcycle: 1 -> 31
dry, switch after the unload drawunloaded_reload: 0 -> 30 -> 29+1; load, load_part2, cycle sounds once each
flag 0, tactical and dry with a switch master: reload 20 -> 30; the switch cancels the dry reload and a new reload runs
HUD (frame crops) tactical: round icon lit through the unload, 30 lit after the load; dry: icon dim, 30 lit, then 29 lit + 1 dim with the icon lit
headless TDM, 12 bots on the ZR68-S, flag 1, 1 round PASS, match_end=True, 0 asserts

Toolchain

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

Linked Issues

The ZR68-S loads the reload phases neoAssets writes for it
(#base weapon_zr68s_reload_phases.txt) and keeps a chambered round
(ChamberedRound 1), as the ZR68C does. It plays the ZR68C's sound
pieces. The phase code is generic, so no code changes.
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/50-cycle branch from 7307cf0 to 338aae6 Compare November 10, 2026 02:10
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/55-zr68-family branch from 769dfa4 to 1ef02e7 Compare November 10, 2026 02:10
@sunzenshen sunzenshen changed the title Partial reloads 06: Add partial reloads to the ZR68-S Partial reloads 09: Add partial reloads to the ZR68-S Nov 10, 2026
@sunzenshen
sunzenshen marked this pull request as ready for review November 10, 2026 04:47
@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