Skip to content

Partial reloads 05: Add the ZR68C reload that keeps a chambered round - #173

Closed
sunzenshen wants to merge 1 commit into
NeotokyoRebuild:stack/reload-zr68c/40-attachfrom
sunzenshen:sketch-zr68c-full
Closed

sunzenshen wants to merge 1 commit into
NeotokyoRebuild:stack/reload-zr68c/40-attachfrom
sunzenshen:sketch-zr68c-full

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 8, 2026 •

Copy link
Copy Markdown
Contributor

Superseded by #180 (same commits, opened from the upstream stack branch so GitHub links the stack). Review there; this draft stays open until the author closes it.

Description

Partial reloads 05. This PR adds the ZR68C reload that keeps a chambered round, used by NeotokyoRebuild/neo#2286: a
reload with a round in the chamber leaves reload after the magazine tap and returns to idle, with no bolt pull.

It is layer 05 of a stack and builds on #178 (04: the resume after the load), #172 (03), #177 (02) and #176 (01).
Next: 06 (the M41 family). The neo flag sv_neo_reload_experimental is 1 by default while the stack is reviewed.


Overview of Changes

  • New slot: skipcycle in the jinrai_zr68c scene, 10 frames (f0-9): from the reload pose at f56 (after the
    tap) back to idle01 f0, magazine seated, handle home. The one scene serves both teams.

  • Markers in the jinrai_zr68c scene: reload:2_load.exit f56, where a reload with a round chambered leaves reload;
    reload:1_unload.sound f1, the first hit of the new unload sound piece.

  • Sequences (new lines of jinrai_zr68c/composites.txt and glued.qci):

    sequence plays when parts length
    reload_skipcycle a reload with a round chambered reload f0-56, then skipcycle 66 frames, 2.167 s
    drawunloaded_reload_skipcycle drawn after 1_unload of reload_skipcycle drawunloaded, reload f31-56, skipcycle 68 frames, 2.233 s
  • Phases file: rows for both sequences. reload_skipcycle plays sound pieces, as a glued clip does: unload
    0.033 s, load 1.300 s, tap 1.733 s; its 1_unload row names the resume drawunloaded_reload_skipcycle (load
    1.367 s, tap 1.800 s, ammo 1.400 s). No other row changes.

  • Sound: zr68_reload_unload.wav, cut from the original reload sound (neo#2286 adds its weapon_zr68.reload_unload
    entry).

  • Compiled models: v_jinrai_zr68c, v_nsf_zr68c with the two new sequences.

  • README and README_ANIMATOR: the slot, the two markers, the two clips, a range that ends at a marker.

How to Review

  • The text carries the change: composites.txt and glued.qci (two lines each), the phases file, the README.
  • viewmodels.blend changes only in the skipcycle slot and the two markers; the other files are generated or
    binary and the checks below cover them.

Checks (measured)

check result
export jinrai_tachi jinrai_zr68c rc 0; no shipped SMD changed; 0 clamps; the post-export blend is unchanged on a second export
joins SEAM 0.0000 u, 0.000 deg on all five seams of the four glued clips
pace PACE jinrai_zr68c 3 authored slots, 0 warnings
sounds end before the clip 9 READY lines, e.g. reload_skipcycle 2.167 s >= weapon_zr68.reload_load_part2 end 1.800 s; the 03 and 04 lines unchanged
compile rc 0; no SMD, phases, wav or model differs from the layer before the merge
compiled ZR68C vs the original NEOTOKYO models 52 / 52 bones; 15 shipped sequences keep frames and fps; Jinrai 0.0185 u / 0.048 deg, NSF 0.0216 u / 0.047 deg (as in #177)
compiled ZR68C vs layer 04 every shared sequence 0.0000 u; only the two new sequences differ
in game, layer 05 assets in the neo build tactical reload: 20 to 1 (+0.705 s) to 31 (+1.335 s), idle at +2.175 s, unload, load and part2 pieces, no cycle; dry reload: 0 to 30 (+1.335 s, chamberempty 1), chambered at +2.28 s (29+1), idle at +2.715 s; flag 0: reload 20 to 30 at +2.22 s (master); HUD ends 30 lit with the glyph (tactical) and 29 lit + 1 dim (dry), 2 magazines
in game with the layer 05 neo PR tactical reload: reload_skipcycle, no bolt pull, 30+1, unload/load/tap sounds once; tactical after the unload: drawunloaded_reload_skipcycle, 30+1; the 03 and 04 resumes unchanged; headless TDM 12 bots PASS, 0 asserts

How to Test

  1. Load a build with the layer 05 neo PR (the flag is 1 by default).
  2. Take a ZR68C, fire a few rounds and reload: no bolt pull, the HUD ends at 30+1.
  3. Reload again with a round chambered and switch to the secondary after the old magazine is out (about 0.7-1.3 s
    in), then back: the draw loads the magazine, taps it, and returns to idle without a pop at the joins.
  4. Optional: viewmodels_post_export.blend, scene jinrai_zr68c, slots reload_skipcycle and
    drawunloaded_reload_skipcycle.

Related

@sunzenshen sunzenshen changed the title Sketch: full ZR68C partial-reload slice Add the ZR68C partial-reload vertical slice clips Nov 8, 2026
A reload with a round chambered plays reload_skipcycle: reload up to
2_load.exit (f56, after the tap), then the new skipcycle slot back to
idle, with no bolt pull. drawunloaded_reload_skipcycle resumes it
after 1_unload. Both teams compile the Jinrai clips.

The phases file gains the rows of both clips. reload_skipcycle plays
sound pieces, as a glued clip does, so the unload step gets its own
piece, zr68_reload_unload.wav.
@sunzenshen sunzenshen changed the title Add the ZR68C partial-reload vertical slice clips Partial reloads 05: Add the ZR68C reload that keeps a chambered round Nov 9, 2026
@sunzenshen
sunzenshen changed the base branch from master to stack/reload-zr68c/40-attach November 9, 2026 07:12
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/40-attach branch from ff67942 to f013d1f Compare November 9, 2026 08:19
@sunzenshen

Copy link
Copy Markdown
Contributor Author

Closing in favor of #180 because this PR cannot be linked into the PR stack.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant