Skip to content

Partial reloads 20: Add the M41 family sources and its reload clips - #192

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/140-jittefrom
stack/reload-zr68c/150-m41
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/140-jittefrom
stack/reload-zr68c/150-m41

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 20: add the M41 family sources and its reload clips. The M41 authors the clips; the M41-S and M41-L
compile them. Used by NeotokyoRebuild/neo#2306 (neo layer 20), which gives the three M41 scripts the reload phases.

It is layer 20 of a stack and builds on #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: #193 (21, MX family). The neo flag
sv_neo_reload_experimental is 1 by default while the stack is reviewed.


Overview of Changes

  • M41 sources: scenes jinrai_mosok41, jinrai_mosok41s and jinrai_mosok41l (one scene per gun, both teams'
    arms) and the projects jinrai_mosok41/, nsf_mosok41/, jinrai_mosok41s/, nsf_mosok41s/, jinrai_mosok41l/,
    nsf_mosok41l/, with mosok41/viewmodel.qci shared by the six team .qc files (each keeps its own $definebone
    lines), preview images mosok41/textures/, mosok41, mosok41s and mosok41l sections in rom_spec.json, and
    the M41 family's rom_widen.json lines.
  • Steps and slots (M41 scene): reload step markers at 1_unload f19 (the magazine out), 2_load f57 (the
    magazine seat) and 3_cycle f102 (the handle home). Authored slots: drawunloaded (f0-33: draw, then a 9-frame
    tilt), drawtocycle (f0-39: draw, then a 15-frame reach), skipcycle (f0-20: the support hand back through the
    start of reload).
  • Glued clips (composites.txt, glued.qci): drawunloaded_reload (joins reload after f31),
    drawtocycle_reload (after f93; the handle pull starts at f94), reload_skipcycle and
    drawunloaded_reload_skipcycle (leave reload at f77, after the magazine tap).
  • M41-S and M41-L, family variants (the pattern of Partial reloads 09: Add the ZR68-S as a ZR68C family variant #181 and layers 17-19): their team .qc files include
    ../jinrai_mosok41/glued.qci; their scenes keep the shipped slots and the reload step markers; the export fills
    their phases files from the M41's clips.
  • Muzzle point: the M41-S's and M41-L's shipped reload carries their own Muzzle point, so in the glued clips
    their Muzzle sits at the M41's, about 17 units back along the barrel (M41-S from frame 25, M41-L on every frame).
    The glued clips do not fire, and the timings are unchanged. This is the accepted cost of sharing one set of clips
    across the family.
  • Variant toggle: the M41 scene shows the M41-S and M41-L guns on the M41 rig and action (mosok41_gun,
    mosok41s_gun, mosok41l_gun).
  • Phases files and sound pieces: weapon_mosok41_reload_phases.txt, weapon_mosok41s_reload_phases.txt,
    weapon_mosok41l_reload_phases.txt; four pieces cut from the shipped m41_reload.wav (m41_reload_unload,
    _load, _load_part2, _cycle).
  • Compiled models: v_jinrai_mosok41, v_nsf_mosok41, v_jinrai_mosok41s, v_nsf_mosok41s (new), and
    v_jinrai_mosok41l, v_nsf_mosok41l (replacing the M41-L models in neoAssets; their stale .xbox.vtx stay as
    they are).
  • README: the M41 family in the layout, "Gun families" (with the Muzzle note) and "Reload resume animations".

How to Review

  • Text: composites.txt, glued.qci, mosok41/viewmodel.qci, the six team .qc files and the three phases files.
  • viewmodels.blend gains the three M41 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 eighteen projects rc 0; ROM CHECK 18 projects, no clamped pose; FAMILY jinrai_mosok41s and jinrai_mosok41l compiles the glued clips of jinrai_mosok41; 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 46 seams
pace PACE jinrai_mosok41 3 authored slots, 0 warnings; every other gun unchanged
sources every M41 source, phases file, wav, model file and rom_widen.json equals the research branch (#175) byte for byte
rom_spec.json regenerated from this layer's .blend. It differs from #175's in the M41-S and M41-L sections only (bone pinky 06, bone thumb 3): #175's file still carries the wider limits of the variants' own skipcycle slots, which #175 later removed
compile, 36 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 M41 family .vvd / .vtx byte-identical to a fresh compile, the .mdl differ only in those pointer-slot bytes
Viewmodel panel (Blender under Xvfb) the M41 scene: Team toggle Jinrai -> NSF -> Jinrai; Variant mosok41 -> mosok41l -> mosok41s -> mosok41; Export gun rc 0, no file changed
in game with the layer 20 neo PR see the neo PR: the three M41s tactical 15+1, dry 15 then 14+1, resumes after the unload and the load, flag 0 = master, headless TDM PASS

How to Test

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

Related

The M41, M41-S and M41-L move into the layout as scenes
jinrai_mosok41, jinrai_mosok41s and jinrai_mosok41l, as on the
full-house branch: one scene per gun with both teams' arms, and
mosok41/viewmodel.qci shared by the six team .qc files, each keeping
its own $definebone lines.

The M41 authors the family's transitions. The reload has three steps:
1_unload when the magazine is out (f19), 2_load at the magazine seat
(f57) and 3_cycle when the handle is home (f102). Three authored
slots: drawunloaded (f0-33), drawtocycle (f0-39) and skipcycle
(f0-20). They make four glued clips: drawunloaded_reload (joins
reload after f31), drawtocycle_reload (after f93, before the handle
pull), reload_skipcycle and drawunloaded_reload_skipcycle (leave
reload at f77, after the magazine tap). The steps play four sound
pieces cut from the shipped reload sound (the load has two).

The M41-S and M41-L are family variants: their team qcs include
../jinrai_mosok41/glued.qci, their scenes keep only the shipped
slots, and the export fills their phases files from the M41's clips.
Their shipped reload carries their own Muzzle point, so in the glued
clips their Muzzle sits at the M41's, about 17 units back along the
barrel; the glued clips do not fire. The Variant toggle of the M41
scene shows the M41-S and M41-L guns.

The six models are compiled from these sources (the M41-L models
replace the ones in neoAssets; the M41 and M41-S had none).
@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