Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds alpaca and llama npcs

Browse Source
This commit is contained in:
Snowram 2021-06-20 04:00:21 +02:00
parent fef0f407d3
commit 58b95d12d4
83 changed files with 718 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/entity/dungeon/tier-5/warlock.ron
View File

@ -1,10 +1,10 @@
EntityConfig (
name: Some("Cultist Warlock"),
body: Some(RandomWith("cultist_warlord")),
body: Some(RandomWith("cultist_warlock")),
loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
main_tool: Some(Item("common.items.weapons.staff.cultist_staff")),
main_tool: Some(Item("common.items.weapons.staff.bipedlarge-cultist_staff")),
second_tool: None,
loadout_asset: None,

17
assets/common/items/armor/warlock/back.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock cape",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Back("Warlock"),
stats: (
protection: Normal(4.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlock/belt.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Belt",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Belt("Warlock"),
stats: (
protection: Normal(8.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlock/chest.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Vest",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Chest("Warlock"),
stats: (
protection: Normal(40.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlock/foot.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Slippers",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Foot("Warlock"),
stats: (
protection: Normal(8.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlock/hand.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Gloves",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Hand("Warlock"),
stats: (
protection: Normal(15.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/warlock/head.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Head("Warlock"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/warlock/pants.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Kilt",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Pants("Warlock"),
stats: (
protection: Normal(30.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlock/shoulder.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlock Shoulders",
description: "Belong to a mighty warlock.",
kind: Armor((
kind: Shoulder("Warlock"),
stats: (
protection: Normal(22.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/warlord/back.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord cape",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Back("Warlord"),
stats: (
protection: Normal(4.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlord/belt.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Belt",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Belt("Warlord"),
stats: (
protection: Normal(8.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlord/chest.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Cuirass",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Chest("Warlord"),
stats: (
protection: Normal(40.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlord/foot.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Feet",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Foot("Warlord"),
stats: (
protection: Normal(8.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlord/hand.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Handguards",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Hand("Warlord"),
stats: (
protection: Normal(15.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/warlord/head.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Helmet",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Head("Warlord"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

17
assets/common/items/armor/warlord/pants.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Legguards",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Pants("Warlord"),
stats: (
protection: Normal(30.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/armor/warlord/shoulder.ron
View File

@ -1,17 +0,0 @@
ItemDef(
name: "Warlord Shoulderguards",
description: "Belong to a mighty warlord.",
kind: Armor((
kind: Shoulder("Warlord"),
stats: (
protection: Normal(22.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Common,
tags: [],
)

0
assets/common/items/weapons/staff/bipedlarge_cultist_staff.ron → assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron
View File

16
assets/common/npc_names.ron
View File

@ -555,6 +555,14 @@
keyword: "ngoubou",
generic: "Ngoubou"
),
llama: (
keyword: "llama",
generic: "Llama"
),
alpaca: (
keyword: "alpaca",
generic: "Alpaca"
),
)
),
quadruped_small: (
@ -898,6 +906,14 @@
keyword: "cultist_warlord",
generic: "Cultist Warlord"
),
cultist_warlock: (
keyword: "cultist_warlock",
generic: "Cultist Warlock"
),
husk_brute: (
keyword: "husk_brute",
generic: "Husk Brute"
),
)
),
golem: (

58
assets/voxygen/item_image_manifest.ron
View File

@ -1548,56 +1548,6 @@
"voxel.armor.bonerattler.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Warlord Set
Armor(Chest("Warlord")): VoxTrans(
"voxel.armor.warlord.chest",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants("Warlord")): VoxTrans(
"voxel.armor.warlord.pants",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt("Warlord")): VoxTrans(
"voxel.armor.warlord.belt",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
),
Armor(Foot("Warlord")): VoxTrans(
"voxel.armor.warlord.foot",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand("Warlord")): VoxTrans(
"voxel.armor.warlord.hand",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder("Warlord")): VoxTrans(
"voxel.armor.warlord.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Warlock Set
Armor(Chest("Warlock")): VoxTrans(
"voxel.armor.warlock.chest",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants("Warlock")): VoxTrans(
"voxel.armor.warlock.pants",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt("Warlock")): VoxTrans(
"voxel.armor.warlock.belt",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
),
Armor(Foot("Warlock")): VoxTrans(
"voxel.armor.warlock.foot",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand("Warlock")): VoxTrans(
"voxel.armor.warlock.hand",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder("Warlock")): VoxTrans(
"voxel.armor.warlock.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Rawhide Set
Armor(Chest("Rawhide")): VoxTrans(
"voxel.armor.hide.rawhide.chest",
@ -2183,14 +2133,6 @@
"voxel.armor.misc.back.backpack",
(0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
),
Armor(Back("Warlord")): VoxTrans(
"voxel.armor.warlord.back",
(0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
),
Armor(Back("Warlock")): VoxTrans(
"voxel.armor.warlock.back",
(0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
),
// Rings
Armor(Ring("Scratched")): VoxTrans(
"voxel.armor.misc.ring.scratched",

104
assets/voxygen/voxel/biped_large_central_manifest.ron
View File

@ -988,4 +988,108 @@
central: ("armor.empty"),
)
),
(Cultistwarlock, Male): (
head: (
offset: (-6.0, -5.5, -6.5),
central: ("npc.cultist_warlock.male.head"),
),
torso_upper: (
offset: (-7.0, -5.5, -5.5),
central: ("npc.cultist_warlock.male.torso_upper"),
),
torso_lower: (
offset: (-6.0, -4.5, -10.0),
central: ("npc.cultist_warlock.male.torso_lower"),
),
jaw: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
(Cultistwarlock, Female): (
head: (
offset: (-6.0, -5.5, -6.5),
central: ("npc.cultist_warlock.male.head"),
),
torso_upper: (
offset: (-7.0, -5.5, -5.5),
central: ("npc.cultist_warlock.male.torso_upper"),
),
torso_lower: (
offset: (-6.0, -4.5, -10.0),
central: ("npc.cultist_warlock.male.torso_lower"),
),
jaw: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
(Huskbrute, Male): (
head: (
offset: (-6.0, -6.0, -6.5),
central: ("npc.husk_brute.male.head"),
),
torso_upper: (
offset: (-8.0, -8.0, -8.0),
central: ("npc.husk_brute.male.torso_upper"),
),
torso_lower: (
offset: (-7.0, -6.5, -9.0),
central: ("npc.husk_brute.male.torso_lower"),
),
jaw: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
(Huskbrute, Female): (
head: (
offset: (-6.0, -6.0, -6.5),
central: ("npc.husk_brute.male.head"),
),
torso_upper: (
offset: (-8.0, -8.0, -8.0),
central: ("npc.husk_brute.male.torso_upper"),
),
torso_lower: (
offset: (-7.0, -6.5, -9.0),
central: ("npc.husk_brute.male.torso_lower"),
),
jaw: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
second: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
)
),
})

136
assets/voxygen/voxel/biped_large_lateral_manifest.ron
View File

@ -1291,4 +1291,140 @@
lateral: ("npc.cultist_warlord.male.foot_r"),
)
),
(Cultistwarlock, Male): (
shoulder_l: (
offset: (-3.5, -3.5, -3.0),
lateral: ("npc.cultist_warlock.male.shoulder_l"),
),
shoulder_r: (
offset: (-3.5, -3.5, -3.0),
lateral: ("npc.cultist_warlock.male.shoulder_r"),
),
hand_l: (
offset: (-3.5, -3.5, -10.0),
lateral: ("npc.cultist_warlock.male.hand_l"),
),
hand_r: (
offset: (-3.5, -3.5, -10.0),
lateral: ("npc.cultist_warlock.male.hand_r"),
),
leg_l: (
offset: (-1.5, -2.0, -2.5),
lateral: ("npc.cultist_warlock.male.leg_l"),
),
leg_r: (
offset: (-1.5, -2.0, -2.5),
lateral: ("npc.cultist_warlock.male.leg_r"),
),
foot_l: (
offset: (-2.5, -4.0, -4.0),
lateral: ("npc.cultist_warlock.male.foot_l"),
),
foot_r: (
offset: (-2.5, -4.0, -4.0),
lateral: ("npc.cultist_warlock.male.foot_r"),
)
),
(Cultistwarlock, Female): (
shoulder_l: (
offset: (-3.5, -3.5, -3.0),
lateral: ("npc.cultist_warlock.male.shoulder_l"),
),
shoulder_r: (
offset: (-3.5, -3.5, -3.0),
lateral: ("npc.cultist_warlock.male.shoulder_r"),
),
hand_l: (
offset: (-3.5, -3.5, -10.0),
lateral: ("npc.cultist_warlock.male.hand_l"),
),
hand_r: (
offset: (-3.5, -3.5, -10.0),
lateral: ("npc.cultist_warlock.male.hand_r"),
),
leg_l: (
offset: (-1.5, -2.0, -2.5),
lateral: ("npc.cultist_warlock.male.leg_l"),
),
leg_r: (
offset: (-1.5, -2.0, -2.5),
lateral: ("npc.cultist_warlock.male.leg_r"),
),
foot_l: (
offset: (-2.5, -4.0, -4.0),
lateral: ("npc.cultist_warlock.male.foot_l"),
),
foot_r: (
offset: (-2.5, -4.0, -4.0),
lateral: ("npc.cultist_warlock.male.foot_r"),
)
),
(Huskbrute, Male): (
shoulder_l: (
offset: (-4.0, -4.5, -4.0),
lateral: ("npc.husk_brute.male.shoulder_l"),
),
shoulder_r: (
offset: (-4.0, -4.5, -4.0),
lateral: ("npc.husk_brute.male.shoulder_r"),
),
hand_l: (
offset: (-4.0, -3.5, -17.0),
lateral: ("npc.husk_brute.male.hand_l"),
),
hand_r: (
offset: (-4.0, -3.5, -17.0),
lateral: ("npc.husk_brute.male.hand_r"),
),
leg_l: (
offset: (-2.0, -2.5, -3.5),
lateral: ("npc.husk_brute.male.leg_l"),
),
leg_r: (
offset: (-2.0, -2.5, -3.5),
lateral: ("npc.husk_brute.male.leg_r"),
),
foot_l: (
offset: (-2.5, -3.5, -3.5),
lateral: ("npc.husk_brute.male.foot_l"),
),
foot_r: (
offset: (-2.5, -3.5, -3.5),
lateral: ("npc.husk_brute.male.foot_r"),
)
),
(Huskbrute, Female): (
shoulder_l: (
offset: (-4.0, -4.5, -4.0),
lateral: ("npc.husk_brute.male.shoulder_l"),
),
shoulder_r: (
offset: (-4.0, -4.5, -4.0),
lateral: ("npc.husk_brute.male.shoulder_r"),
),
hand_l: (
offset: (-4.0, -3.5, -17.0),
lateral: ("npc.husk_brute.male.hand_l"),
),
hand_r: (
offset: (-4.0, -3.5, -17.0),
lateral: ("npc.husk_brute.male.hand_r"),
),
leg_l: (
offset: (-2.0, -2.5, -3.5),
lateral: ("npc.husk_brute.male.leg_l"),
),
leg_r: (
offset: (-2.0, -2.5, -3.5),
lateral: ("npc.husk_brute.male.leg_r"),
),
foot_l: (
offset: (-2.5, -3.5, -3.5),
lateral: ("npc.husk_brute.male.foot_l"),
),
foot_r: (
offset: (-2.5, -3.5, -3.5),
lateral: ("npc.husk_brute.male.foot_r"),
)
),
})

8
assets/voxygen/voxel/humanoid_armor_back_manifest.ron
View File

@ -40,14 +40,6 @@
vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
color: None
),
"Warlord": (
vox_spec: ("armor.warlord.back", (-5.0, -1.0, -14.0)),
color: None
),
"Warlock": (
vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)),
color: None
),
"Rawhide": (
vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)),
color: None

8
assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
View File

@ -72,14 +72,6 @@
vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
color: None
),
"Warlord":(
vox_spec: ("armor.warlord.belt", (-4.0, -3.5, 1.0)),
color: None
),
"Warlock":(
vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)),
color: None
),
"Rawhide": (
vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)),
color: None

8
assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
View File

@ -142,14 +142,6 @@
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
color: None
),
"Warlord": (
vox_spec: ("armor.warlord.chest", (-7.0, -3.5, -0.5)),
color: None
),
"Warlock": (
vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)),
color: None
),
"Rawhide": (
vox_spec: ("armor.hide.rawhide.chest", (-7.0, -3.5, 2.0)),
color: None

8
assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
View File

@ -72,14 +72,6 @@
vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)),
color: None
),
"Warlord": (
vox_spec: ("armor.warlord.foot", (-2.5, -3.5, -2.0)),
color: None
),
"Warlock": (
vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)),
color: None
),
"Rawhide": (
vox_spec: ("armor.hide.rawhide.foot", (-2.5, -3.5, -2.0)),
color: None

20
assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
View File

@ -150,26 +150,6 @@
color: None
)
),
"Warlord": (
left: (
vox_spec: ("armor.warlord.hand", (-3.0, -2.0, -5.0)),
color: None
),
right: (
vox_spec: ("armor.warlord.hand", (-2.0, -2.0, -5.0)),
color: None
)
),
"Warlock": (
left: (
vox_spec: ("armor.warlock.hand", (-4.5, -3.5, -5.0)),
color: None
),
right: (
vox_spec: ("armor.warlock.hand", (-2.5, -3.5, -5.0)),
color: None
)
),
"Rawhide": (
left: (
vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)),

8
assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
View File

@ -100,14 +100,6 @@
vox_spec: ("armor.leather_blue.pants", (-5.0, -3.5, 1.0)),
color: None
),
"Warlord": (
vox_spec: ("armor.warlord.pants", (-6.0, -4.5, -2.0)),
color: None
),
"Warlock": (
vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)),
color: None
),
"Rawhide": (
vox_spec: ("armor.hide.rawhide.pants", (-5.0, -3.5, 1.0)),
color: None

20
assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
View File

@ -231,26 +231,6 @@
color: None
)
),
"Warlord": (
left: (
vox_spec: ("armor.warlord.shoulder", (-8.0, -3.5 , -2.5)),
color: None
),
right: (
vox_spec: ("armor.warlord.shoulder", (-1.0, -3.5 , -2.5)),
color: None
)
),
"Warlock": (
left: (
vox_spec: ("armor.warlock.shoulder", (-6.0, -4.0 , -2.0)),
color: None
),
right: (
vox_spec: ("armor.warlock.shoulder", (0.0, -4.0, -2.0)),
color: None
)
),
"Rawhide": (
left: (
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)),

BIN
assets/voxygen/voxel/npc/alpaca/male/ears.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/foot_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/foot_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/jaw.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/leg_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/leg_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/neck.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/tail.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/torso_back.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/alpaca/male/torso_front.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/foot_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/foot_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/hand_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/hand_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/leg_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/leg_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/torso_lower.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cultist_warlock/male/torso_upper.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/foot_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/foot_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/hand_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/hand_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/leg_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/leg_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/shoulder_l.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/shoulder_r.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/torso_lower.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/husk_brute/male/torso_upper.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/ears.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/foot_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/foot_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/jaw.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/leg_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/leg_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/neck.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/tail.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/torso_back.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/llama/male/torso_front.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

120
assets/voxygen/voxel/quadruped_medium_central_manifest.ron
View File

@ -1919,4 +1919,124 @@
central: ("npc.ngoubou.male.tail"),
),
),
(Llama, Male): (
head: (
offset: (-3.0, -2.0, -3.5),
central: ("npc.llama.male.head"),
),
neck: (
offset: (-3.0, -4.5, -9.5),
central: ("npc.llama.male.neck"),
),
jaw: (
offset: (-2.0, 0.0, -2.0),
central: ("npc.llama.male.jaw"),
),
torso_front: (
offset: (-6.0, -9.0, -6.0),
central: ("npc.llama.male.torso_front"),
),
torso_back: (
offset: (-5.0, -12.0, -5.0),
central: ("npc.llama.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
central: ("npc.llama.male.ears"),
),
tail: (
offset: (-2.0, -5.0, -7.0),
central: ("npc.llama.male.tail"),
),
),
(Llama, Female): (
head: (
offset: (-3.0, -2.0, -3.5),
central: ("npc.llama.male.head"),
),
neck: (
offset: (-3.0, -4.5, -9.5),
central: ("npc.llama.male.neck"),
),
jaw: (
offset: (-2.0, 0.0, -2.0),
central: ("npc.llama.male.jaw"),
),
torso_front: (
offset: (-6.0, -9.0, -6.0),
central: ("npc.llama.male.torso_front"),
),
torso_back: (
offset: (-5.0, -12.0, -5.0),
central: ("npc.llama.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
central: ("npc.llama.male.ears"),
),
tail: (
offset: (-2.0, -5.0, -7.0),
central: ("npc.llama.male.tail"),
),
),
(Alpaca, Male): (
head: (
offset: (-4.0, -3.0, -4.0),
central: ("npc.alpaca.male.head"),
),
neck: (
offset: (-3.0, -3.5, -6.5),
central: ("npc.alpaca.male.neck"),
),
jaw: (
offset: (-1.0, 0.0, -0.5),
central: ("npc.alpaca.male.jaw"),
),
torso_front: (
offset: (-5.0, -8.0, -4.5),
central: ("npc.alpaca.male.torso_front"),
),
torso_back: (
offset: (-5.0, -10.0, -4.5),
central: ("npc.alpaca.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
central: ("npc.alpaca.male.ears"),
),
tail: (
offset: (-3.0, -5.0, -8.0),
central: ("npc.alpaca.male.tail"),
),
),
(Alpaca, Female): (
head: (
offset: (-4.0, -3.0, -4.0),
central: ("npc.alpaca.male.head"),
),
neck: (
offset: (-3.0, -3.5, -6.5),
central: ("npc.alpaca.male.neck"),
),
jaw: (
offset: (-1.0, 0.0, -0.5),
central: ("npc.alpaca.male.jaw"),
),
torso_front: (
offset: (-5.0, -8.0, -4.5),
central: ("npc.alpaca.male.torso_front"),
),
torso_back: (
offset: (-5.0, -10.0, -4.5),
central: ("npc.alpaca.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
central: ("npc.alpaca.male.ears"),
),
tail: (
offset: (-3.0, -5.0, -8.0),
central: ("npc.alpaca.male.tail"),
),
),
})

136
assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
View File

@ -2175,4 +2175,140 @@
lateral: ("npc.ngoubou.male.foot_br"),
),
),
(Llama, Male): (
leg_fl: (
offset: (-2.0, -2.5, -6.0),
lateral: ("npc.llama.male.leg_fr"),
),
leg_fr: (
offset: (-2.0, -2.5, -6.0),
lateral: ("npc.llama.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.llama.male.leg_br"),
),
leg_br: (
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.llama.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -2.0, -8.0),
lateral: ("npc.llama.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -2.0, -8.0),
lateral: ("npc.llama.male.foot_fr"),
),
foot_bl: (
offset: (-1.5, -2.5, -9.0),
lateral: ("npc.llama.male.foot_br"),
),
foot_br: (
offset: (-1.5, -2.5, -9.0),
lateral: ("npc.llama.male.foot_br"),
),
),
(Llama, Female): (
leg_fl: (
offset: (-2.0, -2.5, -6.0),
lateral: ("npc.llama.male.leg_fr"),
),
leg_fr: (
offset: (-2.0, -2.5, -6.0),
lateral: ("npc.llama.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.llama.male.leg_br"),
),
leg_br: (
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.llama.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -2.0, -8.0),
lateral: ("npc.llama.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -2.0, -8.0),
lateral: ("npc.llama.male.foot_fr"),
),
foot_bl: (
offset: (-1.5, -2.5, -9.0),
lateral: ("npc.llama.male.foot_br"),
),
foot_br: (
offset: (-1.5, -2.5, -9.0),
lateral: ("npc.llama.male.foot_br"),
),
),
(Alpaca, Male): (
leg_fl: (
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.alpaca.male.leg_fr"),
),
leg_fr: (
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.alpaca.male.leg_fr"),
),
leg_bl: (
offset: (-2.5, -2.5, -4.5),
lateral: ("npc.alpaca.male.leg_br"),
),
leg_br: (
offset: (-2.5, -2.5, -4.5),
lateral: ("npc.alpaca.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_fr"),
),
foot_bl: (
offset: (-2.0, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_br"),
),
foot_br: (
offset: (-2.0, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_br"),
),
),
(Alpaca, Female): (
leg_fl: (
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.alpaca.male.leg_fr"),
),
leg_fr: (
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.alpaca.male.leg_fr"),
),
leg_bl: (
offset: (-2.5, -2.5, -4.5),
lateral: ("npc.alpaca.male.leg_br"),
),
leg_br: (
offset: (-2.5, -2.5, -4.5),
lateral: ("npc.alpaca.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_fr"),
),
foot_bl: (
offset: (-2.0, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_br"),
),
foot_br: (
offset: (-2.0, -2.0, -6.0),
lateral: ("npc.alpaca.male.foot_br"),
),
),
})

1
common/src/comp/body.rs
View File

@ -307,6 +307,7 @@ impl Body {
biped_large::Species::Werewolf => Vec3::new(4.0, 3.0, 3.5),
biped_large::Species::Harvester => Vec3::new(4.6, 3.0, 5.4),
biped_large::Species::Cultistwarlord => Vec3::new(3.0, 3.0, 4.5),
biped_large::Species::Cultistwarlock => Vec3::new(3.0, 3.0, 4.5),
_ => Vec3::new(4.6, 3.0, 6.0),
},
Body::BipedSmall(body) => match body.species {

10
common/src/comp/body/biped_large.rs
View File

@ -53,6 +53,8 @@ make_case_elim!(
Blueoni = 16,
Redoni = 17,
Cultistwarlord = 18,
Cultistwarlock = 19,
Huskbrute = 20,
}
);
@ -80,6 +82,8 @@ pub struct AllSpecies<SpeciesMeta> {
pub oni_blue: SpeciesMeta,
pub oni_red: SpeciesMeta,
pub cultist_warlord: SpeciesMeta,
pub cultist_warlock: SpeciesMeta,
pub husk_brute: SpeciesMeta,
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@ -107,11 +111,13 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
Species::Blueoni => &self.oni_blue,
Species::Redoni => &self.oni_red,
Species::Cultistwarlord => &self.cultist_warlord,
Species::Cultistwarlock => &self.cultist_warlock,
Species::Huskbrute => &self.husk_brute,
}
}
}
pub const ALL_SPECIES: [Species; 19] = [
pub const ALL_SPECIES: [Species; 21] = [
Species::Ogre,
Species::Cyclops,
Species::Wendigo,
@ -131,6 +137,8 @@ pub const ALL_SPECIES: [Species; 19] = [
Species::Blueoni,
Species::Redoni,
Species::Cultistwarlord,
Species::Cultistwarlock,
Species::Huskbrute,
];
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

10
common/src/comp/body/quadruped_medium.rs
View File

@ -64,6 +64,8 @@ pub enum Species {
Snowleopard = 31,
Mammoth = 32,
Ngoubou = 33,
Llama = 34,
Alpaca = 35,
}
/// Data representing per-species generic data.
@ -103,6 +105,8 @@ pub struct AllSpecies<SpeciesMeta> {
pub snowleopard: SpeciesMeta,
pub mammoth: SpeciesMeta,
pub ngoubou: SpeciesMeta,
pub llama: SpeciesMeta,
pub alpaca: SpeciesMeta,
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@ -143,11 +147,13 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
Species::Snowleopard => &self.snowleopard,
Species::Mammoth => &self.mammoth,
Species::Ngoubou => &self.ngoubou,
Species::Llama => &self.llama,
Species::Alpaca => &self.alpaca,
}
}
}
pub const ALL_SPECIES: [Species; 32] = [
pub const ALL_SPECIES: [Species; 34] = [
Species::Grolgar,
Species::Saber,
Species::Tiger,
@ -180,6 +186,8 @@ pub const ALL_SPECIES: [Species; 32] = [
Species::Snowleopard,
Species::Mammoth,
Species::Ngoubou,
Species::Llama,
Species::Alpaca,
];
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

9
common/src/comp/inventory/loadout_builder.rs
View File

@ -267,9 +267,9 @@ fn default_main_tool(body: &Body) -> Item {
(biped_large::Species::Wendigo, _) => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.wendigo_magic",
)),
(biped_large::Species::Werewolf, _) => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.beast_claws",
)),
(biped_large::Species::Werewolf | biped_large::Species::Huskbrute, _) => Some(
Item::new_from_asset_expect("common.items.npc_weapons.unique.beast_claws"),
),
(biped_large::Species::Cyclops, _) => Some(Item::new_from_asset_expect(
"common.items.npc_weapons.hammer.cyclops_hammer",
)),
@ -300,6 +300,9 @@ fn default_main_tool(body: &Body) -> Item {
(biped_large::Species::Cultistwarlord, _) => Some(Item::new_from_asset_expect(
"common.items.weapons.sword.bipedlarge-cultist",
)),
(biped_large::Species::Cultistwarlock, _) => Some(Item::new_from_asset_expect(
"common.items.weapons.staff.bipedlarge-cultist_staff",
)),
},
Body::Object(body) => match body {
object::Body::Crossbow => Some(Item::new_from_asset_expect(

2
common/src/states/utils.rs
View File

@ -70,6 +70,8 @@ impl Body {
quadruped_medium::Species::Snowleopard => 160.0,
quadruped_medium::Species::Mammoth => 180.0,
quadruped_medium::Species::Ngoubou => 170.0,
quadruped_medium::Species::Llama => 130.0,
quadruped_medium::Species::Alpaca => 120.0,
},
Body::BipedLarge(body) => match body.species {
biped_large::Species::Slysaurok => 100.0,

4
server/src/events/entity_manipulation.rs
View File

@ -418,7 +418,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
| quadruped_medium::Species::Antelope
| quadruped_medium::Species::Kelpie
| quadruped_medium::Species::Cattle
| quadruped_medium::Species::Yak => {
| quadruped_medium::Species::Yak
| quadruped_medium::Species::Llama
| quadruped_medium::Species::Alpaca => {
"common.loot_tables.creature.quad_medium.gentle"
},
quadruped_medium::Species::Ngoubou => {

20
voxygen/anim/src/biped_large/mod.rs
View File

@ -230,6 +230,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (10.5, -3.0),
(Redoni, _) => (10.5, -3.0),
(Cultistwarlord, _) => (0.5, 14.5),
(Cultistwarlock, _) => (0.5, 14.5),
(Huskbrute, _) => (8.5, 4.0),
},
jaw: match (body.species, body.body_type) {
(Ogre, _) => (0.0, 0.0),
@ -251,6 +253,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (0.0, 3.5),
(Redoni, _) => (0.0, 3.5),
(Cultistwarlord, _) => (0.0, 3.5),
(Cultistwarlock, _) => (0.0, 3.5),
(Huskbrute, _) => (-5.0, -5.0),
},
upper_torso: match (body.species, body.body_type) {
(Ogre, Male) => (0.0, 27.5),
@ -273,6 +277,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (-1.0, 26.5),
(Redoni, _) => (-1.0, 26.5),
(Cultistwarlord, _) => (-1.0, 18.5),
(Cultistwarlock, _) => (-1.0, 18.5),
(Huskbrute, _) => (-1.0, 23.5),
},
lower_torso: match (body.species, body.body_type) {
(Ogre, Male) => (1.0, -7.0),
@ -295,6 +301,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (0.0, -8.5),
(Redoni, _) => (0.0, -8.5),
(Cultistwarlord, _) => (0.0, -1.5),
(Cultistwarlock, _) => (0.0, -1.5),
(Huskbrute, _) => (0.0, -6.5),
},
tail: match (body.species, body.body_type) {
(Werewolf, _) => (-5.5, -2.0),
@ -325,6 +333,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (11.0, 2.0, -5.5),
(Redoni, _) => (11.0, 2.0, -5.5),
(Cultistwarlord, _) => (11.5, -1.0, 4.5),
(Cultistwarlock, _) => (11.5, -1.0, 4.5),
(Huskbrute, _) => (10.5, 1.0, -2.5),
},
hand: match (body.species, body.body_type) {
(Ogre, Male) => (14.5, 0.0, -4.0),
@ -347,6 +357,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (13.5, 0.5, -8.0),
(Redoni, _) => (13.5, 0.5, -8.0),
(Cultistwarlord, _) => (11.5, -1.0, -1.0),
(Cultistwarlock, _) => (11.5, -1.0, -1.0),
(Huskbrute, _) => (12.0, 1.5, -6.0),
},
leg: match (body.species, body.body_type) {
(Ogre, Male) => (0.0, 0.0, -4.0),
@ -369,6 +381,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (4.5, 2.0, -5.5),
(Redoni, _) => (4.5, 2.0, -5.5),
(Cultistwarlord, _) => (3.5, -1.0, -8.5),
(Cultistwarlock, _) => (3.5, -1.0, -8.5),
(Huskbrute, _) => (4.0, 0.0, -5.5),
},
foot: match (body.species, body.body_type) {
(Ogre, Male) => (4.0, 1.0, -12.0),
@ -391,6 +405,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (5.0, 5.0, -12.5),
(Redoni, _) => (5.0, 5.0, -12.5),
(Cultistwarlord, _) => (3.5, 0.0, -12.5),
(Cultistwarlock, _) => (3.5, 0.0, -12.5),
(Huskbrute, _) => (4.5, 0.5, -12.5),
},
scaler: match (body.species, body.body_type) {
(Ogre, Male) => 1.12,
@ -413,6 +429,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => 1.2,
(Redoni, _) => 1.2,
(Cultistwarlord, _) => 1.0,
(Cultistwarlock, _) => 1.0,
(Huskbrute, _) => 1.2,
},
tempo: match (body.species, body.body_type) {
(Ogre, Male) => 0.9,
@ -446,6 +464,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Blueoni, _) => (12.5, 0.0),
(Redoni, _) => (12.5, 0.0),
(Cultistwarlord, _) => (8.0, 0.0),
(Cultistwarlock, _) => (8.0, 0.0),
(Huskbrute, _) => (12.5, 0.0),
},
shl: match (body.species, body.body_type) {
(Dullahan, _) => (-4.75, -11.0, 8.5, 1.47, -0.2, 0.0),

22
voxygen/anim/src/quadruped_medium/mod.rs
View File

@ -177,6 +177,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (1.5, 0.5),
(Mammoth, _) => (0.5, -1.5),
(Ngoubou, _) => (0.5, -2.5),
(Llama, _) => (0.5, 10.0),
(Alpaca, _) => (0.5, 7.5),
},
neck: match (body.species, body.body_type) {
(Grolgar, _) => (1.0, -1.0),
@ -212,6 +214,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (0.0, 1.5),
(Mammoth, _) => (0.5, -0.5),
(Ngoubou, _) => (2.0, 1.0),
(Llama, _) => (2.5, 4.5),
(Alpaca, _) => (-1.5, 3.0),
},
jaw: match (body.species, body.body_type) {
(Grolgar, _) => (7.0, 2.0),
@ -248,6 +252,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (3.0, -3.0),
(Mammoth, _) => (4.5, -3.0),
(Ngoubou, _) => (4.5, -4.0),
(Llama, _) => (4.0, -1.0),
(Alpaca, _) => (3.0, -2.5),
},
tail: match (body.species, body.body_type) {
(Grolgar, _) => (-11.5, -0.5),
@ -283,6 +289,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (-10.5, 3.0),
(Mammoth, _) => (-13.0, -1.5),
(Ngoubou, _) => (-12.0, 5.5),
(Llama, _) => (-9.0, 6.0),
(Alpaca, _) => (-8.5, 3.5),
},
torso_front: match (body.species, body.body_type) {
(Grolgar, _) => (10.0, 13.0),
@ -318,6 +326,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (1.5, 13.0),
(Mammoth, _) => (11.5, 20.5),
(Ngoubou, _) => (9.5, 16.5),
(Llama, _) => (7.0, 15.0),
(Alpaca, _) => (7.0, 11.5),
},
torso_back: match (body.species, body.body_type) {
(Grolgar, _) => (-10.0, 1.5),
@ -353,6 +363,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (-11.0, 0.0),
(Mammoth, _) => (-13.0, -2.5),
(Ngoubou, _) => (-8.0, -2.0),
(Llama, _) => (-8.0, 0.0),
(Alpaca, _) => (-6.0, 0.0),
},
ears: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, 8.0),
@ -389,6 +401,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (1.5, 3.0),
(Mammoth, _) => (12.0, -3.0),
(Ngoubou, _) => (12.0, -3.0),
(Llama, _) => (1.0, 3.5),
(Alpaca, _) => (1.0, 2.0),
},
leg_f: match (body.species, body.body_type) {
(Grolgar, _) => (7.5, -5.5, -1.0),
@ -424,6 +438,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (6.5, -4.0, -2.5),
(Mammoth, _) => (10.0, -5.0, -5.0),
(Ngoubou, _) => (7.5, -4.0, -1.5),
(Llama, _) => (5.0, -1.5, -1.0),
(Alpaca, _) => (3.5, -2.5, -0.5),
},
leg_b: match (body.species, body.body_type) {
(Grolgar, _) => (6.0, -6.5, -4.0),
@ -459,6 +475,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (5.5, -5.0, -1.5),
(Mammoth, _) => (7.5, -7.0, -5.0),
(Ngoubou, _) => (4.5, -9.5, 0.0),
(Llama, _) => (5.0, -7.0, -2.0),
(Alpaca, _) => (3.5, -7.0, 0.0),
},
feet_f: match (body.species, body.body_type) {
(Grolgar, _) => (0.0, 0.0, -4.0),
@ -494,6 +512,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (0.5, 0.5, -4.5),
(Mammoth, _) => (-0.5, -0.5, -6.0),
(Ngoubou, _) => (-1.0, 0.5, -6.0),
(Llama, _) => (-0.5, 0.5, -6.0),
(Alpaca, _) => (0.0, -0.5, -5.0),
},
feet_b: match (body.species, body.body_type) {
(Grolgar, _) => (0.5, -1.5, -3.0),
@ -529,6 +549,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Snowleopard, _) => (0.5, 0.5, -5.5),
(Mammoth, _) => (0.5, -0.5, -4.5),
(Ngoubou, _) => (0.5, 1.0, -5.5),
(Llama, _) => (0.5, -1.5, -3.5),
(Alpaca, _) => (-0.5, -0.5, -5.5),
},
scaler: match (body.species, body.body_type) {
(Grolgar, _) => (1.05),