Skip to content

Partial reloads 11: Keep a chambered round through a Tachi reload - #2297

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/57-zr68lfrom
stack/reload-zr68c/70-tachi
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/57-zr68lfrom
stack/reload-zr68c/70-tachi

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Depends on NeotokyoRebuild/neoAssets#183 (layer 11: the Tachi chamber phases file).

Partial reloads 11: add a chambered round to the Tachi. This PR builds on layer 10 (#2296, the ZR68-L) and pairs with
neoAssets layer 11. Next: #2298 (12, the Kyla).

The chamber code of layer 08 (#2294) is generic: a weapon gets a chamber slot from its weapon script and a phases file
that says when the chamber holds a round. This PR adds the three script lines; it has no code changes.

  • Tachi: #base "weapon_tachi_reload_phases.txt", "ReloadPhases" {}, "ChamberedRound" "1", as the ZR68 guns
    have them. The phases file has one 3_cycle row each for reload and reloadempty, at the ammo credit (1.733 s).
    The Tachi keeps its shipped reload clips and sounds whole: a tactical reload gives 15+1, a dry reload 14+1.
  • No resume: the Tachi phases have no unload or load step, so a switch before the credit cancels the reload as on
    master; a switch after the credit keeps the rounds and the chambered round.
  • 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 Tachi behaves as on master.

How to review

  1. weapon_tachi.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 11 phases file.
  3. Test in game: "How to test".

How to test

  1. Load a map (the flag is 1 by default) as Assault and take the Tachi: 14 rounds in the HUD row, the round icon above
    the fire mode lit (14+1).
  2. Fire a few rounds and reload: the row fills to 15, the icon stays lit (15+1).
  3. Fire it empty: the slide locks (fireempty, idle01empty). Reload: the icon is dim until the slide release, then
    lit with 14 in the row.
  4. Reload empty and switch to the primary just after the slide release, then back: a plain draw, 14+1 kept.
  5. Repeat with sv_neo_reload_experimental 0 (set before the map loads): master, 15 rounds, no +1.

Results

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

case flag 1 flag 0 (master)
tactical from 12 (11+1) reload: 16 (15+1) at +1.71 s, reserve 45 -> 30 reload: 15 at +1.71 s, reserve 45 -> 30
dry from 0 reloadempty: 15 with the chamber filled at the credit (+1.71 s; one tick 15 with the chamber empty, then 14+1) 15
dry, switch after the credit (+1.81 s), back plain draw, 14+1 kept, no second reload; fires plain draw, 15 kept
dry, switch before the credit (+1.17 s), back drawempty, clip 0, a fresh reloadempty to 14+1 (as master)
last round fired, switch away and back fireempty, drawempty, idle01empty, then the auto reloadempty to 14+1 the same sequences, 15
HUD (frame crops) tactical: icon lit throughout, row 11 -> 15; dry: icon dim and row 0, then icon lit with row 14
headless TDM, 12 Assault bots (Tachi secondary), flag 1, 1 round PASS, match_end=True, 0 asserts; bots switched to the Tachi 9 times

Toolchain

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

Linked Issues

The Tachi script gets the reload phases from neoAssets and a chamber
slot: #base "weapon_tachi_reload_phases.txt", "ReloadPhases" {} and
"ChamberedRound" "1", as the ZR68 guns have them. The generic chamber
code then gives 15+1 after a tactical reload and 14+1 after a dry one,
with the chamber filled at the ammo credit. No code changes.
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/57-zr68l branch from 94d3e09 to eac260d Compare November 10, 2026 02:10
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/70-tachi branch from 14a64f4 to fa3bdc8 Compare November 10, 2026 02:10
@sunzenshen sunzenshen changed the title Partial reloads 08: Keep a chambered round through a Tachi reload Partial reloads 11: Keep a chambered round through a Tachi reload Nov 10, 2026
@sunzenshen
sunzenshen marked this pull request as ready for review November 10, 2026 07:36
@sunzenshen
sunzenshen requested review from a team and sunmachine November 10, 2026 07:37
@sunzenshen
sunzenshen marked this pull request as draft November 12, 2026 06:54
@sunmachine sunmachine added the Animations Animation stuff. Including the syncronizing of animations between client and server based on state. label Nov 12, 2026
@sunzenshen

Copy link
Copy Markdown
Contributor Author

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

@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