diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index fe3f432d3c..3263edc316 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -577,6 +577,18 @@ "werewolf": { "keyword": "werewolf", "generic": "Werewolf" + }, + "lizardman_occult": { + "keyword": "lizardman_occult", + "generic": "Occult Lizardman" + }, + "lizardman_mighty": { + "keyword": "lizardman_mighty", + "generic": "Mighty Lizardman" + }, + "lizardman_sly": { + "keyword": "lizardman_sly", + "generic": "Sly Lizardman" } } }, diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron index 199f727236..ca9515518c 100644 --- a/assets/voxygen/voxel/biped_large_central_manifest.ron +++ b/assets/voxygen/voxel/biped_large_central_manifest.ron @@ -359,4 +359,184 @@ center: ("armor.empty"), ) ), + (Occultlizardman, Male): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_occult.male.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_occult.male.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_occult.male.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_occult.male.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_occult.male.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_occult.male.weapon"), + ) + ), + (Occultlizardman, Female): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_occult.female.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_occult.female.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_occult.female.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_occult.female.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_occult.female.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_occult.female.weapon"), + ) + ), + (Mightylizardman, Male): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_mighty.male.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_mighty.male.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_mighty.male.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_mighty.male.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_mighty.male.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_mighty.male.weapon"), + ) + ), + (Mightylizardman, Female): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_mighty.female.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_mighty.female.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_mighty.female.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_mighty.female.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_mighty.female.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_mighty.female.weapon"), + ) + ), + (Slylizardman, Male): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_sly.male.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_sly.male.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_sly.male.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_sly.male.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_sly.male.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_sly.male.weapon"), + ) + ), + (Slylizardman, Female): ( + head: ( + offset: (-3.0, 0.0, -4.5), + center: ("npc.lizardman_sly.female.head"), + ), + torso_upper: ( + offset: (-5.0, -6.5, -7.0), + center: ("npc.lizardman_sly.female.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -5.5, -8.0), + center: ("npc.lizardman_sly.female.torso_lower"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + center: ("npc.lizardman_sly.female.jaw"), + ), + tail: ( + offset: (-2.0, -16.0, -1.0), + center: ("npc.lizardman_sly.female.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + center: ("armor.empty"), + ), + main: ( + offset: (-1.5, -9.0, -10.0), + center: ("npc.lizardman_sly.female.weapon"), + ) + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron index d077d97521..bc10a4cda4 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -407,4 +407,208 @@ lateral: ("npc.werewolf.male.foot_r"), ), ), + (Occultlizardman, Male): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_occult.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_occult.male.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_occult.male.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_occult.male.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_occult.male.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_occult.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_occult.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_occult.male.foot_r"), + ), + ), + (Occultlizardman, Female): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_occult.female.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_occult.female.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_occult.female.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_occult.female.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_occult.female.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_occult.female.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_occult.female.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_occult.female.foot_r"), + ), + ), + (Mightylizardman, Male): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_mighty.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_mighty.male.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_mighty.male.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_mighty.male.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_mighty.male.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_mighty.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_mighty.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_mighty.male.foot_r"), + ), + ), + (Mightylizardman, Female): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_mighty.female.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_mighty.female.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_mighty.female.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_mighty.female.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_mighty.female.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_mighty.female.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_mighty.female.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_mighty.female.foot_r"), + ), + ), + (Slylizardman, Male): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_sly.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_sly.male.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_sly.male.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_sly.male.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_sly.male.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_sly.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_sly.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_sly.male.foot_r"), + ), + ), + (Slylizardman, Female): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_sly.female.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.lizardman_sly.female.shoulder_r"), + ), + hand_l: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_sly.female.hand_l"), + ), + hand_r: ( + offset: (-2.0, -2.0, -10.0), + lateral: ("npc.lizardman_sly.female.hand_r"), + ), + leg_l: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_sly.female.leg_l"), + ), + leg_r: ( + offset: (-2.0, -3.0, -3.5), + lateral: ("npc.lizardman_sly.female.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_sly.female.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -5.0), + lateral: ("npc.lizardman_sly.female.foot_r"), + ), + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_l.vox new file mode 100644 index 0000000000..6e4270b3cd --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c0b017be3de0a4100a1a576ef5e24b5a9e4cd6d5e580a66c2fdc1a7de1b2197 +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_r.vox new file mode 100644 index 0000000000..26c29ac69d --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7faa33031c1b7d209046357845e0935ce45e792814edec7f276b4ebb70d4679f +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_l.vox new file mode 100644 index 0000000000..df187c82fd --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d37118a5589e494389dfdaf4ad4d9b2a58cedc698e1b6afb3a4f20e61ae36ae +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_r.vox new file mode 100644 index 0000000000..23e40c6bbb --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e41cdb99bfe49730accee1395d43d68441f0083806e63dcc9d0d59e5ba7f7a45 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/head.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/head.vox new file mode 100644 index 0000000000..f512dcc3b4 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0940c86e377231766171d5b9662ac7e5afe7630c1325918d872523d9775e9b3 +size 2016 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/jaw.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/jaw.vox new file mode 100644 index 0000000000..19117b4dd4 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46e91b67aebdf43c86fb266ff86688383fd6830ebf2db363b793d83ef28c3acb +size 1384 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_l.vox new file mode 100644 index 0000000000..a98168d55c --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd1fc239a42fe533be68657e5f24743b27277e834a534d01b746919a64e5107b +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_r.vox new file mode 100644 index 0000000000..3aa526edc6 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d85a93eaf50b88e838cfe4687405016afc88a83c89018f3c3f2bcabefafee245 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_l.vox new file mode 100644 index 0000000000..b25a989a90 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d01a5e864ae3ba4c1008af73dc7cadbf471b92a41490ae90e3e8928ca51d4f09 +size 1600 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_r.vox new file mode 100644 index 0000000000..bcf60be977 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8742fbba713ba1aa87d7318375c0404d09e7dea3fe6d513c9d0436ebf959437a +size 1600 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/tail.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/tail.vox new file mode 100644 index 0000000000..f26efc80be --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c1da10b9da0dda836bac88dc429d7d5038f83a92bf8c8e8335ce309a2af833a +size 1784 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_lower.vox new file mode 100644 index 0000000000..b76e3cbb24 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f669fcc6f0090543a484edd6a1890f76fd5f740e47f998d7d94dca1d95a44131 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_upper.vox new file mode 100644 index 0000000000..c6a7037bae --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12e575fda1616723d0dbcca84bd3b4131867e574aee829f09eb3171a2c6c3809 +size 3280 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/weapon.vox b/assets/voxygen/voxel/npc/lizardman_mighty/female/weapon.vox new file mode 100644 index 0000000000..514829a2d4 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/female/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e5ac6c2aa4e33816037279a9a3970c0b489a89d0cc5a3e2217064cccfb1f340 +size 1548 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_l.vox new file mode 100644 index 0000000000..75d7b13df1 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9f95f442153a034d0d948e4c9ca6a8838b141ef528c400f2cdd2089412ddd48 +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_r.vox new file mode 100644 index 0000000000..4166826738 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffa4e05ae11d280fde233972020e59d4cc5f0568ad5835935d251f64a42b989f +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_l.vox new file mode 100644 index 0000000000..a8ee78f85c --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ccd4856d952b1adec9492d84996de650ab03a14219ab4d09fc75d4ffdd205c0 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_r.vox new file mode 100644 index 0000000000..87774e6314 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ab352d9d27a497921b3b1f3af81724c36aa7ba798ec5639d9747c04850221bb +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/head.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/head.vox new file mode 100644 index 0000000000..cc2224b334 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:404a0adac2488fa5f701145a058321603a199102a40bdad47096aacdbf657056 +size 2016 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/jaw.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/jaw.vox new file mode 100644 index 0000000000..0e04e0a73d --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2faf1d2a7fbd4aa208305c094f6e87477766c53837700781d0543ccacd970f2 +size 1384 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_l.vox new file mode 100644 index 0000000000..30285fe082 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e88bd8fa419eac0c84ca21466a7849b3a42fd64e0d888cd9b1c7ae12b3a7b1a +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_r.vox new file mode 100644 index 0000000000..c71f90957f --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8fbfa21c28a561b79749ce54d627300b6e193077b972d15664a8c4a93f3fef8 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_l.vox new file mode 100644 index 0000000000..5ceb8cf503 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec3fa52a991a55dff8e671594cd98e8e4e4f1c4164c7e71e1f9d3ef449b02603 +size 1600 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_r.vox new file mode 100644 index 0000000000..4cb2f86638 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:121f2863c20d151094c7ff269ed1f1ac98bdb1d75716395e8e2ed1e3c83aafe1 +size 1600 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/tail.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/tail.vox new file mode 100644 index 0000000000..24ee1e47f5 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ced999f87da655cb0fe640d0b5d85160a5478c4c7a228d9f9d95783cda32222 +size 1784 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_lower.vox new file mode 100644 index 0000000000..07b2043f8d --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfcdef0589349779d2b776c25f347e90800b1daba33a21ce6dfac65c44afdb24 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_upper.vox new file mode 100644 index 0000000000..43889ff555 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90652c0a51fe3bc4bc1d7402a1f60fe18ff522e13940872d9fd25f1d898e7369 +size 3280 diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/weapon.vox b/assets/voxygen/voxel/npc/lizardman_mighty/male/weapon.vox new file mode 100644 index 0000000000..c34831debb --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_mighty/male/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c3011013f1f2762c7f1034ea2fd2da2426424b403da374809851786fdeb8981 +size 1476 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/foot_l.vox new file mode 100644 index 0000000000..7e8998ead8 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f109605e6d3f27a14f61f2f7442fec3778bac3be03d6942e1c0bbb345007d2b +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/foot_r.vox new file mode 100644 index 0000000000..9c8a8389de --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ccfba8a0bf43e0e5c921887a49f1904e60525d2b27339ecee38044d4d6a6004 +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/hand_l.vox new file mode 100644 index 0000000000..bc3b6f39e9 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca0ee26232162aefe65ca542161e1a818a206c8fef95a0d5f0f968a61664fe92 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/hand_r.vox new file mode 100644 index 0000000000..b8d96ddbf6 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88e9a8afac8c4a4ed7e20dba784696eca3479481c7e0af4cc8ee2c67a0f96657 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/head.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/head.vox new file mode 100644 index 0000000000..2c1b36b9e1 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc5e3cf6d91663fc449f5265233a90b676026c6a1b2caeb738cfc74385b1657b +size 1912 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/jaw.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/jaw.vox new file mode 100644 index 0000000000..a7c82831f1 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:504b076c4fd655044b7bb0e57cf4320a2745f48de6def8cec9f6546b2f25c6ce +size 1368 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/leg_l.vox new file mode 100644 index 0000000000..8d96030743 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a854ebd127c33549af9186f0c23be39e5ef060fb2e42c1684d6e50609bcc2c66 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/leg_r.vox new file mode 100644 index 0000000000..696f28f39d --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee5b4ca044be9eb85fe9a75ef63f58c23a8685867065fb304b8eaaaca6c19165 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_l.vox new file mode 100644 index 0000000000..95c9736599 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:669fec2766bdad089a339dafbe120d4324ad41f24d112894d12e4486efa48169 +size 1640 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_r.vox new file mode 100644 index 0000000000..1d2d4412ca --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b339bb913daf1061069cc5330dee63162f14be66a5b4e148274802c09735c641 +size 1640 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/tail.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/tail.vox new file mode 100644 index 0000000000..14a17d1fc8 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3abb83621ad9d4108db59e6b77421b64dbf2c8eea27e48d465ae37caf931cec6 +size 1784 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/torso_lower.vox new file mode 100644 index 0000000000..e064b0bf43 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce0ce66cba45310ac0b00d5789043df037060945e54398a36491565daf459b70 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/torso_upper.vox new file mode 100644 index 0000000000..f7901272bc --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88159b68f9fc9b212c65f4ad864edab4d3a1773f434c6192630a0fda35b69e5c +size 3472 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/weapon.vox b/assets/voxygen/voxel/npc/lizardman_occult/female/weapon.vox new file mode 100644 index 0000000000..12f8b3693e --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/female/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:949263aa4188847a4859d324db734638283bcfdf42e1db720f1444b5fbd76bde +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/foot_l.vox new file mode 100644 index 0000000000..0ff8125598 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a471ad2b9aab4fb52bf014d665684650c24d955a45f9b9e1aefe3a01961c09a3 +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/foot_r.vox new file mode 100644 index 0000000000..ffee426c82 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41a835df83bbba29f8a4f5b84b764ec3825712ce53bb8bdc7aff7a1b5160808d +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/hand_l.vox new file mode 100644 index 0000000000..e6834d991a --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8540f080db8a0954dc615014c84ad5117da3b3e02d05f641f77a229bbf42dde0 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/hand_r.vox new file mode 100644 index 0000000000..8f14e1f591 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fa7fea7c0852b9c48ec3548a24e4ce49d2ad3581e1f94a7c519ce06665071eb +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/head.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/head.vox new file mode 100644 index 0000000000..e80d819689 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e89821be9a99b8a32bb93f1d5b45021d4db15bf66e20d897f5c05988b89c7c1 +size 1912 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/jaw.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/jaw.vox new file mode 100644 index 0000000000..0353e652ff --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b124e7f49ba1b48bae1c04825987fcb7ee7ce1dd1e3ec2833d164d903079a53 +size 1368 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/leg_l.vox new file mode 100644 index 0000000000..b16e98cddc --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d30550dec622f4246f7bb99c9318222c2129b17b6d222cf21027c5816789eb8f +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/leg_r.vox new file mode 100644 index 0000000000..8b5392706e --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03d39de0985faf3cbbca468101ecb355f95a1d5883a5f6f4e255a2f0e79410a6 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_l.vox new file mode 100644 index 0000000000..1deb0f8cf9 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c875e438f0e58ed837291ed0d9117917092b1a137d1ca0ec0d858d44262c30e +size 1640 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_r.vox new file mode 100644 index 0000000000..b1857799d0 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd7496bcdc069bbff6cf22a4abfccf38779c9b77c6520efd4e6025bfee864c4 +size 1640 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/tail.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/tail.vox new file mode 100644 index 0000000000..8114365e56 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e86272de363f631d6eef7a732b09dd1bcf58e96991bbb8571e74bb46d4bae999 +size 1784 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/torso_lower.vox new file mode 100644 index 0000000000..16174d5c83 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f78f6ebab9a93b407a43abb7421c1426246244ab9b164939880e1f56972fe6e4 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/torso_upper.vox new file mode 100644 index 0000000000..56644a28b8 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f48192cda9a5d39523ca6a3e7170b9b6f942ecbdc09dc7821638fb6f216861ea +size 3472 diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/weapon.vox b/assets/voxygen/voxel/npc/lizardman_occult/male/weapon.vox new file mode 100644 index 0000000000..4197cabd08 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_occult/male/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d3d20ccb07c8846fb87b3744f271704ed008e72a36366fb66050ce79cbf29b +size 1500 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/foot_l.vox new file mode 100644 index 0000000000..3a1741ef0b --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44f2c0f0589f958815f899af2d28bbdd4497ab9bdc34944b8d2e3cbe6248ba4e +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/foot_r.vox new file mode 100644 index 0000000000..2ca8212c68 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d27f2120a01aec6108b4e2545f534cdfc85c4a34c6a1f155c5e01eb1b2faff +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/hand_l.vox new file mode 100644 index 0000000000..f3b635dc69 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13a89684cdc70cd83d87a16db02ea08764f19d4418e048dd963e11df91df0cc0 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/hand_r.vox new file mode 100644 index 0000000000..d3c047a8b1 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cbbde4d8ace032f06b21de5568d57b97ae9bb4b68d8c4950db235692d595482 +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/head.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/head.vox new file mode 100644 index 0000000000..5b7d371d9e --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f90f7ecf978697bbf46ac12b2ca2f1b4043b9096da298455436baf7ee351ea39 +size 1952 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/jaw.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/jaw.vox new file mode 100644 index 0000000000..c8e3f3fc85 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c621ac4247606a6b1434307d9a90c5da6d46576edbb70d0c06c4281cca4008bc +size 1360 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/leg_l.vox new file mode 100644 index 0000000000..adf92fed4f --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07d757cf9f9be72770ed29ffd2e9207de9d334969087bec8036c21785b97e500 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/leg_r.vox new file mode 100644 index 0000000000..ea4c35fd8c --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3abd82024b86fa9fde6b512ca000b0a7559829dbf26f3202038bab4cf6ecae9e +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_l.vox new file mode 100644 index 0000000000..c22ee7b2f1 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3de949dd03eb8f8fddb30431bc10217c4d544533516ff5d1f546de72fcad6284 +size 1608 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_r.vox new file mode 100644 index 0000000000..c937606ff5 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dc9bd809078909bfcbcccd6e9972099bdc1432f6228cf3e935e279d64d04bd5 +size 1608 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/tail.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/tail.vox new file mode 100644 index 0000000000..a78e6cf3bb --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6abd58c8b4d6a296ff80be5ba322a92aceb911ce814125e1a0ceac3881557825 +size 1736 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/torso_lower.vox new file mode 100644 index 0000000000..3e45350a69 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89b9042f0c385a5eddd45d6d3de237f60d4f831d09fe648304d29c7d3ce50447 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/torso_upper.vox new file mode 100644 index 0000000000..33e34f150a --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1db42707b8f94dfcecde7648f7e8c751d97074befbee55cfcac207c920a16b62 +size 3272 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/weapon.vox b/assets/voxygen/voxel/npc/lizardman_sly/female/weapon.vox new file mode 100644 index 0000000000..4b20dcd826 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/female/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fd76b477e2d2fed4de4e18d256600929281cf6398c2765b336a00a4be99ddea +size 1568 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/foot_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/foot_l.vox new file mode 100644 index 0000000000..6f45f415f5 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e42fb0b44ba37d65728db969769d766d6f70c52b84ab7debfa0bda78d84e9ece +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/foot_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/foot_r.vox new file mode 100644 index 0000000000..95e2aeeb95 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:597b4abf4aac559be8ff4c0ec0104e88606da282ea566d8b4f54d134ff498ff3 +size 1592 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/hand_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/hand_l.vox new file mode 100644 index 0000000000..10318eb9e0 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68a0d2ea3c4c7f780143da3bcad9a5eb316acb9dc8b3ab095d10561ee69df10b +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/hand_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/hand_r.vox new file mode 100644 index 0000000000..7c63bf9be0 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:649e1ca972968dc896339f41efb0a40c37e15f21b5079ef218ae75df131a48fd +size 1508 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/head.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/head.vox new file mode 100644 index 0000000000..3322d86617 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2c9d60eb6d8151611ae24ca025fd2e644aa2a33ca07bc1f19c856be797938ff +size 1952 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/jaw.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/jaw.vox new file mode 100644 index 0000000000..1ac60b2fd6 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48eff56440825a4235a51ae1319b693050697fed1030ae1b4611ff0afdc0c661 +size 1360 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/leg_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/leg_l.vox new file mode 100644 index 0000000000..f65c8d6e13 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:659585ab889a0140761f42869216274e9e39c475702a208e9724d57edbe5b952 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/leg_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/leg_r.vox new file mode 100644 index 0000000000..dce4d2c77f --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:808b91970220582c3a889e55b6ff192ffc0be149fc136cf460352e7680c7ea42 +size 1372 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_l.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_l.vox new file mode 100644 index 0000000000..70812627df --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83aa2a8dc98813c25cc935efb2026ac224cb34864c1a16326569c09553c9023e +size 1608 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_r.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_r.vox new file mode 100644 index 0000000000..4181f6a2aa --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d67bc0abcdaed9cf985e378f7e202fb1537061d480500b997602f86fc7d406da +size 1608 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/tail.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/tail.vox new file mode 100644 index 0000000000..042497ae58 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5162b7ba1a88b27dff64c980e10a61e93da17ad9948a5b38f976eb7039bea93 +size 1736 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/torso_lower.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/torso_lower.vox new file mode 100644 index 0000000000..ac0dcd0300 --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aadb01d32b5d85814cba8ffb9540d444a7a77bc651895b1c5abd309cd6333df7 +size 1860 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/torso_upper.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/torso_upper.vox new file mode 100644 index 0000000000..088b1c245f --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ebec63078eaaf6d8e052e3deb36a7f35dbdaa4371be4fcb7929a70b84e7982 +size 3272 diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/weapon.vox b/assets/voxygen/voxel/npc/lizardman_sly/male/weapon.vox new file mode 100644 index 0000000000..d697fabd1a --- /dev/null +++ b/assets/voxygen/voxel/npc/lizardman_sly/male/weapon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee2532c73758630110fc0f913a11e337c05693d060f4d46bcce6e7fa21d7892f +size 1648 diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs index d7d91803ec..3427767c33 100644 --- a/common/src/comp/body/biped_large.rs +++ b/common/src/comp/body/biped_large.rs @@ -40,6 +40,9 @@ make_case_elim!( Troll = 3, Dullahan = 4, Werewolf = 5, + Occultlizardman = 6, + Mightylizardman = 7, + Slylizardman = 8, } ); @@ -54,6 +57,9 @@ pub struct AllSpecies { pub troll: SpeciesMeta, pub dullahan: SpeciesMeta, pub werewolf: SpeciesMeta, + pub lizardman_occult: SpeciesMeta, + pub lizardman_mighty: SpeciesMeta, + pub lizardman_sly: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -68,17 +74,23 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Troll => &self.troll, Species::Dullahan => &self.dullahan, Species::Werewolf => &self.werewolf, + Species::Occultlizardman => &self.lizardman_occult, + Species::Mightylizardman => &self.lizardman_mighty, + Species::Slylizardman => &self.lizardman_sly, } } } -pub const ALL_SPECIES: [Species; 6] = [ +pub const ALL_SPECIES: [Species; 9] = [ Species::Ogre, Species::Cyclops, Species::Wendigo, Species::Troll, Species::Dullahan, Species::Werewolf, + Species::Occultlizardman, + Species::Mightylizardman, + Species::Slylizardman, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/src/biped_large/idle.rs b/voxygen/src/anim/src/biped_large/idle.rs index 0eee1f4694..c6e2ee3f6e 100644 --- a/voxygen/src/anim/src/biped_large/idle.rs +++ b/voxygen/src/anim/src/biped_large/idle.rs @@ -105,7 +105,7 @@ impl Animation for IdleAnimation { ); } next.jaw.orientation = Quaternion::rotation_x(-0.1 + breathing * 2.0); - next.jaw.scale = Vec3::one() * 1.02; + next.jaw.scale = Vec3::one() * 0.98; next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); next.tail.orientation = diff --git a/voxygen/src/anim/src/biped_large/mod.rs b/voxygen/src/anim/src/biped_large/mod.rs index 55a95637df..58dc05a8f3 100644 --- a/voxygen/src/anim/src/biped_large/mod.rs +++ b/voxygen/src/anim/src/biped_large/mod.rs @@ -140,6 +140,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (6.0, 10.0), (Dullahan, _) => (3.0, 6.0), (Werewolf, _) => (19.0, 1.0), + (Occultlizardman, _) => (6.0, 3.5), + (Mightylizardman, _) => (6.0, 3.5), + (Slylizardman, _) => (6.0, 3.5), }, jaw: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0), @@ -148,6 +151,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (2.0, -4.0), (Dullahan, _) => (0.0, 0.0), (Werewolf, _) => (-2.5, -4.5), + (Occultlizardman, _) => (1.0, -2.5), + (Mightylizardman, _) => (1.0, -2.5), + (Slylizardman, _) => (1.0, -2.5), }, upper_torso: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 28.0), @@ -157,6 +163,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (-1.0, 27.5), (Dullahan, _) => (0.0, 29.0), (Werewolf, _) => (3.0, 26.5), + (Occultlizardman, _) => (3.0, 23.0), + (Mightylizardman, _) => (3.0, 23.0), + (Slylizardman, _) => (3.0, 23.0), }, lower_torso: match (body.species, body.body_type) { (Ogre, Male) => (1.0, -7.0), @@ -166,6 +175,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (1.0, -10.5), (Dullahan, _) => (0.0, -6.5), (Werewolf, _) => (1.0, -10.0), + (Occultlizardman, _) => (0.0, -6.0), + (Mightylizardman, _) => (0.0, -6.0), + (Slylizardman, _) => (0.0, -6.0), }, tail: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0), @@ -174,6 +186,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (0.0, 0.0), (Dullahan, _) => (0.0, 0.0), (Werewolf, _) => (-5.5, -2.0), + (Occultlizardman, _) => (-5.5, -6.0), + (Mightylizardman, _) => (-5.5, -6.0), + (Slylizardman, _) => (-5.5, -6.0), }, shoulder: match (body.species, body.body_type) { (Ogre, Male) => (12.0, 0.5, 0.0), @@ -183,6 +198,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (11.0, 0.5, -1.5), (Dullahan, _) => (14.0, 0.5, 4.5), (Werewolf, _) => (9.0, 4.0, -6.5), + (Occultlizardman, _) => (7.5, 1.0, -1.5), + (Mightylizardman, _) => (7.5, 1.0, -1.5), + (Slylizardman, _) => (7.5, 1.0, -1.5), }, hand: match (body.species, body.body_type) { (Ogre, Male) => (14.5, 0.0, -2.0), @@ -192,6 +210,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (11.5, 0.0, -1.5), (Dullahan, _) => (14.5, 0.0, -2.5), (Werewolf, _) => (10.0, 2.5, -11.0), + (Occultlizardman, _) => (8.0, 1.5, -5.5), + (Mightylizardman, _) => (8.0, 1.5, -5.5), + (Slylizardman, _) => (8.0, 1.5, -5.5), }, leg: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 0.0, -4.0), @@ -201,6 +222,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (5.0, 0.0, -6.0), (Dullahan, _) => (0.0, 0.0, -5.0), (Werewolf, _) => (4.5, 0.5, -3.0), + (Occultlizardman, _) => (3.0, 0.5, -6.0), + (Mightylizardman, _) => (3.0, 0.5, -6.0), + (Slylizardman, _) => (3.0, 0.5, -6.0), }, foot: match (body.species, body.body_type) { (Ogre, Male) => (4.0, 2.5, 8.0), @@ -210,6 +234,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Troll, _) => (6.0, 0.5, 4.0), (Dullahan, _) => (4.0, 2.5, 8.0), (Werewolf, _) => (5.5, 6.5, 6.0), + (Occultlizardman, _) => (3.5, 4.0, 5.0), + (Mightylizardman, _) => (3.5, 4.0, 5.0), + (Slylizardman, _) => (3.5, 4.0, 5.0), }, beast: match (body.species, body.body_type) { (Werewolf, _) => (true), diff --git a/voxygen/src/anim/src/biped_large/run.rs b/voxygen/src/anim/src/biped_large/run.rs index 43b60f90c9..e1824e8f4a 100644 --- a/voxygen/src/anim/src/biped_large/run.rs +++ b/voxygen/src/anim/src/biped_large/run.rs @@ -2,7 +2,7 @@ use super::{ super::{vek::*, Animation}, BipedLargeSkeleton, SkeletonAttr, }; -use std::{f32::consts::PI, ops::Mul}; +use std::f32::consts::PI; pub struct RunAnimation; @@ -36,6 +36,7 @@ impl Animation for RunAnimation { * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin()).powf(2.0 as f32))) .sqrt()) * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin()); + let footvertl = (anim_time as f32 * 16.0 * lab as f32).sin(); let footvertr = (anim_time as f32 * 16.0 * lab as f32 + PI).sin(); let handhoril = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin(); @@ -67,6 +68,7 @@ impl Animation for RunAnimation { * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.5).sin()).powf(2.0 as f32))) .sqrt()) * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.5).sin()); + let footvertl2 = (anim_time as f32 * 16.0 * lab as f32 + 0.5 * PI).sin(); let footvertr2 = (anim_time as f32 * 16.0 * lab as f32 + 1.5 * PI).sin(); let handhoril2 = (anim_time as f32 * 16.0 * lab as f32 + 0.5 * PI).sin(); diff --git a/voxygen/src/anim/src/biped_large/wield.rs b/voxygen/src/anim/src/biped_large/wield.rs index 6f07366117..77ccbbf7ca 100644 --- a/voxygen/src/anim/src/biped_large/wield.rs +++ b/voxygen/src/anim/src/biped_large/wield.rs @@ -69,6 +69,9 @@ impl Animation for WieldAnimation { .sqrt()) * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin()); + let footvertl = (anim_time as f32 * 16.0 * lab as f32).sin(); + let footvertr = (anim_time as f32 * 16.0 * lab as f32 + PI).sin(); + let footrotl = (((5.0) / (2.5 + (2.5) @@ -272,6 +275,43 @@ impl Animation for WieldAnimation { next.torso.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(-0.25); next.torso.scale = Vec3::one() / 8.0; + next.leg_l.position = Vec3::new( + -skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, + ) * 0.98; + next.leg_l.orientation = + Quaternion::rotation_z(short * 0.18) * Quaternion::rotation_x(foothoril * 0.3); + next.leg_l.scale = Vec3::one() * 0.98; + + next.leg_r.position = Vec3::new( + skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, + ) * 0.98; + + next.leg_r.orientation = + Quaternion::rotation_z(short * 0.18) * Quaternion::rotation_x(foothorir * 0.3); + next.leg_r.scale = Vec3::one() * 0.98; + + next.foot_l.position = Vec3::new( + -skeleton_attr.foot.0, + 4.0 + skeleton_attr.foot.1 + foothoril * 8.5, + skeleton_attr.foot.2 + ((footvertl * 6.5).max(0.0)), + ) / 8.0; + next.foot_l.orientation = + Quaternion::rotation_x(-0.5 + footrotl * 0.85) * Quaternion::rotation_y(0.0); + next.foot_l.scale = Vec3::one() / 8.0; + + next.foot_r.position = Vec3::new( + skeleton_attr.foot.0, + 4.0 + skeleton_attr.foot.1 + foothorir * 8.5, + skeleton_attr.foot.2 + ((footvertr * 6.5).max(0.0)), + ) / 8.0; + next.foot_r.orientation = + Quaternion::rotation_x(-0.5 + footrotr * 0.85) * Quaternion::rotation_y(0.0); + next.foot_r.scale = Vec3::one() / 8.0; + next.control.position = Vec3::new(7.0, 9.0, -10.0); next.control.orientation = Quaternion::rotation_x(test * 0.02) * Quaternion::rotation_y(test * 0.02) @@ -281,4 +321,4 @@ impl Animation for WieldAnimation { next } -} +} \ No newline at end of file