Repository navigation
Partial reloads 18: Add partial reloads to the SRM family - #2304
Closed
sunzenshen wants to merge 1 commit into
Closed
sunzenshen wants to merge 1 commit into
sunzenshen wants to merge 1 commit into
Conversation
Both SRM scripts get the reload phases from neoAssets and a chamber
slot: weapon_srm.txt #base "weapon_srm_reload_phases.txt" and
weapon_srm_s.txt #base "weapon_srm_s_reload_phases.txt", each with
"ReloadPhases" {} and "ChamberedRound" "1". game_sounds_weapons.txt
gets the three reload sound pieces both play (weapon_srm.reload_unload,
reload_load, reload_cycle). The generic phase code then resumes a
reload interrupted after the unload or the load, and a reload with a
round chambered skips the handle pull. No code changes.
This was referenced Nov 9, 2026
Closed
sunzenshen
force-pushed
the
stack/reload-zr68c/120-mpn45
branch
from
November 10, 2026 02:10
6f9422b to
4c5a156
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/130-srm
branch
from
November 10, 2026 02:10
3dcdb74 to
5ddc5c2
Compare
This was referenced Nov 13, 2026
Contributor
Author
|
Closing to clear the board in favor of the PR stack of sunzenshen#34 |
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#190 (layer 18: the SRM family sources, clips, phases files and sound pieces).
Partial reloads 18: add partial reloads to the SRM family. This PR builds on layer 17 (#2303, the MPN45 family) and
pairs with neoAssets layer 18. Next: #2305 (19, Jitte family).
The phase code of 03-05 is generic: a weapon gets partial reloads from its weapon script and a phases file. This PR
adds the weapon script lines and the sound entries; it has no code changes.
weapon_srm.txt):#base "weapon_srm_reload_phases.txt","ReloadPhases" {},"ChamberedRound" "1",as the ZR68C has them.
weapon_srm_s.txt): the same lines with#base "weapon_srm_s_reload_phases.txt".weapon_srm.reload_unload,_load,_cycle. The reload has three steps(magazine out, magazine seat, handle).
sv_neo_reload_experimentaldefaults to 1 while the partial-reload stack is reviewed (Partial reloads 06: Resume a ZR68C reload after the magazine is unloaded #2293); thelast PR of the stack sets it back to 0. With the flag at 0 both SRMs behave as on master.
How to review
weapon_srm.txt,weapon_srm_s.txt: the three lines each, asweapon_zr68c.txthas them (Partial reloads 06: Resume a ZR68C reload after the magazine is unloaded #2293, Partial reloads 08: Keep a chambered round through a partial reload #2294).game_sounds_weapons.txt: the three SRM entries, in theweapon_zr68.reload_*pattern.How to test
50+1.50+1. Fire it empty and reload: 50 with a dim round icon, then49+1at the handle.once with a round chambered. Then once dry after the new magazine is seated (about 2.0-2.9 s in).
sv_neo_reload_experimental 0(set before the map loads): master behavior, 50 rounds, no+1.Results
Layer 18 build (this PR + neoAssets layer 18), Linux Debug,
ntre_engage_ctg, owner SRM plus abot_mimicbot ofthe same class (Recon) with the same gun, clip and chamber state; the bot's traced sequences and clips match the
owner's in every run. Times from the reload start (resumes: from the draw).
reload_skipcycle: 1 at the unload (+0.65 s) -> 51 (50+1) at the load (+1.94 s), ends +2.31 s; unload and load sounds; no handle pullreload: 0 -> 50 with the round icon dim (+1.94 s) -> 49+1 at the handle (+2.94 s)drawunloaded_reload: 0 -> 50 (+1.98 s) -> 49+1 (+2.97 s); load and cycle soundsdrawunloaded_reload_skipcycle: 1 -> 51 (+1.98 s)drawtocycle_reload: 50 dim -> 49+1 (+1.50 s); cycle soundreload10 -> 50 and 0 -> 50 at +2.84 s, whole sound+right of the row is bright whenever the magazine holds 50, so it is not a chamber cue (not compared with master frames)match_end=True, 0 asserts; bots kept their reloads past the magazine out (clip 0 and 1)Toolchain
Linked Issues