Repository navigation
Partial reloads 23: Rack the Supa-7's first loaded round over the hull - #2312
Closed
sunzenshen wants to merge 1 commit into
Closed
sunzenshen wants to merge 1 commit into
sunzenshen wants to merge 1 commit into
Conversation
With experimental reloads on and a model that has reloadpump, the shot that empties the gun plays the shipped recoil clip without the pump stroke and leaves the spent hull in the chamber; a shell shot plays its sound without the pump clicks. A dry reload then racks its first round over the hull with reloadpump, and the inserts go on from the loading pose, so it ends without the finishing rack. A shot during that rack waits until the pump is home. Without reloadpump the gun keeps the shipped flow.
This was referenced Nov 10, 2026
This was referenced Nov 13, 2026
Closed
Closed
Contributor
Author
|
Closing to clear the board in favor of the PR stack of sunzenshen#39 |
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
Depends on NeotokyoRebuild/neoAssets#197 (Supa-7 sources, the
reloadpumpclip and the no-pump shell shot sound).Partial reloads 23: the Supa-7 pumps after the first shell of a dry reload. This PR builds on layer 22 (#2308, the
flag off). Behind
sv_neo_reload_experimental 1; with the flag at 0 the Supa-7 is as on master. The ammo model ismaster's: the clip count, the HUD and the empty test do not change.
fire2(
ACT_VM_RECOIL2) for a shell,fire1(ACT_VM_RECOIL1) for a slug. Both are in the shipped models and were neverplayed. The spent hull stays in the chamber. A slug skips its pump sound; a shell plays
weapon_murata.single_nopump, the shot without the pump clicks that the shippedmurata_fire.wavcarries.reloadstartand firstreloadinsertplay, thenreloadpumpracks that shell over thehull at once. The inserts go on from the loading pose and the reload ends with
reloadendshort, with no rack at theend: the gun can fire after the first shell instead of after the whole reload.
reloadpumpin the viewmodel, the gun keeps the shipped flow.reloadpumpis found byname on the viewmodel.
The sound and the clip are built in the neoAssets PR, which describes the method: the no-pump wav is made from classic
NEOTOKYO's
murata_fire.wavby a seeded script, and its steps and checksum are listed there.It is layer 23 of a stack. Next: 24 (#2309, the Supa-7 tube and chamber, rebased on this layer) and 25 (#2313,
slug input rules).
How to review
weapon_supa7.h: the private helpers.weapon_supa7.cpp:PrimaryAttack(shells and slugs) picks the no-pump shot;ItemPostFramestarts the pump afterthe first insert and holds a shot while it plays;
UsesPumpAfterInsertis the flag and model check.game_sounds_weapons.txt:weapon_murata.single_nopump.How to test
sv_neo_reload_experimental 1and load a map. Take the Supa-7.sv_neo_reload_experimental 0(set before the map loads): master behavior.Results
Layer 23 build (this PR on layer 22 + neoAssets layer 23), Linux Debug,
ntre_engage_ctg, owner Supa-7 plus abot_mimicbot of the same class (Assault) with the same gun. Times are from the reload press.fire2, no-pump sound, hull staysaltfirewith its pumpreloadstart, insert 1,reloadpumpat +0.885 s (clip 1), inserts, 7 at +4.82 s,reloadendshort, idle +5.24 sreloadendrack, idle +4.97 smatch_end=True, 0 asserts, 0 crashesThe reload takes longer than master's to fill the gun (the pump plays once in the middle instead of once at the end
from idle), but the gun is ready to fire after the first shell.
With layers 24 and 25 on top, the same flow was also checked for a slug last shot, a slug loaded first, a held fire
during the pump, a switch before the pump (trigger or reload after it) and a sprint during the pump; see #2309 and
#2313.
Toolchain
Linked Issues