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_aa13.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_aa13.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_aa13.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_aa13.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_aa13.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_aa13.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_aa13.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_aa13.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_aa13.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_aa13.vvd
Binary file not shown.
19 changes: 12 additions & 7 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, Kyla and MilSO.
ZR68-L, Kyla, MilSO and AA13.
Expect the folder layout, scripts and steps here to change as more weapons are added.

## Change an animation (quick recipe)
Expand All @@ -25,19 +25,20 @@ 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`, `jinrai_klya9` (the Kyla) 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), `jinrai_milso` and
`jinrai_aa13`. 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, 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).
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C, ZR68-L, Kyla and AA13): 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`
sets only `$modelname` and includes this file. The ZR68-S and ZR68-L follow the ZR68C layout
(`zr68s/viewmodel.qci`, `zr68l/viewmodel.qci`); the ZR68-L scope's preview images are the MX's, in `mx/textures/`.
The MilSO keeps a whole `.qc` per team, as its team models differ in more than their bones.
The AA13 follows the ZR68C layout with `aa13/viewmodel.qci`. The MilSO keeps a whole `.qc` per team, as its team
models differ in more than their bones.
- `arms/textures/` (Jinrai and NSF arms, shared by every weapon) and `GUN/textures/`: preview images the `.blend` loads.
- `rom_limits.py`, `rom_spec.json` and `rom_widen.json`: the range-of-motion limits on the rigs (see
Range-of-motion limits).
Expand Down Expand Up @@ -309,6 +310,10 @@ onto its own poses at each end, with the same frame counts. The step markers of
`2_load` f42. The ZR68-S plays the ZR68C's sound pieces (`weapon_zr68.reload_*`); the ZR68-L has its own
(`weapon_zr68l.reload_*`).

The AA13 has the same four clips. It joins `reload` after f58 (the drum fully out) and f112, and leaves it at f104,
the drum seat. Slots: `drawunloaded` f0-44, `drawtocycle` f0-37, `skipcycle` f0-18. Its unload step has two sound
pieces (`reload_unload`, `reload_unload_part2`: the release tick and the drum pull).

The animator makes the motion look right and places markers; the export does the frame and time arithmetic.
The `README_ANIMATOR` text block in `viewmodels.blend` repeats these rules.

