From 559ece5ede9768d36b1482a6cc17b8cf6cbb6389 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Jan 2021 00:45:56 +0100 Subject: [PATCH] More npcs work --- assets/common/npc_names.ron | 34 ++++- .../voxel/biped_large_central_manifest.ron | 60 ++++++++ .../voxel/biped_large_lateral_manifest.ron | 68 +++++++++ .../voxel/biped_small_central_manifest.ron | 132 ++++++++++++++++++ .../voxel/biped_small_lateral_manifest.ron | 108 ++++++++++++++ .../voxel/bird_medium_central_manifest.ron | 20 +-- .../voxel/bird_medium_lateral_manifest.ron | 20 +-- .../voxygen/voxel/npc/basilisk/male/chest.vox | 3 + .../voxel/npc/basilisk/male/foot_bl.vox | 3 + .../voxel/npc/basilisk/male/foot_br.vox | 3 + .../voxel/npc/basilisk/male/foot_fl.vox | 3 + .../voxel/npc/basilisk/male/foot_fr.vox | 3 + .../voxel/npc/basilisk/male/head_lower.vox | 3 + .../voxel/npc/basilisk/male/head_upper.vox | 3 + .../voxygen/voxel/npc/basilisk/male/jaw.vox | 3 + .../voxel/npc/basilisk/male/tail_front.vox | 3 + .../voxel/npc/basilisk/male/tail_rear.vox | 3 + .../voxygen/voxel/npc/dog/female/foot_br.vox | 2 +- assets/voxygen/voxel/npc/dog/female/tail.vox | 2 +- assets/voxygen/voxel/npc/dog/male/foot_br.vox | 2 +- assets/voxygen/voxel/npc/dog/male/tail.vox | 2 +- .../voxygen/voxel/npc/gnarling/male/chest.vox | 3 + .../voxel/npc/gnarling/male/dagger.vox | 3 + .../voxel/npc/gnarling/male/foot_l.vox | 3 + .../voxel/npc/gnarling/male/foot_r.vox | 3 + .../voxel/npc/gnarling/male/hand_l.vox | 3 + .../voxel/npc/gnarling/male/hand_r.vox | 3 + .../voxygen/voxel/npc/gnarling/male/head.vox | 3 + .../voxel/npc/gnarling/male/main_hand.vox | 3 + .../voxel/npc/gnarling/male/shorts.vox | 3 + .../voxygen/voxel/npc/gnarling/male/tail.vox | 3 + assets/voxygen/voxel/npc/kappa/male/chest.vox | 3 + .../voxygen/voxel/npc/kappa/male/foot_l.vox | 3 + .../voxygen/voxel/npc/kappa/male/foot_r.vox | 3 + .../voxygen/voxel/npc/kappa/male/hand_l.vox | 3 + .../voxygen/voxel/npc/kappa/male/hand_r.vox | 3 + assets/voxygen/voxel/npc/kappa/male/head.vox | 3 + .../voxygen/voxel/npc/kappa/male/shorts.vox | 3 + assets/voxygen/voxel/npc/kappa/male/tail.vox | 3 + .../voxel/npc/mandragora/male/chest.vox | 3 + .../voxel/npc/mandragora/male/foot_l.vox | 3 + .../voxel/npc/mandragora/male/foot_r.vox | 3 + .../voxel/npc/mandragora/male/hand_l.vox | 3 + .../voxel/npc/mandragora/male/hand_r.vox | 3 + .../voxel/npc/mandragora/male/shorts.vox | 3 + .../voxygen/voxel/npc/minotaur/male/axe.vox | 3 + .../voxel/npc/minotaur/male/foot_l.vox | 3 + .../voxel/npc/minotaur/male/foot_r.vox | 3 + .../voxel/npc/minotaur/male/hand_l.vox | 3 + .../voxel/npc/minotaur/male/hand_r.vox | 3 + .../voxygen/voxel/npc/minotaur/male/head.vox | 3 + .../voxygen/voxel/npc/minotaur/male/leg_l.vox | 3 + .../voxygen/voxel/npc/minotaur/male/leg_r.vox | 3 + .../voxel/npc/minotaur/male/shoulder_l.vox | 3 + .../voxel/npc/minotaur/male/shoulder_r.vox | 3 + .../voxygen/voxel/npc/minotaur/male/tail.vox | 3 + .../voxel/npc/minotaur/male/torso_lower.vox | 3 + .../voxel/npc/minotaur/male/torso_upper.vox | 3 + assets/voxygen/voxel/npc/owl/female/head.vox | 3 + assets/voxygen/voxel/npc/owl/female/leg_l.vox | 3 + assets/voxygen/voxel/npc/owl/female/leg_r.vox | 3 + assets/voxygen/voxel/npc/owl/female/tail.vox | 3 + assets/voxygen/voxel/npc/owl/female/torso.vox | 3 + .../voxygen/voxel/npc/owl/female/wing_l.vox | 3 + .../voxygen/voxel/npc/owl/female/wing_r.vox | 3 + .../voxel/npc/{snowyowl => owl}/male/head.vox | 0 .../npc/{snowyowl => owl}/male/leg_l.vox | 0 .../npc/{snowyowl => owl}/male/leg_r.vox | 0 .../voxel/npc/{snowyowl => owl}/male/tail.vox | 0 .../npc/{snowyowl => owl}/male/torso.vox | 0 .../npc/{snowyowl => owl}/male/wing_l.vox | 0 .../npc/{snowyowl => owl}/male/wing_r.vox | 0 .../voxel/npc/sunlizard/male/chest_back.vox | 3 + .../voxel/npc/sunlizard/male/chest_front.vox | 3 + .../voxel/npc/sunlizard/male/foot_l.vox | 3 + .../voxel/npc/sunlizard/male/foot_r.vox | 3 + .../voxel/npc/sunlizard/male/hand_l.vox | 3 + .../voxel/npc/sunlizard/male/hand_r.vox | 3 + .../voxygen/voxel/npc/sunlizard/male/head.vox | 3 + .../voxygen/voxel/npc/sunlizard/male/jaw.vox | 3 + .../voxel/npc/sunlizard/male/leg_l.vox | 3 + .../voxel/npc/sunlizard/male/leg_r.vox | 3 + .../voxygen/voxel/npc/sunlizard/male/neck.vox | 3 + .../voxel/npc/sunlizard/male/tail_back.vox | 3 + .../voxel/npc/sunlizard/male/tail_front.vox | 3 + .../voxel/quadruped_low_central_manifest.ron | 52 +++++++ .../voxel/quadruped_low_lateral_manifest.ron | 52 +++++-- .../quadruped_small_central_manifest.ron | 28 ++++ .../quadruped_small_lateral_manifest.ron | 36 +++++ .../voxel/theropod_central_manifest.ron | 60 ++++++++ .../voxel/theropod_lateral_manifest.ron | 52 +++++++ common/src/comp/body.rs | 1 + common/src/comp/body/biped_large.rs | 6 +- common/src/comp/body/biped_small.rs | 14 +- common/src/comp/body/bird_medium.rs | 8 +- common/src/comp/body/quadruped_low.rs | 6 +- common/src/comp/body/quadruped_small.rs | 6 +- common/src/comp/body/theropod.rs | 6 +- common/src/comp/inventory/loadout_builder.rs | 5 + common/src/states/utils.rs | 1 + voxygen/anim/src/biped_large/mod.rs | 13 +- voxygen/anim/src/biped_small/mod.rs | 18 +++ voxygen/anim/src/bird_medium/mod.rs | 17 ++- voxygen/anim/src/quadruped_low/mod.rs | 8 ++ voxygen/anim/src/quadruped_medium/idle.rs | 6 +- voxygen/anim/src/quadruped_small/mod.rs | 5 + voxygen/anim/src/theropod/idle.rs | 2 +- voxygen/anim/src/theropod/mod.rs | 11 ++ voxygen/src/hud/mod.rs | 2 +- world/src/layer/wildlife.rs | 30 ++-- 110 files changed, 1025 insertions(+), 71 deletions(-) create mode 100644 assets/voxygen/voxel/npc/basilisk/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/head_lower.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/head_upper.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/tail_front.vox create mode 100644 assets/voxygen/voxel/npc/basilisk/male/tail_rear.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/dagger.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/head.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/main_hand.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/shorts.vox create mode 100644 assets/voxygen/voxel/npc/gnarling/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/head.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/shorts.vox create mode 100644 assets/voxygen/voxel/npc/kappa/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/mandragora/male/shorts.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/axe.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/head.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/shoulder_l.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/shoulder_r.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/torso_lower.vox create mode 100644 assets/voxygen/voxel/npc/minotaur/male/torso_upper.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/head.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/torso.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/wing_l.vox create mode 100644 assets/voxygen/voxel/npc/owl/female/wing_r.vox rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/head.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/leg_l.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/leg_r.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/tail.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/torso.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/wing_l.vox (100%) rename assets/voxygen/voxel/npc/{snowyowl => owl}/male/wing_r.vox (100%) create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/chest_front.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/head.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/tail_back.vox create mode 100644 assets/voxygen/voxel/npc/sunlizard/male/tail_front.vox diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 6786fc1517..be28efa0fd 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -745,6 +745,10 @@ hare: ( keyword: "hare", generic: "Hare" + ), + dog: ( + keyword: "dog", + generic: "Dog" ) ) ), @@ -776,9 +780,9 @@ keyword: "eagle", generic: "Eagle" ), - snowyowl: ( - keyword: "snowyowl", - generic: "Snowy Owl" + owl: ( + keyword: "owl", + generic: "Owl" ), parrot: ( keyword: "parrot", @@ -837,6 +841,10 @@ mindflayer: ( keyword: "mindflayer", generic: "Mindflayer" + ), + minotaur: ( + keyword: "minotaur", + generic: "Minotaur" ) ) ), @@ -885,6 +893,10 @@ raptor_wood: ( keyword: "raptor_wood", generic: "Wood Raptor" + ), + sunlizard: ( + keyword: "sunlizard", + generic: "Sun Lizard" ) ) ), @@ -928,6 +940,18 @@ adlet: ( keyword: "adlet", generic: "Adlet" + ), + gnarling: ( + keyword: "gnarling", + generic: "Gnarling" + ), + mandragora: ( + keyword: "mandragora", + generic: "Mandragora" + ), + kappa: ( + keyword: "kappa", + generic: "Kappa" ) ) ), @@ -1021,6 +1045,10 @@ lavadrake: ( keyword: "lavadrake", generic: "Lava Drake" + ), + basilisk: ( + keyword: "basilisk", + generic: "Basilisk" ) ) ) diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron index 1c61fc917d..e3415df554 100644 --- a/assets/voxygen/voxel/biped_large_central_manifest.ron +++ b/assets/voxygen/voxel/biped_large_central_manifest.ron @@ -599,4 +599,64 @@ central: ("weapon.staff.firestaff_mindflayer"), ) ), + (Minotaur, Male): ( + head: ( + offset: (-6.5, 0.0, -8.0), + central: ("npc.minotaur.male.head"), + ), + torso_upper: ( + offset: (-8.5, -8.0, -10.0), + central: ("npc.minotaur.male.torso_upper"), + ), + torso_lower: ( + offset: (-5.5, -5.5, -14.0), + central: ("npc.minotaur.male.torso_lower"), + ), + jaw: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.5, -17.0, -8.0), + central: ("npc.minotaur.male.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-5.5, -3.5, -4.0), + central: ("weapon.staff.firestaff_mindflayer"), + ) + ), + (Minotaur, Female): ( + head: ( + offset: (-6.5, 0.0, -8.0), + central: ("npc.minotaur.male.head"), + ), + torso_upper: ( + offset: (-8.5, -8.0, -10.0), + central: ("npc.minotaur.male.torso_upper"), + ), + torso_lower: ( + offset: (-5.5, -5.5, -14.0), + central: ("npc.minotaur.male.torso_lower"), + ), + jaw: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.5, -17.0, -8.0), + central: ("npc.minotaur.male.tail"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-5.5, -3.5, -4.0), + central: ("weapon.staff.firestaff_mindflayer"), + ) + ), }) \ 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 af538c5c72..51d7b8bc17 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -679,4 +679,72 @@ lateral: ("npc.mindflayer.male.foot_r"), ) ), + (Minotaur, Male): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.minotaur.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.minotaur.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.0, -4.5, -14.0), + lateral: ("npc.minotaur.male.hand_l"), + ), + hand_r: ( + offset: (-4.0, -4.5, -14.0), + lateral: ("npc.minotaur.male.hand_r"), + ), + leg_l: ( + offset: (-2.5, -4.0, -3.5), + lateral: ("npc.minotaur.male.leg_l"), + ), + leg_r: ( + offset: (-2.5, -4.0, -3.5), + lateral: ("npc.minotaur.male.leg_r"), + ), + foot_l: ( + offset: (-3.5, -9.0, -5.0), + lateral: ("npc.minotaur.male.foot_l"), + ), + foot_r: ( + offset: (-3.5, -9.0, -5.0), + lateral: ("npc.minotaur.male.foot_r"), + ) + ), + (Minotaur, Female): ( + shoulder_l: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.minotaur.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.5, -3.5, -4.5), + lateral: ("npc.minotaur.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.0, -4.5, -14.0), + lateral: ("npc.minotaur.male.hand_l"), + ), + hand_r: ( + offset: (-4.0, -4.5, -14.0), + lateral: ("npc.minotaur.male.hand_r"), + ), + leg_l: ( + offset: (-2.5, -4.0, -3.5), + lateral: ("npc.minotaur.male.leg_l"), + ), + leg_r: ( + offset: (-2.5, -4.0, -3.5), + lateral: ("npc.minotaur.male.leg_r"), + ), + foot_l: ( + offset: (-3.5, -9.0, -5.0), + lateral: ("npc.minotaur.male.foot_l"), + ), + foot_r: ( + offset: (-3.5, -9.0, -5.0), + lateral: ("npc.minotaur.male.foot_r"), + ) + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/biped_small_central_manifest.ron b/assets/voxygen/voxel/biped_small_central_manifest.ron index 86d077e456..53bb7fdf2e 100644 --- a/assets/voxygen/voxel/biped_small_central_manifest.ron +++ b/assets/voxygen/voxel/biped_small_central_manifest.ron @@ -131,4 +131,136 @@ central: ("weapon.spear.adlet"), ), ), + (Gnarling, Male): ( + head: ( + offset: (-6.5, -5.5, -4.5), + central: ("npc.gnarling.male.head"), + ), + chest: ( + offset: (-4.5, -3.5, -2.5), + central: ("npc.gnarling.male.chest"), + ), + shorts: ( + offset: (-3.5, -3.0, -2.5), + central: ("npc.gnarling.male.shorts"), + ), + tail: ( + offset: (-1.5, -13.0, -3.0), + central: ("npc.gnarling.male.tail"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), + (Gnarling, Female): ( + head: ( + offset: (-6.5, -5.5, -4.5), + central: ("npc.gnarling.male.head"), + ), + chest: ( + offset: (-4.5, -3.5, -2.5), + central: ("npc.gnarling.male.chest"), + ), + shorts: ( + offset: (-3.5, -3.0, -2.5), + central: ("npc.gnarling.male.shorts"), + ), + tail: ( + offset: (-1.5, -13.0, -3.0), + central: ("npc.gnarling.male.tail"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), + (Mandragora, Male): ( + head: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + chest: ( + offset: (-11.0, -11.0, -6.5), + central: ("npc.mandragora.male.chest"), + ), + shorts: ( + offset: (-3.0, -3.0, -1.0), + central: ("npc.mandragora.male.shorts"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), + (Mandragora, Female): ( + head: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + chest: ( + offset: (-11.0, -11.0, -6.5), + central: ("npc.mandragora.male.chest"), + ), + shorts: ( + offset: (-3.0, -3.0, -1.0), + central: ("npc.mandragora.male.shorts"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), + (Kappa, Male): ( + head: ( + offset: (-4.5, -5.0, -4.5), + central: ("npc.kappa.male.head"), + ), + chest: ( + offset: (-6.5, -8.0, -7.0), + central: ("npc.kappa.male.chest"), + ), + shorts: ( + offset: (-3.5, -4.0, -1.5), + central: ("npc.kappa.male.shorts"), + ), + tail: ( + offset: (-2.5, -10.0, -5.0), + central: ("npc.kappa.male.tail"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), + (Kappa, Female): ( + head: ( + offset: (-4.5, -5.0, -4.5), + central: ("npc.kappa.male.head"), + ), + chest: ( + offset: (-6.5, -8.0, -7.0), + central: ("npc.kappa.male.chest"), + ), + shorts: ( + offset: (-3.5, -4.0, -1.5), + central: ("npc.kappa.male.shorts"), + ), + tail: ( + offset: (-2.5, -10.0, -5.0), + central: ("npc.kappa.male.tail"), + ), + main: ( + offset: (-0.5, -7.5, -5.0), + central: ("weapon.spear.adlet"), + ), + ), }) diff --git a/assets/voxygen/voxel/biped_small_lateral_manifest.ron b/assets/voxygen/voxel/biped_small_lateral_manifest.ron index edca8bc940..d2fae5454e 100644 --- a/assets/voxygen/voxel/biped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_small_lateral_manifest.ron @@ -107,4 +107,112 @@ lateral: ("npc.adlet.male.foot_r"), ), ), + (Gnarling, Male): ( + hand_l: ( + offset: (-1.5, -1.5, -7.0), + lateral: ("npc.gnarling.male.hand_l"), + ), + hand_r: ( + offset: (-1.5, -1.5, -7.0), + lateral: ("npc.gnarling.male.hand_r"), + ), + foot_l: ( + offset: (-1.0, -2.0, -5.0), + lateral: ("npc.gnarling.male.foot_l"), + ), + foot_r: ( + offset: (-1.0, -2.0, -5.0), + lateral: ("npc.gnarling.male.foot_r"), + ), + ), + (Gnarling, Female): ( + hand_l: ( + offset: (-1.5, -1.5, -7.0), + lateral: ("npc.gnarling.male.hand_l"), + ), + hand_r: ( + offset: (-1.5, -1.5, -7.0), + lateral: ("npc.gnarling.male.hand_r"), + ), + foot_l: ( + offset: (-1.0, -2.0, -5.0), + lateral: ("npc.gnarling.male.foot_l"), + ), + foot_r: ( + offset: (-1.0, -2.0, -5.0), + lateral: ("npc.gnarling.male.foot_r"), + ), + ), + (Mandragora, Male): ( + hand_l: ( + offset: (-2.0, -1.5, -7.0), + lateral: ("npc.mandragora.male.hand_l"), + ), + hand_r: ( + offset: (-2.0, -1.5, -7.0), + lateral: ("npc.mandragora.male.hand_r"), + ), + foot_l: ( + offset: (-1.0, -1.5, -4.0), + lateral: ("npc.mandragora.male.foot_l"), + ), + foot_r: ( + offset: (-1.0, -1.5, -4.0), + lateral: ("npc.mandragora.male.foot_r"), + ), + ), + (Mandragora, Female): ( + hand_l: ( + offset: (-2.0, -1.5, -7.0), + lateral: ("npc.mandragora.male.hand_l"), + ), + hand_r: ( + offset: (-2.0, -1.5, -7.0), + lateral: ("npc.mandragora.male.hand_r"), + ), + foot_l: ( + offset: (-1.0, -1.5, -4.0), + lateral: ("npc.mandragora.male.foot_l"), + ), + foot_r: ( + offset: (-1.0, -1.5, -4.0), + lateral: ("npc.mandragora.male.foot_r"), + ), + ), + (Kappa, Male): ( + hand_l: ( + offset: (-3.0, -2.5, -10.0), + lateral: ("npc.kappa.male.hand_l"), + ), + hand_r: ( + offset: (-3.0, -2.5, -10.0), + lateral: ("npc.kappa.male.hand_r"), + ), + foot_l: ( + offset: (-2.5, -3.0, -9.0), + lateral: ("npc.kappa.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -3.0, -9.0), + lateral: ("npc.kappa.male.foot_r"), + ), + ), + (Kappa, Female): ( + hand_l: ( + offset: (-3.0, -2.5, -10.0), + lateral: ("npc.kappa.male.hand_l"), + ), + hand_r: ( + offset: (-3.0, -2.5, -10.0), + lateral: ("npc.kappa.male.hand_r"), + ), + foot_l: ( + offset: (-2.5, -3.0, -9.0), + lateral: ("npc.kappa.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -3.0, -9.0), + lateral: ("npc.kappa.male.foot_r"), + ), + ), }) diff --git a/assets/voxygen/voxel/bird_medium_central_manifest.ron b/assets/voxygen/voxel/bird_medium_central_manifest.ron index 87bf41bdf7..ee00459527 100644 --- a/assets/voxygen/voxel/bird_medium_central_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_central_manifest.ron @@ -139,32 +139,32 @@ central: ("npc.eagle.male.tail"), ) ), - (Snowyowl, Male): ( + (Owl, Male): ( head: ( offset: (-3.5, -4.5, -4.0), - central: ("npc.snowyowl.male.head"), + central: ("npc.owl.male.head"), ), torso: ( offset: (-3.5, -5.0, -3.0), - central: ("npc.snowyowl.male.torso"), + central: ("npc.owl.male.torso"), ), tail: ( offset: (-2.5, -3.0, -2.0), - central: ("npc.snowyowl.male.tail"), + central: ("npc.owl.male.tail"), ) ), - (Snowyowl, Female): ( + (Owl, Female): ( head: ( - offset: (-3.5, -4.5, -4.0), - central: ("npc.snowyowl.male.head"), + offset: (-4.5, -4.5, -4.5), + central: ("npc.owl.female.head"), ), torso: ( - offset: (-3.5, -5.0, -3.0), - central: ("npc.snowyowl.male.torso"), + offset: (-3.5, -5.0, -3.5), + central: ("npc.owl.female.torso"), ), tail: ( offset: (-2.5, -3.0, -2.0), - central: ("npc.snowyowl.male.tail"), + central: ("npc.owl.female.tail"), ) ), (Parrot, Male): ( diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron index 35116121e2..2147d9d4e4 100644 --- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron @@ -179,40 +179,40 @@ lateral: ("npc.eagle.male.leg_r"), ) ), - (Snowyowl, Male): ( + (Owl, Male): ( wing_l: ( offset: (-1.0, -2.5, -8.0), - lateral: ("npc.snowyowl.male.wing_l"), + lateral: ("npc.owl.male.wing_l"), ), wing_r: ( offset: (-1.0, -2.5, -8.0), - lateral: ("npc.snowyowl.male.wing_r"), + lateral: ("npc.owl.male.wing_r"), ), foot_l: ( offset: (-1.0, 0.0, -6.5), - lateral: ("npc.snowyowl.male.leg_l"), + lateral: ("npc.owl.male.leg_l"), ), foot_r: ( offset: (-1.0, 0.0, -6.5), - lateral: ("npc.snowyowl.male.leg_r"), + lateral: ("npc.owl.male.leg_r"), ) ), - (Snowyowl, Female): ( + (Owl, Female): ( wing_l: ( offset: (-1.0, -2.5, -8.0), - lateral: ("npc.snowyowl.male.wing_l"), + lateral: ("npc.owl.female.wing_l"), ), wing_r: ( offset: (-1.0, -2.5, -8.0), - lateral: ("npc.snowyowl.male.wing_r"), + lateral: ("npc.owl.female.wing_r"), ), foot_l: ( offset: (-1.0, 0.0, -6.5), - lateral: ("npc.snowyowl.male.leg_l"), + lateral: ("npc.owl.female.leg_l"), ), foot_r: ( offset: (-1.0, 0.0, -6.5), - lateral: ("npc.snowyowl.male.leg_r"), + lateral: ("npc.owl.female.leg_r"), ) ), (Parrot, Male): ( diff --git a/assets/voxygen/voxel/npc/basilisk/male/chest.vox b/assets/voxygen/voxel/npc/basilisk/male/chest.vox new file mode 100644 index 0000000000..c4a395dbaa --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41dc59bb7c25502be8c91377a392da091e2eefc34a90f706fbe403279291352f +size 10876 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox new file mode 100644 index 0000000000..bc87d80914 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39b32c142cb3e6d3dc186fd9f95338c5b4f24ff471a0231dee87da6eacee9bc3 +size 2920 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox new file mode 100644 index 0000000000..e9461a2bb5 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9d4c2c39ec3b08cebee105c24edf9cc5b11b0b3f156860a5cbb0960ff59817a +size 2920 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox new file mode 100644 index 0000000000..5cff2571c2 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a109cb737e4bb7bca5f1e1c3567e77dd592206a48cdaddbf3dbe9b6dddef598 +size 3088 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox new file mode 100644 index 0000000000..3002f165c1 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:885bd8acd9ad061d3bcbdd37f21075bc54f2138387e25caf95e4cedf4123f184 +size 3088 diff --git a/assets/voxygen/voxel/npc/basilisk/male/head_lower.vox b/assets/voxygen/voxel/npc/basilisk/male/head_lower.vox new file mode 100644 index 0000000000..29bcbca5d8 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f16f69a291b05f3d6aab73aaa13a9addd13dc26d9ffc4beceb739a9933f3e7 +size 7428 diff --git a/assets/voxygen/voxel/npc/basilisk/male/head_upper.vox b/assets/voxygen/voxel/npc/basilisk/male/head_upper.vox new file mode 100644 index 0000000000..4a64783e9d --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dc95681a5e78dbbd5cbca2d4e6763c7b677e3e011bc97f3b79337c32519fda6 +size 3756 diff --git a/assets/voxygen/voxel/npc/basilisk/male/jaw.vox b/assets/voxygen/voxel/npc/basilisk/male/jaw.vox new file mode 100644 index 0000000000..6966ed9c1f --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b35a9d21875eea4afb5a018d436523e16d00c880e24502cef440cc37780f8f58 +size 1552 diff --git a/assets/voxygen/voxel/npc/basilisk/male/tail_front.vox b/assets/voxygen/voxel/npc/basilisk/male/tail_front.vox new file mode 100644 index 0000000000..df5e608380 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b032da5cb40709480fe3850d78beb5c290caf84a2fc57a0559bb50ddceffb69 +size 4416 diff --git a/assets/voxygen/voxel/npc/basilisk/male/tail_rear.vox b/assets/voxygen/voxel/npc/basilisk/male/tail_rear.vox new file mode 100644 index 0000000000..88d41f14a2 --- /dev/null +++ b/assets/voxygen/voxel/npc/basilisk/male/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b01b1e3e492edd539f3af4469bed8f44df2afa4eaec04222fb790a8edcfd2e8 +size 2772 diff --git a/assets/voxygen/voxel/npc/dog/female/foot_br.vox b/assets/voxygen/voxel/npc/dog/female/foot_br.vox index 8551b115c6..d60f068cd3 100644 --- a/assets/voxygen/voxel/npc/dog/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/dog/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:290ee67869c332d28c1147bdf36abef069e7159f47533eb42b4a9deaaf3ac8eb +oid sha256:ff984e3bc856c16cd960b12f75a66f2f766d9313ed84e4be556aebd983b87a9c size 1300 diff --git a/assets/voxygen/voxel/npc/dog/female/tail.vox b/assets/voxygen/voxel/npc/dog/female/tail.vox index e9d802e638..0fd0228784 100644 --- a/assets/voxygen/voxel/npc/dog/female/tail.vox +++ b/assets/voxygen/voxel/npc/dog/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b75e503a3742c3f2663bfdf404626c49baa9f5aad31409927d787aa28813d90e +oid sha256:2a46645ac8a712f46be63a7b3c9e167f06a064a42c109d3dc6606a7c4f34b3b1 size 1432 diff --git a/assets/voxygen/voxel/npc/dog/male/foot_br.vox b/assets/voxygen/voxel/npc/dog/male/foot_br.vox index d9e302c8d5..1a3bfec4a9 100644 --- a/assets/voxygen/voxel/npc/dog/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/dog/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61c2a707098f9a70032d511f23eb0c4b2488bd0a1ae64cb006e8cde8b70464c4 +oid sha256:2b71e6540b86675be630cf7e1f606ec2973324490f3e94e143cf8cc3b03e5520 size 1300 diff --git a/assets/voxygen/voxel/npc/dog/male/tail.vox b/assets/voxygen/voxel/npc/dog/male/tail.vox index 41ecc7221c..54b15d3263 100644 --- a/assets/voxygen/voxel/npc/dog/male/tail.vox +++ b/assets/voxygen/voxel/npc/dog/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f38f5c494eca27c9eecf1e9a0c7ccd17bd675ea8224be67800665ccc4e8e3f1 +oid sha256:37781613ca1861357c62686c87ec887ae175b3dcc013dfc113d3fb3c5a977757 size 1432 diff --git a/assets/voxygen/voxel/npc/gnarling/male/chest.vox b/assets/voxygen/voxel/npc/gnarling/male/chest.vox new file mode 100644 index 0000000000..923c912ca7 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6922bb143dee2491811e455ad7f03db1a8658065eb1243065d46265d7a860f12 +size 1648 diff --git a/assets/voxygen/voxel/npc/gnarling/male/dagger.vox b/assets/voxygen/voxel/npc/gnarling/male/dagger.vox new file mode 100644 index 0000000000..d326f3eb98 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/dagger.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82482290ed4562e1b82b21d59008967448f08e58229b69e2cdfa614b717d06ee +size 1312 diff --git a/assets/voxygen/voxel/npc/gnarling/male/foot_l.vox b/assets/voxygen/voxel/npc/gnarling/male/foot_l.vox new file mode 100644 index 0000000000..360a342b98 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc85e3a2fbf52bf69230c123ee07ed647af9383e1b099984f4822dc2e4c0daef +size 1188 diff --git a/assets/voxygen/voxel/npc/gnarling/male/foot_r.vox b/assets/voxygen/voxel/npc/gnarling/male/foot_r.vox new file mode 100644 index 0000000000..95aff98875 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c801957433abef8df299de07b63ba4664599a17236418a7f5b89fcb5a293190 +size 1188 diff --git a/assets/voxygen/voxel/npc/gnarling/male/hand_l.vox b/assets/voxygen/voxel/npc/gnarling/male/hand_l.vox new file mode 100644 index 0000000000..7ba41aa539 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:576881ca227ca535284e13cb707604c1f8a9e79113633943f901cc544300828b +size 1264 diff --git a/assets/voxygen/voxel/npc/gnarling/male/hand_r.vox b/assets/voxygen/voxel/npc/gnarling/male/hand_r.vox new file mode 100644 index 0000000000..a85db94247 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce0fc26d4f82c65c91b5089db9bafc7b8dddf4f9f1758ed35b094b52048f7198 +size 1264 diff --git a/assets/voxygen/voxel/npc/gnarling/male/head.vox b/assets/voxygen/voxel/npc/gnarling/male/head.vox new file mode 100644 index 0000000000..ac64a6de7c --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a4c4c9187984eb5ed3d806ee0769d824c3fe070e42da150d9c43383e958a849 +size 2852 diff --git a/assets/voxygen/voxel/npc/gnarling/male/main_hand.vox b/assets/voxygen/voxel/npc/gnarling/male/main_hand.vox new file mode 100644 index 0000000000..e588b21338 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/main_hand.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e24a90f1ac457addf71e77adb60a3917fdcd0f950a52c59b3d0b92bcd5c6e29f +size 1308 diff --git a/assets/voxygen/voxel/npc/gnarling/male/shorts.vox b/assets/voxygen/voxel/npc/gnarling/male/shorts.vox new file mode 100644 index 0000000000..3644927ab1 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/shorts.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2468a57f1e74849220e28c9734ac0413be829620e13a722e078181c707344b94 +size 1456 diff --git a/assets/voxygen/voxel/npc/gnarling/male/tail.vox b/assets/voxygen/voxel/npc/gnarling/male/tail.vox new file mode 100644 index 0000000000..231a776873 --- /dev/null +++ b/assets/voxygen/voxel/npc/gnarling/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57e6e15ff647b72c3a3420aae6978cd1006a7642c55e4bac94a1595fd64c6a65 +size 1308 diff --git a/assets/voxygen/voxel/npc/kappa/male/chest.vox b/assets/voxygen/voxel/npc/kappa/male/chest.vox new file mode 100644 index 0000000000..deb793ee3c --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:117ec5e77f0a5bdb2a13a942452c2797f12e3a745c255f592a15f8c81a37f7f4 +size 4356 diff --git a/assets/voxygen/voxel/npc/kappa/male/foot_l.vox b/assets/voxygen/voxel/npc/kappa/male/foot_l.vox new file mode 100644 index 0000000000..775285df0b --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20bd3dac180e1457c4c4a4605bd09c231d157a98b0d0e2e32cc072e8a0b10e2e +size 1380 diff --git a/assets/voxygen/voxel/npc/kappa/male/foot_r.vox b/assets/voxygen/voxel/npc/kappa/male/foot_r.vox new file mode 100644 index 0000000000..9f4fcba501 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6867b87be57f6fef7c940c9b04bd767684345b235f29125887dbe4c457842d96 +size 1380 diff --git a/assets/voxygen/voxel/npc/kappa/male/hand_l.vox b/assets/voxygen/voxel/npc/kappa/male/hand_l.vox new file mode 100644 index 0000000000..897502a675 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43b5d50fd9516ac4b9209a6246ce3f452ea327d8c1c439e373c87c5eddc25e7a +size 1448 diff --git a/assets/voxygen/voxel/npc/kappa/male/hand_r.vox b/assets/voxygen/voxel/npc/kappa/male/hand_r.vox new file mode 100644 index 0000000000..8778503bf6 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3aff415942d5dfb82e5c4778b633e45b2d65489cb28716dd2752ec066407c786 +size 1448 diff --git a/assets/voxygen/voxel/npc/kappa/male/head.vox b/assets/voxygen/voxel/npc/kappa/male/head.vox new file mode 100644 index 0000000000..27e95a6b04 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:181c563704bedbdbfc41e4c349ff45e806bb39aa429a81551eb4544cef09be40 +size 2260 diff --git a/assets/voxygen/voxel/npc/kappa/male/shorts.vox b/assets/voxygen/voxel/npc/kappa/male/shorts.vox new file mode 100644 index 0000000000..bd68ecda21 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/shorts.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca1531db32117e639b0970c243af1a48114d7e54d8a8e57ca51c28d4f8afca10 +size 1388 diff --git a/assets/voxygen/voxel/npc/kappa/male/tail.vox b/assets/voxygen/voxel/npc/kappa/male/tail.vox new file mode 100644 index 0000000000..b102982ce9 --- /dev/null +++ b/assets/voxygen/voxel/npc/kappa/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c54bc787f81103ee047c6421527bc819d4c37c2bd18da898d60e5dcda0ba8cb +size 1436 diff --git a/assets/voxygen/voxel/npc/mandragora/male/chest.vox b/assets/voxygen/voxel/npc/mandragora/male/chest.vox new file mode 100644 index 0000000000..b9c886f54d --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adc0cca7885391bd324c0939136bcc4e6d2e9c0f625d3e71aa6bc8f5daf541b0 +size 2916 diff --git a/assets/voxygen/voxel/npc/mandragora/male/foot_l.vox b/assets/voxygen/voxel/npc/mandragora/male/foot_l.vox new file mode 100644 index 0000000000..3c5b943c0c --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b802de1db55f26caad2cd4903e9e432e58986aece30cc7226060f8469c5d75dd +size 1140 diff --git a/assets/voxygen/voxel/npc/mandragora/male/foot_r.vox b/assets/voxygen/voxel/npc/mandragora/male/foot_r.vox new file mode 100644 index 0000000000..ed48339700 --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f2dfdb8aebde1599b112c74b2f933d7d22cdbdf5f6acc177e2d67fbcd2d1411 +size 1140 diff --git a/assets/voxygen/voxel/npc/mandragora/male/hand_l.vox b/assets/voxygen/voxel/npc/mandragora/male/hand_l.vox new file mode 100644 index 0000000000..6b22fdeb1c --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da48cb2417b90fb79744c5d417af13433138652e8d9fe4b7be2dc890b7729f9b +size 1204 diff --git a/assets/voxygen/voxel/npc/mandragora/male/hand_r.vox b/assets/voxygen/voxel/npc/mandragora/male/hand_r.vox new file mode 100644 index 0000000000..40b638780b --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c07e91da7e73c238d752d0dac970f615e7a467a2970e9046093289985a0d98a +size 1204 diff --git a/assets/voxygen/voxel/npc/mandragora/male/shorts.vox b/assets/voxygen/voxel/npc/mandragora/male/shorts.vox new file mode 100644 index 0000000000..5586767f11 --- /dev/null +++ b/assets/voxygen/voxel/npc/mandragora/male/shorts.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e15ea1aa65576683e5a7410c606c5fc1c7e54179c509c39921fcb372ca93d9a5 +size 1232 diff --git a/assets/voxygen/voxel/npc/minotaur/male/axe.vox b/assets/voxygen/voxel/npc/minotaur/male/axe.vox new file mode 100644 index 0000000000..ba51b0efc3 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/axe.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81c825d278f673f3b214dd9772faf5d3fab9f69a4dba2ec320a23369140dcd23 +size 3460 diff --git a/assets/voxygen/voxel/npc/minotaur/male/foot_l.vox b/assets/voxygen/voxel/npc/minotaur/male/foot_l.vox new file mode 100644 index 0000000000..47caa357a9 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a26f677a27849702c5e5f343ccd94d3a152e2e64bed811c0c373920d22b86e +size 2396 diff --git a/assets/voxygen/voxel/npc/minotaur/male/foot_r.vox b/assets/voxygen/voxel/npc/minotaur/male/foot_r.vox new file mode 100644 index 0000000000..f39dde569f --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:200408f8cab051336d46af40e6a8d49e5dc7790eb9af9549c678b186f1e81109 +size 2396 diff --git a/assets/voxygen/voxel/npc/minotaur/male/hand_l.vox b/assets/voxygen/voxel/npc/minotaur/male/hand_l.vox new file mode 100644 index 0000000000..2cd23866d8 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a3ca0d466d913da7daeb3e8f446137a7bff50533dc91b8dd1df3428e624f976 +size 3516 diff --git a/assets/voxygen/voxel/npc/minotaur/male/hand_r.vox b/assets/voxygen/voxel/npc/minotaur/male/hand_r.vox new file mode 100644 index 0000000000..7acfdfc87d --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a495f547f429243bd0402b706805b8ee8c4e6e453c05f9d78b482c5e6f022a4 +size 3516 diff --git a/assets/voxygen/voxel/npc/minotaur/male/head.vox b/assets/voxygen/voxel/npc/minotaur/male/head.vox new file mode 100644 index 0000000000..a2fa5bf8f1 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dcdc59d4840c072fbdac6b2659612baaa42c0d9d692fe433287ccb8f7fb6d66 +size 3508 diff --git a/assets/voxygen/voxel/npc/minotaur/male/leg_l.vox b/assets/voxygen/voxel/npc/minotaur/male/leg_l.vox new file mode 100644 index 0000000000..38eab76312 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:449cd794ede2a08a5c676e116c03e914e994cf17763713aab8e10aafe683464b +size 1880 diff --git a/assets/voxygen/voxel/npc/minotaur/male/leg_r.vox b/assets/voxygen/voxel/npc/minotaur/male/leg_r.vox new file mode 100644 index 0000000000..8745b79b3d --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4ec77093db6b2824e9d3aabf38370fdc14c52fa7ef86ecbae5596e5e8fc3914 +size 1880 diff --git a/assets/voxygen/voxel/npc/minotaur/male/shoulder_l.vox b/assets/voxygen/voxel/npc/minotaur/male/shoulder_l.vox new file mode 100644 index 0000000000..cc4f4d1b09 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45d5c3765acce825ebbfdb4e2120425daadfb6db3d118a4367e204c22c850795 +size 2324 diff --git a/assets/voxygen/voxel/npc/minotaur/male/shoulder_r.vox b/assets/voxygen/voxel/npc/minotaur/male/shoulder_r.vox new file mode 100644 index 0000000000..1f06ee7d93 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:511cc22935546b3af18c1a66ba56ff78b3cb3ba026827ffc0d8ae94d4cb5ebcd +size 2324 diff --git a/assets/voxygen/voxel/npc/minotaur/male/tail.vox b/assets/voxygen/voxel/npc/minotaur/male/tail.vox new file mode 100644 index 0000000000..b0f953dee9 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0f9bf26e14774b9446d748f63c10754624d2f2976431092e915a5b9f9dc4d2 +size 1576 diff --git a/assets/voxygen/voxel/npc/minotaur/male/torso_lower.vox b/assets/voxygen/voxel/npc/minotaur/male/torso_lower.vox new file mode 100644 index 0000000000..2205013816 --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28f15a3c523f6a3fafb5fbef31787296cb0fe231a6a3f72d21062794e3f6e1ef +size 3036 diff --git a/assets/voxygen/voxel/npc/minotaur/male/torso_upper.vox b/assets/voxygen/voxel/npc/minotaur/male/torso_upper.vox new file mode 100644 index 0000000000..a9e4cff09a --- /dev/null +++ b/assets/voxygen/voxel/npc/minotaur/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61602fb7fc50e5392cebe37a66baf0bb21e1a5642cee3e61a6506ffc109e3fb +size 8356 diff --git a/assets/voxygen/voxel/npc/owl/female/head.vox b/assets/voxygen/voxel/npc/owl/female/head.vox new file mode 100644 index 0000000000..4cdb7bbfb0 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f2bff2796a1ffa725f745ce91d29610a316c420727d1782d408b382be9bf670 +size 2356 diff --git a/assets/voxygen/voxel/npc/owl/female/leg_l.vox b/assets/voxygen/voxel/npc/owl/female/leg_l.vox new file mode 100644 index 0000000000..819fdc1206 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7212dad002db2a10f2370b49d0ab07a5d6be884bd3136f9d4b0caa6af7dc3c76 +size 1196 diff --git a/assets/voxygen/voxel/npc/owl/female/leg_r.vox b/assets/voxygen/voxel/npc/owl/female/leg_r.vox new file mode 100644 index 0000000000..86934442fb --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37e15e29979a22df53d483514de19ee70a10c99f666b5ceca8f1b099369d4d34 +size 1196 diff --git a/assets/voxygen/voxel/npc/owl/female/tail.vox b/assets/voxygen/voxel/npc/owl/female/tail.vox new file mode 100644 index 0000000000..405243c791 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7f190a3e6a8c635f5234f510e1fe59a2471876d4658ef9a2c1dcb7e233e811c +size 1264 diff --git a/assets/voxygen/voxel/npc/owl/female/torso.vox b/assets/voxygen/voxel/npc/owl/female/torso.vox new file mode 100644 index 0000000000..f4c0a0c277 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21e64dbdf9e61833c9babf6f9cc78cbbc60b38a6131f88bed8f374f8f632a12b +size 2244 diff --git a/assets/voxygen/voxel/npc/owl/female/wing_l.vox b/assets/voxygen/voxel/npc/owl/female/wing_l.vox new file mode 100644 index 0000000000..a57e7bcdd2 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/wing_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4da1b8df08ab2397b2689204cad3fc6137fcf0c2f830ef18323b0088859997c8 +size 1364 diff --git a/assets/voxygen/voxel/npc/owl/female/wing_r.vox b/assets/voxygen/voxel/npc/owl/female/wing_r.vox new file mode 100644 index 0000000000..ae2d4bb3d3 --- /dev/null +++ b/assets/voxygen/voxel/npc/owl/female/wing_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da50d172a4a9cbb96dbc43d5da0984bcd035351ce32401a13663a98f250c81ab +size 1364 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/head.vox b/assets/voxygen/voxel/npc/owl/male/head.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/head.vox rename to assets/voxygen/voxel/npc/owl/male/head.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox b/assets/voxygen/voxel/npc/owl/male/leg_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox rename to assets/voxygen/voxel/npc/owl/male/leg_l.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox b/assets/voxygen/voxel/npc/owl/male/leg_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox rename to assets/voxygen/voxel/npc/owl/male/leg_r.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/tail.vox b/assets/voxygen/voxel/npc/owl/male/tail.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/tail.vox rename to assets/voxygen/voxel/npc/owl/male/tail.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/torso.vox b/assets/voxygen/voxel/npc/owl/male/torso.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/torso.vox rename to assets/voxygen/voxel/npc/owl/male/torso.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox b/assets/voxygen/voxel/npc/owl/male/wing_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox rename to assets/voxygen/voxel/npc/owl/male/wing_l.vox diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox b/assets/voxygen/voxel/npc/owl/male/wing_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox rename to assets/voxygen/voxel/npc/owl/male/wing_r.vox diff --git a/assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox b/assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox new file mode 100644 index 0000000000..6e9341a990 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe0b0c88fab94154e0652ff9ef40c38aee5d3be680d41d1a3721b407d4ed37d5 +size 2020 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/chest_front.vox b/assets/voxygen/voxel/npc/sunlizard/male/chest_front.vox new file mode 100644 index 0000000000..4f8ed6c34c --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/chest_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef55205dc956dabdfc66740c6c89f9390a8929184e44ba7a7765525663a28692 +size 1784 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/foot_l.vox b/assets/voxygen/voxel/npc/sunlizard/male/foot_l.vox new file mode 100644 index 0000000000..efb407e2a1 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bf1b2877e4325004e570bcfdc5bd6e82a96d38e05b003b7f650726893eb5cdc +size 1276 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/foot_r.vox b/assets/voxygen/voxel/npc/sunlizard/male/foot_r.vox new file mode 100644 index 0000000000..657df4c5ce --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a78b69dfca6492afbd5f30eb408c51567dfb14100b9cb63a9a47bb6717c98f7 +size 1276 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/hand_l.vox b/assets/voxygen/voxel/npc/sunlizard/male/hand_l.vox new file mode 100644 index 0000000000..2a6f892ef5 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a61452aa33dc9e2d7d072b7ca32591b64f0c0984ecedc963794843cf82050a5 +size 1228 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/hand_r.vox b/assets/voxygen/voxel/npc/sunlizard/male/hand_r.vox new file mode 100644 index 0000000000..5b6a22e735 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:574f1d1598b12780a16154d3b12b6b50f056cfbeeb51d4b4bcfe3a02c362f786 +size 1228 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/head.vox b/assets/voxygen/voxel/npc/sunlizard/male/head.vox new file mode 100644 index 0000000000..d47e33d01a --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90545e06e5d28f7edca9fac8b25378ca5628a1b0518510ce870b4695079095dd +size 2764 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/jaw.vox b/assets/voxygen/voxel/npc/sunlizard/male/jaw.vox new file mode 100644 index 0000000000..dd51d3b64c --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60ed220b4cf22cfab7cd3ab9577162a0921c4eac4f08a40d0aa7defd04de3b37 +size 1260 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/leg_l.vox b/assets/voxygen/voxel/npc/sunlizard/male/leg_l.vox new file mode 100644 index 0000000000..d3501ac447 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2c28aaa835fbbc4be60de200693512a6ab858313f2e911118b4605feb615e6a +size 1364 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/leg_r.vox b/assets/voxygen/voxel/npc/sunlizard/male/leg_r.vox new file mode 100644 index 0000000000..1b59ffe4d5 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff4fde9b88060412c5d47b7fcb42480d17e68105c2846571b419566ea789aa9 +size 1364 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/neck.vox b/assets/voxygen/voxel/npc/sunlizard/male/neck.vox new file mode 100644 index 0000000000..a5599ab695 --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc3fd83da4b47520c17f4f5a5a79314e71a8bd20d29f70049609b6aed0e47744 +size 1356 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/tail_back.vox b/assets/voxygen/voxel/npc/sunlizard/male/tail_back.vox new file mode 100644 index 0000000000..bf27de199d --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/tail_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9299380e75a045d15e9c4891544efe55b8b28e8e575a812fe3c42dbbe896c8f +size 1440 diff --git a/assets/voxygen/voxel/npc/sunlizard/male/tail_front.vox b/assets/voxygen/voxel/npc/sunlizard/male/tail_front.vox new file mode 100644 index 0000000000..be8d0ca51e --- /dev/null +++ b/assets/voxygen/voxel/npc/sunlizard/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59ce56366b74ffc521d022fe2ebbb5093eaf7c4dea293702ae92b8a7f9e8773f +size 1416 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index b25366bac1..8ece2226a5 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -624,4 +624,56 @@ central: ("npc.lavadrake.male.tail_front"), ), ), + (Basilisk, Male): ( + upper: ( + offset: (-5.5, 0.0, -11.0), + central: ("npc.basilisk.male.head_upper"), + ), + lower: ( + offset: (-8.5, 0.0, -4.0), + central: ("npc.basilisk.male.head_lower"), + ), + jaw: ( + offset: (-2.5, 0.0, -15.0), + central: ("npc.basilisk.male.jaw"), + ), + chest: ( + offset: (-6.5, -13.0, -12.5), + central: ("npc.basilisk.male.chest"), + ), + tail_rear: ( + offset: (-3.5, -20.0, -4.0), + central: ("npc.basilisk.male.tail_rear"), + ), + tail_front: ( + offset: (-4.5, -24.0, -7.0), + central: ("npc.basilisk.male.tail_front"), + ), + ), + (Basilisk, Female): ( + upper: ( + offset: (-5.5, 0.0, -11.0), + central: ("npc.basilisk.male.head_upper"), + ), + lower: ( + offset: (-8.5, 0.0, -4.0), + central: ("npc.basilisk.male.head_lower"), + ), + jaw: ( + offset: (-2.5, 0.0, -15.0), + central: ("npc.basilisk.male.jaw"), + ), + chest: ( + offset: (-6.5, -13.0, -12.5), + central: ("npc.basilisk.male.chest"), + ), + tail_rear: ( + offset: (-3.5, -20.0, -4.0), + central: ("npc.basilisk.male.tail_rear"), + ), + tail_front: ( + offset: (-4.5, -24.0, -7.0), + central: ("npc.basilisk.male.tail_front"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron index 8201bdb88b..9ee5695317 100644 --- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron @@ -145,37 +145,37 @@ ), (Asp, Male): ( front_left: ( - offset: (-11.0, 0.0, -7.0), + offset: (-17.0, 0.0, -14.0), lateral: ("npc.asp.male.foot_fl"), ), front_right: ( - offset: (0.0, 0.0, -7.0), + offset: (0.0, 0.0, -14.0), lateral: ("npc.asp.male.foot_fr"), ), back_left: ( - offset: (-9.0, 0.0, -7.0), + offset: (-7.5, 0.0, -6.5), lateral: ("npc.asp.male.foot_bl"), ), back_right: ( - offset: (0.0, 0.0, -7.0), + offset: (0.0, 0.0, -6.5), lateral: ("npc.asp.male.foot_br"), ), ), (Asp, Female): ( front_left: ( - offset: (-11.0, 0.0, -7.0), + offset: (-17.0, 0.0, -14.0), lateral: ("npc.asp.male.foot_fl"), ), front_right: ( - offset: (0.0, 0.0, -7.0), + offset: (0.0, 0.0, -14.0), lateral: ("npc.asp.male.foot_fr"), ), back_left: ( - offset: (-9.0, 0.0, -7.0), + offset: (-7.5, 0.0, -6.5), lateral: ("npc.asp.male.foot_bl"), ), back_right: ( - offset: (0.0, 0.0, -7.0), + offset: (0.0, 0.0, -6.5), lateral: ("npc.asp.male.foot_br"), ), ), @@ -431,4 +431,40 @@ lateral: ("npc.lavadrake.male.foot_br"), ), ), + (Basilisk, Male): ( + front_left: ( + offset: (-17.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_fl"), + ), + front_right: ( + offset: (0.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_fr"), + ), + back_left: ( + offset: (-15.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_bl"), + ), + back_right: ( + offset: (0.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_br"), + ), + ), + (Basilisk, Female): ( + front_left: ( + offset: (-17.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_fl"), + ), + front_right: ( + offset: (0.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_fr"), + ), + back_left: ( + offset: (-15.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_bl"), + ), + back_right: ( + offset: (0.0, 0.0, -9.0), + lateral: ("npc.basilisk.male.foot_br"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index d1a30a5791..823d4eee11 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -714,4 +714,32 @@ central: ("npc.hare.female.tail"), ), ), + (Dog, Male):( + head: ( + offset: (-3.5, 0.0, -4.0), + central: ("npc.dog.male.head"), + ), + chest: ( + offset: (-2.5, -5.5, -3.5), + central: ("npc.dog.male.chest"), + ), + tail: ( + offset: (-1.5, -7.0, -1.0), + central: ("npc.dog.male.tail"), + ), + ), + (Dog, Female):( + head: ( + offset: (-3.5, 0.0, -4.0), + central: ("npc.dog.female.head"), + ), + chest: ( + offset: (-2.5, -5.5, -3.5), + central: ("npc.dog.female.chest"), + ), + tail: ( + offset: (-1.5, -7.0, -1.0), + central: ("npc.dog.female.tail"), + ), + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron index 9ba07314aa..f04f164dd4 100644 --- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron @@ -917,4 +917,40 @@ lateral: ("npc.hare.female.foot_br"), ), ), + (Dog, Male): ( + left_front: ( + offset: (-1.0, -1.5, -6.0), + lateral: ("npc.dog.male.foot_fl"), + ), + right_front: ( + offset: (-1.0, -1.5, -6.0), + lateral: ("npc.dog.male.foot_fr"), + ), + left_back: ( + offset: (-1.5, -2.0, -6.0), + lateral: ("npc.dog.male.foot_bl"), + ), + right_back: ( + offset: (-1.5, -2.0, -6.0), + lateral: ("npc.dog.male.foot_br"), + ), + ), + (Dog, Female): ( + left_front: ( + offset: (-1.0, -1.5, -6.0), + lateral: ("npc.dog.female.foot_fl"), + ), + right_front: ( + offset: (-1.0, -1.5, -6.0), + lateral: ("npc.dog.female.foot_fr"), + ), + left_back: ( + offset: (-1.5, -2.0, -6.0), + lateral: ("npc.dog.female.foot_bl"), + ), + right_back: ( + offset: (-1.5, -2.0, -6.0), + lateral: ("npc.dog.female.foot_br"), + ), + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index ec9e6b9c85..39f62e4832 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -299,4 +299,64 @@ central: ("npc.raptor_wood.male.tail_back"), ), ), + (Sunlizard, Male): ( + head: ( + offset: (-12.5, -1.0, -12.5), + central: ("npc.sunlizard.male.head"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.sunlizard.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -2.0), + central: ("npc.sunlizard.male.neck"), + ), + chest_front: ( + offset: (-3.5, -3.0, -3.5), + central: ("npc.sunlizard.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -3.5), + central: ("npc.sunlizard.male.chest_back"), + ), + tail_front: ( + offset: (-1.5, -11.0, -2.5), + central: ("npc.sunlizard.male.tail_front"), + ), + tail_back: ( + offset: (-1.5, -30.0, -2.0), + central: ("npc.sunlizard.male.tail_back"), + ), + ), + (Sunlizard, Female): ( + head: ( + offset: (-12.5, -1.0, -12.5), + central: ("npc.sunlizard.male.head"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.sunlizard.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -2.0), + central: ("npc.sunlizard.male.neck"), + ), + chest_front: ( + offset: (-3.5, -3.0, -3.5), + central: ("npc.sunlizard.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -3.5), + central: ("npc.sunlizard.male.chest_back"), + ), + tail_front: ( + offset: (-1.5, -11.0, -2.5), + central: ("npc.sunlizard.male.tail_front"), + ), + tail_back: ( + offset: (-1.5, -30.0, -2.0), + central: ("npc.sunlizard.male.tail_back"), + ), + ), }) diff --git a/assets/voxygen/voxel/theropod_lateral_manifest.ron b/assets/voxygen/voxel/theropod_lateral_manifest.ron index 3f33e5b0b5..9a0d0a8e26 100644 --- a/assets/voxygen/voxel/theropod_lateral_manifest.ron +++ b/assets/voxygen/voxel/theropod_lateral_manifest.ron @@ -259,4 +259,56 @@ lateral: ("npc.raptor_wood.male.foot_r"), ), ), + (Sunlizard, Male): ( + hand_l: ( + offset: (-4.0, -1.5, -7.0), + lateral: ("npc.sunlizard.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -1.5, -7.0), + lateral: ("npc.sunlizard.male.hand_r"), + ), + leg_l: ( + offset: (-1.5, -2.5, -3.5), + lateral: ("npc.sunlizard.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -2.5, -3.5), + lateral: ("npc.sunlizard.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.0, -9.0), + lateral: ("npc.sunlizard.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.0, -9.0), + lateral: ("npc.sunlizard.male.foot_r"), + ), + ), + (Sunlizard, Female): ( + hand_l: ( + offset: (-4.0, -1.5, -7.0), + lateral: ("npc.sunlizard.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -1.5, -7.0), + lateral: ("npc.sunlizard.male.hand_r"), + ), + leg_l: ( + offset: (-1.5, -2.5, -3.5), + lateral: ("npc.sunlizard.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -2.5, -3.5), + lateral: ("npc.sunlizard.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.0, -9.0), + lateral: ("npc.sunlizard.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.0, -9.0), + lateral: ("npc.sunlizard.male.foot_r"), + ), + ), }) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 977de09376..37efb6f1da 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -257,6 +257,7 @@ impl Body { theropod::Species::Snowraptor => 2.6, theropod::Species::Sandraptor => 2.6, theropod::Species::Woodraptor => 2.6, + theropod::Species::Sunlizard => 2.5, _ => 8.0, }, Body::BirdMedium(body) => match body.species { diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs index ab751e8cf9..737ef7bd62 100644 --- a/common/src/comp/body/biped_large.rs +++ b/common/src/comp/body/biped_large.rs @@ -44,6 +44,7 @@ make_case_elim!( Mightysaurok = 7, Slysaurok = 8, Mindflayer = 9, + Minotaur = 10, } ); @@ -62,6 +63,7 @@ pub struct AllSpecies { pub saurok_mighty: SpeciesMeta, pub saurok_sly: SpeciesMeta, pub mindflayer: SpeciesMeta, + pub minotaur: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -80,11 +82,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Mightysaurok => &self.saurok_mighty, Species::Slysaurok => &self.saurok_sly, Species::Mindflayer => &self.mindflayer, + Species::Minotaur => &self.minotaur, } } } -pub const ALL_SPECIES: [Species; 10] = [ +pub const ALL_SPECIES: [Species; 11] = [ Species::Ogre, Species::Cyclops, Species::Wendigo, @@ -95,6 +98,7 @@ pub const ALL_SPECIES: [Species; 10] = [ Species::Mightysaurok, Species::Slysaurok, Species::Mindflayer, + Species::Minotaur, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/body/biped_small.rs b/common/src/comp/body/biped_small.rs index 7fd14af32d..f52d6d937e 100644 --- a/common/src/comp/body/biped_small.rs +++ b/common/src/comp/body/biped_small.rs @@ -37,6 +37,9 @@ make_case_elim!( Gnome = 0, Sahagin = 1, Adlet = 2, + Gnarling = 3, + Mandragora = 4, + Kappa = 5, } ); @@ -48,6 +51,9 @@ pub struct AllSpecies { pub gnome: SpeciesMeta, pub sahagin: SpeciesMeta, pub adlet: SpeciesMeta, + pub gnarling: SpeciesMeta, + pub mandragora: SpeciesMeta, + pub kappa: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -59,14 +65,20 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Gnome => &self.gnome, Species::Sahagin => &self.sahagin, Species::Adlet => &self.adlet, + Species::Gnarling => &self.gnarling, + Species::Mandragora => &self.mandragora, + Species::Kappa => &self.kappa, } } } -pub const ALL_SPECIES: [Species; 3] = [ +pub const ALL_SPECIES: [Species; 6] = [ Species::Gnome, Species::Sahagin, Species::Adlet, + Species::Gnarling, + Species::Mandragora, + Species::Kappa, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs index 26e7e7fa5c..264e6abf05 100644 --- a/common/src/comp/body/bird_medium.rs +++ b/common/src/comp/body/bird_medium.rs @@ -39,7 +39,7 @@ make_case_elim!( Goose = 2, Peacock = 3, Eagle = 4, - Snowyowl = 5, + Owl = 5, Parrot = 6, Cockatrice = 7, } @@ -55,7 +55,7 @@ pub struct AllSpecies { pub goose: SpeciesMeta, pub peacock: SpeciesMeta, pub eagle: SpeciesMeta, - pub snowyowl: SpeciesMeta, + pub owl: SpeciesMeta, pub parrot: SpeciesMeta, pub cockatrice: SpeciesMeta, } @@ -71,7 +71,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Goose => &self.goose, Species::Peacock => &self.peacock, Species::Eagle => &self.eagle, - Species::Snowyowl => &self.snowyowl, + Species::Owl => &self.owl, Species::Parrot => &self.parrot, Species::Cockatrice => &self.cockatrice, } @@ -84,7 +84,7 @@ pub const ALL_SPECIES: [Species; 8] = [ Species::Goose, Species::Peacock, Species::Eagle, - Species::Snowyowl, + Species::Owl, Species::Parrot, Species::Cockatrice, ]; diff --git a/common/src/comp/body/quadruped_low.rs b/common/src/comp/body/quadruped_low.rs index 0ad0f137b4..1d2d62367a 100644 --- a/common/src/comp/body/quadruped_low.rs +++ b/common/src/comp/body/quadruped_low.rs @@ -46,6 +46,7 @@ make_case_elim!( Sandshark = 9, Hakulaq = 10, Lavadrake = 11, + Basilisk = 12, } ); @@ -66,6 +67,7 @@ pub struct AllSpecies { pub sandshark: SpeciesMeta, pub hakulaq: SpeciesMeta, pub lavadrake: SpeciesMeta, + pub basilisk: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -86,11 +88,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Sandshark => &self.sandshark, Species::Hakulaq => &self.hakulaq, Species::Lavadrake => &self.lavadrake, + Species::Basilisk => &self.basilisk, } } } -pub const ALL_SPECIES: [Species; 12] = [ +pub const ALL_SPECIES: [Species; 13] = [ Species::Crocodile, Species::Alligator, Species::Salamander, @@ -103,6 +106,7 @@ pub const ALL_SPECIES: [Species; 12] = [ Species::Sandshark, Species::Hakulaq, Species::Lavadrake, + Species::Basilisk, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/body/quadruped_small.rs b/common/src/comp/body/quadruped_small.rs index 90505a7d27..12288bd687 100644 --- a/common/src/comp/body/quadruped_small.rs +++ b/common/src/comp/body/quadruped_small.rs @@ -57,6 +57,7 @@ pub enum Species { Porcupine = 22, Beaver = 23, Hare = 24, + Dog = 25, } /// Data representing per-species generic data. @@ -89,6 +90,7 @@ pub struct AllSpecies { pub porcupine: SpeciesMeta, pub beaver: SpeciesMeta, pub hare: SpeciesMeta, + pub dog: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -122,11 +124,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Porcupine => &self.porcupine, Species::Beaver => &self.beaver, Species::Hare => &self.hare, + Species::Dog => &self.dog, } } } -pub const ALL_SPECIES: [Species; 25] = [ +pub const ALL_SPECIES: [Species; 26] = [ Species::Pig, Species::Fox, Species::Sheep, @@ -152,6 +155,7 @@ pub const ALL_SPECIES: [Species; 25] = [ Species::Porcupine, Species::Beaver, Species::Hare, + Species::Dog, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/body/theropod.rs b/common/src/comp/body/theropod.rs index c3d1c63e36..54633ec9df 100644 --- a/common/src/comp/body/theropod.rs +++ b/common/src/comp/body/theropod.rs @@ -33,6 +33,7 @@ pub enum Species { Sandraptor = 2, Snowraptor = 3, Woodraptor = 4, + Sunlizard = 5, } /// Data representing per-species generic data. @@ -43,6 +44,7 @@ pub struct AllSpecies { pub raptor_sand: SpeciesMeta, pub raptor_snow: SpeciesMeta, pub raptor_wood: SpeciesMeta, + pub sunlizard: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -56,16 +58,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Sandraptor => &self.raptor_sand, Species::Snowraptor => &self.raptor_snow, Species::Woodraptor => &self.raptor_wood, + Species::Sunlizard => &self.sunlizard, } } } -pub const ALL_SPECIES: [Species; 5] = [ +pub const ALL_SPECIES: [Species; 6] = [ Species::Archaeos, Species::Odonto, Species::Sandraptor, Species::Snowraptor, Species::Woodraptor, + Species::Sunlizard, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 5f6902da7d..5f1620709c 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -231,6 +231,11 @@ impl LoadoutBuilder { "common.items.npc_weapons.staff.mindflayer_staff", )); }, + (biped_large::Species::Minotaur, _) => { + main_tool = Some(Item::new_from_asset_expect( + "common.items.npc_weapons.sword.saurok_sword", + )); + }, }, Body::Object(object::Body::Crossbow) => { main_tool = Some(Item::new_from_asset_expect( diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 410d0abf44..e127309915 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -90,6 +90,7 @@ impl Body { quadruped_low::Species::Sandshark => 160.0, quadruped_low::Species::Hakulaq => 140.0, quadruped_low::Species::Lavadrake => 100.0, + quadruped_low::Species::Basilisk => 120.0, }, } } diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs index bbe51978f0..eb65fc0d8a 100644 --- a/voxygen/anim/src/biped_large/mod.rs +++ b/voxygen/anim/src/biped_large/mod.rs @@ -194,6 +194,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (6.0, 3.5), (Slysaurok, _) => (6.0, 3.5), (Mindflayer, _) => (5.0, 5.5), + (Minotaur, _) => (6.0, 3.0), }, jaw: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0), @@ -206,9 +207,10 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (1.0, -2.5), (Slysaurok, _) => (1.0, -2.5), (Mindflayer, _) => (0.0, 0.0), + (Minotaur, _) => (2.0, -4.0), }, upper_torso: match (body.species, body.body_type) { - (Ogre, Male) => (0.0, 28.0), + (Ogre, Male) => (0.0, 27.5), (Ogre, Female) => (0.0, 28.0), (Cyclops, _) => (-2.0, 27.0), (Wendigo, _) => (-1.0, 29.0), @@ -219,6 +221,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (3.0, 23.0), (Slysaurok, _) => (3.0, 23.0), (Mindflayer, _) => (0.0, 30.5), + (Minotaur, _) => (-1.0, 27.5), }, lower_torso: match (body.species, body.body_type) { (Ogre, Male) => (1.0, -7.0), @@ -232,12 +235,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (0.0, -6.0), (Slysaurok, _) => (0.0, -6.0), (Mindflayer, _) => (3.5, -19.5), + (Minotaur, _) => (1.5, -8.5), }, tail: match (body.species, body.body_type) { (Werewolf, _) => (-5.5, -2.0), (Occultsaurok, _) => (-4.5, -6.0), (Mightysaurok, _) => (-4.5, -6.0), (Slysaurok, _) => (-4.5, -6.0), + (Minotaur, _) => (-3.0, -6.0), _ => (0.0, 0.0), }, shoulder: match (body.species, body.body_type) { @@ -252,6 +257,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (7.5, 1.0, -1.5), (Slysaurok, _) => (7.5, 1.0, -1.5), (Mindflayer, _) => (8.0, 0.5, -1.0), + (Minotaur, _) => (10.0, 1.0, -4.0), }, hand: match (body.species, body.body_type) { (Ogre, Male) => (14.5, 0.0, -2.0), @@ -265,6 +271,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (8.0, 1.5, -5.5), (Slysaurok, _) => (8.0, 1.5, -5.5), (Mindflayer, _) => (9.0, 0.5, -4.5), + (Minotaur, _) => (12.5, 0.5, -7.0), }, leg: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 0.0, -4.0), @@ -278,9 +285,10 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (3.0, 0.5, -6.0), (Slysaurok, _) => (3.0, 0.5, -6.0), (Mindflayer, _) => (6.0, -2.0, 6.5), + (Minotaur, _) => (5.0, 0.0, -6.0), }, foot: match (body.species, body.body_type) { - (Ogre, Male) => (4.0, 1.0, -13.5), + (Ogre, Male) => (4.0, 1.0, -12.0), (Ogre, Female) => (4.0, 0.5, -13.5), (Cyclops, _) => (4.0, 0.5, -17.0), (Wendigo, _) => (5.0, 2.5, -17.0), @@ -291,6 +299,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Mightysaurok, _) => (3.5, 2.0, -12.0), (Slysaurok, _) => (3.5, 2.0, -12.0), (Mindflayer, _) => (4.5, 1.5, -7.0), + (Minotaur, _) => (6.0, 4.5, -13.5), }, shl: match (body.species, body.body_type) { (Dullahan, _) => (-4.75, -11.0, 8.5, 1.47, -0.2, 0.0), diff --git a/voxygen/anim/src/biped_small/mod.rs b/voxygen/anim/src/biped_small/mod.rs index 2a23083043..f43aafdeca 100644 --- a/voxygen/anim/src/biped_small/mod.rs +++ b/voxygen/anim/src/biped_small/mod.rs @@ -95,31 +95,49 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Gnome, _) => (-1.0, 9.0), (Sahagin, _) => (7.0, -3.5), (Adlet, _) => (0.0, 7.0), + (Gnarling, _) => (0.0, 6.0), + (Mandragora, _) => (-1.0, 9.0), + (Kappa, _) => (8.0, 3.5), }, chest: match (body.species, body.body_type) { (Gnome, _) => (0.0, 9.0), (Sahagin, _) => (0.0, 15.0), (Adlet, _) => (0.0, 11.0), + (Gnarling, _) => (0.0, 7.5), + (Mandragora, _) => (0.0, 8.5), + (Kappa, _) => (0.0, 14.5), }, shorts: match (body.species, body.body_type) { (Gnome, _) => (0.0, -3.0), (Sahagin, _) => (0.5, -7.0), (Adlet, _) => (0.0, -3.0), + (Gnarling, _) => (0.0, -3.0), + (Mandragora, _) => (0.0, -3.0), + (Kappa, _) => (0.0, -3.0), }, tail: match (body.species, body.body_type) { (Gnome, _) => (0.0, 0.0), (Sahagin, _) => (-2.5, -2.0), (Adlet, _) => (-4.5, -2.0), + (Gnarling, _) => (-2.0, 1.5), + (Mandragora, _) => (0.0, 0.0), + (Kappa, _) => (0.0, -3.0), }, hand: match (body.species, body.body_type) { (Gnome, _) => (6.0, 0.5, -1.0), (Sahagin, _) => (9.5, 3.5, -2.0), (Adlet, _) => (6.0, -0.5, 0.0), + (Gnarling, _) => (5.0, 0.0, 1.5), + (Mandragora, _) => (6.0, -0.5, -2.5), + (Kappa, _) => (7.5, 3.5, -2.0), }, foot: match (body.species, body.body_type) { (Gnome, _) => (3.0, 0.0, 4.0), (Sahagin, _) => (3.0, 1.0, 8.0), (Adlet, _) => (3.0, 0.5, 7.0), + (Gnarling, _) => (2.5, 1.0, 5.0), + (Mandragora, _) => (3.0, 0.0, 4.0), + (Kappa, _) => (3.0, 3.0, 9.0), }, } } diff --git a/voxygen/anim/src/bird_medium/mod.rs b/voxygen/anim/src/bird_medium/mod.rs index d4ce88524d..1cc817ea53 100644 --- a/voxygen/anim/src/bird_medium/mod.rs +++ b/voxygen/anim/src/bird_medium/mod.rs @@ -87,7 +87,7 @@ impl Default for SkeletonAttr { impl<'a> From<&'a Body> for SkeletonAttr { fn from(body: &'a Body) -> Self { - use comp::bird_medium::Species::*; + use comp::bird_medium::{BodyType::*, Species::*}; Self { head: match (body.species, body.body_type) { (Duck, _) => (4.0, 3.0), @@ -95,7 +95,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Goose, _) => (5.0, 2.5), (Peacock, _) => (1.0, 1.0), (Eagle, _) => (2.5, 5.0), - (Snowyowl, _) => (2.5, 5.0), + (Owl, Male) => (2.5, 5.0), + (Owl, Female) => (2.5, 7.0), (Parrot, _) => (0.5, 4.5), (Cockatrice, _) => (0.0, 4.0), }, @@ -105,7 +106,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Goose, _) => (0.0, 8.0), (Peacock, _) => (0.0, 10.0), (Eagle, _) => (0.0, 8.0), - (Snowyowl, _) => (0.0, 4.5), + (Owl, Male) => (0.0, 4.5), + (Owl, Female) => (0.0, 4.5), (Parrot, _) => (0.0, 5.0), (Cockatrice, _) => (0.0, 12.5), }, @@ -115,7 +117,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Goose, _) => (-5.0, 3.0), (Peacock, _) => (-5.5, 2.0), (Eagle, _) => (-8.0, -4.0), - (Snowyowl, _) => (-6.0, -2.0), + (Owl, Male) => (-6.0, -2.0), + (Owl, Female) => (-6.0, -2.5), (Parrot, _) => (-8.0, -2.0), (Cockatrice, _) => (-10.0, -2.5), }, @@ -125,7 +128,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Goose, _) => (3.75, -1.0, 2.0), (Peacock, _) => (3.0, 0.0, 1.0), (Eagle, _) => (3.0, -8.0, 4.0), - (Snowyowl, _) => (3.5, -5.5, 4.0), + (Owl, Male) => (3.5, -5.5, 4.0), + (Owl, Female) => (3.5, -6.0, 3.5), (Parrot, _) => (2.0, -4.5, 3.0), (Cockatrice, _) => (4.5, -2.5, 1.5), }, @@ -135,7 +139,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Goose, _) => (2.0, -1.5, 7.0), (Peacock, _) => (2.0, -2.5, 8.0), (Eagle, _) => (2.0, -2.0, 8.0), - (Snowyowl, _) => (1.5, -2.5, 7.0), + (Owl, Male) => (1.5, -2.5, 7.0), + (Owl, Female) => (1.5, -3.0, 6.5), (Parrot, _) => (1.5, -3.0, 3.0), (Cockatrice, _) => (4.0, -3.5, 12.0), }, diff --git a/voxygen/anim/src/quadruped_low/mod.rs b/voxygen/anim/src/quadruped_low/mod.rs index 4f09ceb0d0..11dc5becda 100644 --- a/voxygen/anim/src/quadruped_low/mod.rs +++ b/voxygen/anim/src/quadruped_low/mod.rs @@ -131,6 +131,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (8.5, 0.5), (Hakulaq, _) => (8.0, 10.0), (Lavadrake, _) => (7.0, 8.0), + (Basilisk, _) => (11.0, 13.5), }, head_lower: match (body.species, body.body_type) { (Crocodile, _) => (8.0, 0.0), @@ -146,6 +147,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (13.5, -10.5), (Hakulaq, _) => (10.5, 1.0), (Lavadrake, _) => (11.5, -6.0), + (Basilisk, _) => (8.5, -6.5), }, jaw: match (body.species, body.body_type) { (Crocodile, _) => (2.5, -3.0), @@ -161,6 +163,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-8.0, -5.5), (Hakulaq, _) => (-6.5, -4.0), (Lavadrake, _) => (3.0, -5.0), + (Basilisk, _) => (1.5, 1.0), }, chest: match (body.species, body.body_type) { (Crocodile, _) => (0.0, 5.0), @@ -176,6 +179,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (0.0, 20.0), (Hakulaq, _) => (0.0, 13.5), (Lavadrake, _) => (0.0, 16.5), + (Basilisk, _) => (0.0, 16.5), }, tail_rear: match (body.species, body.body_type) { (Crocodile, _) => (-12.5, -1.0), @@ -191,6 +195,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-10.0, 0.5), (Hakulaq, _) => (-9.0, -2.0), (Lavadrake, _) => (-12.0, -2.0), + (Basilisk, _) => (-10.0, -3.0), }, tail_front: match (body.species, body.body_type) { (Crocodile, _) => (-6.0, 0.0), @@ -206,6 +211,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-13.0, -8.0), (Hakulaq, _) => (-6.0, -5.5), (Lavadrake, _) => (-7.0, -4.5), + (Basilisk, _) => (-2.5, -4.5), }, feet_f: match (body.species, body.body_type) { (Crocodile, _) => (3.5, 6.0, -1.0), @@ -221,6 +227,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (5.5, 2.0, -8.0), (Hakulaq, _) => (4.5, 2.0, -4.5), (Lavadrake, _) => (4.5, 4.0, -6.5), + (Basilisk, _) => (6.5, 4.0, -7.5), }, feet_b: match (body.species, body.body_type) { (Crocodile, _) => (3.5, -6.0, -1.0), @@ -236,6 +243,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (3.5, -15.0, -14.0), (Hakulaq, _) => (3.5, -8.0, -4.5), (Lavadrake, _) => (3.5, -8.0, -6.5), + (Basilisk, _) => (4.5, -13.0, -7.5), }, lean: match (body.species, body.body_type) { (Pangolin, _) => (0.4, 0.0), diff --git a/voxygen/anim/src/quadruped_medium/idle.rs b/voxygen/anim/src/quadruped_medium/idle.rs index 4e2c3b3c20..54cafabc67 100644 --- a/voxygen/anim/src/quadruped_medium/idle.rs +++ b/voxygen/anim/src/quadruped_medium/idle.rs @@ -113,14 +113,12 @@ impl Animation for IdleAnimation { next.foot_fl.position = Vec3::new(-s_a.feet_f.0, s_a.feet_f.1, s_a.feet_f.2 + slower * -0.2); - next.foot_fr.position = - Vec3::new(s_a.feet_f.0, s_a.feet_f.1, s_a.feet_f.2 + slower * -0.2); + next.foot_fr.position = Vec3::new(s_a.feet_f.0, s_a.feet_f.1, s_a.feet_f.2 + slower * -0.2); next.foot_bl.position = Vec3::new(-s_a.feet_b.0, s_a.feet_b.1, s_a.feet_b.2 + slower * -0.2); - next.foot_br.position = - Vec3::new(s_a.feet_b.0, s_a.feet_b.1, s_a.feet_b.2 + slower * -0.2); + next.foot_br.position = Vec3::new(s_a.feet_b.0, s_a.feet_b.1, s_a.feet_b.2 + slower * -0.2); next } diff --git a/voxygen/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs index 64c7ddbf14..eb4bd967dc 100644 --- a/voxygen/anim/src/quadruped_small/mod.rs +++ b/voxygen/anim/src/quadruped_small/mod.rs @@ -129,6 +129,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (5.5, 0.0), (Hare, Male) => (3.0, 2.0), (Hare, Female) => (2.5, 3.0), + (Dog, _) => (3.0, 4.5), }, chest: match (body.species, body.body_type) { (Pig, _) => (0.0, 6.0), @@ -157,6 +158,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (2.0, 6.0), (Hare, Male) => (-2.0, 7.0), (Hare, Female) => (-2.0, 6.0), + (Dog, _) => (-2.0, 9.5), }, feet_f: match (body.species, body.body_type) { (Pig, _) => (4.5, 3.5, -1.0), @@ -185,6 +187,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (4.5, 4.5, -4.0), (Hare, Male) => (3.0, 1.0, -3.0), (Hare, Female) => (3.0, 0.5, -4.0), + (Dog, _) => (3.5, 3.0, -2.5), }, feet_b: match (body.species, body.body_type) { (Pig, _) => (3.5, -2.0, 0.0), @@ -213,6 +216,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (4.0, -2.5, -3.0), (Hare, Male) => (3.5, -1.0, -2.0), (Hare, Female) => (3.5, -3.0, -2.0), + (Dog, _) => (3.0, -3.5, -2.5), }, tail: match (body.species, body.body_type) { (Pig, _) => (-4.5, 2.5), @@ -241,6 +245,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (-6.5, -1.0), (Hare, Male) => (-4.0, -1.0), (Hare, Female) => (-4.0, 2.0), + (Dog, _) => (-5.0, 0.5), }, scaler: match (body.species, body.body_type) { (Pig, _) => (0.9), diff --git a/voxygen/anim/src/theropod/idle.rs b/voxygen/anim/src/theropod/idle.rs index bac0a997d0..bcb1622858 100644 --- a/voxygen/anim/src/theropod/idle.rs +++ b/voxygen/anim/src/theropod/idle.rs @@ -63,7 +63,7 @@ impl Animation for IdleAnimation { next.tail_front.position = Vec3::new(0.0, s_a.tail_front.0, s_a.tail_front.1); next.tail_front.orientation = Quaternion::rotation_x(0.1); - next.tail_back.position = Vec3::new(0.0, s_a.tail_back.0, s_a.tail_back.1 - 0.5); + next.tail_back.position = Vec3::new(0.0, s_a.tail_back.0, s_a.tail_back.1); next.tail_back.orientation = Quaternion::rotation_x(0.1); next.hand_l.position = Vec3::new(-s_a.hand.0, s_a.hand.1, s_a.hand.2); diff --git a/voxygen/anim/src/theropod/mod.rs b/voxygen/anim/src/theropod/mod.rs index 89b131f0f0..3760055e12 100644 --- a/voxygen/anim/src/theropod/mod.rs +++ b/voxygen/anim/src/theropod/mod.rs @@ -127,6 +127,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (8.0, 5.0), (Snowraptor, _) => (8.0, 5.0), (Woodraptor, _) => (8.0, 5.0), + (Sunlizard, _) => (6.5, 3.5), }, jaw: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -7.0), @@ -134,6 +135,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (0.0, -4.0), (Snowraptor, _) => (0.0, -4.0), (Woodraptor, _) => (0.0, -4.0), + (Sunlizard, _) => (2.0, -2.5), }, neck: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -2.0), @@ -141,6 +143,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (4.0, 2.5), (Snowraptor, _) => (4.0, 2.5), (Woodraptor, _) => (4.0, 2.5), + (Sunlizard, _) => (2.5, 1.5), }, chest_front: match (body.species, body.body_type) { (Archaeos, _) => (0.0, 20.0), @@ -148,6 +151,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (0.0, 15.5), (Snowraptor, _) => (0.0, 15.5), (Woodraptor, _) => (0.0, 15.5), + (Sunlizard, _) => (0.0, 14.0), }, chest_back: match (body.species, body.body_type) { (Archaeos, _) => (-5.5, -1.0), @@ -155,6 +159,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (-3.0, 0.5), (Snowraptor, _) => (-3.0, 0.5), (Woodraptor, _) => (-3.0, 0.5), + (Sunlizard, _) => (-2.0, 0.0), }, tail_front: match (body.species, body.body_type) { (Archaeos, _) => (-9.0, -1.5), @@ -162,6 +167,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (-9.5, -1.0), (Snowraptor, _) => (-9.5, -1.0), (Woodraptor, _) => (-9.5, -1.0), + (Sunlizard, _) => (-8.5, -2.0), }, tail_back: match (body.species, body.body_type) { (Archaeos, _) => (-8.0, -0.5), @@ -169,6 +175,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (-10.5, 0.5), (Snowraptor, _) => (-10.5, 1.0), (Woodraptor, _) => (-10.5, 0.5), + (Sunlizard, _) => (-10.0, -0.5), }, hand: match (body.species, body.body_type) { (Archaeos, _) => (3.0, 0.0, -4.0), @@ -176,6 +183,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (2.5, 3.0, 1.0), (Snowraptor, _) => (2.5, 3.0, 1.0), (Woodraptor, _) => (2.5, 3.0, 1.0), + (Sunlizard, _) => (2.5, 1.5, -0.5), }, leg: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -3.0, -4.0), @@ -183,6 +191,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (1.5, -2.5, -3.0), (Snowraptor, _) => (1.5, -2.5, -3.0), (Woodraptor, _) => (1.5, -2.5, -3.0), + (Sunlizard, _) => (2.5, -2.5, -3.0), }, foot: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -0.5, -7.0), @@ -190,6 +199,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (2.0, 0.0, -3.0), (Snowraptor, _) => (2.0, 0.0, -3.0), (Woodraptor, _) => (2.0, 0.0, -3.0), + (Sunlizard, _) => (1.0, -0.5, -2.5), }, scaler: match (body.species, body.body_type) { (Archaeos, _) => (3.0), @@ -197,6 +207,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandraptor, _) => (8.0), (Snowraptor, _) => (8.0), (Woodraptor, _) => (8.0), + (Sunlizard, _) => (8.0), }, } } diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 7e30244c84..9060506c1a 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -2240,7 +2240,7 @@ impl Hud { // Don't put NPC messages in chat box. self.new_messages - .retain(|m| !matches!(m.chat_type, comp::ChatType::Npc(_, _))); + .retain(|m| !matches!(m.chat_type, comp::ChatType::Npc(_, _))); // Chat box match Chat::new( diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs index 1376a23a74..782a068284 100644 --- a/world/src/layer/wildlife.rs +++ b/world/src/layer/wildlife.rs @@ -134,12 +134,16 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( make_entity: |pos, rng| { EntityInfo::at(pos) .with_body(match rng.gen_range(0, 4) { - 0 => { - quadruped_medium::Body::random_with(rng, &quadruped_medium::Species::Mouflon).into() - }, - 1 => { - quadruped_medium::Body::random_with(rng, &quadruped_medium::Species::Yak).into() - }, + 0 => quadruped_medium::Body::random_with( + rng, + &quadruped_medium::Species::Mouflon, + ) + .into(), + 1 => quadruped_medium::Body::random_with( + rng, + &quadruped_medium::Species::Yak, + ) + .into(), _ => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Highland, @@ -160,8 +164,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( 0 => { bird_medium::Body::random_with(rng, &bird_medium::Species::Eagle).into() }, - 1 => bird_medium::Body::random_with(rng, &bird_medium::Species::Snowyowl) - .into(), + 1 => bird_medium::Body::random_with(rng, &bird_medium::Species::Owl).into(), 2 => quadruped_small::Body { species: quadruped_small::Species::Fox, body_type: quadruped_small::BodyType::Female, @@ -278,10 +281,11 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_medium::Species::Horse, ) .into(), - 10 => { - quadruped_medium::Body::random_with(rng, &quadruped_medium::Species::Cattle) - .into() - }, + 10 => quadruped_medium::Body::random_with( + rng, + &quadruped_medium::Species::Cattle, + ) + .into(), _ => bird_medium::Body::random_with(rng, &bird_medium::Species::Chicken) .into(), }) @@ -668,7 +672,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( ) .into(), 1 => quadruped_low::Body::random_with(rng, &quadruped_low::Species::Asp) - .into(), + .into(), 2 => { theropod::Body::random_with(rng, &theropod::Species::Sandraptor).into() },