Skip to content

Partial reloads 18: Add the SRM family sources and its reload clips - #190

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/120-mpn45from
stack/reload-zr68c/130-srm
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/120-mpn45from
stack/reload-zr68c/130-srm

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 18: add the SRM family sources and its reload clips. The SRM authors the clips; the SRM-S compiles
them. Used by NeotokyoRebuild/neo#2304 (neo layer 18), which gives both SRM scripts the reload phases.

It is layer 18 of a stack and builds on #189 (17, MPN45 family), #188 (16, PZ252), #187 (15, SRS), #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: #191 (19, Jitte family). The neo flag sv_neo_reload_experimental is 1 by default while the
stack is reviewed.


Overview of Changes

  • SRM sources: scenes jinrai_srm and jinrai_srm_s (one scene per gun, both teams' arms) and the projects
    jinrai_srm/, nsf_srm/, jinrai_srm_s/, nsf_srm_s/, with srm/viewmodel.qci and srm_s/viewmodel.qci
    shared by each gun's team .qc files (the ZR68C layout), preview images srm/textures/, srm and srm_s
    sections in rom_spec.json.
  • Steps and slots (SRM scene): reload step markers at 1_unload f19 (the magazine out), 2_load f58 (the
    magazine seat) and 3_cycle f88 (the handle home). Authored slots: drawunloaded (f0-34), drawtocycle (f0-32),
    skipcycle (f0-11).
  • Glued clips (composites.txt, glued.qci): drawunloaded_reload (joins reload after f33),
    drawtocycle_reload (after f75), reload_skipcycle and drawunloaded_reload_skipcycle (leave reload at f58;
    the SRM has no magazine tap).
  • SRM-S, a family variant (the pattern of Partial reloads 09: Add the ZR68-S as a ZR68C family variant #181 and layer 17): its team .qc files include
    ../jinrai_srm/glued.qci; its scene keeps the shipped slots and the reload step markers; the export fills its
    phases file from the SRM's clips.
  • Variant toggle: the SRM scene shows the SRM-S gun on the SRM rig and action (srm_gun, srm_s_gun).
  • Phases files and sound pieces: weapon_srm_reload_phases.txt, weapon_srm_s_reload_phases.txt; three pieces
    cut from the shipped srm_reload.wav (srm_reload_unload, _load, _cycle).
  • Compiled models: v_jinrai_srm, v_nsf_srm, v_jinrai_srm_s, v_nsf_srm_s (the SRM had no models in
    neoAssets before).
  • README: the SRM family in the layout, "Gun families" and "Reload resume animations".

How to Review

  • Text: composites.txt, glued.qci, srm/viewmodel.qci, srm_s/viewmodel.qci, the team .qc files and the two
    phases files.
  • viewmodels.blend gains the two SRM scenes; 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 thirteen projects rc 0; ROM CHECK 13 projects, no clamped pose; FAMILY jinrai_srm_s compiles the glued clips of jinrai_srm; 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 36 seams
pace PACE jinrai_srm 3 authored slots, 0 warnings; every other gun unchanged
sounds end before the clip 12 SRM READY lines (6 per gun)
sources every SRM source, phases file, wav and model file equals the research branch (#175) byte for byte
compile, 26 projects rc 0, 0 warnings; the 110 model files of the other guns byte-identical to layer 17's compile except runtime pointer-slot bytes of the .mdl; the SRM .vvd / .vtx and the SRM .mdl byte-identical to a fresh compile, the SRM-S .mdl differ only in those pointer-slot bytes
Viewmodel panel (Blender under Xvfb) the SRM scene: Team toggle Jinrai -> NSF -> Jinrai; Variant srm -> srm_s -> srm; Export gun rc 0, no file changed
in game with the layer 18 neo PR see the neo PR: both SRMs tactical 50+1, dry 50 then 49+1, resumes after the unload and the load, flag 0 = master, headless TDM PASS

How to Test

  1. Load a build with the layer 18 neo PR (the flag is 1 by default).
  2. Take the SRM (any class), fire some rounds and reload: no handle pull, 50+1. Fire it empty and reload: 50,
    then 49+1 at the handle.
  3. Reload and switch to the secondary after the old magazine is out (about 0.7-1.9 s in), then back: the draw
    continues the reload, with no pop at the joins.
  4. Repeat with the SRM-S. In Blender, open the SRM scene and pick srm_s in the Viewmodel panel's Variant dropdown.

Related

The SRM and SRM-S move into the layout as scenes jinrai_srm and
jinrai_srm_s, as on the full-house branch: one scene per gun with both
teams' arms, srm/viewmodel.qci and srm_s/viewmodel.qci shared by each
gun's team .qc files.

The SRM authors the family's transitions. The reload has three steps:
1_unload when the magazine is out (f19), 2_load at the magazine seat
(f58) and 3_cycle when the handle is home (f88). Three authored
slots: drawunloaded (f0-34), drawtocycle (f0-32) and skipcycle
(f0-11). They make four glued clips: drawunloaded_reload (joins
reload after f33), drawtocycle_reload (after f75), reload_skipcycle
and drawunloaded_reload_skipcycle (leave reload at f58; the SRM has
no magazine tap). The steps play three sound pieces cut from the
shipped reload sound.

The SRM-S is a family variant: its team qcs include
../jinrai_srm/glued.qci, its scene keeps only the shipped slots, and
the export fills its phases file from the SRM's clips. The Variant
toggle of the SRM scene shows the SRM-S gun.

The four models are compiled from these sources (the SRM had no
models in neoAssets before).
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/120-mpn45 branch from dccdecd to 3800275 Compare November 10, 2026 02:08
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/130-srm branch from 103e73c to d7b384e Compare November 10, 2026 02:09
@sunzenshen sunzenshen changed the title Partial reloads 15: Add the SRM family sources and its reload clips Partial reloads 18: Add the SRM family 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