diff --git a/assets/voxygen/voxel/npc/llama/male/llama.vox b/assets/voxygen/voxel/npc/llama/male/llama.vox new file mode 100644 index 0000000000..3abd250912 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/llama.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5d225568a6ef401d6e255ca2d859c71b5afb24dbc81b35bb2c2600e2733e0ef +size 39172 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 7b2603ce5f..9ca3c87341 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -1922,61 +1922,73 @@ (Llama, Male): ( head: ( offset: (-3.0, -2.0, -3.5), - central: ("npc.llama.male.head"), + central: ("npc.llama.male.llama"), ), neck: ( offset: (-3.0, -4.5, -9.5), - central: ("npc.llama.male.neck"), + central: ("npc.llama.male.llama"), + model_index: 1, ), jaw: ( offset: (-2.0, 0.0, -2.0), - central: ("npc.llama.male.jaw"), + central: ("npc.llama.male.llama"), + model_index: 2, ), torso_front: ( offset: (-6.0, -9.0, -6.0), - central: ("npc.llama.male.torso_front"), + central: ("npc.llama.male.llama"), + model_index: 3, ), torso_back: ( offset: (-5.0, -12.0, -5.0), - central: ("npc.llama.male.torso_back"), + central: ("npc.llama.male.llama"), + model_index: 4, ), ears: ( offset: (-4.0, -1.0, 0.0), - central: ("npc.llama.male.ears"), + central: ("npc.llama.male.llama"), + model_index: 5, ), tail: ( offset: (-2.0, -5.0, -7.0), - central: ("npc.llama.male.tail"), + central: ("npc.llama.male.llama"), + model_index: 6, ), ), (Llama, Female): ( head: ( offset: (-3.0, -2.0, -3.5), - central: ("npc.llama.male.head"), + central: ("npc.llama.male.llama"), ), neck: ( offset: (-3.0, -4.5, -9.5), - central: ("npc.llama.male.neck"), + central: ("npc.llama.male.llama"), + model_index: 1, ), jaw: ( offset: (-2.0, 0.0, -2.0), - central: ("npc.llama.male.jaw"), + central: ("npc.llama.male.llama"), + model_index: 2, ), torso_front: ( offset: (-6.0, -9.0, -6.0), - central: ("npc.llama.male.torso_front"), + central: ("npc.llama.male.llama"), + model_index: 3, ), torso_back: ( offset: (-5.0, -12.0, -5.0), - central: ("npc.llama.male.torso_back"), + central: ("npc.llama.male.llama"), + model_index: 4, ), ears: ( offset: (-4.0, -1.0, 0.0), - central: ("npc.llama.male.ears"), + central: ("npc.llama.male.llama"), + model_index: 5, ), tail: ( offset: (-2.0, -5.0, -7.0), - central: ("npc.llama.male.tail"), + central: ("npc.llama.male.llama"), + model_index: 6, ), ), (Alpaca, Male): ( diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index e76adaed73..19a0cfdf7c 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -2178,69 +2178,85 @@ (Llama, Male): ( leg_fl: ( offset: (-2.0, -2.5, -6.0), - lateral: ("npc.llama.male.leg_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 7, ), leg_fr: ( offset: (-2.0, -2.5, -6.0), - lateral: ("npc.llama.male.leg_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 7, ), leg_bl: ( offset: (-2.0, -3.0, -5.0), - lateral: ("npc.llama.male.leg_br"), + lateral: ("npc.llama.male.llama"), + model_index: 8, ), leg_br: ( offset: (-2.0, -3.0, -5.0), - lateral: ("npc.llama.male.leg_br"), + lateral: ("npc.llama.male.llama"), + model_index: 8, ), foot_fl: ( offset: (-1.5, -2.0, -8.0), - lateral: ("npc.llama.male.foot_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 9, ), foot_fr: ( offset: (-1.5, -2.0, -8.0), - lateral: ("npc.llama.male.foot_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 9, ), foot_bl: ( offset: (-1.5, -2.5, -9.0), - lateral: ("npc.llama.male.foot_br"), + lateral: ("npc.llama.male.llama"), + model_index: 10, ), foot_br: ( offset: (-1.5, -2.5, -9.0), - lateral: ("npc.llama.male.foot_br"), + lateral: ("npc.llama.male.llama"), + model_index: 10, ), ), (Llama, Female): ( leg_fl: ( offset: (-2.0, -2.5, -6.0), - lateral: ("npc.llama.male.leg_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 7, ), leg_fr: ( offset: (-2.0, -2.5, -6.0), - lateral: ("npc.llama.male.leg_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 7, ), leg_bl: ( offset: (-2.0, -3.0, -5.0), - lateral: ("npc.llama.male.leg_br"), + lateral: ("npc.llama.male.llama"), + model_index: 8, ), leg_br: ( offset: (-2.0, -3.0, -5.0), - lateral: ("npc.llama.male.leg_br"), + lateral: ("npc.llama.male.llama"), + model_index: 8, ), foot_fl: ( offset: (-1.5, -2.0, -8.0), - lateral: ("npc.llama.male.foot_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 9, ), foot_fr: ( offset: (-1.5, -2.0, -8.0), - lateral: ("npc.llama.male.foot_fr"), + lateral: ("npc.llama.male.llama"), + model_index: 9, ), foot_bl: ( offset: (-1.5, -2.5, -9.0), - lateral: ("npc.llama.male.foot_br"), + lateral: ("npc.llama.male.llama"), + model_index: 10, ), foot_br: ( offset: (-1.5, -2.5, -9.0), - lateral: ("npc.llama.male.foot_br"), + lateral: ("npc.llama.male.llama"), + model_index: 10, ), ), (Alpaca, Male): (