Repository navigation
Partial reloads 23: Add the Supa-7 pump after the first shell - #197
Closed
sunzenshen wants to merge 1 commit into
Closed
sunzenshen wants to merge 1 commit into
sunzenshen wants to merge 1 commit into
Conversation
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.
This was referenced Nov 10, 2026
Closed
Closed
Closed
Closed
Contributor
Author
|
Closing to clear the board in favor of the PR stack of sunzenshen#29 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 racksthat 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
jinrai_shotgun/,nsf_shotgun/, sharedshotgun/viewmodel.qci) and onejinrai_shotgunscene inviewmodels.blendwith the Team toggle. The shippedclips are unchanged.
reloadpump(27 frames, 0.867 s): cuts in atreloadinsertframe 15, goes to the pump alongreloadend's grippath, plays
reloadend's rack with a 1-frame hold, and returns to the load pose atreloadstart's pace (the handis 5 % faster on average). It ends on
reloadinsertframe 0, so the inserts continue. The fingers let go of thepump over the first 30 % of the return and the hand lifts 1.8 u off it.
fire1(slug) andfire2(shell) are compiled and played by the code.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.wavhas the pump's clicks bakedin (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; sha2568363387ca0cbc6fbed42c9c00d6c8fe27b6fa8f15f172049171c36624a541078). It is not in this repository.Steps (the script's docstring has the constants):
bands, frame by frame.
The clean decay past 0.9 s gives RT60 2.3 s, which the tail follows.
Tools. Python 3.12.3 with numpy and scipy. Runtime under 1 s.
Reproduce.
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.
Checks. Spectrograms and RMS of the original and each variant (attached:
a_cut.png,b_borrowed.png,c_synth.png,d_lowpass.png): thechosen 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
jinrai_shotgun/glued.qci(reloadpump), the new SMDs,neo/soundsrc/.viewmodels.blend: thejinrai_shotgunscene; other scenes unchanged.Checks (measured)
reloadendframe 17 at its own limitreloadpump)reloadend: 1 and 0)How to Test
See the neo PR (NeotokyoRebuild/neo#2312).
Related
Partial reloads 13: Add the MilSO chamber phases #185 (13), Partial reloads 12: Add the Kyla sources and its reload resume #184 (12), Partial reloads 11: Add the Tachi chamber phases #183 (11), Partial reloads 10: Add the ZR68-L reload clips #182 (10), Partial reloads 09: Add the ZR68-S as a ZR68C family variant #181 (09), Partial reloads 08: Add the ZR68C reload that keeps a chambered round #180 (08), Partial reloads 07: Add the ZR68C resume clip after the load animation #178 (07), Partial reloads 06: Add the ZR68C reload after magazine detach animation #179 (06), Partial reloads 05: Add the ZR68C viewmodel sources #177 (05), Add empty lowered sprint animations for the MILSO and Tachi #196 (04), Partial reloads 03: Add the MILSO viewmodel sources #195 (03),
Partial reloads 02: Add empty lowered sprint animation for the Tachi #194 (02), Partial reloads 01: Move the Tachi animation sources into a consolidated Blender project #176 (01)