From 6f18d16aa25d2a83649b25da37fa3172bb96cae2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Jan 2021 23:35:59 +0100 Subject: [PATCH] Add new quadmeds npcs with rough offsets --- assets/common/npc_names.ron | 28 ++ .../voxel/npc/barghest/male/foot_bl.vox | 3 + .../voxel/npc/barghest/male/foot_br.vox | 3 + .../voxel/npc/barghest/male/foot_fl.vox | 3 + .../voxel/npc/barghest/male/foot_fr.vox | 3 + .../voxygen/voxel/npc/barghest/male/head.vox | 3 + .../voxygen/voxel/npc/barghest/male/jaw.vox | 3 + .../voxel/npc/barghest/male/leg_bl.vox | 3 + .../voxel/npc/barghest/male/leg_br.vox | 3 + .../voxel/npc/barghest/male/leg_fl.vox | 3 + .../voxel/npc/barghest/male/leg_fr.vox | 3 + .../voxygen/voxel/npc/barghest/male/neck.vox | 3 + .../voxygen/voxel/npc/barghest/male/tail.vox | 3 + .../voxel/npc/barghest/male/torso_back.vox | 3 + .../voxel/npc/barghest/male/torso_front.vox | 3 + assets/voxygen/voxel/npc/bear/male/ears.vox | 3 + .../voxygen/voxel/npc/bear/male/foot_bl.vox | 3 + .../voxygen/voxel/npc/bear/male/foot_br.vox | 3 + .../voxygen/voxel/npc/bear/male/foot_fl.vox | 3 + .../voxygen/voxel/npc/bear/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/bear/male/head.vox | 3 + assets/voxygen/voxel/npc/bear/male/jaw.vox | 3 + assets/voxygen/voxel/npc/bear/male/leg_bl.vox | 3 + assets/voxygen/voxel/npc/bear/male/leg_br.vox | 3 + assets/voxygen/voxel/npc/bear/male/leg_fl.vox | 3 + assets/voxygen/voxel/npc/bear/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/bear/male/neck.vox | 3 + assets/voxygen/voxel/npc/bear/male/tail.vox | 3 + .../voxel/npc/bear/male/torso_back.vox | 3 + .../voxel/npc/bear/male/torso_front.vox | 3 + .../voxygen/voxel/npc/cattle/female/ears.vox | 3 + .../voxel/npc/cattle/female/foot_bl.vox | 3 + .../voxel/npc/cattle/female/foot_br.vox | 3 + .../voxel/npc/cattle/female/foot_fl.vox | 3 + .../voxel/npc/cattle/female/foot_fr.vox | 3 + .../voxygen/voxel/npc/cattle/female/head.vox | 3 + .../voxygen/voxel/npc/cattle/female/jaw.vox | 3 + .../voxel/npc/cattle/female/leg_bl.vox | 3 + .../voxel/npc/cattle/female/leg_br.vox | 3 + .../voxel/npc/cattle/female/leg_fl.vox | 3 + .../voxel/npc/cattle/female/leg_fr.vox | 3 + .../voxygen/voxel/npc/cattle/female/neck.vox | 3 + .../voxygen/voxel/npc/cattle/female/tail.vox | 3 + .../voxel/npc/cattle/female/torso_back.vox | 3 + .../voxel/npc/cattle/female/torso_front.vox | 3 + assets/voxygen/voxel/npc/cattle/male/ears.vox | 3 + .../voxygen/voxel/npc/cattle/male/foot_bl.vox | 3 + .../voxygen/voxel/npc/cattle/male/foot_br.vox | 3 + .../voxygen/voxel/npc/cattle/male/foot_fl.vox | 3 + .../voxygen/voxel/npc/cattle/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/cattle/male/head.vox | 3 + assets/voxygen/voxel/npc/cattle/male/jaw.vox | 3 + .../voxygen/voxel/npc/cattle/male/leg_bl.vox | 3 + .../voxygen/voxel/npc/cattle/male/leg_br.vox | 3 + .../voxygen/voxel/npc/cattle/male/leg_fl.vox | 3 + .../voxygen/voxel/npc/cattle/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/cattle/male/neck.vox | 3 + assets/voxygen/voxel/npc/cattle/male/tail.vox | 3 + .../voxel/npc/cattle/male/torso_back.vox | 3 + .../voxel/npc/cattle/male/torso_front.vox | 3 + .../voxygen/voxel/npc/darkhound/male/ears.vox | 3 + .../voxel/npc/darkhound/male/foot_bl.vox | 3 + .../voxel/npc/darkhound/male/foot_br.vox | 3 + .../voxel/npc/darkhound/male/foot_fl.vox | 3 + .../voxel/npc/darkhound/male/foot_fr.vox | 3 + .../voxygen/voxel/npc/darkhound/male/head.vox | 3 + .../voxygen/voxel/npc/darkhound/male/jaw.vox | 3 + .../voxel/npc/darkhound/male/leg_bl.vox | 3 + .../voxel/npc/darkhound/male/leg_br.vox | 3 + .../voxel/npc/darkhound/male/leg_fl.vox | 3 + .../voxel/npc/darkhound/male/leg_fr.vox | 3 + .../voxygen/voxel/npc/darkhound/male/neck.vox | 3 + .../voxygen/voxel/npc/darkhound/male/tail.vox | 3 + .../voxel/npc/darkhound/male/torso_back.vox | 3 + .../voxel/npc/darkhound/male/torso_front.vox | 3 + assets/voxygen/voxel/npc/dog/female/chest.vox | 3 + .../voxygen/voxel/npc/dog/female/foot_bl.vox | 3 + .../voxygen/voxel/npc/dog/female/foot_br.vox | 3 + .../voxygen/voxel/npc/dog/female/foot_fl.vox | 3 + .../voxygen/voxel/npc/dog/female/foot_fr.vox | 3 + assets/voxygen/voxel/npc/dog/female/head.vox | 3 + assets/voxygen/voxel/npc/dog/female/tail.vox | 3 + assets/voxygen/voxel/npc/dog/male/chest.vox | 3 + assets/voxygen/voxel/npc/dog/male/foot_bl.vox | 3 + assets/voxygen/voxel/npc/dog/male/foot_br.vox | 3 + assets/voxygen/voxel/npc/dog/male/foot_fl.vox | 3 + assets/voxygen/voxel/npc/dog/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/dog/male/head.vox | 3 + assets/voxygen/voxel/npc/dog/male/tail.vox | 3 + .../voxygen/voxel/npc/highland/male/ears.vox | 3 + .../voxel/npc/highland/male/foot_bl.vox | 3 + .../voxel/npc/highland/male/foot_br.vox | 3 + .../voxel/npc/highland/male/foot_fl.vox | 3 + .../voxel/npc/highland/male/foot_fr.vox | 3 + .../voxygen/voxel/npc/highland/male/head.vox | 3 + .../voxygen/voxel/npc/highland/male/jaw.vox | 3 + .../voxel/npc/highland/male/leg_bl.vox | 3 + .../voxel/npc/highland/male/leg_br.vox | 3 + .../voxel/npc/highland/male/leg_fl.vox | 3 + .../voxel/npc/highland/male/leg_fr.vox | 3 + .../voxygen/voxel/npc/highland/male/neck.vox | 3 + .../voxygen/voxel/npc/highland/male/tail.vox | 3 + .../voxel/npc/highland/male/torso_back.vox | 3 + .../voxel/npc/highland/male/torso_front.vox | 3 + assets/voxygen/voxel/npc/panda/male/ears.vox | 3 + .../voxygen/voxel/npc/panda/male/foot_bl.vox | 3 + .../voxygen/voxel/npc/panda/male/foot_br.vox | 3 + .../voxygen/voxel/npc/panda/male/foot_fl.vox | 3 + .../voxygen/voxel/npc/panda/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/panda/male/head.vox | 3 + assets/voxygen/voxel/npc/panda/male/jaw.vox | 3 + .../voxygen/voxel/npc/panda/male/leg_bl.vox | 3 + .../voxygen/voxel/npc/panda/male/leg_br.vox | 3 + .../voxygen/voxel/npc/panda/male/leg_fl.vox | 3 + .../voxygen/voxel/npc/panda/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/panda/male/neck.vox | 3 + assets/voxygen/voxel/npc/panda/male/tail.vox | 3 + .../voxel/npc/panda/male/torso_back.vox | 3 + .../voxel/npc/panda/male/torso_front.vox | 3 + assets/voxygen/voxel/npc/yak/male/ears.vox | 3 + assets/voxygen/voxel/npc/yak/male/foot_bl.vox | 3 + assets/voxygen/voxel/npc/yak/male/foot_br.vox | 3 + assets/voxygen/voxel/npc/yak/male/foot_fl.vox | 3 + assets/voxygen/voxel/npc/yak/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/yak/male/head.vox | 3 + assets/voxygen/voxel/npc/yak/male/jaw.vox | 3 + assets/voxygen/voxel/npc/yak/male/leg_bl.vox | 3 + assets/voxygen/voxel/npc/yak/male/leg_br.vox | 3 + assets/voxygen/voxel/npc/yak/male/leg_fl.vox | 3 + assets/voxygen/voxel/npc/yak/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/yak/male/neck.vox | 3 + assets/voxygen/voxel/npc/yak/male/tail.vox | 3 + .../voxygen/voxel/npc/yak/male/torso_back.vox | 3 + .../voxel/npc/yak/male/torso_front.vox | 3 + .../quadruped_medium_central_manifest.ron | 420 ++++++++++++++++ .../quadruped_medium_lateral_manifest.ron | 476 ++++++++++++++++++ common/src/comp/agent.rs | 2 + common/src/comp/body.rs | 19 + common/src/comp/body/quadruped_medium.rs | 30 +- common/src/comp/inventory/loadout_builder.rs | 9 +- common/src/states/utils.rs | 7 + voxygen/anim/src/quadruped_medium/idle.rs | 7 +- voxygen/anim/src/quadruped_medium/mod.rs | 93 ++++ world/src/layer/wildlife.rs | 37 +- world/src/site/dungeon/mod.rs | 8 +- 145 files changed, 1514 insertions(+), 21 deletions(-) create mode 100644 assets/voxygen/voxel/npc/barghest/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/head.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/barghest/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/head.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/bear/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/ears.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/head.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/jaw.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/neck.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/cattle/female/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/head.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/cattle/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/head.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/darkhound/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/chest.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/head.vox create mode 100644 assets/voxygen/voxel/npc/dog/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/head.vox create mode 100644 assets/voxygen/voxel/npc/dog/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/head.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/highland/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/head.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/panda/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/head.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/yak/male/torso_front.vox diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index e08840b6d4..6786fc1517 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -506,6 +506,34 @@ horse: ( keyword: "horse", generic: "Horse" + ), + barghest: ( + keyword: "barghest", + generic: "Barghest" + ), + cattle: ( + keyword: "cattle", + generic: "Cattle" + ), + darkhound: ( + keyword: "darkhound", + generic: "Darkhound" + ), + highland: ( + keyword: "highland", + generic: "Highland" + ), + yak: ( + keyword: "yak", + generic: "Yak" + ), + panda: ( + keyword: "panda", + generic: "Panda" + ), + bear: ( + keyword: "bear", + generic: "Bear" ) ) ), diff --git a/assets/voxygen/voxel/npc/barghest/male/foot_bl.vox b/assets/voxygen/voxel/npc/barghest/male/foot_bl.vox new file mode 100644 index 0000000000..c1b8628d8c --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:330158ac59154e8cdd07ba60ee1b9981c40cf1f2db333eadbf4ce71bb850600f +size 1352 diff --git a/assets/voxygen/voxel/npc/barghest/male/foot_br.vox b/assets/voxygen/voxel/npc/barghest/male/foot_br.vox new file mode 100644 index 0000000000..cade4195bf --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:881c420266fb65b2a6d503ff98bb19c32767ed554c4ba695bae80b32253204ea +size 1352 diff --git a/assets/voxygen/voxel/npc/barghest/male/foot_fl.vox b/assets/voxygen/voxel/npc/barghest/male/foot_fl.vox new file mode 100644 index 0000000000..7a2afb273c --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0818eb5708de531bb6a643e286c5dcbd558601a4290df7bdce07ab253a2b62d4 +size 2040 diff --git a/assets/voxygen/voxel/npc/barghest/male/foot_fr.vox b/assets/voxygen/voxel/npc/barghest/male/foot_fr.vox new file mode 100644 index 0000000000..7a2afb273c --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0818eb5708de531bb6a643e286c5dcbd558601a4290df7bdce07ab253a2b62d4 +size 2040 diff --git a/assets/voxygen/voxel/npc/barghest/male/head.vox b/assets/voxygen/voxel/npc/barghest/male/head.vox new file mode 100644 index 0000000000..85a2f722be --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7536a4efd64ff53033e8004a1cd6cf32d9c682e2adf3f1d2658b74afd911e1 +size 5584 diff --git a/assets/voxygen/voxel/npc/barghest/male/jaw.vox b/assets/voxygen/voxel/npc/barghest/male/jaw.vox new file mode 100644 index 0000000000..65f6a1843a --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dfa1c50964bc2dc770324466b0263f5d693d52882109681027ee54f1afd78b8 +size 3044 diff --git a/assets/voxygen/voxel/npc/barghest/male/leg_bl.vox b/assets/voxygen/voxel/npc/barghest/male/leg_bl.vox new file mode 100644 index 0000000000..8690264067 --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:408481796f6185af03aa173530a535ee049428914fa9fa5e4ed520da1d85b472 +size 1636 diff --git a/assets/voxygen/voxel/npc/barghest/male/leg_br.vox b/assets/voxygen/voxel/npc/barghest/male/leg_br.vox new file mode 100644 index 0000000000..29f7503963 --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d86c491f0edbe494f5c58157896bff8025f5ee541c383bd3cd716ba847d5d204 +size 1636 diff --git a/assets/voxygen/voxel/npc/barghest/male/leg_fl.vox b/assets/voxygen/voxel/npc/barghest/male/leg_fl.vox new file mode 100644 index 0000000000..affc602c3d --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:560f3c9beac1c9687c59a2fb1d8a086c2c82506ebdc3c000f6021d07bf828b3d +size 2592 diff --git a/assets/voxygen/voxel/npc/barghest/male/leg_fr.vox b/assets/voxygen/voxel/npc/barghest/male/leg_fr.vox new file mode 100644 index 0000000000..97cb9c89dd --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf40e6b61cab5a8700f594e89f7ab031b3a758e1719deb1043ec1c01cfe845ce +size 2592 diff --git a/assets/voxygen/voxel/npc/barghest/male/neck.vox b/assets/voxygen/voxel/npc/barghest/male/neck.vox new file mode 100644 index 0000000000..c962eeee5d --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01845388ca6e6a0d9669c20fb68e070ff7f03761398404794f175b22117075d5 +size 4548 diff --git a/assets/voxygen/voxel/npc/barghest/male/tail.vox b/assets/voxygen/voxel/npc/barghest/male/tail.vox new file mode 100644 index 0000000000..22951052f3 --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d9f8bc149bcbcf6eaeb8aee62c9647b5756d20d7e91d033091c9eb43fe972cb +size 2364 diff --git a/assets/voxygen/voxel/npc/barghest/male/torso_back.vox b/assets/voxygen/voxel/npc/barghest/male/torso_back.vox new file mode 100644 index 0000000000..e2bf0fede5 --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50ad89d085dc0a8cb3ca5a3394355a37baa5e136883dc69e32034564692550b0 +size 4904 diff --git a/assets/voxygen/voxel/npc/barghest/male/torso_front.vox b/assets/voxygen/voxel/npc/barghest/male/torso_front.vox new file mode 100644 index 0000000000..c259d2c761 --- /dev/null +++ b/assets/voxygen/voxel/npc/barghest/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe9a71f158f2b208349282cb4e66d98e0f6ddd7bf727aa7c3e9b936599a0017b +size 9468 diff --git a/assets/voxygen/voxel/npc/bear/male/ears.vox b/assets/voxygen/voxel/npc/bear/male/ears.vox new file mode 100644 index 0000000000..1d11ca5f90 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4d593059c60e84c26ae502174a4d13485051f71c79f876925ae5c35c9c1fe13 +size 1152 diff --git a/assets/voxygen/voxel/npc/bear/male/foot_bl.vox b/assets/voxygen/voxel/npc/bear/male/foot_bl.vox new file mode 100644 index 0000000000..6aee207029 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bf323ff6820ca512e7f30aac0c6a3c10684e13dfbacb204802bf5372087b7fa +size 1644 diff --git a/assets/voxygen/voxel/npc/bear/male/foot_br.vox b/assets/voxygen/voxel/npc/bear/male/foot_br.vox new file mode 100644 index 0000000000..974c725244 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a171067f6acd7100b55e7f5a8594fb7ae0d2e9f830e44ced0eccdb388645d8b2 +size 1644 diff --git a/assets/voxygen/voxel/npc/bear/male/foot_fl.vox b/assets/voxygen/voxel/npc/bear/male/foot_fl.vox new file mode 100644 index 0000000000..ed05709a46 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:815d0c01fd543070bb592224ad7304c6c8ec6f5006684127de9bcf530f77fe0d +size 1792 diff --git a/assets/voxygen/voxel/npc/bear/male/foot_fr.vox b/assets/voxygen/voxel/npc/bear/male/foot_fr.vox new file mode 100644 index 0000000000..bb2793afa1 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a75db338cf2b56647af0a5b261d6ac9a988527b1e844b7b293cc1cfb790a634 +size 1792 diff --git a/assets/voxygen/voxel/npc/bear/male/head.vox b/assets/voxygen/voxel/npc/bear/male/head.vox new file mode 100644 index 0000000000..054f38161a --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:511c310e2efccda253372ade99f0e42ba71acc59b02cfadc41064973a6e48b4b +size 3128 diff --git a/assets/voxygen/voxel/npc/bear/male/jaw.vox b/assets/voxygen/voxel/npc/bear/male/jaw.vox new file mode 100644 index 0000000000..3a4b561060 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96f8bb45455098ee8b450ad61494149c6f14a31f13ae849caf67a0b2898131d0 +size 1244 diff --git a/assets/voxygen/voxel/npc/bear/male/leg_bl.vox b/assets/voxygen/voxel/npc/bear/male/leg_bl.vox new file mode 100644 index 0000000000..dff638b54e --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec01423928a2fb630ce718f28ace9a3da4b686ac292ad20a46b0a9fbefc3a5d9 +size 1852 diff --git a/assets/voxygen/voxel/npc/bear/male/leg_br.vox b/assets/voxygen/voxel/npc/bear/male/leg_br.vox new file mode 100644 index 0000000000..e57e0b6ac9 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0158e291e218e741816c02a2315b3d6cbcdb9bcb022ea03637f2d1339f98b9d +size 1852 diff --git a/assets/voxygen/voxel/npc/bear/male/leg_fl.vox b/assets/voxygen/voxel/npc/bear/male/leg_fl.vox new file mode 100644 index 0000000000..24c561ea4f --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d009912a423e387437d686e736e199e7c58819439c5aa9c2e3ddf80f281f43e3 +size 1792 diff --git a/assets/voxygen/voxel/npc/bear/male/leg_fr.vox b/assets/voxygen/voxel/npc/bear/male/leg_fr.vox new file mode 100644 index 0000000000..ad10a9af22 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf78f473efa727d39ce74a73a43de7a67da08d3f3d51ad865bea258fd8037daa +size 1792 diff --git a/assets/voxygen/voxel/npc/bear/male/neck.vox b/assets/voxygen/voxel/npc/bear/male/neck.vox new file mode 100644 index 0000000000..9c507cffcd --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dab0f135b4e3bd5cfdac109ae9c9af2712ef2595ef5741da17b2601894a6ddfc +size 2120 diff --git a/assets/voxygen/voxel/npc/bear/male/tail.vox b/assets/voxygen/voxel/npc/bear/male/tail.vox new file mode 100644 index 0000000000..9d52d99d05 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a5491f90b3fe94c69d4c09914a5cb265b5f97e998826e9616858101796aaaf +size 1336 diff --git a/assets/voxygen/voxel/npc/bear/male/torso_back.vox b/assets/voxygen/voxel/npc/bear/male/torso_back.vox new file mode 100644 index 0000000000..b8dbf4c16b --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bd1c2965441a352756c11d8245d698343f02ebf1dfac5b47bd14ba82394160f +size 6812 diff --git a/assets/voxygen/voxel/npc/bear/male/torso_front.vox b/assets/voxygen/voxel/npc/bear/male/torso_front.vox new file mode 100644 index 0000000000..748025a4e0 --- /dev/null +++ b/assets/voxygen/voxel/npc/bear/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12be3dbe23d2a418dfede1c6c4a482aa93eebb1fa50334aa7790d1a2dc325aeb +size 7512 diff --git a/assets/voxygen/voxel/npc/cattle/female/ears.vox b/assets/voxygen/voxel/npc/cattle/female/ears.vox new file mode 100644 index 0000000000..808df1f55d --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef16716a3c34c5a937c61e462a3ceddc6850dce6b46640a0675005b6fe8b9e3b +size 1168 diff --git a/assets/voxygen/voxel/npc/cattle/female/foot_bl.vox b/assets/voxygen/voxel/npc/cattle/female/foot_bl.vox new file mode 100644 index 0000000000..0e68e83277 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a83019f09ec8b365d240b8958910fb03d588d46b3769c01f804a48815e01d9c9 +size 1356 diff --git a/assets/voxygen/voxel/npc/cattle/female/foot_br.vox b/assets/voxygen/voxel/npc/cattle/female/foot_br.vox new file mode 100644 index 0000000000..7687247d37 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0162cc53cfbda10605b84f776f5a206204c46cc6fc0b3074cea1042d4205bd89 +size 1356 diff --git a/assets/voxygen/voxel/npc/cattle/female/foot_fl.vox b/assets/voxygen/voxel/npc/cattle/female/foot_fl.vox new file mode 100644 index 0000000000..b8ff8df974 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37b3eb7438b03dd38a5894315aee3141d2b3a1af01e5033e54b4c95b9ffbbfce +size 1384 diff --git a/assets/voxygen/voxel/npc/cattle/female/foot_fr.vox b/assets/voxygen/voxel/npc/cattle/female/foot_fr.vox new file mode 100644 index 0000000000..18ad78a760 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e3873227506a00579a7a967ea0e45b30229a471d99cee0359fe5a0c7570dcbc +size 1384 diff --git a/assets/voxygen/voxel/npc/cattle/female/head.vox b/assets/voxygen/voxel/npc/cattle/female/head.vox new file mode 100644 index 0000000000..a6bc43361f --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee7f58ac229888c4b0039b1ff4c566e7d15d91d54bfed6811232d95f704b5359 +size 2296 diff --git a/assets/voxygen/voxel/npc/cattle/female/jaw.vox b/assets/voxygen/voxel/npc/cattle/female/jaw.vox new file mode 100644 index 0000000000..ea5c639414 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b004375e895dc27b00ccda21c17aa7b4febf8b283bd0e7b03e4cb8cb5d0d416f +size 1184 diff --git a/assets/voxygen/voxel/npc/cattle/female/leg_bl.vox b/assets/voxygen/voxel/npc/cattle/female/leg_bl.vox new file mode 100644 index 0000000000..69e43996ce --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a1227487605288610f234b24e9750c0f2aef12a2854b7b66e1a9342f13c0262 +size 1680 diff --git a/assets/voxygen/voxel/npc/cattle/female/leg_br.vox b/assets/voxygen/voxel/npc/cattle/female/leg_br.vox new file mode 100644 index 0000000000..f0f3cb3abd --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a7817a84243a30d3498a8b3aacd8ec2a56a047a92e3a1507a0ae94c0c5fdfaa +size 1680 diff --git a/assets/voxygen/voxel/npc/cattle/female/leg_fl.vox b/assets/voxygen/voxel/npc/cattle/female/leg_fl.vox new file mode 100644 index 0000000000..86bb23ec71 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7062a0a3697243800e75177c669bf9f96bca8b95331887f5e952ed6f6b32d1ae +size 1584 diff --git a/assets/voxygen/voxel/npc/cattle/female/leg_fr.vox b/assets/voxygen/voxel/npc/cattle/female/leg_fr.vox new file mode 100644 index 0000000000..b91091286d --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b027dca88db4cec8273d878dac69e800fc4ee3afa18bdfa9b8a38ada60b851f +size 1584 diff --git a/assets/voxygen/voxel/npc/cattle/female/neck.vox b/assets/voxygen/voxel/npc/cattle/female/neck.vox new file mode 100644 index 0000000000..b419939db5 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e70c01ae08121b8188e1c2f12019e89b5de7d23da0b2d908e4c0a63ef1cff7c +size 2552 diff --git a/assets/voxygen/voxel/npc/cattle/female/tail.vox b/assets/voxygen/voxel/npc/cattle/female/tail.vox new file mode 100644 index 0000000000..5535ec743f --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aef0a909b120b053b57e563f249db4ccc8813ffc00dbc580e577fa87b9395360 +size 1352 diff --git a/assets/voxygen/voxel/npc/cattle/female/torso_back.vox b/assets/voxygen/voxel/npc/cattle/female/torso_back.vox new file mode 100644 index 0000000000..de7163e908 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52c5c314242a5f763e817beac6128655143188f2a4663a3ec580d364f70f66cb +size 5236 diff --git a/assets/voxygen/voxel/npc/cattle/female/torso_front.vox b/assets/voxygen/voxel/npc/cattle/female/torso_front.vox new file mode 100644 index 0000000000..2879bc2932 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/female/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fefec0b64537efcc3c4ec39ea37feec7dd808c383e1ef2b53d3575dd9e97c834 +size 5224 diff --git a/assets/voxygen/voxel/npc/cattle/male/ears.vox b/assets/voxygen/voxel/npc/cattle/male/ears.vox new file mode 100644 index 0000000000..8ed7ffe298 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11c52d0746adfe98dab62397d05eaab4d08a654170c5352ec3afee8343dcedde +size 1168 diff --git a/assets/voxygen/voxel/npc/cattle/male/foot_bl.vox b/assets/voxygen/voxel/npc/cattle/male/foot_bl.vox new file mode 100644 index 0000000000..11f4d4588f --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5b93c6673ecf6f3b7106bc206b019074939493e569ed9454e45dfc100d11ad8 +size 1356 diff --git a/assets/voxygen/voxel/npc/cattle/male/foot_br.vox b/assets/voxygen/voxel/npc/cattle/male/foot_br.vox new file mode 100644 index 0000000000..7c8b112ef6 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe5a0e9b3575369741365ce71ee87187e69a107154cff3b519eb7626fea00b69 +size 1356 diff --git a/assets/voxygen/voxel/npc/cattle/male/foot_fl.vox b/assets/voxygen/voxel/npc/cattle/male/foot_fl.vox new file mode 100644 index 0000000000..8a513b5e74 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4af263bc9b225d9f78cfaf50c8ac55cf021dfc24dd537a9c3f3ad233b9916c0d +size 1384 diff --git a/assets/voxygen/voxel/npc/cattle/male/foot_fr.vox b/assets/voxygen/voxel/npc/cattle/male/foot_fr.vox new file mode 100644 index 0000000000..33bedbb6cb --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e5e04d3a841450fb906ee89b7384770ab1a90eee74c82ab1b1926a6587e6054 +size 1384 diff --git a/assets/voxygen/voxel/npc/cattle/male/head.vox b/assets/voxygen/voxel/npc/cattle/male/head.vox new file mode 100644 index 0000000000..3539e3e206 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7420c86b8d904789e923144d1c5fbad2427ebe21a316f24698982a4642b697e +size 2640 diff --git a/assets/voxygen/voxel/npc/cattle/male/jaw.vox b/assets/voxygen/voxel/npc/cattle/male/jaw.vox new file mode 100644 index 0000000000..0cff761c61 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:894bac4b2b15c7b1126ddd39be75db3c296ae0a590626cbcd025ffba77d41e91 +size 1184 diff --git a/assets/voxygen/voxel/npc/cattle/male/leg_bl.vox b/assets/voxygen/voxel/npc/cattle/male/leg_bl.vox new file mode 100644 index 0000000000..0a885bc090 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94faba53344cdec7fd8a672278c3bd2cb0a28bb340981c87d6b0df210879d80a +size 1680 diff --git a/assets/voxygen/voxel/npc/cattle/male/leg_br.vox b/assets/voxygen/voxel/npc/cattle/male/leg_br.vox new file mode 100644 index 0000000000..936a2091cd --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dac98754c6aea5e963d276ad2914e5d484d9c7a2c84ee9027b290f03e71566df +size 1680 diff --git a/assets/voxygen/voxel/npc/cattle/male/leg_fl.vox b/assets/voxygen/voxel/npc/cattle/male/leg_fl.vox new file mode 100644 index 0000000000..ccd8b92ffa --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d6be622d45ad945948713a1ae4fc84adfb248a39515036e3c8f6fe31410f40a +size 1952 diff --git a/assets/voxygen/voxel/npc/cattle/male/leg_fr.vox b/assets/voxygen/voxel/npc/cattle/male/leg_fr.vox new file mode 100644 index 0000000000..203c5a12dc --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:693553ea5e974aa23808b0a742685f647912915de10febd643c187d67366339c +size 1952 diff --git a/assets/voxygen/voxel/npc/cattle/male/neck.vox b/assets/voxygen/voxel/npc/cattle/male/neck.vox new file mode 100644 index 0000000000..ebe7b47510 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04f379a7283d0f9d3b6bc4ec90979f33d98ecc7068ba567f6ff31d18315a41ff +size 2872 diff --git a/assets/voxygen/voxel/npc/cattle/male/tail.vox b/assets/voxygen/voxel/npc/cattle/male/tail.vox new file mode 100644 index 0000000000..5625f718cf --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b397d4e3cb930b0d50f88eb256fb81599d730c8ae53c6dba54ad6589e5c08af +size 1352 diff --git a/assets/voxygen/voxel/npc/cattle/male/torso_back.vox b/assets/voxygen/voxel/npc/cattle/male/torso_back.vox new file mode 100644 index 0000000000..da1778120c --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aafd5e1bf6bae8d146be5a492addabcc833c626437e99d0874669eadef55e7e +size 5380 diff --git a/assets/voxygen/voxel/npc/cattle/male/torso_front.vox b/assets/voxygen/voxel/npc/cattle/male/torso_front.vox new file mode 100644 index 0000000000..73ad117603 --- /dev/null +++ b/assets/voxygen/voxel/npc/cattle/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3bb46cc151462aba7a07d687308ced9b6da667207bc8e56aa6ca9a782ad26b2 +size 6416 diff --git a/assets/voxygen/voxel/npc/darkhound/male/ears.vox b/assets/voxygen/voxel/npc/darkhound/male/ears.vox new file mode 100644 index 0000000000..be63d667e5 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d80826947324e175f23127e368ed0e04bed2e02069f114397103782bf19afd76 +size 1216 diff --git a/assets/voxygen/voxel/npc/darkhound/male/foot_bl.vox b/assets/voxygen/voxel/npc/darkhound/male/foot_bl.vox new file mode 100644 index 0000000000..72a861d55a --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd383a80ad883ba3ecb8a7352b786beb0590b03d84368391c18ea554694fb599 +size 1396 diff --git a/assets/voxygen/voxel/npc/darkhound/male/foot_br.vox b/assets/voxygen/voxel/npc/darkhound/male/foot_br.vox new file mode 100644 index 0000000000..db36974f95 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3808693bbdb7857cc14177b5d9c2bdae504c4472c5b9b131c3e6c887e7e9283d +size 1396 diff --git a/assets/voxygen/voxel/npc/darkhound/male/foot_fl.vox b/assets/voxygen/voxel/npc/darkhound/male/foot_fl.vox new file mode 100644 index 0000000000..e8d95c34bb --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f49cd636fab9a09dc4c98832c12be5dd720d6f1f87771396ac309a1a39b5365 +size 1336 diff --git a/assets/voxygen/voxel/npc/darkhound/male/foot_fr.vox b/assets/voxygen/voxel/npc/darkhound/male/foot_fr.vox new file mode 100644 index 0000000000..3cb8a20d56 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b14d7638a2bd5b12431525b156b4d6b67cd82d08b6c679076565c740449f1ef +size 1336 diff --git a/assets/voxygen/voxel/npc/darkhound/male/head.vox b/assets/voxygen/voxel/npc/darkhound/male/head.vox new file mode 100644 index 0000000000..da61c020a9 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beec6ec3b457a3bdfc45ef96884c9c43487aaa46afe3154cd79a2fe73e0dc5fe +size 1728 diff --git a/assets/voxygen/voxel/npc/darkhound/male/jaw.vox b/assets/voxygen/voxel/npc/darkhound/male/jaw.vox new file mode 100644 index 0000000000..46288b1d6c --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06db8c2059efab785aa5e21f6c6e1fb1dcf51ee13037effb9363a65325e9f529 +size 1236 diff --git a/assets/voxygen/voxel/npc/darkhound/male/leg_bl.vox b/assets/voxygen/voxel/npc/darkhound/male/leg_bl.vox new file mode 100644 index 0000000000..2a2b2264e6 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fec22d5427c0d42da4171befd9fe858933127c8e4df0430f6c807710b42e8cf +size 1464 diff --git a/assets/voxygen/voxel/npc/darkhound/male/leg_br.vox b/assets/voxygen/voxel/npc/darkhound/male/leg_br.vox new file mode 100644 index 0000000000..bb6e43fb56 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8896549e6fb15a3eff8a2f54b62e28970dfccbc675394a44235abf7269defdeb +size 1464 diff --git a/assets/voxygen/voxel/npc/darkhound/male/leg_fl.vox b/assets/voxygen/voxel/npc/darkhound/male/leg_fl.vox new file mode 100644 index 0000000000..b98fe8c1d2 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88ea2f92adcb532a0dbe8097bb0d67141ce373752e34733c48062a696bf2a357 +size 1448 diff --git a/assets/voxygen/voxel/npc/darkhound/male/leg_fr.vox b/assets/voxygen/voxel/npc/darkhound/male/leg_fr.vox new file mode 100644 index 0000000000..6284746824 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d46e3f2d36a17f6ec7f34fcf29722b8fa927cdd26a864760337143039635fdf7 +size 1448 diff --git a/assets/voxygen/voxel/npc/darkhound/male/neck.vox b/assets/voxygen/voxel/npc/darkhound/male/neck.vox new file mode 100644 index 0000000000..62fd3b4c3a --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:471f240c7898b3e7866a0cda065feb0b744a45ba75ade46cce6ffe5501b33df6 +size 1500 diff --git a/assets/voxygen/voxel/npc/darkhound/male/tail.vox b/assets/voxygen/voxel/npc/darkhound/male/tail.vox new file mode 100644 index 0000000000..b74ed3024c --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f21ebe56a10a801c91766087b41adb443d7209c5b7f029aab536b2fc12f105be +size 1348 diff --git a/assets/voxygen/voxel/npc/darkhound/male/torso_back.vox b/assets/voxygen/voxel/npc/darkhound/male/torso_back.vox new file mode 100644 index 0000000000..953ad994a1 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b01a1ca8834ab5dd52f611e74f529bf86b89a7154a45a210f9f50850b7704005 +size 2388 diff --git a/assets/voxygen/voxel/npc/darkhound/male/torso_front.vox b/assets/voxygen/voxel/npc/darkhound/male/torso_front.vox new file mode 100644 index 0000000000..76c572f511 --- /dev/null +++ b/assets/voxygen/voxel/npc/darkhound/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0b3d0e49842c9eeebe946123d95178fff6097e53c528678ff675bd722696e29 +size 3476 diff --git a/assets/voxygen/voxel/npc/dog/female/chest.vox b/assets/voxygen/voxel/npc/dog/female/chest.vox new file mode 100644 index 0000000000..359cbcba37 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c277e5c426fd9b831849b6fc282130ec82300b49103e5f1c01cecb373d6a5866 +size 2136 diff --git a/assets/voxygen/voxel/npc/dog/female/foot_bl.vox b/assets/voxygen/voxel/npc/dog/female/foot_bl.vox new file mode 100644 index 0000000000..060f51feef --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b6b9a69bbcba3c706b99262d04ddedb1df649efede847d0b8712552539c49df +size 1300 diff --git a/assets/voxygen/voxel/npc/dog/female/foot_br.vox b/assets/voxygen/voxel/npc/dog/female/foot_br.vox new file mode 100644 index 0000000000..8551b115c6 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290ee67869c332d28c1147bdf36abef069e7159f47533eb42b4a9deaaf3ac8eb +size 1300 diff --git a/assets/voxygen/voxel/npc/dog/female/foot_fl.vox b/assets/voxygen/voxel/npc/dog/female/foot_fl.vox new file mode 100644 index 0000000000..e0631c3513 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cf17480e4774a864fd7fb73145a3e59d8fe9cf4646d0ed398d62510129d7f5b +size 1228 diff --git a/assets/voxygen/voxel/npc/dog/female/foot_fr.vox b/assets/voxygen/voxel/npc/dog/female/foot_fr.vox new file mode 100644 index 0000000000..14917dc876 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66821392e30213e90e6318bb8168a1908cc5740f3818caed5190a47527d35ae6 +size 1228 diff --git a/assets/voxygen/voxel/npc/dog/female/head.vox b/assets/voxygen/voxel/npc/dog/female/head.vox new file mode 100644 index 0000000000..a1d683430a --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8756eb17a0e00e7f8251dbe194d2fd0c1cdaffedab1a8068ab73fac3730c0a3a +size 1772 diff --git a/assets/voxygen/voxel/npc/dog/female/tail.vox b/assets/voxygen/voxel/npc/dog/female/tail.vox new file mode 100644 index 0000000000..e9d802e638 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b75e503a3742c3f2663bfdf404626c49baa9f5aad31409927d787aa28813d90e +size 1432 diff --git a/assets/voxygen/voxel/npc/dog/male/chest.vox b/assets/voxygen/voxel/npc/dog/male/chest.vox new file mode 100644 index 0000000000..fd4c59c2f0 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7eb62fa9b90c4ad88f2fd1dd96ffe45b4630ab1081f3e447ad8c44f8f407237 +size 2136 diff --git a/assets/voxygen/voxel/npc/dog/male/foot_bl.vox b/assets/voxygen/voxel/npc/dog/male/foot_bl.vox new file mode 100644 index 0000000000..ade5f135bc --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d75a171bdb543ffa662929d44071e8bb4846aabd703e04dbddc3b16894857ef1 +size 1300 diff --git a/assets/voxygen/voxel/npc/dog/male/foot_br.vox b/assets/voxygen/voxel/npc/dog/male/foot_br.vox new file mode 100644 index 0000000000..d9e302c8d5 --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61c2a707098f9a70032d511f23eb0c4b2488bd0a1ae64cb006e8cde8b70464c4 +size 1300 diff --git a/assets/voxygen/voxel/npc/dog/male/foot_fl.vox b/assets/voxygen/voxel/npc/dog/male/foot_fl.vox new file mode 100644 index 0000000000..fa8ba881ce --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15792830a47d95a14c528debc3ef1f471907933aa5eb422c94b937d3818e4492 +size 1228 diff --git a/assets/voxygen/voxel/npc/dog/male/foot_fr.vox b/assets/voxygen/voxel/npc/dog/male/foot_fr.vox new file mode 100644 index 0000000000..6c4c489c2e --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f93dd3929ec430046b4a877d6ceb93b0f8022f63ae4a358a25d0bf93a93918d +size 1228 diff --git a/assets/voxygen/voxel/npc/dog/male/head.vox b/assets/voxygen/voxel/npc/dog/male/head.vox new file mode 100644 index 0000000000..552506abfe --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ef4784a5e528831069ef27b8fb7640fbf2e3c1edb0392a3d6fd598c61e06c1c +size 1772 diff --git a/assets/voxygen/voxel/npc/dog/male/tail.vox b/assets/voxygen/voxel/npc/dog/male/tail.vox new file mode 100644 index 0000000000..41ecc7221c --- /dev/null +++ b/assets/voxygen/voxel/npc/dog/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f38f5c494eca27c9eecf1e9a0c7ccd17bd675ea8224be67800665ccc4e8e3f1 +size 1432 diff --git a/assets/voxygen/voxel/npc/highland/male/ears.vox b/assets/voxygen/voxel/npc/highland/male/ears.vox new file mode 100644 index 0000000000..a7bd49c6cf --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9712b72bedf80a26395a54612ecc89948f60e133c6fb655b979d6f7c6bb2f94 +size 1192 diff --git a/assets/voxygen/voxel/npc/highland/male/foot_bl.vox b/assets/voxygen/voxel/npc/highland/male/foot_bl.vox new file mode 100644 index 0000000000..6890e2f784 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44b440bb6bc8367ea0627e404cbfaacfcab42d6793bb2ce2c4433aae8b935c9d +size 1356 diff --git a/assets/voxygen/voxel/npc/highland/male/foot_br.vox b/assets/voxygen/voxel/npc/highland/male/foot_br.vox new file mode 100644 index 0000000000..7c5fe05c4c --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7502bf3bfd951a5908ebaf0298326a1b600781296c988840fc448d17df26fa45 +size 1356 diff --git a/assets/voxygen/voxel/npc/highland/male/foot_fl.vox b/assets/voxygen/voxel/npc/highland/male/foot_fl.vox new file mode 100644 index 0000000000..848e014dd2 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1425e769724c9f93ef3a302125caf7f11755196d34bb16b4b89d0036c8b6f1d0 +size 1384 diff --git a/assets/voxygen/voxel/npc/highland/male/foot_fr.vox b/assets/voxygen/voxel/npc/highland/male/foot_fr.vox new file mode 100644 index 0000000000..ed5b5349b4 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3281dd62983db45d67cb61a5c408dc9fe170f1ad1e5b03714e9f4267411497ad +size 1384 diff --git a/assets/voxygen/voxel/npc/highland/male/head.vox b/assets/voxygen/voxel/npc/highland/male/head.vox new file mode 100644 index 0000000000..8cdd70f2de --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25578b6111f456fb8190905302221679d709b49e8ca725c9e6cd558c2421c84c +size 3128 diff --git a/assets/voxygen/voxel/npc/highland/male/jaw.vox b/assets/voxygen/voxel/npc/highland/male/jaw.vox new file mode 100644 index 0000000000..df29320318 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ec83e1d145fdefb249a41f95ee448cea5a40cac5a642e3b9e3ada92beb4ebb7 +size 1184 diff --git a/assets/voxygen/voxel/npc/highland/male/leg_bl.vox b/assets/voxygen/voxel/npc/highland/male/leg_bl.vox new file mode 100644 index 0000000000..7e83dbd008 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b6ce56d522db5e322d6101c3d601197fe57a052eb3858ffafdba6a92ea879b1 +size 1680 diff --git a/assets/voxygen/voxel/npc/highland/male/leg_br.vox b/assets/voxygen/voxel/npc/highland/male/leg_br.vox new file mode 100644 index 0000000000..a256c4fe5b --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b23dc2c5a91ace542605037869b90ced88c2c808e624b0aef9e3d80a53fe92e +size 1680 diff --git a/assets/voxygen/voxel/npc/highland/male/leg_fl.vox b/assets/voxygen/voxel/npc/highland/male/leg_fl.vox new file mode 100644 index 0000000000..df7d6bdc7a --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa3f530cf4d9d28f1326c0a8e95575f52fe05d7db0ed639d35cc321300a302e +size 1584 diff --git a/assets/voxygen/voxel/npc/highland/male/leg_fr.vox b/assets/voxygen/voxel/npc/highland/male/leg_fr.vox new file mode 100644 index 0000000000..deb719181d --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d76a5eb7cec685973e53a070a1efa1eb4e6a5b8748335305c1f43a41ccd09f31 +size 1584 diff --git a/assets/voxygen/voxel/npc/highland/male/neck.vox b/assets/voxygen/voxel/npc/highland/male/neck.vox new file mode 100644 index 0000000000..a306405daa --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:911f49107e08161b33e86e488a580e27e58c3f85f007b41af8cae3cd37e434bc +size 2920 diff --git a/assets/voxygen/voxel/npc/highland/male/tail.vox b/assets/voxygen/voxel/npc/highland/male/tail.vox new file mode 100644 index 0000000000..97cf9b72e5 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71ce20b320c818a3c3dd955f5e33190fec06b4d9fbdeb7b1e8a7451fef79ea41 +size 1360 diff --git a/assets/voxygen/voxel/npc/highland/male/torso_back.vox b/assets/voxygen/voxel/npc/highland/male/torso_back.vox new file mode 100644 index 0000000000..1c5575aa85 --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd93f1fb2fff553aa1067ecc025b08ed6fc59d8afa9c694193c8605c24ab8263 +size 5500 diff --git a/assets/voxygen/voxel/npc/highland/male/torso_front.vox b/assets/voxygen/voxel/npc/highland/male/torso_front.vox new file mode 100644 index 0000000000..a95d6d39cb --- /dev/null +++ b/assets/voxygen/voxel/npc/highland/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d863c0f24f7375758c296ce4e9e0d0f96baf54c6234da791f1198a884da163f1 +size 5732 diff --git a/assets/voxygen/voxel/npc/panda/male/ears.vox b/assets/voxygen/voxel/npc/panda/male/ears.vox new file mode 100644 index 0000000000..0df4b389d0 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d9ec2db95f6f2b9299fc8f56e7e32486f0b98dc55fd00414e35030d6b84cfda +size 1176 diff --git a/assets/voxygen/voxel/npc/panda/male/foot_bl.vox b/assets/voxygen/voxel/npc/panda/male/foot_bl.vox new file mode 100644 index 0000000000..0148da1e50 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbf7c4621ea3e1bcbf666f0e539459538d2be02ef0d693914922d5178a7f9487 +size 1600 diff --git a/assets/voxygen/voxel/npc/panda/male/foot_br.vox b/assets/voxygen/voxel/npc/panda/male/foot_br.vox new file mode 100644 index 0000000000..79a36ddf82 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6adf41bd3cd6a66cd973241b72b2b3b51e1b76f101a81ccb5c5eff9d8fe48863 +size 1600 diff --git a/assets/voxygen/voxel/npc/panda/male/foot_fl.vox b/assets/voxygen/voxel/npc/panda/male/foot_fl.vox new file mode 100644 index 0000000000..6d6798bb4e --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aab186c10645c2adbaeff73ed519f101f95f7400dcb38cdbfe9dfe972d3d410 +size 1704 diff --git a/assets/voxygen/voxel/npc/panda/male/foot_fr.vox b/assets/voxygen/voxel/npc/panda/male/foot_fr.vox new file mode 100644 index 0000000000..4d992eaf97 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:172abed800cea878e4edb20dbb799c3cc0fefe43277f8be14b7bef09e3d107f8 +size 1704 diff --git a/assets/voxygen/voxel/npc/panda/male/head.vox b/assets/voxygen/voxel/npc/panda/male/head.vox new file mode 100644 index 0000000000..8da5d392ba --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b360b44a16448891492229b2344524e297e959f25d554ed6ee759bf2649f3ad +size 3024 diff --git a/assets/voxygen/voxel/npc/panda/male/jaw.vox b/assets/voxygen/voxel/npc/panda/male/jaw.vox new file mode 100644 index 0000000000..ac30435a03 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fed05a7a56faab08d1d67c89306affbd51f6b31a0cef06ba3f8ee56db9dad0b +size 1212 diff --git a/assets/voxygen/voxel/npc/panda/male/leg_bl.vox b/assets/voxygen/voxel/npc/panda/male/leg_bl.vox new file mode 100644 index 0000000000..085665ba54 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82dad7112a43e0c3512c46066607cbc356e52ad2a00525e174a86957e8e7f4d4 +size 1852 diff --git a/assets/voxygen/voxel/npc/panda/male/leg_br.vox b/assets/voxygen/voxel/npc/panda/male/leg_br.vox new file mode 100644 index 0000000000..81231d2c8b --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a65854428c017054ccc1ea9901b96edb89fb79bd626b7591f1f2b35c760aac9 +size 1852 diff --git a/assets/voxygen/voxel/npc/panda/male/leg_fl.vox b/assets/voxygen/voxel/npc/panda/male/leg_fl.vox new file mode 100644 index 0000000000..8a3d23f3ac --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53d67acdc1c06fa648f9d809b6096d38d186ef620e23ede7bb6b3a0ce0bc9709 +size 1760 diff --git a/assets/voxygen/voxel/npc/panda/male/leg_fr.vox b/assets/voxygen/voxel/npc/panda/male/leg_fr.vox new file mode 100644 index 0000000000..665cea65d3 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6a4639292cc5251f19bf43dd19bd21c4816e2160296a9f33ba78a62f2b6c1d1 +size 1760 diff --git a/assets/voxygen/voxel/npc/panda/male/neck.vox b/assets/voxygen/voxel/npc/panda/male/neck.vox new file mode 100644 index 0000000000..1a656cdba5 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:515a91c893f32427e5080dc1b05f7fe66ba5dbb97d7f2ed779274b1fa68c2d49 +size 2120 diff --git a/assets/voxygen/voxel/npc/panda/male/tail.vox b/assets/voxygen/voxel/npc/panda/male/tail.vox new file mode 100644 index 0000000000..ca9ea290e1 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a577050f80d243a0cdd483a667299ec84fc39cf49fde76287a036765c2379ade +size 1336 diff --git a/assets/voxygen/voxel/npc/panda/male/torso_back.vox b/assets/voxygen/voxel/npc/panda/male/torso_back.vox new file mode 100644 index 0000000000..013f824e84 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6293227fb4b9bc19a5d71dc182b411e8a49672b135b7f3fbd185a5aa10816705 +size 7940 diff --git a/assets/voxygen/voxel/npc/panda/male/torso_front.vox b/assets/voxygen/voxel/npc/panda/male/torso_front.vox new file mode 100644 index 0000000000..d239c5fea7 --- /dev/null +++ b/assets/voxygen/voxel/npc/panda/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:339be526fda035d26c1701a7a69ca845dafa2d5a9ecbc6ae9ddca1c8f19392ec +size 7600 diff --git a/assets/voxygen/voxel/npc/yak/male/ears.vox b/assets/voxygen/voxel/npc/yak/male/ears.vox new file mode 100644 index 0000000000..dc87c2cdbb --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:724d3bb27ba9cf63b3d8ff709bf7774987546aa2a26c95e5c596f8faaa54902e +size 1192 diff --git a/assets/voxygen/voxel/npc/yak/male/foot_bl.vox b/assets/voxygen/voxel/npc/yak/male/foot_bl.vox new file mode 100644 index 0000000000..a04cc94cd5 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da8808f71b0872113987b4288deaafe8fbce84a821894a8f728d1964002c1a7d +size 1356 diff --git a/assets/voxygen/voxel/npc/yak/male/foot_br.vox b/assets/voxygen/voxel/npc/yak/male/foot_br.vox new file mode 100644 index 0000000000..d2ab5ec9fe --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce95027700f8d2fca638d370ca6896af1de57c3917a107f22aa94ed7fda03662 +size 1356 diff --git a/assets/voxygen/voxel/npc/yak/male/foot_fl.vox b/assets/voxygen/voxel/npc/yak/male/foot_fl.vox new file mode 100644 index 0000000000..951344d5a9 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9c8143642cd15c1e0263429980b70c8762647caadeb1323eae533c89e59ddc2 +size 1420 diff --git a/assets/voxygen/voxel/npc/yak/male/foot_fr.vox b/assets/voxygen/voxel/npc/yak/male/foot_fr.vox new file mode 100644 index 0000000000..712a731534 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e71e176392ab3a6053228ead8bb7636d9383c8d31ac6b7fcf61f55904b6a03ab +size 1420 diff --git a/assets/voxygen/voxel/npc/yak/male/head.vox b/assets/voxygen/voxel/npc/yak/male/head.vox new file mode 100644 index 0000000000..5f374cdd6e --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2de6595c9394f7ca90bf9e53096079568eb0115f12524986c159685ccf905bc +size 2680 diff --git a/assets/voxygen/voxel/npc/yak/male/jaw.vox b/assets/voxygen/voxel/npc/yak/male/jaw.vox new file mode 100644 index 0000000000..d2af14ffdf --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9680579a8607d5c3e1189a63ccdee16ceff19dc9075e928be63fb37f27740069 +size 1184 diff --git a/assets/voxygen/voxel/npc/yak/male/leg_bl.vox b/assets/voxygen/voxel/npc/yak/male/leg_bl.vox new file mode 100644 index 0000000000..2edfc7a704 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3d9e44682f388f084ed5294a2e0157bfc9645fda5ccb39eeebd7aba42f4d06 +size 1880 diff --git a/assets/voxygen/voxel/npc/yak/male/leg_br.vox b/assets/voxygen/voxel/npc/yak/male/leg_br.vox new file mode 100644 index 0000000000..59bdd4d54b --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d84ea87ffd1ca221a1644fe46781c4763256627206057b1fb79cc01fd095bc59 +size 1880 diff --git a/assets/voxygen/voxel/npc/yak/male/leg_fl.vox b/assets/voxygen/voxel/npc/yak/male/leg_fl.vox new file mode 100644 index 0000000000..9095df9bd2 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f07a322bbf33a76f761c16c94f09626586bc86eecdac777029f0f9d4793e216e +size 1908 diff --git a/assets/voxygen/voxel/npc/yak/male/leg_fr.vox b/assets/voxygen/voxel/npc/yak/male/leg_fr.vox new file mode 100644 index 0000000000..de380a6f9e --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09389bc4f9245e1594a7c16396bcdc9326016f4b132361f593599a7ee199b2cf +size 1908 diff --git a/assets/voxygen/voxel/npc/yak/male/neck.vox b/assets/voxygen/voxel/npc/yak/male/neck.vox new file mode 100644 index 0000000000..78a3eba3f6 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fbac3a1bf3da520353910f8dd64070bc68b689a5f98e29bb0f00a2fe0328817 +size 3332 diff --git a/assets/voxygen/voxel/npc/yak/male/tail.vox b/assets/voxygen/voxel/npc/yak/male/tail.vox new file mode 100644 index 0000000000..c9d4ded911 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:017dfed37b627961f93183e77ad28c8d27450cda57b28d5dc66ac27b5e637303 +size 1588 diff --git a/assets/voxygen/voxel/npc/yak/male/torso_back.vox b/assets/voxygen/voxel/npc/yak/male/torso_back.vox new file mode 100644 index 0000000000..a8408768e1 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efaf70700f86c779185fea0897d8aa2e8fdcc2fd4e02112dc77742dd79fda49e +size 6288 diff --git a/assets/voxygen/voxel/npc/yak/male/torso_front.vox b/assets/voxygen/voxel/npc/yak/male/torso_front.vox new file mode 100644 index 0000000000..16a540e0f7 --- /dev/null +++ b/assets/voxygen/voxel/npc/yak/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f2687d4c069390b150601f086b3a0b61bc223e51b3db35ad2597e28a8c9aa98 +size 7920 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 8c7f92632c..384717e891 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -1199,4 +1199,424 @@ central: ("npc.horse.male.tail"), ), ), + (Barghest, Male): ( + head: ( + offset: (-7.0, 0.0, -8.0), + central: ("npc.barghest.male.head"), + ), + neck: ( + offset: (-7.0, -1.5, -10.0), + central: ("npc.barghest.male.neck"), + ), + jaw: ( + offset: (-10.0, 0.0, -5.0), + central: ("npc.barghest.male.jaw"), + ), + torso_front: ( + offset: (-8.0, -12.0, -10.5), + central: ("npc.barghest.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -7.0), + central: ("npc.barghest.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-3.0, -15.0, -5.0), + central: ("npc.barghest.male.tail"), + ), + ), + (Barghest, Female): ( + head: ( + offset: (-7.0, 0.0, -8.0), + central: ("npc.barghest.male.head"), + ), + neck: ( + offset: (-7.0, -1.5, -10.0), + central: ("npc.barghest.male.neck"), + ), + jaw: ( + offset: (-10.0, 0.0, -5.0), + central: ("npc.barghest.male.jaw"), + ), + torso_front: ( + offset: (-8.0, -12.0, -10.5), + central: ("npc.barghest.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -7.0), + central: ("npc.barghest.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-3.0, -15.0, -5.0), + central: ("npc.barghest.male.tail"), + ), + ), + (Cattle, Male): ( + head: ( + offset: (-5.0, 0.0, -6.5), + central: ("npc.cattle.male.head"), + ), + neck: ( + offset: (-4.0, -2.0, -7.0), + central: ("npc.cattle.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.cattle.male.jaw"), + ), + torso_front: ( + offset: (-6.0, -9.0, -8.0), + central: ("npc.cattle.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -6.5), + central: ("npc.cattle.male.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.cattle.male.ears"), + ), + tail: ( + offset: (-1.0, -8.0, -13.0), + central: ("npc.cattle.male.tail"), + ), + ), + (Cattle, Female): ( + head: ( + offset: (-5.0, 0.0, -5.0), + central: ("npc.cattle.female.head"), + ), + neck: ( + offset: (-4.0, -2.0, -6.0), + central: ("npc.cattle.female.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.cattle.female.jaw"), + ), + torso_front: ( + offset: (-6.0, -9.0, -6.5), + central: ("npc.cattle.female.torso_front"), + ), + torso_back: ( + offset: (-6.0, -8.0, -7.5), + central: ("npc.cattle.female.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.cattle.female.ears"), + ), + tail: ( + offset: (-1.0, -8.0, -13.0), + central: ("npc.cattle.female.tail"), + ), + ), + (Darkhound, Male): ( + head: ( + offset: (-2.5, 0.0, -3.5), + central: ("npc.darkhound.male.head"), + ), + neck: ( + offset: (-2.5, -2.0, -3.5), + central: ("npc.darkhound.male.neck"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.darkhound.male.jaw"), + ), + torso_front: ( + offset: (-3.5, -13.0, -6.0), + central: ("npc.darkhound.male.torso_front"), + ), + torso_back: ( + offset: (-3.5, -12.0, -4.5), + central: ("npc.darkhound.male.torso_back"), + ), + ears: ( + offset: (-2.5, -1.0, 0.0), + central: ("npc.darkhound.male.ears"), + ), + tail: ( + offset: (-1.5, -16.0, -5.0), + central: ("npc.darkhound.male.tail"), + ), + ), + (Darkhound, Female): ( + head: ( + offset: (-2.5, 0.0, -3.5), + central: ("npc.darkhound.male.head"), + ), + neck: ( + offset: (-2.5, -2.0, -3.5), + central: ("npc.darkhound.male.neck"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.darkhound.male.jaw"), + ), + torso_front: ( + offset: (-3.5, -13.0, -6.0), + central: ("npc.darkhound.male.torso_front"), + ), + torso_back: ( + offset: (-3.5, -12.0, -4.5), + central: ("npc.darkhound.male.torso_back"), + ), + ears: ( + offset: (-2.5, -1.0, 0.0), + central: ("npc.darkhound.male.ears"), + ), + tail: ( + offset: (-1.5, -16.0, -5.0), + central: ("npc.darkhound.male.tail"), + ), + ), + (Highland, Male): ( + head: ( + offset: (-12.0, 0.0, -6.0), + central: ("npc.highland.male.head"), + ), + neck: ( + offset: (-5.0, -2.0, -7.0), + central: ("npc.highland.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.highland.male.jaw"), + ), + torso_front: ( + offset: (-6.0, -9.0, -8.5), + central: ("npc.highland.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -7.5), + central: ("npc.highland.male.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.highland.male.ears"), + ), + tail: ( + offset: (-1.0, -6.0, -13.0), + central: ("npc.highland.male.tail"), + ), + ), + (Highland, Female): ( + head: ( + offset: (-12.0, 0.0, -6.0), + central: ("npc.highland.male.head"), + ), + neck: ( + offset: (-5.0, -2.0, -7.0), + central: ("npc.highland.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.highland.male.jaw"), + ), + torso_front: ( + offset: (-6.0, -9.0, -8.5), + central: ("npc.highland.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -7.5), + central: ("npc.highland.male.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.highland.male.ears"), + ), + tail: ( + offset: (-1.0, -6.0, -13.0), + central: ("npc.highland.male.tail"), + ), + ), + (Yak, Male): ( + head: ( + offset: (-7.0, 0.0, -8.0), + central: ("npc.yak.male.head"), + ), + neck: ( + offset: (-5.0, -2.0, -8.0), + central: ("npc.yak.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.yak.male.jaw"), + ), + torso_front: ( + offset: (-7.0, -9.0, -11.0), + central: ("npc.yak.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -9.5), + central: ("npc.yak.male.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.yak.male.ears"), + ), + tail: ( + offset: (-2.0, -5.0, -15.0), + central: ("npc.yak.male.tail"), + ), + ), + (Yak, Female): ( + head: ( + offset: (-7.0, 0.0, -8.0), + central: ("npc.yak.male.head"), + ), + neck: ( + offset: (-5.0, -2.0, -8.0), + central: ("npc.yak.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.yak.male.jaw"), + ), + torso_front: ( + offset: (-7.0, -9.0, -11.0), + central: ("npc.yak.male.torso_front"), + ), + torso_back: ( + offset: (-6.0, -10.0, -9.5), + central: ("npc.yak.male.torso_back"), + ), + ears: ( + offset: (-6.0, -1.0, 0.0), + central: ("npc.yak.male.ears"), + ), + tail: ( + offset: (-2.0, -5.0, -15.0), + central: ("npc.yak.male.tail"), + ), + ), + (Panda, Male): ( + head: ( + offset: (-5.5, 0.0, -5.0), + central: ("npc.panda.male.head"), + ), + neck: ( + offset: (-4.5, -1.5, -5.5), + central: ("npc.panda.male.neck"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.panda.male.jaw"), + ), + torso_front: ( + offset: (-6.5, -12.0, -7.5), + central: ("npc.panda.male.torso_front"), + ), + torso_back: ( + offset: (-6.5, -12.0, -7.0), + central: ("npc.panda.male.torso_back"), + ), + ears: ( + offset: (-5.5, -1.0, 0.0), + central: ("npc.panda.male.ears"), + ), + tail: ( + offset: (-2.5, -5.0, -3.5), + central: ("npc.panda.male.tail"), + ), + ), + (Panda, Female): ( + head: ( + offset: (-5.5, 0.0, -5.0), + central: ("npc.panda.male.head"), + ), + neck: ( + offset: (-4.5, -1.5, -5.5), + central: ("npc.panda.male.neck"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.panda.male.jaw"), + ), + torso_front: ( + offset: (-6.5, -12.0, -7.5), + central: ("npc.panda.male.torso_front"), + ), + torso_back: ( + offset: (-6.5, -12.0, -7.0), + central: ("npc.panda.male.torso_back"), + ), + ears: ( + offset: (-5.5, -1.0, 0.0), + central: ("npc.panda.male.ears"), + ), + tail: ( + offset: (-2.5, -5.0, -3.5), + central: ("npc.panda.male.tail"), + ), + ), + (Bear, Male): ( + head: ( + offset: (-5.5, 0.0, -5.0), + central: ("npc.bear.male.head"), + ), + neck: ( + offset: (-4.5, -1.5, -5.5), + central: ("npc.bear.male.neck"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.bear.male.jaw"), + ), + torso_front: ( + offset: (-6.5, -12.0, -7.5), + central: ("npc.bear.male.torso_front"), + ), + torso_back: ( + offset: (-5.5, -12.0, -7.0), + central: ("npc.bear.male.torso_back"), + ), + ears: ( + offset: (-4.5, -1.0, 0.0), + central: ("npc.bear.male.ears"), + ), + tail: ( + offset: (-2.5, -5.0, -3.5), + central: ("npc.bear.male.tail"), + ), + ), + (Bear, Female): ( + head: ( + offset: (-5.5, 0.0, -5.0), + central: ("npc.bear.male.head"), + ), + neck: ( + offset: (-4.5, -1.5, -5.5), + central: ("npc.bear.male.neck"), + ), + jaw: ( + offset: (-2.5, 0.0, -1.0), + central: ("npc.bear.male.jaw"), + ), + torso_front: ( + offset: (-6.5, -12.0, -7.5), + central: ("npc.bear.male.torso_front"), + ), + torso_back: ( + offset: (-5.5, -12.0, -7.0), + central: ("npc.bear.male.torso_back"), + ), + ears: ( + offset: (-4.5, -1.0, 0.0), + central: ("npc.bear.male.ears"), + ), + tail: ( + offset: (-2.5, -5.0, -3.5), + central: ("npc.bear.male.tail"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index a999b509f4..640eb06690 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -1359,4 +1359,480 @@ lateral: ("npc.horse.male.foot_br"), ), ), + (Barghest, Male): ( + leg_fl: ( + offset: (-3.5, -4.0, -5.0), + lateral: ("npc.barghest.male.leg_fl"), + ), + leg_fr: ( + offset: (-3.5, -4.0, -5.0), + lateral: ("npc.barghest.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -3.5), + lateral: ("npc.barghest.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -3.5), + lateral: ("npc.barghest.male.leg_br"), + ), + foot_fl: ( + offset: (-4.5, -5.5, -7.0), + lateral: ("npc.barghest.male.foot_fl"), + ), + foot_fr: ( + offset: (-4.5, -5.5, -7.0), + lateral: ("npc.barghest.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.barghest.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.barghest.male.foot_br"), + ), + ), + (Barghest, Female): ( + leg_fl: ( + offset: (-3.5, -4.0, -5.0), + lateral: ("npc.barghest.male.leg_fl"), + ), + leg_fr: ( + offset: (-3.5, -4.0, -5.0), + lateral: ("npc.barghest.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -3.5), + lateral: ("npc.barghest.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -3.5), + lateral: ("npc.barghest.male.leg_br"), + ), + foot_fl: ( + offset: (-4.5, -5.5, -7.0), + lateral: ("npc.barghest.male.foot_fl"), + ), + foot_fr: ( + offset: (-4.5, -5.5, -7.0), + lateral: ("npc.barghest.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.barghest.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.barghest.male.foot_br"), + ), + ), + (Cattle, Male): ( + leg_fl: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.cattle.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.cattle.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -5.0), + lateral: ("npc.cattle.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -5.0), + lateral: ("npc.cattle.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.cattle.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.cattle.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.cattle.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.cattle.male.foot_br"), + ), + ), + (Cattle, Female): ( + leg_fl: ( + offset: (-2.0, -2.5, -5.5), + lateral: ("npc.cattle.female.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -5.5), + lateral: ("npc.cattle.female.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.cattle.female.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.cattle.female.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.cattle.female.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.cattle.female.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.cattle.female.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.cattle.female.foot_br"), + ), + ), + (Darkhound, Male): ( + leg_fl: ( + offset: (-1.5, -3.5, -4.0), + lateral: ("npc.darkhound.male.leg_fl"), + ), + leg_fr: ( + offset: (-1.5, -3.5, -4.0), + lateral: ("npc.darkhound.male.leg_fr"), + ), + leg_bl: ( + offset: (-1.5, -3.5, -3.5), + lateral: ("npc.darkhound.male.leg_bl"), + ), + leg_br: ( + offset: (-1.5, -3.5, -3.5), + lateral: ("npc.darkhound.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -4.0, -8.0), + lateral: ("npc.darkhound.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -4.0, -8.0), + lateral: ("npc.darkhound.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -3.5, -8.0), + lateral: ("npc.darkhound.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -3.5, -8.0), + lateral: ("npc.darkhound.male.foot_br"), + ), + ), + (Darkhound, Female): ( + leg_fl: ( + offset: (-1.5, -3.5, -4.0), + lateral: ("npc.darkhound.male.leg_fl"), + ), + leg_fr: ( + offset: (-1.5, -3.5, -4.0), + lateral: ("npc.darkhound.male.leg_fr"), + ), + leg_bl: ( + offset: (-1.5, -3.5, -3.5), + lateral: ("npc.darkhound.male.leg_bl"), + ), + leg_br: ( + offset: (-1.5, -3.5, -3.5), + lateral: ("npc.darkhound.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -4.0, -8.0), + lateral: ("npc.darkhound.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -4.0, -8.0), + lateral: ("npc.darkhound.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -3.5, -8.0), + lateral: ("npc.darkhound.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -3.5, -8.0), + lateral: ("npc.darkhound.male.foot_br"), + ), + ), + (Highland, Male): ( + leg_fl: ( + offset: (-2.0, -2.5, -4.5), + lateral: ("npc.highland.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -4.5), + lateral: ("npc.highland.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.highland.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.highland.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.highland.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.highland.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.highland.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.highland.male.foot_br"), + ), + ), + (Highland, Female): ( + leg_fl: ( + offset: (-2.0, -2.5, -4.5), + lateral: ("npc.highland.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -4.5), + lateral: ("npc.highland.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.highland.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.highland.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.highland.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.highland.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.highland.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.highland.male.foot_br"), + ), + ), + (Yak, Male): ( + leg_fl: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -9.0), + lateral: ("npc.yak.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -9.0), + lateral: ("npc.yak.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.yak.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.yak.male.foot_br"), + ), + ), + (Yak, Female): ( + leg_fl: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -10.5), + lateral: ("npc.yak.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -9.0), + lateral: ("npc.yak.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -9.0), + lateral: ("npc.yak.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.yak.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.yak.male.foot_br"), + ), + ), + (Bear, Male): ( + leg_fl: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.bear.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.bear.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.bear.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.bear.male.leg_br"), + ), + foot_fl: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.bear.male.foot_fl"), + ), + foot_fr: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.bear.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.bear.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.bear.male.foot_br"), + ), + ), + (Panda, Female): ( + leg_fl: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.panda.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.panda.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.panda.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.panda.male.leg_br"), + ), + foot_fl: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.panda.male.foot_fl"), + ), + foot_fr: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.panda.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.panda.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.panda.male.foot_br"), + ), + ), + (Panda, Male): ( + leg_fl: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.panda.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.panda.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.panda.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.panda.male.leg_br"), + ), + foot_fl: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.panda.male.foot_fl"), + ), + foot_fr: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.panda.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.panda.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.panda.male.foot_br"), + ), + ), + (Bear, Female): ( + leg_fl: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.bear.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -3.5, -4.5), + lateral: ("npc.bear.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.bear.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.5, -5.0), + lateral: ("npc.bear.male.leg_br"), + ), + foot_fl: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.bear.male.foot_fl"), + ), + foot_fr: ( + offset: (-3.0, -4.5, -7.0), + lateral: ("npc.bear.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.bear.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -4.0, -6.0), + lateral: ("npc.bear.male.foot_br"), + ), + ), }) diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 2d60b968c0..3260c6c09c 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -141,6 +141,8 @@ impl<'a> From<&'a Body> for Psyche { quadruped_medium::Species::Zebra => 0.7, quadruped_medium::Species::Antelope => 0.6, quadruped_medium::Species::Horse => 0.7, + quadruped_medium::Species::Cattle => 0.7, + quadruped_medium::Species::Darkhound => 0.9, _ => 0.5, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index edcc366654..977de09376 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -173,6 +173,12 @@ impl Body { quadruped_medium::Species::Deer => 1.5, quadruped_medium::Species::Donkey => 1.5, quadruped_medium::Species::Kelpie => 1.5, + quadruped_medium::Species::Barghest => 1.8, + quadruped_medium::Species::Cattle => 1.8, + quadruped_medium::Species::Highland => 1.8, + quadruped_medium::Species::Yak => 1.8, + quadruped_medium::Species::Panda => 1.8, + quadruped_medium::Species::Bear => 1.8, _ => 1.5, }, Body::QuadrupedLow(body) => match body.species { @@ -237,6 +243,7 @@ impl Body { quadruped_medium::Species::Lion => 2.0, quadruped_medium::Species::Saber => 2.0, quadruped_medium::Species::Catoblepas => 2.9, + quadruped_medium::Species::Barghest => 2.5, _ => 1.6, }, Body::QuadrupedLow(body) => match body.species { @@ -321,6 +328,12 @@ impl Body { quadruped_medium::Species::Antelope => 300, quadruped_medium::Species::Kelpie => 600, quadruped_medium::Species::Horse => 600, + quadruped_medium::Species::Barghest => 1000, + quadruped_medium::Species::Cattle => 600, + quadruped_medium::Species::Highland => 600, + quadruped_medium::Species::Yak => 600, + quadruped_medium::Species::Panda => 800, + quadruped_medium::Species::Bear => 800, _ => 400, }, Body::BirdMedium(bird_medium) => match bird_medium.species { @@ -411,6 +424,12 @@ impl Body { quadruped_medium::Species::Antelope => 20, quadruped_medium::Species::Kelpie => 30, quadruped_medium::Species::Horse => 30, + quadruped_medium::Species::Barghest => 50, + quadruped_medium::Species::Cattle => 30, + quadruped_medium::Species::Highland => 30, + quadruped_medium::Species::Yak => 30, + quadruped_medium::Species::Panda => 40, + quadruped_medium::Species::Bear => 40, _ => 20, }, Body::BirdMedium(bird_medium) => match bird_medium.species { diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs index c657d289ce..d1b2b89b43 100644 --- a/common/src/comp/body/quadruped_medium.rs +++ b/common/src/comp/body/quadruped_medium.rs @@ -52,6 +52,13 @@ pub enum Species { Antelope = 19, Kelpie = 20, Horse = 21, + Barghest = 22, + Cattle = 23, + Darkhound = 24, + Highland = 25, + Yak = 26, + Panda = 27, + Bear = 28, } /// Data representing per-species generic data. @@ -79,6 +86,13 @@ pub struct AllSpecies { pub antelope: SpeciesMeta, pub kelpie: SpeciesMeta, pub horse: SpeciesMeta, + pub barghest: SpeciesMeta, + pub cattle: SpeciesMeta, + pub darkhound: SpeciesMeta, + pub highland: SpeciesMeta, + pub yak: SpeciesMeta, + pub panda: SpeciesMeta, + pub bear: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -107,11 +121,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Antelope => &self.antelope, Species::Kelpie => &self.kelpie, Species::Horse => &self.horse, + Species::Barghest => &self.barghest, + Species::Cattle => &self.cattle, + Species::Darkhound => &self.darkhound, + Species::Highland => &self.highland, + Species::Yak => &self.yak, + Species::Panda => &self.panda, + Species::Bear => &self.bear, } } } -pub const ALL_SPECIES: [Species; 20] = [ +pub const ALL_SPECIES: [Species; 27] = [ Species::Grolgar, Species::Saber, Species::Tiger, @@ -132,6 +153,13 @@ pub const ALL_SPECIES: [Species; 20] = [ Species::Antelope, Species::Kelpie, Species::Horse, + Species::Barghest, + Species::Cattle, + Species::Darkhound, + Species::Highland, + Species::Yak, + Species::Panda, + Species::Bear, ]; 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 979be8bab6..5f6902da7d 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -89,7 +89,8 @@ impl LoadoutBuilder { quadruped_medium::Species::Wolf | quadruped_medium::Species::Grolgar | quadruped_medium::Species::Lion - | quadruped_medium::Species::Bonerattler => { + | quadruped_medium::Species::Bonerattler + | quadruped_medium::Species::Darkhound => { main_tool = Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedquick", )); @@ -110,7 +111,11 @@ impl LoadoutBuilder { "common.items.npc_weapons.unique.quadmedjump", )); }, - quadruped_medium::Species::Tuskram | quadruped_medium::Species::Roshwalr => { + quadruped_medium::Species::Tuskram + | quadruped_medium::Species::Roshwalr + | quadruped_medium::Species::Highland + | quadruped_medium::Species::Yak + | quadruped_medium::Species::Cattle => { main_tool = Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedcharge", )); diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 84aa9d1cc9..410d0abf44 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -59,6 +59,13 @@ impl Body { quadruped_medium::Species::Antelope => 185.0, quadruped_medium::Species::Kelpie => 180.0, quadruped_medium::Species::Horse => 180.0, + quadruped_medium::Species::Barghest => 180.0, + quadruped_medium::Species::Cattle => 180.0, + quadruped_medium::Species::Darkhound => 180.0, + quadruped_medium::Species::Highland => 180.0, + quadruped_medium::Species::Yak => 180.0, + quadruped_medium::Species::Panda => 180.0, + quadruped_medium::Species::Bear => 180.0, }, Body::BipedSmall(_) => 100.0, Body::BirdMedium(_) => 80.0, diff --git a/voxygen/anim/src/quadruped_medium/idle.rs b/voxygen/anim/src/quadruped_medium/idle.rs index d2a168bec4..4e2c3b3c20 100644 --- a/voxygen/anim/src/quadruped_medium/idle.rs +++ b/voxygen/anim/src/quadruped_medium/idle.rs @@ -112,14 +112,15 @@ 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_fl.orientation = Quaternion::rotation_x(0.0); - 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_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs index 4f8d693584..ee9ff1ec92 100644 --- a/voxygen/anim/src/quadruped_medium/mod.rs +++ b/voxygen/anim/src/quadruped_medium/mod.rs @@ -163,6 +163,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (1.5, 2.5), (Kelpie, _) => (4.0, -1.0), (Horse, _) => (0.5, 1.5), + (Barghest, _) => (0.5, -2.5), + (Cattle, Male) => (0.5, 3.5), + (Cattle, Female) => (2.5, 4.0), + (Darkhound, _) => (3.0, -1.0), + (Highland, _) => (2.5, 5.0), + (Yak, _) => (2.5, 5.0), + (Panda, _) => (0.0, 0.5), + (Bear, _) => (0.5, 1.5), }, neck: match (body.species, body.body_type) { (Grolgar, _) => (1.0, -1.0), @@ -185,6 +193,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (0.5, 2.5), (Kelpie, _) => (2.0, 1.0), (Horse, _) => (1.5, 1.5), + (Barghest, _) => (0.5, -0.5), + (Cattle, Male) => (0.0, 0.0), + (Cattle, Female) => (0.0, 0.0), + (Darkhound, _) => (1.0, 1.5), + (Highland, _) => (0.0, 1.5), + (Yak, _) => (0.0, 0.0), + (Panda, _) => (0.5, 0.0), + (Bear, _) => (0.5, 0.0), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (7.0, 2.0), @@ -207,6 +223,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (3.0, 0.5), (Kelpie, _) => (1.0, 1.0), (Horse, _) => (4.0, 1.0), + (Barghest, _) => (6.5, -3.0), + (Cattle, Male) => (5.0, -5.5), + (Cattle, Female) => (5.0, -5.0), + (Darkhound, _) => (2.0, -2.0), + (Highland, _) => (5.0, -6.0), + (Yak, _) => (6.0, -8.0), + (Panda, _) => (3.0, -3.0), + (Bear, _) => (3.5, -2.0), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-11.5, -0.5), @@ -229,6 +253,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (-10.0, 2.0), (Kelpie, _) => (-9.0, 3.0), (Horse, _) => (-9.0, 1.5), + (Barghest, _) => (-7.0, -4.0), + (Cattle, Male) => (-8.0, 3.5), + (Cattle, Female) => (-8.0, 5.5), + (Darkhound, _) => (-9.0, -3.0), + (Highland, _) => (-9.0, 5.0), + (Yak, _) => (-8.0, 2.5), + (Panda, _) => (-9.5, 0.0), + (Bear, _) => (-10.0, -0.5), }, torso_front: match (body.species, body.body_type) { (Grolgar, _) => (10.0, 13.0), @@ -251,6 +283,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (10.0, 14.0), (Kelpie, _) => (10.0, 16.0), (Horse, _) => (7.0, 16.0), + (Barghest, _) => (11.5, 15.5), + (Cattle, Male) => (7.0, 15.5), + (Cattle, Female) => (7.0, 14.5), + (Darkhound, _) => (7.0, 14.0), + (Highland, _) => (7.0, 12.5), + (Yak, _) => (7.0, 15.5), + (Panda, _) => (7.0, 13.5), + (Bear, _) => (7.0, 14.5), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (-10.0, 1.5), @@ -273,6 +313,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (-7.0, 0.0), (Kelpie, _) => (-8.0, -1.0), (Horse, _) => (-8.0, -1.5), + (Barghest, _) => (-9.0, -1.5), + (Cattle, Male) => (-8.0, -0.5), + (Cattle, Female) => (-10.0, -2.0), + (Darkhound, _) => (-12.0, 0.5), + (Highland, _) => (-8.0, -0.5), + (Yak, _) => (-8.0, -0.5), + (Panda, _) => (-11.0, -0.5), + (Bear, _) => (-11.0, -0.5), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 8.0), @@ -295,6 +343,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (2.5, 5.0), (Kelpie, _) => (1.0, 7.5), (Horse, _) => (1.0, 7.0), + (Barghest, _) => (12.0, -3.0), + (Cattle, Male) => (2.0, -1.5), + (Cattle, Female) => (2.0, -1.5), + (Darkhound, _) => (1.0, 2.5), + (Highland, _) => (2.0, -1.5), + (Yak, _) => (3.0, -5.0), + (Panda, _) => (1.0, 4.0), + (Bear, _) => (1.0, 4.0), }, leg_f: match (body.species, body.body_type) { (Grolgar, _) => (7.5, -5.5, -1.0), @@ -317,6 +373,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (4.0, -4.5, -2.5), (Kelpie, _) => (4.5, -3.5, -3.5), (Horse, _) => (4.5, -2.5, -3.0), + (Barghest, _) => (9.5, 0.0, -2.5), + (Cattle, Male) => (5.5, -2.0, -2.5), + (Cattle, Female) => (5.5, -2.5, -1.0), + (Darkhound, _) => (4.0, -6.5, -2.0), + (Highland, _) => (5.5, -2.5, 0.0), + (Yak, _) => (4.5, -2.0, -1.5), + (Panda, _) => (7.5, -5.5, -2.0), + (Bear, _) => (7.5, -5.5, -2.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (6.0, -6.5, -4.0), @@ -339,6 +403,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (3.5, -7.5, -3.5), (Kelpie, _) => (3.5, -7.0, -2.5), (Horse, _) => (3.5, -7.0, -2.0), + (Barghest, _) => (7.0, -3.5, -5.5), + (Cattle, Male) => (4.0, -7.0, -1.0), + (Cattle, Female) => (4.0, -6.5, 0.0), + (Darkhound, _) => (4.0, -6.5, -3.0), + (Highland, _) => (4.5, -7.0, 0.0), + (Yak, _) => (4.5, -6.0, -1.0), + (Panda, _) => (7.0, -7.0, -2.0), + (Bear, _) => (6.5, -6.5, -2.0), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (0.0, 0.0, -4.0), @@ -361,6 +433,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (-0.5, 0.0, -3.5), (Kelpie, _) => (-0.5, 0.5, -4.5), (Horse, _) => (-0.5, 0.5, -5.0), + (Barghest, _) => (2.0, 2.5, -6.0), + (Cattle, Male) => (-2.5, 1.0, -5.0), + (Cattle, Female) => (-1.5, 0.5, -5.5), + (Darkhound, _) => (0.0, 0.5, -4.0), + (Highland, _) => (-0.5, 0.5, -4.5), + (Yak, _) => (-0.5, 0.0, -5.0), + (Panda, _) => (-1.0, 2.0, -4.5), + (Bear, _) => (0.0, 2.0, -5.5), }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (0.5, -1.5, -3.0), @@ -383,6 +463,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (-0.5, -1.5, -3.5), (Kelpie, _) => (0.5, -0.5, -3.5), (Horse, _) => (0.5, -1.5, -3.5), + (Barghest, _) => (0.5, 1.0, -4.5), + (Cattle, Male) => (-0.5, -0.5, -5.0), + (Cattle, Female) => (-0.5, -1.0, -3.5), + (Darkhound, _) => (0.0, -1.0, -3.5), + (Highland, _) => (-0.5, -0.5, -3.0), + (Yak, _) => (-0.5, -0.5, -5.0), + (Panda, _) => (-0.5, 0.5, -5.0), + (Bear, _) => (0.5, 0.5, -6.0), }, scaler: match (body.species, body.body_type) { (Grolgar, _) => (1.3), @@ -393,6 +481,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Tiger, _) => (1.2), (Catoblepas, _) => (1.3), (Roshwalr, _) => (1.2), + (Barghest, _) => (1.3), _ => (1.0), }, startangle: match (body.species, body.body_type) { @@ -405,6 +494,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (-0.5), (Bonerattler, _) => (-0.7), (Roshwalr, _) => (-0.3), + (Barghest, _) => (-0.5), _ => (0.0), }, tempo: match (body.species, body.body_type) { @@ -423,6 +513,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Zebra, _) => (0.85), (Kelpie, _) => (0.85), (Horse, _) => (0.85), + (Barghest, _) => (0.95), + (Darkhound, _) => (1.1), _ => (1.0), }, spring: match (body.species, body.body_type) { @@ -441,6 +533,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Antelope, _) => (1.2), (Kelpie, _) => (0.95), (Horse, _) => (0.85), + (Darkhound, _) => (1.2), _ => (1.0), }, feed: match (body.species, body.body_type) { diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs index 49b7c1644e..1376a23a74 100644 --- a/world/src/layer/wildlife.rs +++ b/world/src/layer/wildlife.rs @@ -133,13 +133,19 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body( - quadruped_medium::Body::random_with( + .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() + }, + _ => quadruped_medium::Body::random_with( rng, - &quadruped_medium::Species::Mouflon, + &quadruped_medium::Species::Highland, ) .into(), - ) + }) .with_alignment(Alignment::Wild) }, group_size: 1..4, @@ -154,11 +160,9 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( 0 => { bird_medium::Body::random_with(rng, &bird_medium::Species::Eagle).into() }, - 1 => quadruped_low::Body::random_with(rng, &quadruped_low::Species::Asp) + 1 => bird_medium::Body::random_with(rng, &bird_medium::Species::Snowyowl) .into(), - 2 => bird_medium::Body::random_with(rng, &bird_medium::Species::Snowyowl) - .into(), - 3 => quadruped_small::Body { + 2 => quadruped_small::Body { species: quadruped_small::Species::Fox, body_type: quadruped_small::BodyType::Female, } @@ -201,7 +205,12 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_medium::Species::Tarasque, ) .into(), - 1 => { + 1 => quadruped_medium::Body::random_with( + rng, + &quadruped_medium::Species::Bear, + ) + .into(), + 2 => { theropod::Body::random_with(rng, &theropod::Species::Woodraptor).into() }, _ => quadruped_medium::Body::random_with( @@ -222,7 +231,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0..11) { + .with_body(match rng.gen_range(0, 12) { 0 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Deer, @@ -269,6 +278,10 @@ 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() + }, _ => bird_medium::Body::random_with(rng, &bird_medium::Species::Chicken) .into(), }) @@ -654,7 +667,9 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_medium::Species::Bonerattler, ) .into(), - 1 => { + 1 => quadruped_low::Body::random_with(rng, &quadruped_low::Species::Asp) + .into(), + 2 => { theropod::Body::random_with(rng, &theropod::Species::Sandraptor).into() }, _ => quadruped_low::Body::random_with( diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index a1807fcbdd..431d66ecc9 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -1017,19 +1017,19 @@ impl Floor { .with_body(comp::Body::QuadrupedMedium( comp::quadruped_medium::Body::random_with( dynamic_rng, - &comp::quadruped_medium::Species::Wolf, + &comp::quadruped_medium::Species::Darkhound, ), )) - .with_name("Tamed Wolf".to_string()) + .with_name("Tamed Darkhound".to_string()) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)), EntityInfo::at(tile_wcenter.map(|e| e as f32)) .with_body(comp::Body::QuadrupedMedium( comp::quadruped_medium::Body::random_with( dynamic_rng, - &comp::quadruped_medium::Species::Wolf, + &comp::quadruped_medium::Species::Darkhound, ), )) - .with_name("Tamed Wolf".to_string()) + .with_name("Tamed Darkhound".to_string()) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)), ], 4 => vec![