Repository navigation
Partial reloads 20: Add partial reloads to the M41 family - #2306
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 three M41 scripts get the reload phases from neoAssets and a
chamber slot: weapon_m41.txt #base "weapon_mosok41_reload_phases.txt",
weapon_m41s.txt #base "weapon_mosok41s_reload_phases.txt" and
weapon_m41l.txt #base "weapon_mosok41l_reload_phases.txt", each with
"ReloadPhases" {} and "ChamberedRound" "1". game_sounds_weapons.txt
gets the four reload sound pieces all three play
(weapon_m41.reload_unload, reload_load, reload_load_part2,
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/140-jitte
branch
from
November 10, 2026 02:10
b5ce300 to
b29b9c1
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/150-m41
branch
from
November 10, 2026 02:11
327bab2 to
f0ae5c0
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#192 (layer 20: the M41 family sources, clips, phases files and sound pieces).
Partial reloads 20: add partial reloads to the M41 family. This PR builds on layer 19 (#2305, the Jitte family) and
pairs with neoAssets layer 20. Next: #2307 (21, MX 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_m41.txt):#base "weapon_mosok41_reload_phases.txt","ReloadPhases" {},"ChamberedRound" "1", as the ZR68C has them.weapon_m41s.txt), M41-L (weapon_m41l.txt): the same lines with#base "weapon_mosok41s_reload_phases.txt"and#base "weapon_mosok41l_reload_phases.txt".weapon_m41.reload_unload,_load,_load_part2,_cycle. Thereload has three steps (magazine out, magazine seat with the tap, 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 the three M41s behave as on master.
How to review
weapon_m41.txt,weapon_m41s.txt,weapon_m41l.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 four M41 entries, in theweapon_zr68.reload_*pattern.How to test
15+1.15+1. Fire it empty and reload: 15 with a dim round icon, then14+1at the handle.once with a round chambered. Then once dry after the new magazine is seated (about 2.0-3.3 s in).
10+1,10,9+1).sv_neo_reload_experimental 0(set before the map loads): master behavior, no+1.Results
Layer 20 build (this PR + neoAssets layer 20), Linux Debug,
ntre_engage_ctg, owner M41 plus abot_mimicbot ofthe same class (Assault, secondary Tachi) with the same gun, clip and chamber state; the bot's traced sequences and
clips match the owner's in every run with a clip. Times from the reload start (resumes: from the draw).
reload_skipcycle: 1 at the unload (+0.65 s) -> 16 (15+1) at the load (+1.91 s), ends +3.24 s; unload, load and tap sounds; no handle pullreload: 0 -> 15 with the round icon dim (+1.91 s) -> 14+1 at the handle (+3.41 s)drawunloaded_reload: 0 -> 15 (+1.98 s) -> 14+1 (+3.48 s); load, tap and cycle soundsdrawunloaded_reload_skipcycle: 1 -> 16 (+1.98 s)drawtocycle_reload: 15 dim -> 14+1 (+1.61 s); cycle soundreload5 -> 15 and 0 -> 15 at +3.32 s, whole soundmatch_end=True, 0 asserts; 9 bots alive at the end with the M41; bots kept their reloads past the magazine out (clip 0 and 1)The M41-S and M41-L play the M41's clips; their
Muzzlepoint sits at the M41's inside those clips (neoAssets layer17). The first shot right after a resume was not checked for a moved muzzle flash: the takes fire about 2 s after the
reload ends.
Toolchain
Linked Issues