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
Binary file added neo/models/weapons/v_jinrai_klya9.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_klya9.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_klya9.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_klya9.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_klya9.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_klya9.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_klya9.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_klya9.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_klya9.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_klya9.vvd
Binary file not shown.
29 changes: 24 additions & 5 deletions neo/modelsrc/weapons/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Weapon model sources

The Tachi and ZR68C viewmodels are the first weapons maintained under these conventions, followed by the ZR68-S,
ZR68-L and MilSO.
ZR68-L, Kyla and MilSO.
Expect the folder layout, scripts and steps here to change as more weapons are added.

## Change an animation (quick recipe)
Expand All @@ -25,13 +25,13 @@ For example, a new pose in a slot of the Tachi. Run the commands from this folde
Layout:

- `viewmodels.blend`: the Blender file for every viewmodel. It holds one **scene** per gun, called a project:
`jinrai_tachi`, `jinrai_zr68c`, `jinrai_zr68s`, `jinrai_zr68l` and `jinrai_milso`. Each scene has one rig and one action, and
both teams' arms (see One scene per gun).
`jinrai_tachi`, `jinrai_zr68c`, `jinrai_zr68s`, `jinrai_zr68l`, `jinrai_klya9` (the Kyla) and `jinrai_milso`. Each scene
has one rig and one action, and both teams' arms (see One scene per gun).
- `PROJECT/` (such as `jinrai_tachi/`): the project's `.qc`, `reference.smd`, `anims/*.smd` (written by the
export) and `composites.txt` (if used). The scripts take project names.
- `nsf_GUN/` (such as `nsf_zr68c/`): the NSF model's `.qc`, `reference.smd` and its shipped clips in `anims/`. It has
no scene and is never exported: it compiles from these SMDs and from the Jinrai glued clips.
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C and ZR68-L): the `$sequence` lines of the glued
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C, ZR68-L and Kyla): the `$sequence` lines of the glued
clips, read from `jinrai_GUN/anims/`. Both team `.qc` files include it, so the NSF model compiles the Jinrai glued
clips. The variants of a gun family include their base gun's file instead (see Gun families).
- `GUN/viewmodel.qci` (such as `tachi/viewmodel.qci`): the QC lines both team models of a gun share. Each team's `.qc`
Expand Down Expand Up @@ -77,7 +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 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).

### Gun families