Expand Down
Binary file added neo/modelsrc/weapons/aa13/textures/aa13_mat1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neo/modelsrc/weapons/aa13/textures/aa13_mat2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neo/modelsrc/weapons/aa13/textures/aa13_mat3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 70 additions & 0 deletions neo/modelsrc/weapons/aa13/viewmodel.qci
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
$cdmaterials "models/weapons/"
$body "body" "reference.smd"
$definebone "Dummy01" "" -2.277793 -6.712466 -22.802588 -0.000000 89.999978 0.000000 0 0 0 0 0 0
$definebone "bone forearm01" "Dummy01" -17.759983 11.498297 -10.099024 -31.114590 90.939514 89.978900 0 0 0 0 0 0
$definebone "bone hand01" "bone forearm01" -0.035545 -23.756729 -0.084862 -0.042628 -1.058941 -0.805063 0 0 0 0 0 0
$definebone "bone middle 05" "bone hand01" 0.273362 -3.765814 -0.387138 -0.000000 0.000000 0.000057 0 0 0 0 0 0
$definebone "bone middle 06" "bone middle 05" 0.000005 -3.784234 -0.191477 -10.216122 -0.000000 -0.116826 0 0 0 0 0 0
$definebone "bone middle 07" "bone middle 06" 0.024370 -3.235445 0.175103 -0.154927 0.133556 -12.925470 0 0 0 0 0 0
$definebone "bone middle 08" "bone middle 07" -0.111959 -3.553720 0.074807 4.989030 0.902866 -18.339691 0 0 0 0 0 0
$definebone "bone index 05" "bone hand01" 1.858448 -3.773900 0.198666 -14.044973 4.338954 0.000000 0 0 0 0 0 0
$definebone "bone index 06" "bone index 05" 0.000000 -3.784245 -0.191474 5.207098 -1.406552 -6.343559 0 0 0 0 0 0
$definebone "bone index 07" "bone index 06" 0.074583 -3.334558 0.036042 -0.154927 0.133558 -12.948845 0 0 0 0 0 0
$definebone "bone index 08" "bone index 07" -0.033765 -2.966134 0.050352 1.496622 2.758622 -18.165055 0 0 0 0 0 0
$definebone "bone ring 05" "bone hand01" -1.407701 -3.765814 -0.387137 0.000000 -5.445048 0.000057 0 0 0 0 0 0
$definebone "bone ring 06" "bone ring 05" 0.000000 -3.784242 -0.191474 -7.169937 1.442593 -0.480196 0 0 0 0 0 0
$definebone "bone ring 07" "bone ring 06" 0.038986 -2.749647 0.107386 -1.660432 -2.201248 -12.888457 0 0 0 0 0 0
$definebone "bone ring 08" "bone ring 07" 0.013189 -3.474700 0.024518 1.138696 2.167728 -31.676656 0 0 0 0 0 0
$definebone "bone pinky 05" "bone hand01" -2.992721 -3.619926 0.091616 0.000000 -9.635719 0.000000 0 0 0 0 0 0
$definebone "bone pinky 06" "bone pinky 05" -0.231693 -2.899980 -0.226464 -7.169938 1.442593 -2.020134 0 0 0 0 0 0
$definebone "bone pinky 07" "bone pinky 06" 0.047096 -3.464703 0.060474 0.392361 0.981705 -12.970447 0 0 0 0 0 0
$definebone "bone pinky 08" "bone pinky 07" -0.012930 -2.746933 0.096227 -4.151539 3.541853 -14.719691 0 0 0 0 0 0
$definebone "bone thumb 04" "bone hand01" 2.231815 -1.416988 1.590840 -38.208942 65.612948 -60.895674 0 0 0 0 0 0
$definebone "bone thumb 05" "bone thumb 04" 0.316680 -3.892337 -0.185574 -33.168523 -11.613907 -10.910489 0 0 0 0 0 0
$definebone "bone thumb 06" "bone thumb 05" 0.269055 -3.933452 0.328686 5.133246 -12.418455 -13.006142 0 0 0 0 0 0
$definebone "bone forearm" "Dummy01" 12.577013 11.498295 -2.149986 31.114527 -89.060440 -89.978894 0 0 0 0 0 0
$definebone "bone hand" "bone forearm" 0.035545 23.756725 -0.084859 -14.678660 2.606786 -11.549912 0 0 0 0 0 0
$definebone "bone middle 1" "bone hand" -0.273364 3.765808 0.387137 0.000003 0.000001 0.000002 0 0 0 0 0 0
$definebone "bone middle 2" "bone middle 1" -0.000001 3.784241 0.191474 -6.531484 5.845948 -45.657177 0 0 0 0 0 0
$definebone "bone middle 3" "bone middle 2" -0.024371 3.235441 -0.175099 -0.154927 0.133562 -81.832006 0 0 0 0 0 0
$definebone "bone middle 4" "bone middle 3" 0.111964 3.553716 -0.074804 4.989025 0.902870 -73.199547 0 0 0 0 0 0
$definebone "bone index 1" "bone hand" -1.858449 3.773899 -0.198660 -14.044967 4.338953 0.000002 0 0 0 0 0 0
$definebone "bone index 2" "bone index 1" -0.000001 3.784231 0.191476 5.346332 -0.276393 -7.004521 0 0 0 0 0 0
$definebone "bone index 3" "bone index 2" -0.074585 3.334559 -0.036041 -0.154921 0.133558 -12.832018 0 0 0 0 0 0
$definebone "bone index 4" "bone index 3" 0.033767 2.966136 -0.050351 1.496628 2.758624 -49.071600 0 0 0 0 0 0
$definebone "bone ring 1" "bone hand" 1.407700 3.765809 0.387137 0.000003 -5.445046 0.000002 0 0 0 0 0 0
$definebone "bone ring 2" "bone ring 1" -0.000003 3.784243 0.191475 -6.148921 2.739370 -60.481359 0 0 0 0 0 0
$definebone "bone ring 3" "bone ring 2" -0.038984 2.749642 -0.107387 -1.660433 -2.201241 -72.795031 0 0 0 0 0 0
$definebone "bone ring 4" "bone ring 3" -0.013185 3.474691 -0.024521 1.138690 2.167731 -81.536477 0 0 0 0 0 0
$definebone "bone pinky 1" "bone hand" 2.992725 3.619928 -0.091621 0.000004 -9.635659 0.000002 0 0 0 0 0 0
$definebone "bone pinky 2" "bone pinky 1" 0.231693 2.899976 0.226467 -7.990349 0.929110 -66.735670 0 0 0 0 0 0
$definebone "bone pinky 3" "bone pinky 2" -0.047092 3.464708 -0.060477 0.392361 0.981711 -77.830297 0 0 0 0 0 0
$definebone "bone pinky 4" "bone pinky 3" 0.012932 2.746925 -0.096224 -4.151543 3.541856 -65.579501 0 0 0 0 0 0
$definebone "bone thumb 1" "bone hand" -2.231816 1.416985 -1.590841 -46.604322 61.384001 -55.069086 0 0 0 0 0 0
$definebone "bone thumb 2" "bone thumb 1" -0.316679 3.892337 0.185578 -33.168531 -11.613905 -18.910466 0 0 0 0 0 0
$definebone "bone thumb 3" "bone thumb 2" -0.269054 3.933450 -0.328682 5.133236 -12.418458 -66.142942 0 0 0 0 0 0
$definebone "Gun" "bone hand" -5.101384 18.401756 -2.687529 86.989861 -92.648568 85.351607 0 0 0 0 0 0
$definebone "Drum" "Gun" 0.040988 -1.991656 -6.507096 0.820479 -0.519669 -1.717726 0 0 0 0 0 0
$definebone "Shell" "Drum" 0.023547 -0.091101 7.651725 0.000003 0.000004 0.000002 0 0 0 0 0 0
$definebone "Release" "Gun" 2.043335 4.301003 0.338931 0.000003 0.000004 0.000001 0 0 0 0 0 0
$definebone "Charge" "Gun" 0.144754 -0.246258 8.793948 0.000003 0.000004 0.000001 0 0 0 0 0 0
$definebone "Muzzle" "Gun" 0.112472 -38.428558 2.892446 0.615971 -90.157756 90.135411 0 0 0 0 0 0
$definebone "Eject" "Gun" -1.332854 -1.821337 5.010891 -9.927016 -179.919231 -7.917763 0 0 0 0 0 0
$definebone "AA13_sight" "Gun" 0.169645 -0.280642 9.121610 -0.000402 89.999979 0.000004 0 0 0 0 0 0
$attachment "muzzle" "Muzzle" -0.0000 0.0000 -0.0000 rotate 0.000 -0.000 0.000
$attachment "eject" "Eject" 0.0000 0.0000 -0.0000 rotate -0.000 -0.000 -0.000
$sequence "idle01" "anims/idle01.smd" activity ACT_VM_IDLE 1 fps 30 fadein 0.20 fadeout 0.20 loop node "0"
$sequence "idle01empty" "anims/idle01empty.smd" activity ACT_VM_IDLE_EMPTY 1 fps 30 fadein 0.20 fadeout 0.20 loop node "0"
$sequence "fire" "anims/fire.smd" activity ACT_VM_PRIMARYATTACK 1 fps 30 fadein 0.20 fadeout 0.20 snap node "2"
$sequence "fire1" "anims/fire1.smd" activity ACT_VM_RECOIL1 1 fps 30 fadein 0.20 fadeout 0.20 snap node "2"
$sequence "fire2" "anims/fire2.smd" activity ACT_VM_RECOIL2 1 fps 30 fadein 0.20 fadeout 0.20 snap node "2"
$sequence "fire3" "anims/fire3.smd" activity ACT_VM_RECOIL3 1 fps 30 fadein 0.20 fadeout 0.20 snap node "2"
$sequence "fireempty" "anims/fireempty.smd" activity ACT_VM_DRYFIRE 1 fps 30 fadein 0.20 fadeout 0.20 snap node "2"
$sequence "draw" "anims/draw.smd" activity ACT_VM_DRAW 1 fps 30 fadein 0.20 fadeout 0.20 snap node "0"
$sequence "reload" "anims/reload.smd" activity ACT_VM_RELOAD 1 fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "holster" "anims/holster.smd" activity ACT_VM_HOLSTER 1 fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "idletolow" "anims/idletolow.smd" activity ACT_VM_LOWERED_TO_IDLE 1 fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "lowtoidle" "anims/lowtoidle.smd" activity ACT_VM_IDLE_TO_LOWERED 1 fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "lowidle" "anims/lowidle.smd" activity ACT_VM_IDLE_LOWERED 1 fps 30 fadein 0.20 fadeout 0.20 loop node "0"
$sequence "changemode" "anims/changemode.smd" activity ACT_VM_CHANGEMODE 1 fps 30 fadein 0.20 fadeout 0.20 snap node "0"
$sequence "melee01" "anims/melee01.smd" activity ACT_VM_MELEEATTACK1 1 fps 30 fadein 0.20 fadeout 0.20 snap node "0"
Loading