From 58b95d12d42f8160f03fbf7618a087fc8b7d9031 Mon Sep 17 00:00:00 2001 From: Snowram Date: Sun, 20 Jun 2021 04:00:21 +0200 Subject: [PATCH] Adds alpaca and llama npcs --- .../common/entity/dungeon/tier-5/warlock.ron | 4 +- assets/common/items/armor/warlock/back.ron | 17 --- assets/common/items/armor/warlock/belt.ron | 17 --- assets/common/items/armor/warlock/chest.ron | 17 --- assets/common/items/armor/warlock/foot.ron | 17 --- assets/common/items/armor/warlock/hand.ron | 17 --- assets/common/items/armor/warlock/head.ron | 17 --- assets/common/items/armor/warlock/pants.ron | 17 --- .../common/items/armor/warlock/shoulder.ron | 17 --- assets/common/items/armor/warlord/back.ron | 17 --- assets/common/items/armor/warlord/belt.ron | 17 --- assets/common/items/armor/warlord/chest.ron | 17 --- assets/common/items/armor/warlord/foot.ron | 17 --- assets/common/items/armor/warlord/hand.ron | 17 --- assets/common/items/armor/warlord/head.ron | 17 --- assets/common/items/armor/warlord/pants.ron | 17 --- .../common/items/armor/warlord/shoulder.ron | 17 --- ...staff.ron => bipedlarge-cultist_staff.ron} | 0 assets/common/npc_names.ron | 16 +++ assets/voxygen/item_image_manifest.ron | 58 -------- .../voxel/biped_large_central_manifest.ron | 104 ++++++++++++++ .../voxel/biped_large_lateral_manifest.ron | 136 ++++++++++++++++++ .../voxel/humanoid_armor_back_manifest.ron | 8 -- .../voxel/humanoid_armor_belt_manifest.ron | 8 -- .../voxel/humanoid_armor_chest_manifest.ron | 8 -- .../voxel/humanoid_armor_foot_manifest.ron | 8 -- .../voxel/humanoid_armor_hand_manifest.ron | 20 --- .../voxel/humanoid_armor_pants_manifest.ron | 8 -- .../humanoid_armor_shoulder_manifest.ron | 20 --- assets/voxygen/voxel/npc/alpaca/male/ears.vox | 3 + .../voxygen/voxel/npc/alpaca/male/foot_br.vox | 3 + .../voxygen/voxel/npc/alpaca/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/alpaca/male/head.vox | 3 + assets/voxygen/voxel/npc/alpaca/male/jaw.vox | 3 + .../voxygen/voxel/npc/alpaca/male/leg_br.vox | 3 + .../voxygen/voxel/npc/alpaca/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/alpaca/male/neck.vox | 3 + assets/voxygen/voxel/npc/alpaca/male/tail.vox | 3 + .../voxel/npc/alpaca/male/torso_back.vox | 3 + .../voxel/npc/alpaca/male/torso_front.vox | 3 + .../voxel/npc/cultist_warlock/male/foot_l.vox | 3 + .../voxel/npc/cultist_warlock/male/foot_r.vox | 3 + .../voxel/npc/cultist_warlock/male/hand_l.vox | 3 + .../voxel/npc/cultist_warlock/male/hand_r.vox | 3 + .../voxel/npc/cultist_warlock/male/head.vox | 3 + .../voxel/npc/cultist_warlock/male/leg_l.vox | 3 + .../voxel/npc/cultist_warlock/male/leg_r.vox | 3 + .../npc/cultist_warlock/male/shoulder_l.vox | 3 + .../npc/cultist_warlock/male/shoulder_r.vox | 3 + .../npc/cultist_warlock/male/torso_lower.vox | 3 + .../npc/cultist_warlock/male/torso_upper.vox | 3 + .../voxel/npc/husk_brute/male/foot_l.vox | 3 + .../voxel/npc/husk_brute/male/foot_r.vox | 3 + .../voxel/npc/husk_brute/male/hand_l.vox | 3 + .../voxel/npc/husk_brute/male/hand_r.vox | 3 + .../voxel/npc/husk_brute/male/head.vox | 3 + .../voxel/npc/husk_brute/male/leg_l.vox | 3 + .../voxel/npc/husk_brute/male/leg_r.vox | 3 + .../voxel/npc/husk_brute/male/shoulder_l.vox | 3 + .../voxel/npc/husk_brute/male/shoulder_r.vox | 3 + .../voxel/npc/husk_brute/male/torso_lower.vox | 3 + .../voxel/npc/husk_brute/male/torso_upper.vox | 3 + assets/voxygen/voxel/npc/llama/male/ears.vox | 3 + .../voxygen/voxel/npc/llama/male/foot_br.vox | 3 + .../voxygen/voxel/npc/llama/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/llama/male/head.vox | 3 + assets/voxygen/voxel/npc/llama/male/jaw.vox | 3 + .../voxygen/voxel/npc/llama/male/leg_br.vox | 3 + .../voxygen/voxel/npc/llama/male/leg_fr.vox | 3 + assets/voxygen/voxel/npc/llama/male/neck.vox | 3 + assets/voxygen/voxel/npc/llama/male/tail.vox | 3 + .../voxel/npc/llama/male/torso_back.vox | 3 + .../voxel/npc/llama/male/torso_front.vox | 3 + .../quadruped_medium_central_manifest.ron | 120 ++++++++++++++++ .../quadruped_medium_lateral_manifest.ron | 136 ++++++++++++++++++ common/src/comp/body.rs | 1 + common/src/comp/body/biped_large.rs | 10 +- common/src/comp/body/quadruped_medium.rs | 10 +- common/src/comp/inventory/loadout_builder.rs | 9 +- common/src/states/utils.rs | 2 + server/src/events/entity_manipulation.rs | 4 +- voxygen/anim/src/biped_large/mod.rs | 20 +++ voxygen/anim/src/quadruped_medium/mod.rs | 22 +++ 83 files changed, 718 insertions(+), 418 deletions(-) delete mode 100644 assets/common/items/armor/warlock/back.ron delete mode 100644 assets/common/items/armor/warlock/belt.ron delete mode 100644 assets/common/items/armor/warlock/chest.ron delete mode 100644 assets/common/items/armor/warlock/foot.ron delete mode 100644 assets/common/items/armor/warlock/hand.ron delete mode 100644 assets/common/items/armor/warlock/head.ron delete mode 100644 assets/common/items/armor/warlock/pants.ron delete mode 100644 assets/common/items/armor/warlock/shoulder.ron delete mode 100644 assets/common/items/armor/warlord/back.ron delete mode 100644 assets/common/items/armor/warlord/belt.ron delete mode 100644 assets/common/items/armor/warlord/chest.ron delete mode 100644 assets/common/items/armor/warlord/foot.ron delete mode 100644 assets/common/items/armor/warlord/hand.ron delete mode 100644 assets/common/items/armor/warlord/head.ron delete mode 100644 assets/common/items/armor/warlord/pants.ron delete mode 100644 assets/common/items/armor/warlord/shoulder.ron rename assets/common/items/weapons/staff/{bipedlarge_cultist_staff.ron => bipedlarge-cultist_staff.ron} (100%) create mode 100644 assets/voxygen/voxel/npc/alpaca/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/head.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/alpaca/male/torso_front.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/head.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_l.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_r.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/torso_lower.vox create mode 100644 assets/voxygen/voxel/npc/cultist_warlock/male/torso_upper.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/head.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/shoulder_l.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/shoulder_r.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/torso_lower.vox create mode 100644 assets/voxygen/voxel/npc/husk_brute/male/torso_upper.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/ears.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/head.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/neck.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/torso_back.vox create mode 100644 assets/voxygen/voxel/npc/llama/male/torso_front.vox diff --git a/assets/common/entity/dungeon/tier-5/warlock.ron b/assets/common/entity/dungeon/tier-5/warlock.ron index 6ee268d287..3ad3030460 100644 --- a/assets/common/entity/dungeon/tier-5/warlock.ron +++ b/assets/common/entity/dungeon/tier-5/warlock.ron @@ -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, diff --git a/assets/common/items/armor/warlock/back.ron b/assets/common/items/armor/warlock/back.ron deleted file mode 100644 index 8f71921ef1..0000000000 --- a/assets/common/items/armor/warlock/back.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/belt.ron b/assets/common/items/armor/warlock/belt.ron deleted file mode 100644 index 571cf5f704..0000000000 --- a/assets/common/items/armor/warlock/belt.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/chest.ron b/assets/common/items/armor/warlock/chest.ron deleted file mode 100644 index 83879ed7b8..0000000000 --- a/assets/common/items/armor/warlock/chest.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/foot.ron b/assets/common/items/armor/warlock/foot.ron deleted file mode 100644 index 6d94314cea..0000000000 --- a/assets/common/items/armor/warlock/foot.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/hand.ron b/assets/common/items/armor/warlock/hand.ron deleted file mode 100644 index 95a430624d..0000000000 --- a/assets/common/items/armor/warlock/hand.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/head.ron b/assets/common/items/armor/warlock/head.ron deleted file mode 100644 index 5efede3c7e..0000000000 --- a/assets/common/items/armor/warlock/head.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/pants.ron b/assets/common/items/armor/warlock/pants.ron deleted file mode 100644 index 6140b196af..0000000000 --- a/assets/common/items/armor/warlock/pants.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlock/shoulder.ron b/assets/common/items/armor/warlock/shoulder.ron deleted file mode 100644 index 105a3458c6..0000000000 --- a/assets/common/items/armor/warlock/shoulder.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/back.ron b/assets/common/items/armor/warlord/back.ron deleted file mode 100644 index 2cd9450e7e..0000000000 --- a/assets/common/items/armor/warlord/back.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/belt.ron b/assets/common/items/armor/warlord/belt.ron deleted file mode 100644 index ae60e2fcd2..0000000000 --- a/assets/common/items/armor/warlord/belt.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/chest.ron b/assets/common/items/armor/warlord/chest.ron deleted file mode 100644 index dbaee7548f..0000000000 --- a/assets/common/items/armor/warlord/chest.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/foot.ron b/assets/common/items/armor/warlord/foot.ron deleted file mode 100644 index 993cd6d067..0000000000 --- a/assets/common/items/armor/warlord/foot.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/hand.ron b/assets/common/items/armor/warlord/hand.ron deleted file mode 100644 index 36f79edf77..0000000000 --- a/assets/common/items/armor/warlord/hand.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/head.ron b/assets/common/items/armor/warlord/head.ron deleted file mode 100644 index ba518e0cdf..0000000000 --- a/assets/common/items/armor/warlord/head.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/pants.ron b/assets/common/items/armor/warlord/pants.ron deleted file mode 100644 index b896347aa2..0000000000 --- a/assets/common/items/armor/warlord/pants.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/warlord/shoulder.ron b/assets/common/items/armor/warlord/shoulder.ron deleted file mode 100644 index c38f423aff..0000000000 --- a/assets/common/items/armor/warlord/shoulder.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/bipedlarge_cultist_staff.ron b/assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron similarity index 100% rename from assets/common/items/weapons/staff/bipedlarge_cultist_staff.ron rename to assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index c898788d85..0339622c22 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -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: ( diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 8159668653..6d6e8d75ce 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -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", diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron index 5f489af07c..2ecc30c8f1 100644 --- a/assets/voxygen/voxel/biped_large_central_manifest.ron +++ b/assets/voxygen/voxel/biped_large_central_manifest.ron @@ -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"), + ) + ), }) diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron index 184d2a10a2..c5f8f2f087 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -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"), + ) + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index 61f2a8225d..1459d036eb 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 3678edd514..e6b95396a8 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index cbe2304567..db7a6b80ec 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 5895fd0204..617d459fb3 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index de569659e1..7d3bff8625 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index c92c63f592..9aa5dde696 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 5203c3c5d8..0b027a70a6 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/npc/alpaca/male/ears.vox b/assets/voxygen/voxel/npc/alpaca/male/ears.vox new file mode 100644 index 0000000000..49f210963f --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdad078882b54abf446d5edfa8d78a887167ccc1930ac6ce670eb37f3508e055 +size 1160 diff --git a/assets/voxygen/voxel/npc/alpaca/male/foot_br.vox b/assets/voxygen/voxel/npc/alpaca/male/foot_br.vox new file mode 100644 index 0000000000..f2eb6ef3c8 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6080c3cd99c4c589ff55c4b9ee57ef9680a0b6df33deb51506ca7cd41e7b0950 +size 1308 diff --git a/assets/voxygen/voxel/npc/alpaca/male/foot_fr.vox b/assets/voxygen/voxel/npc/alpaca/male/foot_fr.vox new file mode 100644 index 0000000000..945049145d --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fa63a6c47240fec203c05fcb318488e47b9aa52546617bb0f008ae7e2792f04 +size 1280 diff --git a/assets/voxygen/voxel/npc/alpaca/male/head.vox b/assets/voxygen/voxel/npc/alpaca/male/head.vox new file mode 100644 index 0000000000..c461d33700 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c00b97957b55be36b0997f469fddf94bee64a27585ea11cd2397e3dfee4233d7 +size 2440 diff --git a/assets/voxygen/voxel/npc/alpaca/male/jaw.vox b/assets/voxygen/voxel/npc/alpaca/male/jaw.vox new file mode 100644 index 0000000000..b2a82b30da --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4dc44735ca5304a10f42d3293c2dcd9f990460f3699ca903454cb07d37b17b0 +size 1120 diff --git a/assets/voxygen/voxel/npc/alpaca/male/leg_br.vox b/assets/voxygen/voxel/npc/alpaca/male/leg_br.vox new file mode 100644 index 0000000000..c56f91a222 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98172a595b57ad9753a57f15bac269dd3d76db7d74d9856fdfdcb9d6ef5295a +size 1680 diff --git a/assets/voxygen/voxel/npc/alpaca/male/leg_fr.vox b/assets/voxygen/voxel/npc/alpaca/male/leg_fr.vox new file mode 100644 index 0000000000..887ba16285 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:269e2de8b4218c5a2c5aa20f0dacbadbc654ea0a26ec3d41c0cf65958ae438b9 +size 1480 diff --git a/assets/voxygen/voxel/npc/alpaca/male/neck.vox b/assets/voxygen/voxel/npc/alpaca/male/neck.vox new file mode 100644 index 0000000000..b04ba96fb8 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60427aa00f289c9db4344a00363f3e1b593fe769029b6ea67bfa189aebe9901c +size 2544 diff --git a/assets/voxygen/voxel/npc/alpaca/male/tail.vox b/assets/voxygen/voxel/npc/alpaca/male/tail.vox new file mode 100644 index 0000000000..bc0ab0cce8 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d971b2f9ea4aafc9418be9b9a3ec6d357939889ff154ff595e4410b72ed72586 +size 1464 diff --git a/assets/voxygen/voxel/npc/alpaca/male/torso_back.vox b/assets/voxygen/voxel/npc/alpaca/male/torso_back.vox new file mode 100644 index 0000000000..5a1ba82be9 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55fc286c9669344f7a54b87dd2afa1926a4922e573bff51a5ab758d56706a21f +size 3464 diff --git a/assets/voxygen/voxel/npc/alpaca/male/torso_front.vox b/assets/voxygen/voxel/npc/alpaca/male/torso_front.vox new file mode 100644 index 0000000000..38c9f15361 --- /dev/null +++ b/assets/voxygen/voxel/npc/alpaca/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83fc57bea7a36092d9c2b57d3d01653da6d28f9d0f4f027a0ad69b02034a4f25 +size 2904 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/foot_l.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/foot_l.vox new file mode 100644 index 0000000000..117dc3cdc1 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be2da809e07b808d54d1c94ac72de7fd6d9bafc439d9794f55fff80294171c3 +size 1544 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/foot_r.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/foot_r.vox new file mode 100644 index 0000000000..117dc3cdc1 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be2da809e07b808d54d1c94ac72de7fd6d9bafc439d9794f55fff80294171c3 +size 1544 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/hand_l.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/hand_l.vox new file mode 100644 index 0000000000..f8179318b4 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e15d76fe8fe2c7e9180bd4bd48de2b7ab014f0c0a7eb403b140d9d8d3d1e02b +size 2028 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/hand_r.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/hand_r.vox new file mode 100644 index 0000000000..51c1180379 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77ebf94f05529c2a7e2f1cd1f5fe5c21ce24f06c50c88d90d78ac66b66728df9 +size 2028 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/head.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/head.vox new file mode 100644 index 0000000000..01d7de9669 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2e46f89a7a07825b91f1b6443669ec298bb2155bc1ff6d3f4459f5e82f5aec5 +size 4840 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/leg_l.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/leg_l.vox new file mode 100644 index 0000000000..3f78f19314 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75f01e69263aa2d6e1a3595e5aa9cdd93194b57e13e7d404983cd894ae911b0e +size 1304 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/leg_r.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/leg_r.vox new file mode 100644 index 0000000000..3f78f19314 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75f01e69263aa2d6e1a3595e5aa9cdd93194b57e13e7d404983cd894ae911b0e +size 1304 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_l.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_l.vox new file mode 100644 index 0000000000..c93fa97b9e --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8085ef273ef650b35ed115871f6fd97b6b83c67319f2923aa18d805d2ae6f18b +size 1724 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_r.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_r.vox new file mode 100644 index 0000000000..d2a6c72a30 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c88e14776ec6ee85c70845032d05001a20249fe0e878c69ad6ad6c0d2d052cba +size 1724 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/torso_lower.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/torso_lower.vox new file mode 100644 index 0000000000..200dcbfca3 --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8ea34977c2dce4d84e7c7fc687be8a9ac0204fe5fff00186a52bdc1020ab93f +size 2800 diff --git a/assets/voxygen/voxel/npc/cultist_warlock/male/torso_upper.vox b/assets/voxygen/voxel/npc/cultist_warlock/male/torso_upper.vox new file mode 100644 index 0000000000..b3716b50bf --- /dev/null +++ b/assets/voxygen/voxel/npc/cultist_warlock/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc111ef29d545cf5182a19f55178eaccf6f7a8a6455bc01df89f1637293a540f +size 4004 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/foot_l.vox b/assets/voxygen/voxel/npc/husk_brute/male/foot_l.vox new file mode 100644 index 0000000000..73112faae9 --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a85347ae6106c2dc616ef80280b81d5c713a314d3b6effb1960ebfad8473ed7 +size 1660 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/foot_r.vox b/assets/voxygen/voxel/npc/husk_brute/male/foot_r.vox new file mode 100644 index 0000000000..f549c46f3f --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:023987c725b7092a0f8d81eff8c2b9f05f74848f46f6fb84127bc66cdb00aac1 +size 1660 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/hand_l.vox b/assets/voxygen/voxel/npc/husk_brute/male/hand_l.vox new file mode 100644 index 0000000000..92b89b98ff --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:814635331cd931787e9f00177f013574d60643a4db756a58c25d4c733bbb4877 +size 3236 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/hand_r.vox b/assets/voxygen/voxel/npc/husk_brute/male/hand_r.vox new file mode 100644 index 0000000000..d703d02be1 --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dbbc132be878fe286e69a6aee1d63522086d7f7f6ec9aca4ed0198befe56394 +size 3236 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/head.vox b/assets/voxygen/voxel/npc/husk_brute/male/head.vox new file mode 100644 index 0000000000..c967bdbf2a --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a156a2f61b141b285dc10da3ec453c96b10f9845a088c6f256a773153b85c978 +size 4792 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/leg_l.vox b/assets/voxygen/voxel/npc/husk_brute/male/leg_l.vox new file mode 100644 index 0000000000..30b089643c --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f4e335af3e38b0f2700c9e79e84839d91ed03d2ce9cd70d1f27add95d329a6c +size 1504 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/leg_r.vox b/assets/voxygen/voxel/npc/husk_brute/male/leg_r.vox new file mode 100644 index 0000000000..5fb1be5c86 --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d84c5521dfe543640114541c9cc7c6fda31c0e416dc077786da631f29866fb0 +size 1504 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/shoulder_l.vox b/assets/voxygen/voxel/npc/husk_brute/male/shoulder_l.vox new file mode 100644 index 0000000000..cca05a1690 --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:659f615c80a701244ab916514ed6dc69fc081de586f51fb0d3260b6a125d94c2 +size 2864 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/shoulder_r.vox b/assets/voxygen/voxel/npc/husk_brute/male/shoulder_r.vox new file mode 100644 index 0000000000..20a04fc8a8 --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91119f24cd15de41f28f6325b375218c545edd06d0e7208c4478f86062720d83 +size 2864 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/torso_lower.vox b/assets/voxygen/voxel/npc/husk_brute/male/torso_lower.vox new file mode 100644 index 0000000000..ad4b4f146b --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81c0ed7bbfcef1802c30e7a2e0d4140d42c979824c65420fdf6ccfc32bc70714 +size 3628 diff --git a/assets/voxygen/voxel/npc/husk_brute/male/torso_upper.vox b/assets/voxygen/voxel/npc/husk_brute/male/torso_upper.vox new file mode 100644 index 0000000000..c479d5ccba --- /dev/null +++ b/assets/voxygen/voxel/npc/husk_brute/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b9f45f40abf6ff014283caba855857fd1d0ec2ed11c25228a396aa275e8939f +size 10652 diff --git a/assets/voxygen/voxel/npc/llama/male/ears.vox b/assets/voxygen/voxel/npc/llama/male/ears.vox new file mode 100644 index 0000000000..9d4f67958c --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e30eab986f71e9a8480d4f818c1a793db7ccd96411a56f9f5bd5586fd169b0f +size 1200 diff --git a/assets/voxygen/voxel/npc/llama/male/foot_br.vox b/assets/voxygen/voxel/npc/llama/male/foot_br.vox new file mode 100644 index 0000000000..e6c780fac0 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c2927d862e271a814e073dd8c10565c3fb0467a2089b175138a70e3a16f5356 +size 1356 diff --git a/assets/voxygen/voxel/npc/llama/male/foot_fr.vox b/assets/voxygen/voxel/npc/llama/male/foot_fr.vox new file mode 100644 index 0000000000..44bbd8341d --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0671223cb64a2b59d006d726ca69b7053a96fd37971a29829be97dd96e5923b4 +size 1368 diff --git a/assets/voxygen/voxel/npc/llama/male/head.vox b/assets/voxygen/voxel/npc/llama/male/head.vox new file mode 100644 index 0000000000..19c4326a7a --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:788e36255e3137423b1993616f224b71e2f285efae8a036bd2f81be9df8beea6 +size 2360 diff --git a/assets/voxygen/voxel/npc/llama/male/jaw.vox b/assets/voxygen/voxel/npc/llama/male/jaw.vox new file mode 100644 index 0000000000..1c2872c516 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1882295dc5e2fdc166c91325ec49cd05ab168605587d15cee89e8f0e50ed7f6f +size 1208 diff --git a/assets/voxygen/voxel/npc/llama/male/leg_br.vox b/assets/voxygen/voxel/npc/llama/male/leg_br.vox new file mode 100644 index 0000000000..567bab2e4b --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b51f1ce14a4daacacfd3bdfa85c17f19cbd70b158265ac5b1cc5ccde95b53b41 +size 1684 diff --git a/assets/voxygen/voxel/npc/llama/male/leg_fr.vox b/assets/voxygen/voxel/npc/llama/male/leg_fr.vox new file mode 100644 index 0000000000..bfb864c7ca --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50d293d04e5271d8c1992a8fc0e59ec7376a2d4908e23d3e52dc986df4c29b1c +size 1604 diff --git a/assets/voxygen/voxel/npc/llama/male/neck.vox b/assets/voxygen/voxel/npc/llama/male/neck.vox new file mode 100644 index 0000000000..396f54b223 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6784e3f6a9f5574baaabadd06961624ce5cf9c90d7ce44e83b44b866326a18a +size 3744 diff --git a/assets/voxygen/voxel/npc/llama/male/tail.vox b/assets/voxygen/voxel/npc/llama/male/tail.vox new file mode 100644 index 0000000000..53d61a3a56 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73000c9ce82db82c6d784a1cb2963ab49c9a32730eb7f0e5d4dc7bf41448154a +size 1344 diff --git a/assets/voxygen/voxel/npc/llama/male/torso_back.vox b/assets/voxygen/voxel/npc/llama/male/torso_back.vox new file mode 100644 index 0000000000..61d600f9a0 --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aed403d3a29983553fad51efc06b372f623101948871a351d1de2613b386d430 +size 4208 diff --git a/assets/voxygen/voxel/npc/llama/male/torso_front.vox b/assets/voxygen/voxel/npc/llama/male/torso_front.vox new file mode 100644 index 0000000000..944fbc586b --- /dev/null +++ b/assets/voxygen/voxel/npc/llama/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1512a046c72120af9c2a048a356dbf6d86e23c0ed3770393a9f0a1d9b30b8edb +size 4424 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index a9a7ff6c04..a1f9869837 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -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"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index c548271783..8e0ff588b2 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -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"), + ), + ), }) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 96ffd4263f..661f9639a3 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -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 { diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs index 7a816f512e..44285fa21e 100644 --- a/common/src/comp/body/biped_large.rs +++ b/common/src/comp/body/biped_large.rs @@ -53,6 +53,8 @@ make_case_elim!( Blueoni = 16, Redoni = 17, Cultistwarlord = 18, + Cultistwarlock = 19, + Huskbrute = 20, } ); @@ -80,6 +82,8 @@ pub struct AllSpecies { 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 { @@ -107,11 +111,13 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies 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 { diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs index f814b57a05..04efc68c25 100644 --- a/common/src/comp/body/quadruped_medium.rs +++ b/common/src/comp/body/quadruped_medium.rs @@ -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 { 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 { @@ -143,11 +147,13 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies 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 { diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 759b4ece11..d9fea9965b 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -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( diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index d105035c43..10968783d6 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -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, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 4f640bd1bc..983dc3e1f6 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -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 => { diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs index 567df6f2b7..9754e4370c 100644 --- a/voxygen/anim/src/biped_large/mod.rs +++ b/voxygen/anim/src/biped_large/mod.rs @@ -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), diff --git a/voxygen/anim/src/quadruped_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs index 5c780cc851..c4f74eeb05 100644 --- a/voxygen/anim/src/quadruped_medium/mod.rs +++ b/voxygen/anim/src/quadruped_medium/mod.rs @@ -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),