Skip to content

Partial reloads 21: Add the MX family sources and its reload clips - #193

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/150-m41from
stack/reload-zr68c/160-mx
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/150-m41from
stack/reload-zr68c/160-mx

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 21: add the MX family sources and its reload clips. The MX authors the clips; the MX-S (silenced)
compiles them. Used by NeotokyoRebuild/neo#2307 (neo layer 21), which gives both MX scripts the reload phases. This is
the last per-gun layer of the stack.

It is layer 21 of a stack and builds on #192 (20, M41 family), #191 (19, Jitte family), #190 (18, SRM family), #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: 22 (neo only, #2308: the flag off), then #197 (23, the Supa-7 pump after the first shell). The neo flag
sv_neo_reload_experimental is 1 by default while the stack is reviewed.


Overview of Changes

  • MX sources: scenes jinrai_mx and jinrai_mxs (one scene per gun, both teams' arms) and the projects
    jinrai_mx/, nsf_mx/, jinrai_mxs/, nsf_mxs/, with mx/viewmodel.qci shared by the four team .qc files,
    preview images mx/textures/ (two of them already there for the ZR68-L scope), mx and mxs sections in
    rom_spec.json.
  • Steps and slots (MX scene): reload step markers at 1_unload f14 (the magazine out), 2_load f39 (the
    magazine seat) and 3_cycle f75 (the handle home). Authored slots: drawunloaded (f0-37), drawtocycle (f0-32),
    skipcycle (f0-14).
  • Glued clips (composites.txt, glued.qci): drawunloaded_reload (joins reload after f30),
    drawtocycle_reload (after f61), reload_skipcycle and drawunloaded_reload_skipcycle (leave reload at f56,
    after the magazine tap).
  • MX-S, a family variant (the pattern of Partial reloads 09: Add the ZR68-S as a ZR68C family variant #181 and layers 17-20): its team .qc files include
    ../jinrai_mx/glued.qci; its scene keeps the shipped slots and the reload step markers; the export fills its
    phases file from the MX's clips. Its Muzzle point in the glued clips differs from its own by 0.027 u (studiomdl
    rounding).
  • Variant toggle: the MX scene shows the MX-S gun on the MX rig and action (mx_gun, mxs_gun); the MX-S sight
    follows Box01.
  • Phases files and sound pieces: weapon_mx_reload_phases.txt, weapon_mxs_reload_phases.txt; three pieces cut
    from the shipped mx_reload.wav (mx_reload_unload, _load (the tap), _cycle).
  • Compiled models: v_jinrai_mx, v_nsf_mx, v_jinrai_mxs, v_nsf_mxs (the MX had no models in neoAssets
    before).
  • README: the MX family in the layout, "Gun families" and "Reload resume animations".

How to Review

  • Text: composites.txt, glued.qci, mx/viewmodel.qci, the four team .qc files and the two phases files.
  • viewmodels.blend gains the two MX 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 twenty projects rc 0; ROM CHECK 20 projects, no clamped pose; FAMILY jinrai_mxs compiles the glued clips of jinrai_mx; 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 51 seams
pace PACE jinrai_mx 3 authored slots, 0 warnings; every other gun unchanged
sources every MX source, phases file, wav and model file equals the research branch (#175) byte for byte
rom_spec.json regenerated from this layer's .blend; equal to #175's except the M41-S and M41-L sections (layer 20)
compile, 40 projects rc 0, 0 warnings; the other guns' .vvd / .vtx byte-identical to the committed files (the Tachi .vvd excepted, the toolchain difference noted in #176), .mdl differ only in runtime pointer-slot bytes; the MX .vvd / .vtx byte-identical to a fresh compile, the .mdl differ only in those pointer-slot bytes
Viewmodel panel (Blender under Xvfb) the MX scene: Team toggle Jinrai -> NSF -> Jinrai; Variant mx -> mxs -> mx; Export gun rc 0, no file changed
in game with the layer 21 neo PR see the neo PR: both MXs tactical 30+1, dry 30 then 29+1, resumes after the unload and the load, flag 0 = master, headless TDM PASS

How to Test

  1. Load a build with the layer 21 neo PR (the flag is 1 by default).
  2. Take the MX (Assault or Support), fire some rounds and reload: no handle pull, 30+1. Fire it empty and reload:
    30, then 29+1 at the handle.
  3. Reload and switch to the secondary after the old magazine is out (about 0.5-1.5 s in), then back: the draw
    continues the reload, with no pop at the joins.
  4. Repeat with the MX-S. In Blender, open the MX scene and pick mxs in the Viewmodel panel's Variant dropdown.

Related

The MX and MX-S (silenced) move into the layout as scenes jinrai_mx
and jinrai_mxs, as on the full-house branch: one scene per gun with
both teams' arms, and mx/viewmodel.qci shared by the four team .qc
files.

The MX authors the family's transitions. The reload has three steps:
1_unload when the magazine is out (f14), 2_load at the magazine seat
(f39) and 3_cycle when the handle is home (f75). Three authored
slots: drawunloaded (f0-37), drawtocycle (f0-32) and skipcycle
(f0-14). They make four glued clips: drawunloaded_reload (joins
reload after f30), drawtocycle_reload (after f61), reload_skipcycle
and drawunloaded_reload_skipcycle (leave reload at f56, after the
magazine tap). The steps play three sound pieces cut from the shipped
reload sound; the load's piece is the tap.

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

The four models are compiled from these sources (the MX had no
models in neoAssets before).
@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