Repository navigation
Partial reloads 07: Add the ZR68C resume clip after the load animation - #178
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 weapon switch after the fresh magazine is in resumes the reload with drawtocycle_reload: the new drawtocycle slot (the shipped draw, then a reach to the bolt), glued to reload after its 2_load join, so the bolt is still pulled. Both team models compile the Jinrai clip through jinrai_zr68c/glued.qci and are recompiled here; the shipped sequences match the original ZR68C within 0.022 units and 0.048 degrees. The phases file names the resume on the 2_load rows of reload and drawunloaded_reload, and gives reload its 3_cycle row so a finished reload leaves nothing to resume. The clip plays the existing cycle sound piece.
sunzenshen
force-pushed
the
stack/reload-zr68c/30-mvp
branch
from
November 9, 2026 08:19
b60af55 to
dfc322d
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/40-attach
branch
from
November 9, 2026 08:19
ff67942 to
f013d1f
Compare
This was referenced Nov 9, 2026
This was referenced Nov 9, 2026
sunzenshen
force-pushed
the
stack/reload-zr68c/30-mvp
branch
from
November 10, 2026 02:07
dfc322d to
48197ed
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/40-attach
branch
from
November 10, 2026 02:07
f013d1f to
cf34668
Compare
This was referenced Nov 10, 2026
sunzenshen
marked this pull request as ready for review
November 10, 2026 04:45
Contributor
Author
|
This is the part of the PR stack where we do not anticipate merging these PRs until every layer of the stack is approved up to |
sunzenshen
marked this pull request as draft
November 13, 2026 03:51
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#26 |
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 animation for resuming a reload after the fresh magazine has been attached. No cycle management yet.
Demo:
sc-5-dry-load.mp4
Partial reloads 07. This PR adds the ZR68C resume after the load, used by NeotokyoRebuild/neo#2292: a ZR68C reload
interrupted after the fresh magazine is seated continues on the next draw with the bolt pull.
It is layer 07 of a stack and builds on #179 (06: the resume after the unload), #177 (05), #196 (04), #195 (03), #194 (02) and #176 (01). Next: #180 (08,
the bolt-cycle clips,
skipcycle). The neo flagsv_neo_reload_experimentalis 1 by default while the stack isreviewed.
Overview of Changes
drawtocyclein thejinrai_zr68cscene, 32 frames (f0-31): the shippeddraw(f0-24), then areach to the pose of
reloadat f60 (markerreload:2_load.join). The one scene serves both teams.reload:2_load.joinf60 in thejinrai_zr68cscene: the reach to the bolt is done, the handle has not moved.drawtocycle_reload=drawtocycle+reloadf61-81, 53 frames (1.733 s), from the new lineof
jinrai_zr68c/composites.txtandglued.qci.reload2_loadanddrawunloaded_reload2_loadname the resumedrawtocycle_reload;reloadgains3_cycle2.267 s, so a finished reload leaves nothing to resume;drawtocycle_reload:3_cycle1.300 s with the existing cycle sound at 1.067 s.
v_jinrai_zr68c,v_nsf_zr68cwith the new sequence.README_ANIMATOR: the second resume clip, its slot and join marker.How to Review
composites.txtandglued.qci(one line each), the phases file, the README.viewmodels.blendchanges only in thedrawtocycleslot and the2_load.joinmarkers; the other files aregenerated or binary and the checks below cover them.
Checks (measured)
jinrai_tachi jinrai_zr68cSEAM0.0000 u, 0.000 deg for both glued clipsPACE jinrai_zr68c 2 authored slots, 0 warningsREADY drawtocycle_reload 1.733 s >= weapon_zr68.reload_cycle end 1.484 s; the 03 clip's three lines unchangeddrawtocycle_reloadis newdrawtocycle_reloadat +2.175 s, idle at +3.915 s, cycle sound once; flag 0: plain draw, fresh reload (master); HUD dim 30, Tachi 15, bright 30 with 2 magazinesdrawtocycle_reload, bolt pulled, clip stays 30, cycle sound once; the 03 cases unchanged; headless TDM 12 bots PASS, 0 assertsHow to Test
switch back. The draw should reach for the bolt and pull it with sound, without a pop at the join.
viewmodels_post_export.blend, scenejinrai_zr68c, slotdrawtocycle_reload.Related