Skip to content

Partial reloads 23: Add the Supa-7 pump after the first shell - #197

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/160-mxfrom
stack/reload-zr68c/175-supa7-pump
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/160-mxfrom
stack/reload-zr68c/175-supa7-pump

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Description

Partial reloads 23: the Supa-7 pump after the first shell. Used by NeotokyoRebuild/neo#2312, which plays it with
sv_neo_reload_experimental 1: after a last shot, a reload puts its first shell in the tube, then the gun racks
that shell into the chamber before the other inserts.

It is layer 23 of a stack and builds on #193 (21, MX family) and the layers below it. Layer 22 (the flag off,
NeotokyoRebuild/neo#2308) is code only. The next layers, 24 (NeotokyoRebuild/neo#2309, the Supa-7 tube and chamber)
and 25 (NeotokyoRebuild/neo#2313, slug input rules), are code only: they use this layer's clips and sound.


Overview of Changes

  • Sources: both Supa-7 teams decompiled into the layout (jinrai_shotgun/, nsf_shotgun/, shared
    shotgun/viewmodel.qci) and one jinrai_shotgun scene in viewmodels.blend with the Team toggle. The shipped
    clips are unchanged.
  • reloadpump (27 frames, 0.867 s): cuts in at reloadinsert frame 15, goes to the pump along reloadend's grip
    path, plays reloadend's rack with a 1-frame hold, and returns to the load pose at reloadstart's pace (the hand
    is 5 % faster on average). It ends on reloadinsert frame 0, so the inserts continue. The fingers let go of the
    pump over the first 30 % of the return and the hand lifts 1.8 u off it.
  • Last-shot clips: none new. The shipped fire1 (slug) and fire2 (shell) are compiled and played by the code.
  • Models: both teams compiled with the new sequence; every shipped sequence equals the base compile.
  • Sound: sound/weapons/murata/murata_fire_nopump.wav, the shell shot without its pump clicks (below).
    Generator: neo/soundsrc/weapons/murata/make_fire_nopump.py.

No-pump shell shot sound

Why. A last shell shot leaves the pump to the animation. The shipped murata_fire.wav has the pump's clicks baked
in (bursts above 4 kHz at 0.535-0.595 s, the back stroke, and 0.765-0.875 s, the forward stroke), so playing it
would pump twice. The pump sound of the reload is a different recording (murata_pump.wav; no correlation match).

Source. Classic NEOTOKYO's sound/weapons/murata/murata_fire.wav (44.1 kHz, mono, s16; sha256
8363387ca0cbc6fbed42c9c00d6c8fe27b6fa8f15f172049171c36624a541078). It is not in this repository.

Steps (the script's docstring has the constants):

  1. Find the clicks as bursts above 4 kHz.
  2. Cut point: keep the shot to 0.52 s, before the first click.
  3. Take the short-time spectrum of the whole shot (1024-sample frames, 75 % overlap) and smooth it in 1/3-octave
    bands, frame by frame.
  4. Bridge both click windows (0.525-0.605 s, 0.755-0.885 s) in the log magnitude between the clean frames around them.
  5. Give every bin a random phase (fixed seed 7) and invert: a noise tail with the shot's own color and decay.
    The clean decay past 0.9 s gives RT60 2.3 s, which the tail follows.
  6. Match the tail's RMS to the shot's on 0.60-0.75 s.
  7. Crossfade shot to tail over 40 ms from 0.52 s.

Tools. Python 3.12.3 with numpy and scipy. Runtime under 1 s.

Reproduce.

python3 neo/soundsrc/weapons/murata/make_fire_nopump.py path/to/murata_fire.wav murata_fire_nopump.wav
sha256sum murata_fire_nopump.wav   # df56877859a534f1236a6b03f21bce36215af943cbccd094abc400722720b2ec

The sha256 matches the committed file with numpy 1.26.4 / scipy 1.11.4 and with numpy 2.5.4 / scipy 1.18.1.

Rejected.

variant result
plain cut at 0.535 s with a 30 ms fade the shot stops at 0.535 s and drops its 2.3 s decay
the M41 slug shot's tail, spectrum- and level-matched the source has no content above 11 kHz and ends at 1.17 s; the color differs from the Supa-7
1.5 kHz low-pass of the click windows only keeps the real tail, but the pump's low-band thump stays and the high band has holes

Checks. Spectrograms and RMS of the original and each variant (attached: a_cut.png, b_borrowed.png, c_synth.png,
d_lowpass.png): the
chosen tail has no burst in either window and its level follows the original within the join. In game (Debug client): the last shell shot plays this file, then the pump animation
and its sound play after the first shell.

How to Review

  • Text: jinrai_shotgun/glued.qci (reloadpump), the new SMDs, neo/soundsrc/.
  • viewmodels.blend: the jinrai_shotgun scene; other scenes unchanged.
  • Sound: run the command above and compare the checksum.

Checks (measured)

check result
export rc 0; ROM no clamp; 0 PACE warnings; a second export changes nothing
clearance (hand and pump) off the pump passes; grip passes except frame 13, which equals reloadend frame 17 at its own limit
wide FOV (reloadpump) 54 deg 21:9: hand and round exposed 0 frames; 90 deg 21:9: hand 2 frames, round 1 (shipped reloadend: 1 and 0)
compile, both teams rc 0, 0 warnings; 19 shipped sequences within 0.0000 u / 0.056 deg of the base compile; vertex data identical
timing from the press, flag 1 pump starts +0.885 s, shell chambered +1.455 s, 7 rounds at +4.82 s, idle +5.24 s; master (flag 0) 7 at +3.95 s, idle +4.97 s
sound sha256 match on two numpy/scipy versions (above)
in game with the neo PR see the neo PR

How to Test

See the neo PR (NeotokyoRebuild/neo#2312).


Related

A last shot that empties the tube leaves the spent hull chambered, so
the reload loads its first shell into the tube and racks it at once.
This replaces the shipped dry reload's rack at the end and lets a
shell be fired after the first insert.

Sources: both Supa-7 teams decompiled into the layout and one
jinrai_shotgun scene with the Team toggle; shipped clips unchanged.

reloadpump (27 frames) cuts in at reloadinsert f15, reaches the pump
on reloadend's grip path, plays reloadend's rack with a 1-frame hold
and returns to the load pose at reloadstart's pace, ending on
reloadinsert f0. Both teams' models are compiled with it; every
shipped sequence compares equal to the base compile.

murata_fire_nopump.wav is the shell shot without the pump clicks
baked into murata_fire.wav, for the last shell shot. It is generated
from classic NEOTOKYO's murata_fire.wav by the seeded script
neo/soundsrc/weapons/murata/make_fire_nopump.py: the tail after the
clicks is noise shaped by the shot's own spectrum and decay.
@sunzenshen

Copy link
Copy Markdown
Contributor Author

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

@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