diff --git a/neo/modelsrc/weapons/README.md b/neo/modelsrc/weapons/README.md index 42c48980..687bda04 100644 --- a/neo/modelsrc/weapons/README.md +++ b/neo/modelsrc/weapons/README.md @@ -77,7 +77,7 @@ teams' arm meshes are skinned to that rig, so a key moves both. Each team's mesh scene, `merge_teams.py` re-bound the NSF arm vertices for the preview only, so the NSF arms show as the NSF model plays them. -The Tachi has no glued clips. +The Tachi has no glued clips; its phases file only tracks the chamber (see Chamber tracking for the Tachi). ### Gun families @@ -262,6 +262,13 @@ A composite has no slot or action in Blender, so it is not in the action browser compiled model. Do not edit its SMD; edit the slots it is made of and export again. +## Chamber tracking for the Tachi + +The Tachi keeps its shipped `reload` and `reloadempty` and gets no glued clips. Its scene carries two markers, +`reloadempty:3_cycle` and `reload:3_cycle`, at the ammo credit (the clip's end minus the script's +`ReloadReadyBeforeEnd`: f52), and the export writes `weapon_tachi_reload_phases.txt` from them: the time the chamber +holds a round. A switch after the credit then keeps the chambered round instead of replaying `reloadempty`. + ## Reload resume animations (ZR68C) When the player switches weapons after the old magazine is out (`1_unload`) or the fresh one is in (`2_load`), and diff --git a/neo/modelsrc/weapons/viewmodels.blend b/neo/modelsrc/weapons/viewmodels.blend index e476b369..7b5e35c5 100644 Binary files a/neo/modelsrc/weapons/viewmodels.blend and b/neo/modelsrc/weapons/viewmodels.blend differ diff --git a/neo/modelsrc/weapons/viewmodels_post_export.blend b/neo/modelsrc/weapons/viewmodels_post_export.blend index 8963b14e..8a223cff 100644 Binary files a/neo/modelsrc/weapons/viewmodels_post_export.blend and b/neo/modelsrc/weapons/viewmodels_post_export.blend differ diff --git a/neo/scripts/weapon_tachi_reload_phases.txt b/neo/scripts/weapon_tachi_reload_phases.txt new file mode 100644 index 00000000..d0dd50c9 --- /dev/null +++ b/neo/scripts/weapon_tachi_reload_phases.txt @@ -0,0 +1,19 @@ +// Tachi ReloadPhases (sv_neo_reload_experimental), included by neo's scripts/weapon_tachi.txt through #base. +// Chamber tracking only: the shipped reload and reloadempty play with their whole original sound, and the magazine +// still loads at ReloadReadyBeforeEnd. "3_cycle" is when the chamber holds a round: at that same ammo credit, so a +// switch after the credit keeps the chambered round instead of replaying reloadempty (the row on reload lets a reload +// interrupted after its credit recover). export_viewmodels.py sets the times from the timeline markers in the .blend. +"WeaponData" +{ + "ReloadPhases" + { + "reload" + { + "3_cycle" { "ammo" "1.733" } + } + "reloadempty" + { + "3_cycle" { "ammo" "1.733" } + } + } +}