Repository navigation
Partial reloads 10: Add partial reloads to the ZR68-L - #2296
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 ZR68-L loads the reload phases neoAssets writes for it (#base weapon_zr68l_reload_phases.txt) and keeps a chambered round (ChamberedRound 1), as the ZR68C does. It plays its own sound pieces (weapon_zr68l.reload_*). The phase code is generic, so no code changes.
This was referenced Nov 9, 2026
sunzenshen
force-pushed
the
stack/reload-zr68c/55-zr68-family
branch
from
November 10, 2026 02:10
769dfa4 to
1ef02e7
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/57-zr68l
branch
from
November 10, 2026 02:10
94d3e09 to
eac260d
Compare
sunzenshen
marked this pull request as ready for review
November 10, 2026 04:46
sunmachine
approved these changes
Nov 10, 2026
sunzenshen
marked this pull request as draft
November 12, 2026 06:55
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#182 (layer 10: the ZR68-L sources, clips, phases file and sound pieces).
Partial reloads 10: add partial reloads to the ZR68-L. This PR builds on layer 09 (the ZR68-S) and pairs with
neoAssets layer 10. Next: #2297 (11, the Tachi).
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_zr68l_reload_phases.txt","ReloadPhases" {},"ChamberedRound" "1", as the ZR68Cand ZR68-S have them. Its reload has its own motion and sounds, so it is not a ZR68C family variant: it has its own
clips and four new sound entries,
weapon_zr68l.reload_unload,_load,_load_part2,_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 ZR68-L behaves as on master.
How to review
weapon_zr68l.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 ZR68-L entries, in theweapon_zr68.reload_*pattern.How to test
9+1.10+1. Fire the magazine empty and reload: 10 with a dim round icon,then
9+1at the bolt pull.with a round chambered.
sv_neo_reload_experimental 0(set before the map loads): master behavior, 10 rounds, no+1.Results
Layer 10 build (this PR + neoAssets layer 10), Linux Debug,
ntre_engage_ctg, owner ZR68-L plus abot_mimicbot:reload_skipcycle: 5 -> 1 at the unload (+0.68 s) -> 11 at the load (+1.41 s); the ZR68-L's unload, load, load_part2 sounds once each; no bolt pullreload: 0 -> 10 with the round icon dim (+1.41 s) -> 9+1 at the bolt pull (+2.28 s)drawunloaded_reload_skipcycle: 1 -> 11drawunloaded_reload: 0 -> 10 -> 9+1; load, load_part2, cycle sounds once eachreload5 -> 10; the switch cancels the dry reload and a newreloadrunsmatch_end=True, 0 assertsToolchain
Linked Issues