Repository navigation
Partial reloads 25: Add Supa-7 slug input rules - #2313
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 sv_neo_reload_experimental on, a Supa-7 reload loads shells or slugs, and the player picks which while it runs: - A round's type is set when it enters the tube, so an input during its insert decides it. - Alt-fire during a reload makes the rest of the load slugs; with no reload running it starts one that loads slugs. - Reload during a slug load makes the rest of it shells. - Any number of slugs; a slug load ends when the slugs run out. - In freeze time, alt-fire loads the whole gun with slugs and reload with shells. The choice is saved in cl_neo_supa7_prefer_slugs and applied to the gun in later freeze times. - The HUD fire-mode letter shows the type a reload is loading, otherwise the chambered round's type. The player's freeze-time alt-fire exception is a type check plus the public sv_neo_reload_experimental rule check, as for the Tachi, and the HUD keeps master's SlugLoaded() call, so CWeaponSupa7 gains no public member. With the flag off the Supa-7 behaves as on master.
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
Partial reloads 25: Supa-7 slug input rules. This PR builds on layer 24 (#2309, the Supa-7 tube and chamber). It has
no neoAssets pair: the Supa-7 plays its shipped clips and the pump of layer 23 (NeotokyoRebuild/neoAssets#197).
With
sv_neo_reload_experimental 1, a Supa-7 reload loads shells or slugs, and the player picks which while it runs.The rules sit in their own layer so #2309 stays the original proposal.
when its insert starts. It is a slug if a slug load is active then.
on. With no reload running, alt-fire starts a reload that loads slugs, also on an empty gun with auto-reload off.
then tops off with shells.
press loads it with shells. Each replaced round goes back to its reserve. A repeat press does nothing. The game lets
alt-fire through in freeze time for this, as it does for the Tachi's fire-mode toggle.
cl_neo_supa7_prefer_slugs(archived user info, likecl_neo_tachi_prefer_auto). In later freeze times the server loads a new Supa-7 with slugs when it is 1.TubePhasesOn*hooks of Partial reloads 24: Model the Supa-7 tube and chamber #2309 and check the flag. With the flag at 0 theSupa-7 behaves as on master.
How to review
weapon_supa7.h:m_bSlugLoad(networked, predicted), the new hooks andConvertLoad.weapon_supa7.cpp:RunInserttypes the round at the credit moment;TubePhasesOnStartSlug,TubePhasesOnLoadInputandTubePhasesOnFreezeTimetake the input;ConvertLoaddoes the freeze-time change.SlugLoaded()(the HUD's fire-mode letter) returns the type a reload is loading, else the chambered round's.player.cpp,c_baseplayer.cpp: the freeze-time alt-fire exception for the Supa-7 with the flag on, shaped likethe Tachi's (type check plus the flag; no new weapon method).
neo_player.cpp: the bots' value of the new user info cvar.How to test
sv_neo_reload_experimental 1and load a map. Take the Supa-7.The HUD letter shows the slug letter while the slugs load.
cl_autoreload_when_empty 0, fire the gun empty, tap alt-fire: six slugs, then the rack. Fire three, tapalt-fire: one slug goes in and the load stops (no slugs left). Reload: shells top off the tube.
start the next round: the new gun has slugs.
sv_neo_reload_experimental 0(set before the map loads): master behavior.Results
Layer 25 build (this PR on #2309, before layer 23 went in below it), Linux Debug,
ntre_engage_ctg, owner Supa-7 plus abot_mimicbot of the sameclass (Assault) with the same gun. The rounds below are listed in fire order (P shell, S slug) after the chambered
round.
With the flag at 0, the same input sequences on this build and on #2309 give the same behavior as master: alt-fire
loads one slug and ends the reload with the pump, freeze-time presses change nothing, and the cvar stays 0.
The headless TDM match (12 Assault bots on the Supa-7, flag 1, 1 round) passes with
match_end=Trueand 0 asserts.The bot's traced states match the owner's in each clip (one take differs by one unsampled insert row).
With layer 23 below #2309 (this PR on the current stack), the Supa-7 pumps after the first round of a dry reload, and
the slug rules apply to that round too:
reloadpumpchambers it; two more slugs, then shells to 7; the next shot is the slug (fire)fire1without the pump, then the shell reload pumps after its first shellreloadendshort, no rackreloadendrack; reload:reloadstart, thenreloadpumpat once, then the insertsmatch_end=True, 0 assertsToolchain
Linked Issues