diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index a8e2a0cadc..511bbb0627 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -251,22 +251,10 @@ "keyword": "sabertooth", "generic": "Sabertooth Tiger" }, - "viper": { - "keyword": "viper", - "generic": "Lizard" - }, "tuskram": { "keyword": "tuskram", "generic": "Tusk Ram" }, - "alligator": { - "keyword": "alligator", - "generic": "Alligator" - }, - "monitor": { - "keyword": "monitor", - "generic": "Monitor Lizard" - }, "lion": { "keyword": "lion", "generic": "Lion" diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox b/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox deleted file mode 100644 index 16521a938c..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox b/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox deleted file mode 100644 index 64881111b8..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox b/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox deleted file mode 100644 index c6683bf74d..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox b/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox deleted file mode 100644 index 13f3c949e9..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox b/assets/voxygen/voxel/npc/alligator/female/head_lower.vox deleted file mode 100644 index 0a1b1fba01..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox b/assets/voxygen/voxel/npc/alligator/female/head_upper.vox deleted file mode 100644 index 3425103eb7..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/jaw.vox b/assets/voxygen/voxel/npc/alligator/female/jaw.vox deleted file mode 100644 index 215c645e57..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/tail.vox b/assets/voxygen/voxel/npc/alligator/female/tail.vox deleted file mode 100644 index 59600cadea..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/torso_back.vox b/assets/voxygen/voxel/npc/alligator/female/torso_back.vox deleted file mode 100644 index 9f780d9d31..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/female/torso_front.vox b/assets/voxygen/voxel/npc/alligator/female/torso_front.vox deleted file mode 100644 index 222f0bee03..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/female/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox b/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox deleted file mode 100644 index 16521a938c..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox b/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox deleted file mode 100644 index 64881111b8..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox b/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox deleted file mode 100644 index c6683bf74d..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox b/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox deleted file mode 100644 index 13f3c949e9..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/head_lower.vox b/assets/voxygen/voxel/npc/alligator/male/head_lower.vox deleted file mode 100644 index 0a1b1fba01..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/head_upper.vox b/assets/voxygen/voxel/npc/alligator/male/head_upper.vox deleted file mode 100644 index 3425103eb7..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/jaw.vox b/assets/voxygen/voxel/npc/alligator/male/jaw.vox deleted file mode 100644 index 215c645e57..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/tail.vox b/assets/voxygen/voxel/npc/alligator/male/tail.vox deleted file mode 100644 index 59600cadea..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/torso_back.vox b/assets/voxygen/voxel/npc/alligator/male/torso_back.vox deleted file mode 100644 index 9f780d9d31..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/alligator/male/torso_front.vox b/assets/voxygen/voxel/npc/alligator/male/torso_front.vox deleted file mode 100644 index 222f0bee03..0000000000 Binary files a/assets/voxygen/voxel/npc/alligator/male/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox b/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox deleted file mode 100644 index c7daeb8a54..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox b/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox deleted file mode 100644 index e2cfe966e4..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox b/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox deleted file mode 100644 index e943a0bd50..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox b/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox deleted file mode 100644 index c7daeb8a54..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox deleted file mode 100644 index 1daeebdb97..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox b/assets/voxygen/voxel/npc/monitor/female/head_upper.vox deleted file mode 100644 index 5ec2589952..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/jaw.vox b/assets/voxygen/voxel/npc/monitor/female/jaw.vox deleted file mode 100644 index ccabd7ebfa..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/tail.vox b/assets/voxygen/voxel/npc/monitor/female/tail.vox deleted file mode 100644 index 1856f9ceb3..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/torso_back.vox b/assets/voxygen/voxel/npc/monitor/female/torso_back.vox deleted file mode 100644 index aa612c8817..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/female/torso_front.vox b/assets/voxygen/voxel/npc/monitor/female/torso_front.vox deleted file mode 100644 index d3d0156353..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/female/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox b/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox deleted file mode 100644 index c7daeb8a54..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox b/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox deleted file mode 100644 index e2cfe966e4..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox b/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox deleted file mode 100644 index e943a0bd50..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox b/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox deleted file mode 100644 index c7daeb8a54..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox deleted file mode 100644 index 1daeebdb97..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox deleted file mode 100644 index 5ec2589952..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/jaw.vox b/assets/voxygen/voxel/npc/monitor/male/jaw.vox deleted file mode 100644 index ccabd7ebfa..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/tail.vox b/assets/voxygen/voxel/npc/monitor/male/tail.vox deleted file mode 100644 index 1856f9ceb3..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/torso_back.vox b/assets/voxygen/voxel/npc/monitor/male/torso_back.vox deleted file mode 100644 index aa612c8817..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/monitor/male/torso_front.vox b/assets/voxygen/voxel/npc/monitor/male/torso_front.vox deleted file mode 100644 index d3d0156353..0000000000 Binary files a/assets/voxygen/voxel/npc/monitor/male/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/foot_lb.vox b/assets/voxygen/voxel/npc/viper/female/foot_lb.vox deleted file mode 100644 index e3106afe8e..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/foot_lf.vox b/assets/voxygen/voxel/npc/viper/female/foot_lf.vox deleted file mode 100644 index 00f9ab1916..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/foot_rb.vox b/assets/voxygen/voxel/npc/viper/female/foot_rb.vox deleted file mode 100644 index 6d5d0ed9ff..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/foot_rf.vox b/assets/voxygen/voxel/npc/viper/female/foot_rf.vox deleted file mode 100644 index 7ec4d3bf0c..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/head_lower.vox b/assets/voxygen/voxel/npc/viper/female/head_lower.vox deleted file mode 100644 index d8d2ff900f..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/head_upper.vox b/assets/voxygen/voxel/npc/viper/female/head_upper.vox deleted file mode 100644 index f7f487f7b0..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/jaw.vox b/assets/voxygen/voxel/npc/viper/female/jaw.vox deleted file mode 100644 index daef62cba1..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/tail.vox b/assets/voxygen/voxel/npc/viper/female/tail.vox deleted file mode 100644 index 525b787d69..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/torso_back.vox b/assets/voxygen/voxel/npc/viper/female/torso_back.vox deleted file mode 100644 index 4eef98b53f..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/female/torso_front.vox b/assets/voxygen/voxel/npc/viper/female/torso_front.vox deleted file mode 100644 index 1e04a6db16..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/female/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/foot_lb.vox b/assets/voxygen/voxel/npc/viper/male/foot_lb.vox deleted file mode 100644 index e3106afe8e..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/foot_lb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/foot_lf.vox b/assets/voxygen/voxel/npc/viper/male/foot_lf.vox deleted file mode 100644 index 00f9ab1916..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/foot_lf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/foot_rb.vox b/assets/voxygen/voxel/npc/viper/male/foot_rb.vox deleted file mode 100644 index 6d5d0ed9ff..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/foot_rb.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/foot_rf.vox b/assets/voxygen/voxel/npc/viper/male/foot_rf.vox deleted file mode 100644 index 7ec4d3bf0c..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/foot_rf.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/head_lower.vox b/assets/voxygen/voxel/npc/viper/male/head_lower.vox deleted file mode 100644 index d8d2ff900f..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/head_lower.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/head_upper.vox b/assets/voxygen/voxel/npc/viper/male/head_upper.vox deleted file mode 100644 index f7f487f7b0..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/head_upper.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/jaw.vox b/assets/voxygen/voxel/npc/viper/male/jaw.vox deleted file mode 100644 index daef62cba1..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/jaw.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/tail.vox b/assets/voxygen/voxel/npc/viper/male/tail.vox deleted file mode 100644 index 525b787d69..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/tail.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/torso_back.vox b/assets/voxygen/voxel/npc/viper/male/torso_back.vox deleted file mode 100644 index 4eef98b53f..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/torso_back.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/viper/male/torso_front.vox b/assets/voxygen/voxel/npc/viper/male/torso_front.vox deleted file mode 100644 index 1e04a6db16..0000000000 Binary files a/assets/voxygen/voxel/npc/viper/male/torso_front.vox and /dev/null differ diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 3536ec793d..3d6a1e91a9 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -120,66 +120,6 @@ central: ("npc.saber.female.tail"), ), ), - (Viper, Male): ( - upper: ( - offset: (-4.0, -5.5, -5.5), - central: ("npc.viper.male.head_upper"), - ), - lower: ( - offset: (-3.0, -4.5, -2.5), - central: ("npc.viper.male.head_lower"), - ), - jaw: ( - offset: (-3.0, -2.5, -1.0), - central: ("npc.viper.male.jaw"), - ), - torso_f: ( - offset: (-5.0, -6.5, -3.5), - central: ("npc.viper.male.torso_front"), - ), - torso_b: ( - offset: (-4.0, -7.0, -3.0), - central: ("npc.viper.male.torso_back"), - ), - ears: ( - offset: (-3.0, -1.5, 1.0), - central: ("armor.empty"), - ), - tail: ( - offset: (-1.0, -8.0, -1.5), - central: ("npc.viper.male.tail"), - ), - ), - (Viper, Female): ( - upper: ( - offset: (-4.0, -5.5, -5.5), - central: ("npc.viper.female.head_upper"), - ), - lower: ( - offset: (-3.0, -4.5, -2.5), - central: ("npc.viper.female.head_lower"), - ), - jaw: ( - offset: (-3.0, -2.5, -1.0), - central: ("npc.viper.male.jaw"), - ), - torso_f: ( - offset: (-5.0, -6.5, -3.5), - central: ("npc.viper.female.torso_front"), - ), - torso_b: ( - offset: (-4.0, -7.0, -3.0), - central: ("npc.viper.female.torso_back"), - ), - ears: ( - offset: (-3.0, -1.5, 1.0), - central: ("armor.empty"), - ), - tail: ( - offset: (-1.0, -5.0, -1.5), - central: ("npc.viper.female.tail"), - ), - ), (Tuskram, Male): ( upper: ( offset: (-4.0, -2.5, -7.0), @@ -240,126 +180,6 @@ central: ("npc.tuskram.male.tail"), ), ), - (Alligator, Male): ( - upper: ( - offset: (-4.0, -5.0, -6.0), - central: ("npc.alligator.male.head_upper"), - ), - lower: ( - offset: (-4.0, -4.5, -1.5), - central: ("npc.alligator.male.head_lower"), - ), - jaw: ( - offset: (-2.0, -7.0, -1.0), - central: ("npc.alligator.male.jaw"), - ), - torso_f: ( - offset: (-5.0, -6.5, -2.5), - central: ("npc.alligator.male.torso_front"), - ), - torso_b: ( - offset: (-4.0, -7.0, -2.0), - central: ("npc.alligator.male.torso_back"), - ), - ears: ( - offset: (-3.0, -1.0, -0.5), - central: ("armor.empty"), - ), - tail: ( - offset: (-2.0, -7.5, -1.5), - central: ("npc.alligator.male.tail"), - ), - ), - (Alligator, Female): ( - upper: ( - offset: (-4.0, -5.0, -6.0), - central: ("npc.alligator.female.head_upper"), - ), - lower: ( - offset: (-4.0, -4.5, -1.5), - central: ("npc.alligator.female.head_lower"), - ), - jaw: ( - offset: (-2.0, -7.0, -1.0), - central: ("npc.alligator.female.jaw"), - ), - torso_f: ( - offset: (-5.0, -6.5, -2.5), - central: ("npc.alligator.female.torso_front"), - ), - torso_b: ( - offset: (-4.0, -7.0, -2.0), - central: ("npc.alligator.female.torso_back"), - ), - ears: ( - offset: (-3.0, -1.0, -0.5), - central: ("armor.empty"), - ), - tail: ( - offset: (-2.0, -7.5, -1.5), - central: ("npc.alligator.male.tail"), - ), - ), - (Monitor, Male): ( - upper: ( - offset: (-3.0, -6.5, -2.5), - central: ("npc.monitor.female.head_upper"), - ), - lower: ( - offset: (-3.0, -4.5, -1.5), - central: ("npc.monitor.female.head_lower"), - ), - jaw: ( - offset: (-2.0, -3.0, -1.0), - central: ("npc.monitor.male.jaw"), - ), - torso_f: ( - offset: (-4.0, -6.5, -2.0), - central: ("npc.monitor.male.torso_front"), - ), - torso_b: ( - offset: (-3.0, -6.5, -1.5), - central: ("npc.monitor.male.torso_back"), - ), - ears: ( - offset: (-3.0, -1.0, -0.5), - central: ("armor.empty"), - ), - tail: ( - offset: (-1.0, -6.5, -1.0), - central: ("npc.monitor.male.tail"), - ), - ), - (Monitor, Female): ( - upper: ( - offset: (-3.0, -6.5, -2.5), - central: ("npc.monitor.female.head_upper"), - ), - lower: ( - offset: (-3.0, -4.5, -1.5), - central: ("npc.monitor.female.head_lower"), - ), - jaw: ( - offset: (-2.0, -3.0, -1.0), - central: ("npc.monitor.male.jaw"), - ), - torso_f: ( - offset: (-4.0, -6.5, -2.0), - central: ("npc.monitor.female.torso_front"), - ), - torso_b: ( - offset: (-3.0, -6.5, -1.5), - central: ("npc.monitor.female.torso_back"), - ), - ears: ( - offset: (-3.0, -1.0, -0.5), - central: ("armor.empty"), - ), - tail: ( - offset: (-1.0, -6.5, -1.0), - central: ("npc.monitor.male.tail"), - ), - ), (Lion, Male): ( upper: ( offset: (-4.5, -5.0, -4.0), diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index a91a680737..03dada8111 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -135,74 +135,6 @@ lateral: ("npc.saber.female.foot_rb"), ), ), - (Viper, Male): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.male.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.male.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.male.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.male.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.male.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.male.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.male.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.male.foot_rb"), - ), - ), - (Viper, Female): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.female.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.female.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.female.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.female.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.female.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.viper.female.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.female.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.viper.female.foot_rb"), - ), - ), (Tuskram, Male): ( leg_lf: ( offset: (-1.5, -1.5, -4.5), @@ -271,142 +203,6 @@ lateral: ("npc.tuskram.female.foot_rb"), ), ), - (Alligator, Male): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.male.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.male.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.male.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.male.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.male.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.male.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.male.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.male.foot_rb"), - ), - ), - (Alligator, Female): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.female.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.female.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.female.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.female.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.female.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.alligator.female.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.female.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.alligator.female.foot_rb"), - ), - ), - (Monitor, Male): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.male.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.male.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.male.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.male.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.male.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.male.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.male.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.male.foot_rb"), - ), - ), - (Monitor, Female): ( - leg_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.female.leg_lf"), - ), - leg_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.female.leg_rf"), - ), - leg_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.female.leg_lb"), - ), - leg_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.female.leg_rb"), - ), - foot_lf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.female.foot_lf"), - ), - foot_rf: ( - offset: (-1.5, -1.5, -2.5), - lateral: ("npc.monitor.female.foot_rf"), - ), - foot_lb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.female.foot_lb"), - ), - foot_rb: ( - offset: (-1.5, -2.0, -3.5), - lateral: ("npc.monitor.female.foot_rb"), - ), - ), (Lion, Male): ( leg_lf: ( offset: (-1.5, -1.5, -2.5), diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs index d4c310db74..b9a20dbe1f 100644 --- a/common/src/comp/body/quadruped_medium.rs +++ b/common/src/comp/body/quadruped_medium.rs @@ -29,10 +29,7 @@ impl From for super::Body { pub enum Species { Grolgar = 0, Saber = 1, - Viper = 2, Tuskram = 3, - Alligator = 4, - Monitor = 5, Lion = 6, Tarasque = 7, } @@ -44,10 +41,7 @@ pub enum Species { pub struct AllSpecies { pub grolgar: SpeciesMeta, pub saber: SpeciesMeta, - pub viper: SpeciesMeta, pub tuskram: SpeciesMeta, - pub alligator: SpeciesMeta, - pub monitor: SpeciesMeta, pub lion: SpeciesMeta, pub tarasque: SpeciesMeta, } @@ -60,23 +54,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies match index { Species::Grolgar => &self.grolgar, Species::Saber => &self.saber, - Species::Viper => &self.viper, Species::Tuskram => &self.tuskram, - Species::Alligator => &self.alligator, - Species::Monitor => &self.monitor, Species::Lion => &self.lion, Species::Tarasque => &self.tarasque, } } } -pub const ALL_SPECIES: [Species; 8] = [ +pub const ALL_SPECIES: [Species; 5] = [ Species::Grolgar, Species::Saber, - Species::Viper, Species::Tuskram, - Species::Alligator, - Species::Monitor, Species::Lion, Species::Tarasque, ]; diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index febfc12325..7a1193a1c1 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -137,120 +137,84 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { head_upper: match (body.species, body.body_type) { (Grolgar, _) => (12.0, 16.0), (Saber, _) => (14.0, 12.0), - (Viper, _) => (14.0, 10.0), (Tuskram, _) => (9.0, 12.0), - (Alligator, _) => (16.0, 11.0), - (Monitor, _) => (14.0, 6.0), (Lion, _) => (12.5, 14.0), (Tarasque, _) => (12.0, 19.0), }, head_lower: match (body.species, body.body_type) { (Grolgar, _) => (-4.0, -7.0), (Saber, _) => (-6.0, 0.0), - (Viper, _) => (-3.0, -1.0), (Tuskram, _) => (-3.0, -1.0), - (Alligator, _) => (-5.0, -4.0), - (Monitor, _) => (-3.0, -1.0), (Lion, _) => (-5.0, -1.0), (Tarasque, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (3.0, -5.0), (Saber, _) => (2.0, -1.0), - (Viper, _) => (3.0, -2.0), (Tuskram, _) => (2.0, -2.0), - (Alligator, _) => (6.0, -6.0), - (Monitor, _) => (4.0, -3.0), (Lion, _) => (2.0, -3.0), (Tarasque, _) => (4.0, -9.0), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-6.0, -2.0), (Saber, _) => (-4.0, -2.0), - (Viper, _) => (-6.0, -1.0), (Tuskram, _) => (-6.0, -2.0), - (Alligator, _) => (-7.0, -1.0), - (Monitor, _) => (-7.0, -1.0), (Lion, _) => (-8.0, -6.0), (Tarasque, _) => (-7.0, -2.0), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (4.0, 11.0), (Saber, _) => (4.0, 9.0), - (Viper, _) => (4.0, 7.0), (Tuskram, _) => (4.0, 9.0), - (Alligator, _) => (4.0, 6.0), - (Monitor, _) => (4.0, 4.0), (Lion, _) => (4.0, 10.0), (Tarasque, _) => (4.0, 9.0), }, torso_mid: match (body.species, body.body_type) { (Grolgar, _) => (-7.0, 10.5), (Saber, _) => (-7.0, 9.5), - (Viper, _) => (-7.0, 7.0), (Tuskram, _) => (-7.0, 9.0), - (Alligator, _) => (-7.0, 6.0), - (Monitor, _) => (-7.0, 4.0), (Lion, _) => (-9.0, 9.0), (Tarasque, _) => (-7.0, 8.0), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (-1.0, 5.0), (Saber, _) => (-1.0, 6.0), - (Viper, _) => (10.0, 2.0), (Tuskram, _) => (10.0, 2.0), - (Alligator, _) => (10.0, 2.0), - (Monitor, _) => (10.0, 2.0), (Lion, _) => (-2.0, 4.0), (Tarasque, _) => (1.5, -2.0), }, leg_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), (Saber, _) => (4.0, 6.0, 3.0), - (Viper, _) => (4.0, 6.0, 3.0), (Tuskram, _) => (4.0, 6.0, 4.5), - (Alligator, _) => (4.0, 6.0, 3.0), - (Monitor, _) => (4.0, 6.0, 3.0), (Lion, _) => (5.0, 6.0, 3.0), (Tarasque, _) => (4.0, 6.0, 3.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), (Saber, _) => (4.0, -6.0, 3.5), - (Viper, _) => (4.0, -4.0, 3.5), (Tuskram, _) => (4.0, -8.0, 5.5), - (Alligator, _) => (4.0, -4.0, 3.5), - (Monitor, _) => (4.0, -6.0, 3.5), (Lion, _) => (5.5, -8.0, 3.5), (Tarasque, _) => (4.0, -8.0, 3.5), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), (Saber, _) => (4.0, 6.0, 3.0), - (Viper, _) => (4.0, 6.0, 3.0), (Tuskram, _) => (4.0, 6.0, 4.5), - (Alligator, _) => (4.0, 6.0, 3.0), - (Monitor, _) => (4.0, 6.0, 3.0), (Lion, _) => (5.0, 6.0, 3.0), (Tarasque, _) => (4.0, 6.0, 3.0), }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), (Saber, _) => (4.0, -6.0, 3.5), - (Viper, _) => (4.0, -4.0, 3.5), (Tuskram, _) => (4.0, -8.0, 5.5), - (Alligator, _) => (4.0, -4.0, 3.5), - (Monitor, _) => (4.0, -6.0, 3.5), (Lion, _) => (5.5, -8.0, 3.5), (Tarasque, _) => (4.0, -8.0, 3.5), }, height: match (body.species, body.body_type) { (Grolgar, _) => (1.2), (Saber, _) => (1.0), - (Viper, _) => (0.7), (Tuskram, _) => (1.0), - (Alligator, _) => (0.5), - (Monitor, _) => (0.4), (Lion, _) => (1.4), (Tarasque, _) => (1.1), },