Skip to content

Partial reloads 15: Add the SRS sources and its reload clips - #187

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/95-aa13from
stack/reload-zr68c/100-srs
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/95-aa13from
stack/reload-zr68c/100-srs

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 15: add the SRS sources and its reload clips. Used by NeotokyoRebuild/neo#2301 (neo layer 15), which
gives the SRS reload phases and the bolt hooks.

It is layer 15 of a stack and builds on #186 (14, AA13), #185 (13, MilSO), #184 (12, Kyla), #183 (11, Tachi), #182
(10), #181 (09), #180 (08), #178 (07), #179 (06), #177 (05), #196 (04), #195 (03), #194 (02) and #176 (01). Next: #188 (16, PZ252). The neo flag
sv_neo_reload_experimental is 1 by default while the stack is reviewed.


Overview of Changes

  • SRS sources: scene jinrai_srs (one scene, both teams' arms) and the projects jinrai_srs/, nsf_srs/, with
    srs/viewmodel.qci shared by the team .qc files (each keeps its own $definebone lines), preview images
    srs/textures/ and mosok41/textures/mosok41_mat4.png (a part of the SRS mesh uses the M41's image), an srs
    section in rom_spec.json.
  • Steps and slots: reload step markers at 1_unload f30 (the magazine out), 2_load f56 (the magazine seat) and
    3_cycle f97 (the bolt home). Authored slots: drawunloaded (f0-38), drawtocycle (f0-31; its reach two frames
    slower to match the shipped pace), skipcycle (f0-16, ends on idle f0).
  • Bolt after a shot: marker charge:3_cycle at f25 of the shipped charge (the bolt home); the phases file gets
    a charge row (0.833 s), which neo uses for the time the next round counts as chambered.
  • Glued clips (composites.txt, glued.qci): drawunloaded_reload (joins reload after f30),
    drawtocycle_reload (after f79), reload_skipcycle (leaves reload at f56) and drawunloaded_reload_skipcycle.
  • Phases file and sound pieces: weapon_srs_reload_phases.txt; three pieces cut from the shipped
    srs_reload.wav (srs_reload_unload, _load, _cycle).
  • Compiled models: v_jinrai_srs, v_nsf_srs (the SRS had no model in neoAssets before).
  • README: the SRS in the layout, the team rig note (the SRS Release bone) and "Reload resume animations".

How to Review

  • Text: composites.txt, glued.qci, srs/viewmodel.qci, the team .qc files and the phases file.
  • viewmodels.blend gains the SRS scene; the other scenes are unchanged. The SMDs are the shipped clips (written
    unchanged by the export) or export output; the checks below cover the binary files.
  • No tool changes.

Checks (measured)

check result
export of all eight guns rc 0; ROM CHECK 8 projects, no clamped pose; no shipped SMD changed; no other gun's SMD or phases file changed; second export: post-export preview unchanged
joins SEAM 0.0000 u, 0.000 deg on all 21 seams (ZR68C, ZR68-L, Kyla, AA13, SRS)
pace PACE jinrai_srs 3 authored slots, 0 warnings; every other gun unchanged
sounds end before the clip 6 SRS READY lines
compile, 16 projects rc 0, 0 warnings; the 70 model files of the other guns byte-identical to layer 14's compile except runtime pointer-slot bytes of the .mdl (64-byte stride); the SRS models as compiled (a fresh compile differs only in 5-10 such bytes)
Viewmodel panel (Blender under Xvfb) the SRS scene: Team toggle Jinrai -> NSF -> Jinrai, Export gun rc 0, no file changed
in game with the layer 15 neo PR see the neo PR: tactical 5+1, dry 5 then 4+1, resumes after the unload and the load, the reload waits for the bolt, flag 0 = master, headless TDM PASS

How to Test

  1. Load a build with the layer 15 neo PR (the flag is 1 by default).
  2. Take an SRS, fire two rounds and reload: no bolt pull, 5+1. Fire it empty and reload: 5, then 4+1 at the
    bolt.
  3. Reload and switch to the secondary after the old magazine is out (about 1.0-1.8 s in), then back: the draw
    continues the reload, with no pop at the joins.

Related

The SRS viewmodels (both teams) move into the layout as scene
jinrai_srs, as on the full-house branch: one scene with both teams'
arms, srs/viewmodel.qci shared by the team .qc files (each keeps its
own $definebone lines) and jinrai_srs/glued.qci included by both.

The reload has three steps: 1_unload when the magazine is out (f30),
2_load at the magazine seat (f56) and 3_cycle when the bolt is home
(f97). Three authored slots: drawunloaded (f0-38), drawtocycle (f0-31,
its reach two frames slower to match the shipped pace) and skipcycle
(f0-16). They make four glued clips: drawunloaded_reload (joins reload
after f30), drawtocycle_reload (after f79), reload_skipcycle (leaves
reload at f56) and drawunloaded_reload_skipcycle. The steps play three
sound pieces cut from the shipped reload sound.

The marker charge:3_cycle (f25 of the shipped charge, the bolt home)
gives the phases file a charge row: the time the next round counts as
chambered after a shot.

The models are compiled from these sources (the SRS had no model in
neoAssets before).
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/95-aa13 branch from de5d113 to 832b74e Compare November 10, 2026 02:08
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/100-srs branch from 540d871 to 1c60eaf Compare November 10, 2026 02:08
@sunzenshen sunzenshen changed the title Partial reloads 12: Add the SRS sources and its reload clips Partial reloads 15: Add the SRS sources and its reload clips Nov 10, 2026
@sunzenshen

Copy link
Copy Markdown
Contributor Author

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

@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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant