Repository navigation
Partial reloads 14: Add partial reloads to the AA13 - #2300
Closed
sunzenshen wants to merge 1 commit into
Closed
sunzenshen wants to merge 1 commit into
sunzenshen wants to merge 1 commit into
Conversation
The AA13 script gets the reload phases from neoAssets and a chamber
slot: #base "weapon_aa13_reload_phases.txt", "ReloadPhases" {} and
"ChamberedRound" "1", as the ZR68C has them, and game_sounds_weapons.txt
the four reload sound pieces the phases play (weapon_aa13.reload_unload,
reload_unload_part2, 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
sunzenshen
force-pushed
the
stack/reload-zr68c/90-milso
branch
from
November 10, 2026 02:10
7e7bed1 to
1bd8934
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/95-aa13
branch
from
November 10, 2026 02:10
93c20eb to
7edf5ab
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#186 (layer 14: the AA13 sources, clips, phases file and sound pieces).
Partial reloads 14: add partial reloads to the AA13. This PR builds on layer 13 (#2299, the MilSO) and pairs with
neoAssets layer 14. Next: #2301 (15, SRS).
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.
#base "weapon_aa13_reload_phases.txt","ReloadPhases" {},"ChamberedRound" "1", as the ZR68C hasthem. Its reload has the ZR68C's three steps (drum out, drum seat, handle) and four new sound entries,
weapon_aa13.reload_unload,_unload_part2,_load,_cycle.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 the AA13 behaves as on master.
How to review
weapon_aa13.txt: the three lines, 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 four AA13 entries, in theweapon_zr68.reload_*pattern.How to test
15+1.16+1. Fire the drum empty and reload: 16 with a dim round icon,then
15+1at the handle.with a round chambered. Then once dry after the new drum is seated (about 3.5-4.3 s in).
sv_neo_reload_experimental 0(set before the map loads): master behavior, 16 rounds, no+1.Results
Layer 14 build (this PR + neoAssets layer 14), Linux Debug,
ntre_engage_ctg, owner AA13 plus abot_mimicbot:reload_skipcycle: 1 at the unload (+1.01 s) -> 17 (16+1) at the load (+3.48 s), ends +4.08 s; unload, unload_part2, load sounds once each; no handle pullreload: 0 -> 16 with the round icon dim (+3.48 s) -> 15+1 at the handle (+4.38 s)drawunloaded_reload: 0 -> 16 (+3.0 s) -> 15+1 (+3.9 s); load and cycle soundsdrawunloaded_reload_skipcycle: 1 -> 17 (+3.0 s)drawtocycle_reload: 16 dim -> 15+1 (+1.88 s); cycle sounddraw, 17 keptreload10 -> 16 and 0 -> 16 at +4.28 s, whole sound; the switch cancels and a newreloadrunsmatch_end=True, 0 asserts; bots reloaded to 17 (16+1); one bot switched after the unloadToolchain
Linked Issues