Repository navigation
Partial reloads 09: Add the ZR68-S as a ZR68C family variant - #181
Closed
sunzenshen wants to merge 2 commits into
Closed
sunzenshen wants to merge 2 commits into
sunzenshen wants to merge 2 commits into
Conversation
The ZR68-S has the ZR68C's motion on the shared bones in every shipped clip, so it is a variant of the ZR68C family: its team qcs include ../jinrai_zr68c/glued.qci and it has no slots of its own. The export treats a project whose qc includes another gun's glued.qci as a variant: it writes the shipped slots only (FAMILY WARN for a new slot left in its scene), and fills the variant's phases file from the base's composites with the variant's own reload markers, failing if they move a join. Exporting a base also exports its variants. Adds the ZR68-S sources (one scene, both teams' arms), its phases file and the compiled models.
This was referenced Nov 9, 2026
The ZR68C scene now shows the ZR68-S gun (silencer) on the ZR68C rig and action, so a new slot can be checked on every gun that plays it. The team collections keep the arms; each gun is in its own collection (zr68c_gun, zr68s_gun), one shown at a time through the Variant dropdown of the Viewmodel panel or the Outliner eye. variant_preview.py builds this once. Variant-only parts are weighted to their nearest base bone at the variant's rest pose, as the game holds them in the glued clips, so no bone is added to the base rig. The ZR68-S gun matches its own scene within 0.0011 u in every shared shipped slot. The new objects have export off: an export of the Tachi and ZR68C projects leaves every SMD and phases file unchanged, and the six models compile byte-identical to the previous commit.
This was referenced Nov 9, 2026
sunzenshen
force-pushed
the
stack/reload-zr68c/50-cycle
branch
from
November 10, 2026 02:07
53981be to
43a4a8d
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/55-zr68-family
branch
from
November 10, 2026 02:07
c440d7e to
46bfa3f
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
[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#25 |
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
Organizes the Blender project such that families of weapons that share the exact same animations can be synced when the animation is edited on one, with changes propagating to the others. The ZRC and ZRS share the same animation family, but the ZRL is significantly different so that one is not included.
Demos:
zr68s-tactical-keeps-chambered-round.mp4
zr68s-dry-reload-chamber-at-bolt.mp4
Partial reloads 09: add the first gun family, the ZR68C with the ZR68-S as its variant. Used by NeotokyoRebuild/neo#2295,
which gives the ZR68-S reload phases.
It is layer 09 of a stack and builds on #180 (08: the chambered round), #178 (07), #179 (06), #177 (05), #196 (04), #195 (03), #194 (02) and
#176 (01). Next: 10 (#182, the ZR68-L). The neo flag
sv_neo_reload_experimentalis 1 by default while the stack isreviewed.
Overview of Changes
Gun families (tools): the ZR68-S has the ZR68C's motion on the shared bones in every shipped clip, so it
compiles the ZR68C's glued clips instead of copies of its own. A gun is a variant when its team
.qcfiles includeanother gun's
../jinrai_BASE/glued.qci.export_viewmodels.pythen:FAMILY WARNand is not exported;composites.txt, with the base's markers overridden by thevariant's own
reloadmarkers, and fails if a variant marker moves a join;glue.pycarries the phases part (variant_times, theafter_varianthook). README: "Gun families".ZR68-S (
jinrai_zr68sscene, both teams' arms): shipped sources,zr68s/viewmodel.qci, team.qcfiles thatinclude
../jinrai_zr68c/glued.qci, itsreloadstep markers (1_unloadf20,2_loadf42; the ZR68C hasf21 / f40 on the same motion) and its phases file. It plays the ZR68C's sound pieces. No slots of its own.
Compiled models:
v_jinrai_zr68s,v_nsf_zr68s.Variant toggle (Blender preview only): the
jinrai_zr68cscene also shows the ZR68-S gun on the ZR68C rig andaction, so a new slot can be checked on both guns. The team collections keep the arms; the guns are in
zr68c_gunand
zr68s_gun, one shown at a time through the new Variant dropdown of the Viewmodel panel or the Outlinereye.
variant_preview.pybuilt it once: the ZR68-S's own parts are weighted to their nearest ZR68C bone at theZR68-S rest pose (
Silencertozr68c,x_silencedtoDummy02), as the game holds them in the glued clips. Thenew objects have export off. README: recipe step 2, "Gun families" (Variant toggle), "Previewing the glued clips".
How to Review
export_viewmodels.py(family_base, the variant branch ofexport_project, the variant list in the mainblock) and
glue.py(variant_times,after_variant, thelayoutandbasearguments)..qcfiles (one include line each), its phases file, the README section "Gun families".variant_preview.py(one-time build; gate below) and theGunrow ofviewmodel_tools.py.viewmodels.blendgains the ZR68-S scene; the SMDs are the original clips (shipped) or export output; the checksbelow cover the binary files.
Checks (measured)
jinrai_tachi jinrai_zr68cFAMILY also exporting jinrai_zr68s; no SMD, phases file or preview changed (worktree clean,POST-EXPORT unchanged);ROM CHECK 3 projects, no clamped poseSEAM0.0000 u, 0.000 deg on all five ZR68C seamsPACE jinrai_zr68c 3 authored slots, 0 warnings)READYlines (9 per gun)FAMILY WARN, not exported, phases file unchanged; a ZR68-S join marker moved one frame: the export fails and names the clipSilencer,x_silenced) at its rest poseVARIANT zr68s on zr68c PASS: the ZR68-S gun on the ZR68C rig within 0.0011 u of its own scene in every shared shipped slot (53 samples;melee01is the ZR68-S's own clip, not compared); export afterwards: no SMD or phases change; the six models compile byte-identical to before the toggle.blendis not modified by togglingHow to Test
30+1. Fire it empty and reload:30, then29+1atthe bolt pull.
continues the reload with no pop at the joins.
viewmodels.blend, scenejinrai_zr68s: shipped slots only; add a slot and export to seeFAMILY WARN.blender viewmodels.blend --python viewmodel_tools.py, scenejinrai_zr68c, Viewmodel panel >Variant >
zr68s: the ZR68-S gun plays the ZR68C's slots.Related