Skip to content

Partial reloads 23: Rack the Supa-7's first loaded round over the hull - #2312

Closed
sunzenshen wants to merge 1 commit into
stack/reload-zr68c/170-flag-offfrom
stack/reload-zr68c/175-supa7-pump
Closed

sunzenshen wants to merge 1 commit into
stack/reload-zr68c/170-flag-offfrom
stack/reload-zr68c/175-supa7-pump

Conversation

@sunzenshen

@sunzenshen sunzenshen commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Description

Depends on NeotokyoRebuild/neoAssets#197 (Supa-7 sources, the reloadpump clip 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 is
master's: the clip count, the HUD and the empty test do not change.

  • Last shot: the shot that empties the gun plays the shipped recoil clip without the pump stroke: fire2
    (ACT_VM_RECOIL2) for a shell, fire1 (ACT_VM_RECOIL1) for a slug. Both are in the shipped models and were never
    played. 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 shipped murata_fire.wav carries.
  • Dry reload: the shipped reloadstart and first reloadinsert play, then reloadpump racks that shell over the
    hull at once. The inserts go on from the loading pose and the reload ends with reloadendshort, with no rack at the
    end: the gun can fire after the first shell instead of after the whole reload.
  • Fire during the pump: the shot waits until the pump is home, then fires the chambered shell.
  • Fallback: without reloadpump in the viewmodel, the gun keeps the shipped flow.
  • No new activity or public method. The shot sound plays through a private Supa-7 helper; reloadpump is found by
    name 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.wav by 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

  1. weapon_supa7.h: the private helpers.
  2. weapon_supa7.cpp: PrimaryAttack (shells and slugs) picks the no-pump shot; ItemPostFrame starts the pump after
    the first insert and holds a shot while it plays; UsesPumpAfterInsert is the flag and model check.
  3. game_sounds_weapons.txt: weapon_murata.single_nopump.

How to test

  1. Set sv_neo_reload_experimental 1 and load a map. Take the Supa-7.
  2. Fire it empty: the last shot has no pump stroke and no pump sound.
  3. Reload: one shell goes in, the gun pumps at once, then the other shells go in. The reload ends without a rack.
  4. Fire it empty, reload, and hold fire from the pump's start: the shot leaves when the pump is home.
  5. Repeat with 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 a
bot_mimic bot of the same class (Assault) with the same gun. Times are from the reload press.

case flag 1 flag 0
last shell shot fire2, no-pump sound, hull stays master: altfire with its pump
dry reload reloadstart, insert 1, reloadpump at +0.885 s (clip 1), inserts, 7 at +4.82 s, reloadendshort, idle +5.24 s master: 7 at +3.95 s, reloadend rack, idle +4.97 s
headless TDM, 1 round PASS, match_end=True, 0 asserts, 0 crashes -

The 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

  • Linux GCC Distro Native (Linux Mint 22.3, GCC 13.3.0)

Linked Issues

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.
@sunzenshen

Copy link
Copy Markdown
Contributor Author

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

@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

Animations Animation stuff. Including the syncronizing of animations between client and server based on state.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants