Repository navigation
Partial reloads 08: Add the ZR68C reload that keeps a chambered round - #180
Closed
sunzenshen wants to merge 1 commit into
Closed
sunzenshen wants to merge 1 commit into
sunzenshen wants to merge 1 commit into
Conversation
A reload with a round chambered plays reload_skipcycle: reload up to 2_load.exit (f56, after the tap), then the new skipcycle slot back to idle, with no bolt pull. drawunloaded_reload_skipcycle resumes it after 1_unload. Both teams compile the Jinrai clips. The phases file gains the rows of both clips. reload_skipcycle plays sound pieces, as a glued clip does, so the unload step gets its own piece, zr68_reload_unload.wav.
This was referenced Nov 9, 2026
sunzenshen
force-pushed
the
stack/reload-zr68c/40-attach
branch
from
November 10, 2026 02:07
f013d1f to
cf34668
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/50-cycle
branch
from
November 10, 2026 02:07
53981be to
43a4a8d
Compare
This was referenced Nov 10, 2026
sunzenshen
marked this pull request as ready for review
November 10, 2026 04:45
sunzenshen
marked this pull request as draft
November 13, 2026 03:50
This was referenced Nov 13, 2026
Closed
This was referenced Nov 13, 2026
Closed
Closed
Closed
Closed
[backup] Partial reloads 18: Add the SRM family sources and its reload clips
sunzenshen/neoAssets#18
Closed
[backup] Partial reloads 20: Add the M41 family sources and its reload clips
sunzenshen/neoAssets#20
Closed
Closed
Contributor
Author
|
Closing to clear the board in favor of the PR stack of sunzenshen#27 |
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
Adds the animations needed to preserve the chambered round when the reload was with a partial magazine.
Demos:
Reloading with a round still chambered:
sc-1-tactical.mp4
Interrupting a reload after the magazine detach:
sc-4-tac-unload.mp4
(There is no additional animation for resuming after mag attachment, because that is just the weapon draw animation.)
Partial reloads 08. This PR adds the ZR68C reload that keeps a chambered round, used by NeotokyoRebuild/neo#2294: a
reload with a round in the chamber leaves
reloadafter the magazine tap and returns to idle, with no bolt pull.It is layer 08 of a stack and builds on #178 (07: the resume after the load), #179 (06), #177 (05), #196 (04), #195 (03), #194 (02) and #176 (01).
Next: 09 (the ZR68-S, #181). The neo flag
sv_neo_reload_experimentalis 1 by default while the stack is reviewed.Overview of Changes
New slot:
skipcyclein thejinrai_zr68cscene, 10 frames (f0-9): from thereloadpose at f56 (after thetap) back to
idle01f0, magazine seated, handle home. The one scene serves both teams.Markers in the
jinrai_zr68cscene:reload:2_load.exitf56, where a reload with a round chambered leavesreload;reload:1_unload.soundf1, the first hit of the new unload sound piece.Sequences (new lines of
jinrai_zr68c/composites.txtandglued.qci):reload_skipcyclereloadf0-56, thenskipcycledrawunloaded_reload_skipcycle1_unloadofreload_skipcycledrawunloaded,reloadf31-56,skipcyclePhases file: rows for both sequences.
reload_skipcycleplays sound pieces, as a glued clip does: unload0.033 s, load 1.300 s, tap 1.733 s; its
1_unloadrow names the resumedrawunloaded_reload_skipcycle(load1.367 s, tap 1.800 s, ammo 1.400 s). No other row changes.
Sound:
zr68_reload_unload.wav, cut from the original reload sound (neo#2294 adds itsweapon_zr68.reload_unloadentry).
Compiled models:
v_jinrai_zr68c,v_nsf_zr68cwith the two new sequences.README and
README_ANIMATOR: the slot, the two markers, the two clips, a range that ends at a marker.How to Review
composites.txtandglued.qci(two lines each), the phases file, the README.viewmodels.blendchanges only in theskipcycleslot and the two markers; the other files are generated orbinary and the checks below cover them.
Checks (measured)
jinrai_tachi jinrai_zr68cSEAM0.0000 u, 0.000 deg on all five seams of the four glued clipsPACE jinrai_zr68c 3 authored slots, 0 warningsREADYlines, e.g.reload_skipcycle 2.167 s >= weapon_zr68.reload_load_part2 end 1.800 s; the 03 and 04 lines unchangedchamberempty1), chambered at +2.28 s (29+1), idle at +2.715 s; flag 0:reload20 to 30 at +2.22 s (master); HUD ends 30 lit with the glyph (tactical) and 29 lit + 1 dim (dry), 2 magazinesreload_skipcycle, no bolt pull, 30+1, unload/load/tap sounds once; tactical after the unload:drawunloaded_reload_skipcycle, 30+1; the 03 and 04 resumes unchanged; headless TDM 12 bots PASS, 0 assertsHow to Test
30+1.in), then back: the draw loads the magazine, taps it, and returns to idle without a pop at the joins.
viewmodels_post_export.blend, scenejinrai_zr68c, slotsreload_skipcycleanddrawunloaded_reload_skipcycle.Related