Expand Down Expand Up @@ -269,6 +270,24 @@ The Tachi keeps its shipped `reload` and `reloadempty` and gets no glued clips.
`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 for the Kyla

The Kyla is a double-action revolver: its reload throws the cylinder out and puts a new one in. It has no chamber and
no cycle step, so the gun is ready as soon as the new cylinder is in. Its scene `jinrai_klya9` carries these markers on
`reload`:

| marker | frame | meaning |
| :-- | :-- | :-- |
| `reload:1_unload` | f17 | the old cylinder leaves the gun; its rounds are gone |
| `reload:1_unload.join` | f28 | the last frame before the new cylinder shows in the support hand |
| `reload:2_load.sound` | f36 | the first sound of the load (`weapon_kyla.reload_load`) |
| `reload:2_load` | f53 | the new cylinder is in, after the last click; the ammo credit, as `ReloadReadyBeforeEnd` on master |

When the player switches weapons after `1_unload` and before the reload ends, the draw plays `drawunloaded_reload`:
the authored `drawunloaded` slot (the shipped `draw` with the cylinder off screen, then a 6-frame tilt to the `reload`
pose at f28), then `reload` from f29. The support hand stays off screen until the new cylinder comes in, as in `reload`.
A switch after `2_load` keeps the six rounds and plays the plain draw; a switch before `1_unload` cancels the reload.

## 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
Expand Down
1,054 changes: 1,054 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/changemode.smd

Large diffs are not rendered by default.

1,304 changes: 1,304 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/draw.smd

Large diffs are not rendered by default.

1,604 changes: 1,604 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/drawunloaded.smd

Large diffs are not rendered by default.

3,754 changes: 3,754 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/drawunloaded_reload.smd

Large diffs are not rendered by default.

704 changes: 704 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/fire.smd

Large diffs are not rendered by default.

704 changes: 704 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/fire_empty.smd

Large diffs are not rendered by default.

554 changes: 554 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/holster.smd

Large diffs are not rendered by default.

1,554 changes: 1,554 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/idle01.smd

Large diffs are not rendered by default.

154 changes: 154 additions & 0 deletions neo/modelsrc/weapons/jinrai_klya9/anims/idle_lowered.smd
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
version 1
nodes
0 "Dummy01" -1
1 "bone forearm01" 0
2 "bone hand01" 1
3 "bone middle 05" 2
4 "bone middle 06" 3
5 "bone middle 07" 4
6 "bone middle 08" 5
7 "bone index 05" 2
8 "bone index 06" 7
9 "bone index 07" 8
10 "bone index 08" 9
11 "bone ring 05" 2
12 "bone ring 06" 11
13 "bone ring 07" 12
14 "bone ring 08" 13
15 "bone pinky 05" 2
16 "bone pinky 06" 15
17 "bone pinky 07" 16
18 "bone pinky 08" 17
19 "bone thumb 04" 2
20 "bone thumb 05" 19
21 "bone thumb 06" 20
22 "bone forearm" 0
23 "bone hand" 22
24 "bone middle 1" 23
25 "bone middle 2" 24
26 "bone middle 3" 25
27 "bone middle 4" 26
28 "bone index 1" 23
29 "bone index 2" 28
30 "bone index 3" 29
31 "bone index 4" 30
32 "bone ring 1" 23
33 "bone ring 2" 32
34 "bone ring 3" 33
35 "bone ring 4" 34
36 "bone pinky 1" 23
37 "bone pinky 2" 36
38 "bone pinky 3" 37
39 "bone pinky 4" 38
40 "bone thumb 1" 23
41 "bone thumb 2" 40
42 "bone thumb 3" 41
43 "Body" 23
44 "Chamber" 43
45 "Hammer" 43
46 "Release" 43
47 "Muzzle" 43
48 "Eject" 43
end
skeleton
time 0
0 7.163901 0.365875 -19.936886 -0.099005 0.001714 -3.122014
1 -0.351828 15.330447 -13.820518 -0.745827 -0.815653 -2.913868
2 -0.035543 -23.756729 -0.084862 0.617027 -0.107651 -0.198276
3 0.273359 -3.765804 -0.387137 0.000000 0.000000 0.000000
4 0.000004 -3.784245 -0.191475 -0.436331 -0.178305 -0.000000
5 0.024374 -3.235440 0.175098 -0.573015 -0.002704 0.002331
6 -0.111969 -3.553708 0.074809 -0.841240 0.087075 0.015758
7 1.858443 -3.773899 0.198660 0.000000 -0.245131 0.075729
8 0.000000 -3.784232 -0.191478 -0.371289 0.090881 -0.024549
9 0.074590 -3.334566 0.036044 -0.660289 -0.002704 0.002331
10 -0.033765 -2.966141 0.050345 -0.664468 0.026121 0.048147
11 -1.407701 -3.765812 -0.387138 -0.000000 0.000000 -0.095034
12 -0.000007 -3.784241 -0.191480 -0.529521 -0.125139 0.025178
13 0.038982 -2.749633 0.107392 -0.572380 -0.028980 -0.038419
14 0.013191 -3.474697 0.024520 -1.074004 0.019874 0.037834
15 -2.992723 -3.619921 0.091619 0.000000 0.000000 -0.168174
16 -0.231694 -2.899983 -0.226468 -0.730111 -0.125139 0.025178
17 0.047093 -3.464710 0.060478 -0.747523 0.006848 0.017134
18 -0.012932 -2.746934 0.096229 -0.778050 -0.072458 0.061817
19 2.231812 -1.416988 1.590842 -0.527369 -0.897563 0.885636
20 0.316681 -3.892334 -0.185578 -0.364956 -0.578900 -0.202701
21 0.269060 -3.933443 0.328674 -0.522312 0.089592 -0.216743
22 12.577014 11.498297 1.716353 1.571261 1.551345 1.587292
23 0.035545 23.756716 -0.084858 -0.030467 0.000030 -0.168771
24 -0.273369 3.765807 0.387136 -0.000000 -0.000000 0.000000
25 -0.000003 3.784233 0.191477 -0.433221 -0.180256 -0.018934
26 -0.024369 3.235438 -0.175109 -1.253706 -0.002704 0.002331
27 0.111968 3.553717 -0.074805 -1.364840 0.087075 0.015758
28 -1.858453 3.773899 -0.198659 0.000000 -0.245131 0.075729
29 -0.000002 3.784241 0.191474 -0.136517 0.070735 -0.178480
30 -0.074589 3.334556 -0.036040 -0.223961 -0.002704 0.002331
31 0.033768 2.966131 -0.050351 -0.856461 0.026121 0.048147
32 1.407695 3.765801 0.387136 -0.000000 -0.000000 -0.095034
33 -0.000003 3.784236 0.191477 -0.705893 -0.116309 0.040343
34 -0.038995 2.749639 -0.107390 -1.270513 -0.028980 -0.038419
35 -0.013195 3.474703 -0.024526 -1.423080 0.019874 0.037834
36 2.992722 3.619933 -0.091621 0.000000 0.000000 -0.168174
37 0.231694 2.899970 0.226468 -0.730128 -0.125139 0.025178
38 -0.047095 3.464702 -0.060476 -1.358395 0.006848 0.017134
39 0.012926 2.746931 -0.096234 -1.144578 -0.072458 0.061817
40 -2.231821 1.416991 -1.590844 -0.961137 -0.813399 1.071353
41 -0.316679 3.892340 0.185575 -0.766377 -0.578900 -0.202701
42 -0.269056 3.933460 -0.328676 -1.154412 0.089592 -0.216743
43 -0.622825 15.609094 -2.746170 1.576858 1.518259 -1.616953
44 -0.009905 1.321663 5.013002 -0.000000 -0.000000 -0.000000
45 -0.016154 8.847375 4.667720 -0.000000 -0.000000 -0.000000
46 1.507199 4.991277 3.850471 -0.000000 -0.000000 -0.000000
47 0.039299 -15.229118 5.599372 1.570796 -0.024092 -1.570796
48 -0.868718 1.344534 6.141920 0.003526 -0.174498 3.121287
time 1
0 7.163901 0.365875 -19.936886 -0.099005 0.001714 -3.122014
1 -0.351828 15.330447 -13.820518 -0.745827 -0.815653 -2.913868
2 -0.035543 -23.756729 -0.084862 0.617027 -0.107651 -0.198276
3 0.273359 -3.765804 -0.387137 0.000000 0.000000 0.000000
4 0.000004 -3.784245 -0.191475 -0.436331 -0.178305 -0.000000
5 0.024374 -3.235440 0.175098 -0.573015 -0.002704 0.002331
6 -0.111969 -3.553708 0.074809 -0.841240 0.087075 0.015758
7 1.858443 -3.773899 0.198660 0.000000 -0.245131 0.075729
8 0.000000 -3.784232 -0.191478 -0.371289 0.090881 -0.024549
9 0.074590 -3.334566 0.036044 -0.660289 -0.002704 0.002331
10 -0.033765 -2.966141 0.050345 -0.664468 0.026121 0.048147
11 -1.407701 -3.765812 -0.387138 -0.000000 0.000000 -0.095034
12 -0.000007 -3.784241 -0.191480 -0.529521 -0.125139 0.025178
13 0.038982 -2.749633 0.107392 -0.572380 -0.028980 -0.038419
14 0.013191 -3.474697 0.024520 -1.074004 0.019874 0.037834
15 -2.992723 -3.619921 0.091619 0.000000 0.000000 -0.168174
16 -0.231694 -2.899983 -0.226468 -0.730111 -0.125139 0.025178
17 0.047093 -3.464710 0.060478 -0.747523 0.006848 0.017134
18 -0.012932 -2.746934 0.096229 -0.778050 -0.072458 0.061817
19 2.231812 -1.416988 1.590842 -0.527369 -0.897563 0.885636
20 0.316681 -3.892334 -0.185578 -0.364956 -0.578900 -0.202701
21 0.269060 -3.933443 0.328674 -0.522312 0.089592 -0.216743
22 12.577014 11.498297 1.716353 1.571261 1.551345 1.587292
23 0.035545 23.756716 -0.084858 -0.030467 0.000030 -0.168771
24 -0.273369 3.765807 0.387136 -0.000000 -0.000000 0.000000
25 -0.000003 3.784233 0.191477 -0.433221 -0.180256 -0.018934
26 -0.024369 3.235438 -0.175109 -1.253706 -0.002704 0.002331
27 0.111968 3.553717 -0.074805 -1.364840 0.087075 0.015758
28 -1.858453 3.773899 -0.198659 0.000000 -0.245131 0.075729
29 -0.000002 3.784241 0.191474 -0.136517 0.070735 -0.178480
30 -0.074589 3.334556 -0.036040 -0.223961 -0.002704 0.002331
31 0.033768 2.966131 -0.050351 -0.856461 0.026121 0.048147
32 1.407695 3.765801 0.387136 -0.000000 -0.000000 -0.095034
33 -0.000003 3.784236 0.191477 -0.705893 -0.116309 0.040343
34 -0.038995 2.749639 -0.107390 -1.270513 -0.028980 -0.038419
35 -0.013195 3.474703 -0.024526 -1.423080 0.019874 0.037834
36 2.992722 3.619933 -0.091621 0.000000 0.000000 -0.168174
37 0.231694 2.899970 0.226468 -0.730128 -0.125139 0.025178
38 -0.047095 3.464702 -0.060476 -1.358395 0.006848 0.017134
39 0.012926 2.746931 -0.096234 -1.144578 -0.072458 0.061817
40 -2.231821 1.416991 -1.590844 -0.961137 -0.813399 1.071353
41 -0.316679 3.892340 0.185575 -0.766377 -0.578900 -0.202701
42 -0.269056 3.933460 -0.328676 -1.154412 0.089592 -0.216743
43 -0.622825 15.609094 -2.746170 1.576858 1.518259 -1.616953
44 -0.009905 1.321663 5.013002 -0.000000 -0.000000 -0.000000
45 -0.016154 8.847375 4.667720 -0.000000 -0.000000 -0.000000
46 1.507199 4.991277 3.850471 -0.000000 -0.000000 -0.000000
47 0.039299 -15.229118 5.599372 1.570796 -0.024092 -1.570796
48 -0.868718 1.344534 6.141920 0.003526 -0.174498 3.121287
end
Loading