Skip to content

Partial reloads 14: Add the AA13 sources and its reload clips - #186

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/90-milsofrom
stack/reload-zr68c/95-aa13
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/90-milsofrom
stack/reload-zr68c/95-aa13

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 14: add the AA13 sources and its reload clips. Used by NeotokyoRebuild/neo#2300 (neo layer 14), which
gives the AA13 reload phases.

It is layer 14 of a stack and builds on #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: #187 (15, SRS). The neo flag sv_neo_reload_experimental
is 1 by default while the stack is reviewed.


Overview of Changes

  • AA13 sources: scene jinrai_aa13 (one scene, both teams' arms) and the projects jinrai_aa13/, nsf_aa13/
    in the ZR68C layout (aa13/viewmodel.qci shared by the team .qc files), preview images aa13/textures/, an
    aa13 section in rom_spec.json.
  • Steps and slots: reload step markers at 1_unload f30 (the drum out), 2_load f104 (the drum seat) and
    3_cycle f131 (the handle home). Authored slots, at the shipped pace: drawunloaded (f0-44), drawtocycle
    (f0-37), skipcycle (f0-18).
  • Glued clips (composites.txt, glued.qci): drawunloaded_reload (joins reload after f58, the drum fully
    out), drawtocycle_reload (after f112), reload_skipcycle (leaves reload at f104) and
    drawunloaded_reload_skipcycle.
  • Phases file and sound pieces: weapon_aa13_reload_phases.txt; four pieces cut from the shipped
    aa13_reload.wav (aa13_reload_unload, _unload_part2, _load, _cycle: the release tick, the drum pull, the
    drum seat, the handle).
  • Compiled models: v_jinrai_aa13, v_nsf_aa13 (the AA13 had no model in neoAssets before).
  • README: the AA13 in the layout and in "Reload resume animations".

How to Review

  • Text: composites.txt, glued.qci, aa13/viewmodel.qci, the team .qc files and the phases file.
  • viewmodels.blend gains the AA13 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 seven guns rc 0; ROM CHECK 7 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 16 seams (ZR68C, ZR68-L, Kyla, AA13)
pace PACE jinrai_aa13 3 authored slots, 0 warnings; every other gun unchanged
sounds end before the clip 7 AA13 READY lines
compile, 14 projects rc 0, 0 warnings; the 60 model files of the other guns byte-identical to layer 13's compile; the AA13 models as compiled (a fresh compile differs only in 10 runtime pointer-slot bytes of the .mdl)
Viewmodel panel (Blender under Xvfb) the AA13 scene: Team toggle Jinrai -> NSF -> Jinrai, Export gun rc 0, no file changed
in game with the layer 14 neo PR see the neo PR: tactical 16+1, dry 16 then 15+1, resumes after the unload and the load, flag 0 = master, headless TDM PASS

How to Test

  1. Load a build with the layer 14 neo PR (the flag is 1 by default).
  2. Take an AA13, fire a few rounds and reload: no handle pull, 16+1. Fire it empty and reload: 16, then 15+1
    at the handle.
  3. Reload and switch to the secondary after the old drum is out (about 1.0-3.4 s in), then back: the draw continues
    the reload, with no pop at the joins.

Related

The AA13 viewmodels (both teams) move into the layout as scene
jinrai_aa13, as on the full-house branch: one scene with both teams'
arms and the ZR68C layout (aa13/viewmodel.qci shared by the team .qc
files, jinrai_aa13/glued.qci included by both).

The reload has the ZR68C's three steps: 1_unload when the drum is out
(f30), 2_load at the drum seat (f104) and 3_cycle when the handle is
home (f131). Three authored slots, at the shipped pace: drawunloaded
(f0-44), drawtocycle (f0-37) and skipcycle (f0-18). They make four
glued clips: drawunloaded_reload (joins reload after f58),
drawtocycle_reload (after f112), reload_skipcycle (leaves reload at
f104) and drawunloaded_reload_skipcycle. The steps play four sound
pieces cut from the shipped reload sound: the release tick and the
drum pull of the unload, the drum seat and the handle.

The models are compiled from these sources (the AA13 had no model in
neoAssets before).
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/90-milso branch from dcdd53e to 083cda4 Compare November 10, 2026 02:08
@sunzenshen
sunzenshen force-pushed the stack/reload-zr68c/95-aa13 branch from de5d113 to 832b74e Compare November 10, 2026 02:08
@sunzenshen sunzenshen changed the title Partial reloads 11: Add the AA13 sources and its reload clips Partial reloads 14: Add the AA13 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