Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions neo/modelsrc/weapons/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ 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; its phases file only tracks the chamber (see Chamber tracking for the Tachi). The Kyla
has one glued clip (see Reload resume for the Kyla).
The Tachi and the MilSO have no glued clips; their phases files only track the chamber (see Chamber tracking for
pistols). The Kyla has one glued clip (see Reload resume for the Kyla).

### Gun families

Expand Down Expand Up @@ -263,12 +263,12 @@ 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
## Chamber tracking for pistols (MilSO, 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`.
The MilSO and the Tachi keep their shipped `reload` and `reloadempty` and get no glued clips. Each scene carries two
markers, `reloadempty:3_cycle` and `reload:3_cycle`, at the ammo credit (the clip's end minus the script's
`ReloadReadyBeforeEnd`: MilSO f50, Tachi f52), and the export writes `weapon_milso_reload_phases.txt` and
`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 for the Kyla

Expand Down
Binary file modified neo/modelsrc/weapons/viewmodels.blend
Binary file not shown.
Binary file modified neo/modelsrc/weapons/viewmodels_post_export.blend
Binary file not shown.
19 changes: 19 additions & 0 deletions neo/scripts/weapon_milso_reload_phases.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// MilSO ReloadPhases (sv_neo_reload_experimental), included by neo's scripts/weapon_milso.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.667" }
}
"reloadempty"
{
"3_cycle" { "ammo" "1.667" }
}
}
}