From c4c8235c6be97e6e67d8ff7e55ebbb88fd4885c3 Mon Sep 17 00:00:00 2001
From: Delyth Williams <delyth.angharad@gmail.com>
Date: Fri, 26 Jun 2020 16:26:00 +0000
Subject: [PATCH] Welsh pixie/armour
---
assets/common/items/armor/belt/druid.ron | 8 ++
assets/common/items/armor/belt/twig.ron | 8 ++
.../common/items/armor/belt/twigsflowers.ron | 8 ++
.../common/items/armor/belt/twigsleaves.ron | 8 ++
assets/common/items/armor/chest/druid.ron | 8 ++
assets/common/items/armor/chest/twig.ron | 8 ++
.../common/items/armor/chest/twigsflowers.ron | 8 ++
.../common/items/armor/chest/twigsleaves.ron | 8 ++
assets/common/items/armor/foot/druid.ron | 8 ++
assets/common/items/armor/foot/twig.ron | 8 ++
.../common/items/armor/foot/twigsflowers.ron | 8 ++
.../common/items/armor/foot/twigsleaves.ron | 8 ++
assets/common/items/armor/hand/druid.ron | 8 ++
assets/common/items/armor/hand/twig.ron | 8 ++
.../common/items/armor/hand/twigsflowers.ron | 8 ++
.../common/items/armor/hand/twigsleaves.ron | 8 ++
assets/common/items/armor/pants/druid.ron | 8 ++
assets/common/items/armor/pants/green_0.ron | 8 --
assets/common/items/armor/pants/hunting.ron | 8 ++
assets/common/items/armor/pants/twig.ron | 8 ++
.../common/items/armor/pants/twigsflowers.ron | 8 ++
.../common/items/armor/pants/twigsleaves.ron | 8 ++
.../items/armor/shoulder/druidshoulder.ron | 8 ++
assets/common/items/armor/shoulder/twigs.ron | 8 ++
.../items/armor/shoulder/twigsflowers.ron | 8 ++
.../items/armor/shoulder/twigsleaves.ron | 8 ++
assets/common/items/boss_drops/potions.ron | 4 +-
assets/voxygen/item_image_manifest.ron | 115 +++++++++++++++++-
assets/voxygen/voxel/armor/belt/druid.vox | Bin 0 -> 1504 bytes
.../voxygen/voxel/armor/belt/twigs_belt.vox | Bin 0 -> 1500 bytes
.../voxel/armor/belt/twigsflowers_belt.vox | Bin 0 -> 1512 bytes
.../voxel/armor/belt/twigsleaves_belt.vox | Bin 0 -> 1516 bytes
assets/voxygen/voxel/armor/chest/druid.vox | Bin 0 -> 2624 bytes
.../voxygen/voxel/armor/chest/twigs_chest.vox | Bin 0 -> 2600 bytes
.../voxel/armor/chest/twigsflowers_chest.vox | Bin 0 -> 2640 bytes
.../voxel/armor/chest/twigsleaves_chest.vox | Bin 0 -> 2624 bytes
assets/voxygen/voxel/armor/foot/druid.vox | Bin 0 -> 1376 bytes
.../voxygen/voxel/armor/foot/twigs_foot.vox | Bin 0 -> 1360 bytes
.../voxel/armor/foot/twigsflowers_foot.vox | Bin 0 -> 1352 bytes
.../voxel/armor/foot/twigsleaves_foot.vox | Bin 0 -> 1352 bytes
.../voxygen/voxel/armor/hand/druid_left.vox | Bin 0 -> 1240 bytes
.../voxygen/voxel/armor/hand/druid_right.vox | Bin 0 -> 1240 bytes
.../voxel/armor/hand/twigs_glove_left.vox | Bin 0 -> 1240 bytes
.../voxel/armor/hand/twigs_glove_right.vox | Bin 0 -> 1240 bytes
.../armor/hand/twigsflowers_glove_left.vox | Bin 0 -> 1260 bytes
.../armor/hand/twigsflowers_glove_right.vox | Bin 0 -> 1260 bytes
.../armor/hand/twigsleaves_glove_left.vox | Bin 0 -> 1252 bytes
.../armor/hand/twigsleaves_glove_right.vox | Bin 0 -> 1252 bytes
assets/voxygen/voxel/armor/pants/cultist.vox | Bin 1992 -> 1992 bytes
assets/voxygen/voxel/armor/pants/druid.vox | Bin 0 -> 2272 bytes
.../voxygen/voxel/armor/pants/twigs_pants.vox | Bin 0 -> 2152 bytes
.../voxel/armor/pants/twigsflowers_pants.vox | Bin 0 -> 2176 bytes
.../voxel/armor/pants/twigsleaves_pants.vox | Bin 0 -> 2128 bytes
.../voxel/armor/shoulder/druid_left.vox | Bin 0 -> 1628 bytes
.../voxel/armor/shoulder/druid_right.vox | Bin 0 -> 1628 bytes
.../voxel/armor/shoulder/twigs_left.vox | Bin 0 -> 1492 bytes
.../voxel/armor/shoulder/twigs_right.vox | Bin 0 -> 1492 bytes
.../shoulder/twigsflowers_shoulder_left.vox | Bin 0 -> 1564 bytes
.../shoulder/twigsflowers_shoulder_right.vox | Bin 0 -> 1564 bytes
.../shoulder/twigsleaves_shoulder_left.vox | Bin 0 -> 1516 bytes
.../shoulder/twigsleaves_shoulder_right.vox | Bin 0 -> 1516 bytes
.../voxel/humanoid_armor_belt_manifest.ron | 16 +++
.../voxel/humanoid_armor_chest_manifest.ron | 20 ++-
.../voxel/humanoid_armor_foot_manifest.ron | 16 +++
.../voxel/humanoid_armor_hand_manifest.ron | 40 ++++++
.../voxel/humanoid_armor_pants_manifest.ron | 18 ++-
.../humanoid_armor_shoulder_manifest.ron | 45 ++++++-
common/src/comp/inventory/item/armor.rs | 64 ++++++++--
voxygen/src/anim/src/character/mod.rs | 2 +-
69 files changed, 519 insertions(+), 29 deletions(-)
create mode 100644 assets/common/items/armor/belt/druid.ron
create mode 100644 assets/common/items/armor/belt/twig.ron
create mode 100644 assets/common/items/armor/belt/twigsflowers.ron
create mode 100644 assets/common/items/armor/belt/twigsleaves.ron
create mode 100644 assets/common/items/armor/chest/druid.ron
create mode 100644 assets/common/items/armor/chest/twig.ron
create mode 100644 assets/common/items/armor/chest/twigsflowers.ron
create mode 100644 assets/common/items/armor/chest/twigsleaves.ron
create mode 100644 assets/common/items/armor/foot/druid.ron
create mode 100644 assets/common/items/armor/foot/twig.ron
create mode 100644 assets/common/items/armor/foot/twigsflowers.ron
create mode 100644 assets/common/items/armor/foot/twigsleaves.ron
create mode 100644 assets/common/items/armor/hand/druid.ron
create mode 100644 assets/common/items/armor/hand/twig.ron
create mode 100644 assets/common/items/armor/hand/twigsflowers.ron
create mode 100644 assets/common/items/armor/hand/twigsleaves.ron
create mode 100644 assets/common/items/armor/pants/druid.ron
delete mode 100644 assets/common/items/armor/pants/green_0.ron
create mode 100644 assets/common/items/armor/pants/hunting.ron
create mode 100644 assets/common/items/armor/pants/twig.ron
create mode 100644 assets/common/items/armor/pants/twigsflowers.ron
create mode 100644 assets/common/items/armor/pants/twigsleaves.ron
create mode 100644 assets/common/items/armor/shoulder/druidshoulder.ron
create mode 100644 assets/common/items/armor/shoulder/twigs.ron
create mode 100644 assets/common/items/armor/shoulder/twigsflowers.ron
create mode 100644 assets/common/items/armor/shoulder/twigsleaves.ron
create mode 100644 assets/voxygen/voxel/armor/belt/druid.vox
create mode 100644 assets/voxygen/voxel/armor/belt/twigs_belt.vox
create mode 100644 assets/voxygen/voxel/armor/belt/twigsflowers_belt.vox
create mode 100644 assets/voxygen/voxel/armor/belt/twigsleaves_belt.vox
create mode 100644 assets/voxygen/voxel/armor/chest/druid.vox
create mode 100644 assets/voxygen/voxel/armor/chest/twigs_chest.vox
create mode 100644 assets/voxygen/voxel/armor/chest/twigsflowers_chest.vox
create mode 100644 assets/voxygen/voxel/armor/chest/twigsleaves_chest.vox
create mode 100644 assets/voxygen/voxel/armor/foot/druid.vox
create mode 100644 assets/voxygen/voxel/armor/foot/twigs_foot.vox
create mode 100644 assets/voxygen/voxel/armor/foot/twigsflowers_foot.vox
create mode 100644 assets/voxygen/voxel/armor/foot/twigsleaves_foot.vox
create mode 100644 assets/voxygen/voxel/armor/hand/druid_left.vox
create mode 100644 assets/voxygen/voxel/armor/hand/druid_right.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigs_glove_left.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigs_glove_right.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigsflowers_glove_left.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigsleaves_glove_left.vox
create mode 100644 assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox
create mode 100644 assets/voxygen/voxel/armor/pants/druid.vox
create mode 100644 assets/voxygen/voxel/armor/pants/twigs_pants.vox
create mode 100644 assets/voxygen/voxel/armor/pants/twigsflowers_pants.vox
create mode 100644 assets/voxygen/voxel/armor/pants/twigsleaves_pants.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/druid_left.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/druid_right.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigs_left.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigs_right.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_left.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_left.vox
create mode 100644 assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox
diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/belt/druid.ron
new file mode 100644
index 0000000000..0a761f49c0
--- /dev/null
+++ b/assets/common/items/armor/belt/druid.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid's Belt",
+ description: "Twisted vines to keep everything secure.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Belt(Druid),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/belt/twig.ron
new file mode 100644
index 0000000000..42c53c5dbb
--- /dev/null
+++ b/assets/common/items/armor/belt/twig.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twig Belt",
+ description: "A belt made from woven from twigs.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Belt(Twig),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/belt/twigsflowers.ron
new file mode 100644
index 0000000000..f11985c104
--- /dev/null
+++ b/assets/common/items/armor/belt/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Belt",
+ description: "A belt woven from twigs and flowers.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Belt(Twigsflowers),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/belt/twigsleaves.ron
new file mode 100644
index 0000000000..5f00fce3e8
--- /dev/null
+++ b/assets/common/items/armor/belt/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Belt",
+ description: "A belt woven from twigs and leaves.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Belt(Twigsleaves),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/chest/druid.ron
new file mode 100644
index 0000000000..71ad9e1bef
--- /dev/null
+++ b/assets/common/items/armor/chest/druid.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid's Vest",
+ description: "Druidic chest wrappings.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Chest(Druid),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/chest/twig.ron
new file mode 100644
index 0000000000..6dd728f2bf
--- /dev/null
+++ b/assets/common/items/armor/chest/twig.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twig Shirt",
+ description: "A shirt woven from twigs.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Chest(Twig),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/chest/twigsflowers.ron
new file mode 100644
index 0000000000..698ae8dc64
--- /dev/null
+++ b/assets/common/items/armor/chest/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Shirt",
+ description: "A shirt woven from twigs and flowers.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Chest(Twigsflowers),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/chest/twigsleaves.ron
new file mode 100644
index 0000000000..e1cc509b9e
--- /dev/null
+++ b/assets/common/items/armor/chest/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Shirt",
+ description: "A shirt woven from twigs and leaves.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Chest(Twigsleaves),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/foot/druid.ron
new file mode 100644
index 0000000000..ceb8f5979f
--- /dev/null
+++ b/assets/common/items/armor/foot/druid.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid's Slippers",
+ description: "For treading softly through the woods.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Foot(Druid),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/foot/twig.ron
new file mode 100644
index 0000000000..e367a857dd
--- /dev/null
+++ b/assets/common/items/armor/foot/twig.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twig Boots",
+ description: "Boots woven from twigs.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Foot(Twig),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/foot/twigsflowers.ron
new file mode 100644
index 0000000000..fda0a894fc
--- /dev/null
+++ b/assets/common/items/armor/foot/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Boots",
+ description: "Boots woven from twigs and flowers.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Foot(Twigsflowers),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/foot/twigsleaves.ron
new file mode 100644
index 0000000000..7aed59cedd
--- /dev/null
+++ b/assets/common/items/armor/foot/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Boots",
+ description: "Boots woven from twigs and leaves.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Foot(Twigsleaves),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/hand/druid.ron
new file mode 100644
index 0000000000..63400b0f1f
--- /dev/null
+++ b/assets/common/items/armor/hand/druid.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid's Gloves",
+ description: "Soft, strong, and flexible.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Hand(Druid),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/hand/twig.ron
new file mode 100644
index 0000000000..bf61fe0209
--- /dev/null
+++ b/assets/common/items/armor/hand/twig.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twig Wraps",
+ description: "Handwraps woven from twigs.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Hand(Twig),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/hand/twigsflowers.ron
new file mode 100644
index 0000000000..68cbc953aa
--- /dev/null
+++ b/assets/common/items/armor/hand/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Wraps",
+ description: "Handwraps woven from twigs and flowers.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Hand(Twigsflowers),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/hand/twigsleaves.ron
new file mode 100644
index 0000000000..13337ae564
--- /dev/null
+++ b/assets/common/items/armor/hand/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Wraps",
+ description: "Handwraps woven from twigs and leaves.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Hand(Twigsleaves),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/pants/druid.ron
new file mode 100644
index 0000000000..d4b635d4ff
--- /dev/null
+++ b/assets/common/items/armor/pants/druid.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid's Kilt",
+ description: "Feel the breeze!\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Pants(Druid),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/green_0.ron b/assets/common/items/armor/pants/green_0.ron
deleted file mode 100644
index c08d850d75..0000000000
--- a/assets/common/items/armor/pants/green_0.ron
+++ /dev/null
@@ -1,8 +0,0 @@
-Item(
- name: "Hunting Pants",
- description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
- kind: Armor(
- kind: Pants(Green),
- stats: (20),
- ),
-)
diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/pants/hunting.ron
new file mode 100644
index 0000000000..bd30d1801f
--- /dev/null
+++ b/assets/common/items/armor/pants/hunting.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Hunting Pants",
+ description: "Crafted from soft, supple leather\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Pants(Hunting),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/pants/twig.ron
new file mode 100644
index 0000000000..0cbb923d0e
--- /dev/null
+++ b/assets/common/items/armor/pants/twig.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twig Pants",
+ description: "Pants woven from twigs. Chafey!\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Pants(Twig),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/pants/twigsflowers.ron
new file mode 100644
index 0000000000..abed6274eb
--- /dev/null
+++ b/assets/common/items/armor/pants/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Pants",
+ description: "Pants woven from twigs and flowers. Fragrant!\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Pants(Twigsflowers),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/pants/twigsleaves.ron
new file mode 100644
index 0000000000..803993b8d0
--- /dev/null
+++ b/assets/common/items/armor/pants/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Pants",
+ description: "Pants woven from twigs and leaves. Slightly less chafey than the twig pants!\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Pants(Twigsleaves),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/shoulder/druidshoulder.ron
new file mode 100644
index 0000000000..b17c658c28
--- /dev/null
+++ b/assets/common/items/armor/shoulder/druidshoulder.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Druid Shoulders",
+ description: "Forged for protectors of the wild.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Shoulder(DruidShoulder),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/shoulder/twigs.ron
new file mode 100644
index 0000000000..144d5552b0
--- /dev/null
+++ b/assets/common/items/armor/shoulder/twigs.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Twiggy Shoulders",
+ description: "Spaulders made from tightly tied twigs.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Shoulder(TwiggyShoulder),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/shoulder/twigsflowers.ron
new file mode 100644
index 0000000000..d62e5d3e10
--- /dev/null
+++ b/assets/common/items/armor/shoulder/twigsflowers.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Flowery Shoulders",
+ description: "Flowery, leafy spaulders.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Shoulder(FlowerShoulder),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/shoulder/twigsleaves.ron
new file mode 100644
index 0000000000..dc88f790e2
--- /dev/null
+++ b/assets/common/items/armor/shoulder/twigsleaves.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leafy Shoulders",
+ description: "Spaulders made from tied twigs and leaves.\n\n<Right-Click to use>",
+ kind: Armor(
+ kind: Shoulder(LeafyShoulder),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/boss_drops/potions.ron b/assets/common/items/boss_drops/potions.ron
index 00ec4ce889..011a0c8d42 100644
--- a/assets/common/items/boss_drops/potions.ron
+++ b/assets/common/items/boss_drops/potions.ron
@@ -1,6 +1,6 @@
Item(
- name: "Powerful Potion",
- description: "Restores 100 Health\nA great monster was slain for this item\n\n<Right-Click to use>",
+ name: "Potent Potion",
+ description: "A potent healing potion.\n\nRestores 100 health on use.\n\n<Right-Click to use>",
kind: Consumable(
kind: Potion,
effect: Health((
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 86a24042cd..ddd80ea625 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -319,6 +319,31 @@
Armor(Shoulder(CultistBlue)): VoxTrans(
"voxel.armor.shoulder.cultist_right",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ // Druid Set
+ Armor(Chest(Druid)): VoxTrans(
+ "voxel.armor.chest.druid",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Druid)): VoxTrans(
+ "voxel.armor.pants.druid",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Druid)): VoxTrans(
+ "voxel.armor.belt.druid",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+ ),
+ Armor(Foot(Druid)): VoxTrans(
+ "voxel.armor.foot.druid",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Druid)): VoxTrans(
+ "voxel.armor.hand.druid_right",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(DruidShoulder)): VoxTrans(
+ "voxel.armor.shoulder.druid_right",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
// Villager Clothing
Armor(Pants(WorkerBlue0)): VoxTrans(
@@ -519,7 +544,7 @@
Armor(Shoulder(ClothBlue0)): VoxTrans(
"voxel.armor.shoulder.cloth_blue_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
- ),
+ ),
//////////////
Armor(Chest(ClothGreen0)): VoxTrans(
"voxel.armor.chest.cloth_green-0",
@@ -590,15 +615,15 @@
"voxel.armor.shoulder.leather_iron_right-2",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
- Armor(Shoulder(IronLeather1)): VoxTrans(
+ Armor(Shoulder(IronLeather1)): VoxTrans(
"voxel.armor.shoulder.leather_iron_right-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
- Armor(Shoulder(IronLeather0)): VoxTrans(
+ Armor(Shoulder(IronLeather0)): VoxTrans(
"voxel.armor.shoulder.leather_iron_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
- Armor(Shoulder(LeatherStrips)): VoxTrans(
+ Armor(Shoulder(LeatherStrips)): VoxTrans(
"voxel.armor.shoulder.leather_strips_right",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
@@ -606,6 +631,86 @@
"voxel.armor.foot.jackalope_slippers",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
+ //Twig Set
+ Armor(Chest(Twig)): VoxTrans(
+ "voxel.armor.chest.twigs_chest",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Twig)): VoxTrans(
+ "voxel.armor.pants.twigs_pants",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Twig)): VoxTrans(
+ "voxel.armor.belt.twigs_belt",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+ ),
+ Armor(Foot(Twig)): VoxTrans(
+ "voxel.armor.foot.twigs_foot",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Twig)): VoxTrans(
+ "voxel.armor.hand.twigs_glove_right",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(TwiggyShoulder)): VoxTrans(
+ "voxel.armor.shoulder.twigs_right",
+ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+ ),
+ //TwigsLeaves Set
+ Armor(Chest(Twigsleaves)): VoxTrans(
+ "voxel.armor.chest.twigsleaves_chest",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Twigsleaves)): VoxTrans(
+ "voxel.armor.pants.twigsleaves_pants",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Twigsleaves)): VoxTrans(
+ "voxel.armor.belt.twigsleaves_belt",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+ ),
+ Armor(Foot(Twigsleaves)): VoxTrans(
+ "voxel.armor.foot.twigsleaves_foot",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Twigsleaves)): VoxTrans(
+ "voxel.armor.hand.twigsleaves_glove_right",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(LeafyShoulder)): VoxTrans(
+ "voxel.armor.shoulder.twigsleaves_shoulder_right",
+ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+ ),
+ //TwigsFlowers Set
+ Armor(Chest(Twigsflowers)): VoxTrans(
+ "voxel.armor.chest.twigsflowers_chest",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Twigsflowers)): VoxTrans(
+ "voxel.armor.pants.twigsflowers_pants",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Twigsflowers)): VoxTrans(
+ "voxel.armor.belt.twigsflowers_belt",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+ ),
+ Armor(Foot(Twigsflowers)): VoxTrans(
+ "voxel.armor.foot.twigsflowers_foot",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Twigsflowers)): VoxTrans(
+ "voxel.armor.hand.twigsflowers_glove_right",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(FlowerShoulder)): VoxTrans(
+ "voxel.armor.shoulder.twigsflowers_shoulder_right",
+ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+ ),
+ //misc
+ Armor(Pants(Hunting)): VoxTrans(
+ "voxel.armor.pants.grayscale",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
// Backs
Armor(Back(Short0)): VoxTrans(
"voxel.armor.back.short-0",
@@ -659,7 +764,7 @@
),
Consumable(Potion): VoxTrans(
"voxel.object.potion_red",
- (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.0,
),
Consumable(Mushroom): VoxTrans(
"voxel.sprite.mushrooms.mushroom-10",
diff --git a/assets/voxygen/voxel/armor/belt/druid.vox b/assets/voxygen/voxel/armor/belt/druid.vox
new file mode 100644
index 0000000000000000000000000000000000000000..5d8d6529f5c5fbceaed51da829a3e6c7607d4e8f
GIT binary patch
literal 1504
zcmbW$Z%AEb90%~<xzF>QBU$0{`hTf8mtGw+|4cK@uG8CgU2b!h%{#L{%r<e-kdRF-
zgYC9~ilt86CbOG`yF|=3F)8-KWQYx93>y)I$cWzeA|iV8?R&PpDp$~f56?Nj?|II7
ze&<iizJuB0BGOnJ+{-~$j7W1Z6nNY{;1>4~%W|+a6ufM?RgrheI5MCdYrr^GOgWyI
zAxqSVhZJctWRqBG#In>S4=K`Q$YxzU%sk9UktRbnIm|>cSIkL~CPOwk%tSNS%t?_Z
zLpC{XX1FH9j5Hat-I~pH+N_Zw<)|y#QS3uqu|!XJM8_0IO@{k6N3nFwvNZe9>_f8;
z%|0~yVCK;imWLTB(qzac$D?DSm@DR_NRuI(9A=`KYv!a#lOdZNH#0isG0aGlA=|Cl
zdP3QHK-;?CaR0!rowcIxza{~<a5#*6qk`R&OW5N51HXB_SX^v$BU}xB^{*2A$*5}E
zfxxjE_@b4NfPr*92AO&avXqR3MnOuqpfHe!ZPx^GU4kbfg2Z7#@)v@##&|SzCm?h>
z5d-s2qdqKX8WX%TBRF}7bDPqU*_ngfZ~@Ba{K)9>B4;Qa1=Cq5Ud}^Gn;`eJVB5H$
zdO;ws^8S5skg+ErvtIP)Z9?q1B;0*5188^#RU!z|5A+L-oe<2N7c9mEx32TpFPI7l
zzCIvWJ0b}2_(Y3f_%Q3ef;yj|{dqxez2MK~Ni>zEqcf0$zNUPPca$LfS_Q_B)?u`x
z7Fd}=;g)1nmt<kjOZn(%sX$kQAo7MF`o3V{BSCp)I)VkcXe-~2p886(6eOdwECWNk
zwqmZm2%-J8=z41}!p9F`@YE6Xy%)mp*)Gh*&SCZDB;w=ak(#&(+1c4B_T`{_`?GkV
z#D_q2G4{P&iQx}6W9E|_{CKMXYqtw=nfIKV7OdP5{QSM3uQMMPBc)inT8CeMYDUjs
z0){^K;`*I5tRV~g^XhP{tQFy^j(_xjk<aB({o}hRu)c)qIxk*-JM(|{Us_s<k%}ma
zil<Q3e+FrhG%SBAxO<47?({T#J|B8}d-2NdSxBT0Nj*uJzwqE4o=WGplbMN;vty{K
z8pYwkb4YDZ!R;@%Vm_3HQ9iT3KY#Z;_gbyZE9f~2oV*Z2<g+<^IC~S9zFozR<Nc^P
z6UCm77tnld6@I@T_qY^^Bm54vDp>#K!TQ$uef?L?zwrKlw&8eV`q3E^cg}|M9%k<3
S%{#l1TKOh2ie@%CSN;M|Gi1#G
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/belt/twigs_belt.vox b/assets/voxygen/voxel/armor/belt/twigs_belt.vox
new file mode 100644
index 0000000000000000000000000000000000000000..0788ae580bd65193c364cd574740a1e50425235c
GIT binary patch
literal 1500
zcmeIy&q^Cn6vy#1_xww13aR2kC|KymWfxr(iqI5-gh2%biOI@^p<AD#Z&3P3eVsOD
zVY|3~uaxd|=Pm;u?#cNj!#y*Txj3D@{VpQM<LL>D{B)7?>3lM5A2<g8(3aWdeEOqn
zU6E^8%5Tl?mt|RXqN^f$tD<XzQwKfi^tS7CU7#>H0!b!C*BwgHJB3j@0tr!a6eWjI
zI|2zY&Tr&UBWHC4vSrS`oQ&029npHhUPJ#_&}((_T`^`bW-w+jW-w+jW-w+jW-w+T
zgCme+Qj8hMp)fcC2~lzsC=8B3LX7hpITQv*AY10_%gJDHMC%264SH~DOIx2EeHn{A
z+#;zQecx|vuEFLRc!p=dC$DPuqeri8{rmaRto<*)e){%g-XFZEi}zb~@@`NM_oIG%
j<8}FA`2RQAzpi;cs=3&%gR7l7Snk%BH+v6xdjs49RhCH;
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/belt/twigsflowers_belt.vox b/assets/voxygen/voxel/armor/belt/twigsflowers_belt.vox
new file mode 100644
index 0000000000000000000000000000000000000000..65f9fa13929cd20c19848c8540d948754aacdc57
GIT binary patch
literal 1512
zcmeIyze*fY6vy#%@A<c4Fh~l)N(feBVTc%F2r5XjEUus+Mk||OD&IiMyg{BIc_W*=
zf}O4_h{g3g5>mx7-41*>ch7H_y=Qi24|We1eu&7<W`9VLOBdPiA8o(rK5+E@pe=`A
zj`}}K*A+QMO}W;To08?mvW#lhJI^{QqN6H$tD<9rvkrPv^tKcoS11gQK$1z-aY3zm
zuQ1k*KthxpRmowj9f5=x*Ee#gky9Ok>@sIxPDVAVBf4I&S6I-adg?<FV+LaeV+Lae
zy9#<zj2Vm>j2Xz_2qc+QV+L|4430oTlpGZbgCmd-<N8Jpg~1WXE_3$fWH30Q>jira
zyRx9i+R}dSecIX-d-}PgaSR57iOD^fJOlsX8F;-t-IfRW?7eLd8_#CldwIJ4y`8LG
zwDZru{(0WP%4|D+JJ*IwuiD1q%l2+zrhQwV|9kE#-~DDk+sbja_b0vf@#}Q^a5nXn
HcmDv7<bF;`
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/belt/twigsleaves_belt.vox b/assets/voxygen/voxel/armor/belt/twigsleaves_belt.vox
new file mode 100644
index 0000000000000000000000000000000000000000..0bc0976502ce166af757efb7dbaccecab024ae69
GIT binary patch
literal 1516
zcmeIy!7D^j6vy%N?m6ck8j&oNm6DY#h!PS?nkE!Ajj^&3D}RRnz~A6c@^3IRN*34m
zN_On*=GCWj-}yCf?s@OcbkBN=k0Nq%&_1Qevx{7``$tptgk$0xZRuV1+fPmHirhg%
zUM%D_Mf2*>3^dYPjx=aQ2T63Oq9cQ|&h(_wVbka+L1A!Y1eqiqHAqR{6~@|;5fCLu
zQgRq;M@B%5>l-=L$f=HusF|}bC!-qGk!vrrS6HS;^-yLoW-w+jW-w+jW-w+jW-w+j
zW*~zjBgiBfGmt}JaAX8T$&sKiI5GlaT;Ir{FgP-zX3oBx3<gK8z06)SJ$PLQ>#*VZ
z@!^5k*CUg{(dl%?#`j?S4*bJAuyoWatDX4u-j<L3U$gqVyxn>DGw-g=maC2Va=J2C
p_LpbM*5Y)z+gbSe%qHKxei3EuD$4ftMA^G(mEHTvue|;Pd;)PMPQw5I
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/chest/druid.vox b/assets/voxygen/voxel/armor/chest/druid.vox
new file mode 100644
index 0000000000000000000000000000000000000000..96ab76e50877f0f403b1c8256bda8e855b1038d6
GIT binary patch
literal 2624
zcmbW%e{5D)9mnx=&+mJ0yD%vQ$}HG1p@j_jF%XMbR_azJ+Zc+YL;R7EjdaANG0oOA
zBwO8*f;fhRt&OZh(>^g~xRFXU`vb{Ba0yu!T#Sh!WHJ8lAI2DC^6~vR|5BWZPxHz-
z_k6$iKKJ{5&gs5~9$j(97_)oF;DZciZDq{f!J&bc<^`YIkWk{${X>I)4@~$REsXKT
z%yBs#jcJh6$jr%`bA@U6!W01!2^l3SV$ParZ;2x!A)`b^%sK9N#1WB@QKBN|JokIz
zh)BpNQ4w>&%=%!aLm-ZXjFPpg8H>aaqnS+69Lvm0aQifAbCEG2GcOrkQB3=ypq_$y
z3hF7Sr=XsKdWval$+1P@5fG7(QKCXkj&<bmFpq$Ugp3juYI3Y6k1zBHh)BpNQK4?;
zgks9`QUMVO86~P_EEbIr3+gP6rC3a6<|S+1Sn9OYY3C9$O4e*)3s+cbwbW{<)l#da
zR!gmxTJ3brXehXVg@Z>xL_$W13N>2L3e#*7EF3%nA`&u6RH)H{R+wgEVd3Br5Rs5k
zqVo28HDe1}Vfis!pdQA6h=hz16|tJpNBR+MBSw2XMazD$jgmEQ9Q)hRC&zwp><34m
z+#FAB{?R8#pB#O1^vTgDN1q&ha`cH)zz<Hb^oeYE1Vkicl&Dan1+6g6O#%xCkAR4T
zj1m=Uw4fEHxv^m3;1Lj!kWr%Yjy`c8T4C9YE>I6+Ktw`DiHcaw=%bqr(M@HP%)Rkb
z!FbNUXCHa?k>~vTDLTrT@%#_)^vBa5Pk%i9@$|>jAK$3S;YH~Uxt3h!0TBrqB`RVy
zIW5d7ik^_~$Y&l9k&scMB36^r!n}EatS8@-&paR^A)`b^tR|<0xeeq7ayfJX5eXS3
zDq=M`K6>i+Q)EqtB1}ajWR$FV8>WH{)DoyAP)neeFy$TV9NLJ4jFL6)S?3@}BxIDV
z`4FZ{1RHr)<XMqt@okQ4BxD2*dPG7-u!;Ocej=YYb6g`KBY3WnkP&PqKa-!yrwYe4
z5;B748VMPX+;{Je=0E@DM|{S|$MxYUqx;WZ(VcC7)t}qibouh`W=L-g{`_Mt=xbN+
zfqOLY)OK~xY?T=ZGQ*Y3xlhPkY1e|?MvIRatr=LQwQm~bVWZXwqlG7p+J9=aX?Lw%
zM;2)4xrI7*@srv)ZnWpL(YMYUJ^McQ?&(nH;V!Kl@6qP@J}nz*Q`d<O^~^5U`m3w7
z_<+&M=Zw~#G1_*?$b6aaAImbQZ<D#urpZ;etMQpd`rz}+q+Op<FC`D+xA-GYKVx+M
z2S%40M(@7Gb)V6>0i$0$VszsPqam)J*=Ka}an?tT`n!z|e%5Gor_tZ8p4FaB9XdSF
zrLjG$b>`3pjeli}&OF(#Q-^j)*Uo9po$cDTVYwdo!fGAbw?)Idj3&NjH1i#!OD`F1
z?(EQD&q^KGe78n+Zq>e?b{*cdOegNUOY;ZUY3Sh{8ve$E8h`pR9Y6Yn#=bqIlP?Tw
zzVV{2zjIb~U2Dn0+qGiF3a#(%(&oEAt<P=f*1)#)dgzN=b@ID+==|$l`rW%dy7Ar`
z{gCgRpEbJnw$UGcV>EVnwO*ars4H*u>rcPmtC8aibmAv%dh7kAx}oKIcvZii+O%Ke
zy@&pz{#WVCf2&`=o{?@|(YF3Jef682|9AZxH*VC+TV}Lw{W<kcKCh({OLg@}Mjt%J
z)}5VIcXzi&M@RLg`!C2$jA_xxB3*ptqu=mo2YaWpQ!l@8THAY1>G9()YRSRHdhcg<
z>Eh5*ouX&|-v4G^^I7}%Uem~v(zCBLH1XqkegDEcn)=ms-ShOMwm(0k2VT3Ry>DJu
zUtga-<W)?D{vvnX=;kj!dcT|Oum2VQ*Adh$$G2zyc?NG8Bhp;|xLEV%JMKNAC0oC)
LW$Vu0D%bo2F!z9t
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/chest/twigs_chest.vox b/assets/voxygen/voxel/armor/chest/twigs_chest.vox
new file mode 100644
index 0000000000000000000000000000000000000000..979b17542fac9179a993ea72d43d9cf8b903b77c
GIT binary patch
literal 2600
zcmeIyy^3T-6u|MS^IdhjT?In}!36^&1rxtl7-VQva6#5JG7$s8)Hm=Ae7Ek{7g(kz
z=nrlGZDz1$X4CMa?yYmqy;Wy!&9`4ad-M0!+LupmzhY>w&(@yaKEGLAZ}`1}#K5!f
zp5OlAT=4s~w`Q&FxZMWG*%rv#X>WJd+tv|C6b2?#+QFoCM<7ucn9^RT5?A5~Bnksl
zi5qbvjzFR?FpaqLes2f&whJeY;(B0SW6|~=?Htig8SPln4ud($kEHGbiNat`d*55{
z-4RF>1|~6)&YpTVI0A{nz?A-CAxE?yl!qA{fka_oDtY9Hk;e-SjzFR?Fpa!xj<YWB
z?2|RKxI}S1Ft4%bTSr7cXY^A=KaS`JYjW}?$3UVmn3FE|3hTmNg}n-U74|CZRoJWC
zFK8lnUF2TaxWeEFBnkslgndh2k-Mg*DRoL6%~BW~fka_oDs_x2a@W)}qt2+K!3u*T
zkSGjHqmFS!?wT5L*{ic3m!rGTBl1yP4@_bUITpl&c*r(G&J}VR%vsa3H$4Rsg~1%F
z*ek3neNy_Q^hxQH(kG=)x?j*l>66kYvSDxp5`}>&N}rTIDScA<M4eK{$D%Me0*S)F
zRO%R4<gTe{Mx9Z|2c|GM0*S)FH0l^v<gTd^*R4AHaivd6pY)iFg@H+IA;&^b9?E&q
z^WfT={pHR6jArLVaXpyhFT|NK{s$QSG5TZl$LNpIAEQ5Zw~*7tI6JmeM&qM*1QLaT
zNo*l!#mJ`UiEWk9I3SKdqA)OtE##~iX~15L=QA3I$r0SA*|xYIn8X(5R@Yo7*I75C
zJNt1v4X!713nNcBc=!A0zR&J=#r0s$#E&k{+MTsKYj@V}M^isJhcu8V4Cc)I>>S)c
zqA;#=5<DY#M(_;YqTC}<a1L}JQE*A}ll&x~6)E>f6x_H+qTo{G7x_g#t5@!kD7bNt
zMB$q+K7VrkCx882_-!_u2M;}X_y+!mZ{V$)<??uwFYWE+^w~>e*K_&Phrj)2eDltu
w%g>*_ak+W>wadqkAK}%1<-gCn-+P*ucfZfe2S3#1lOLDMN571Ja<1q9Z~m;P`2YX_
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/chest/twigsflowers_chest.vox b/assets/voxygen/voxel/armor/chest/twigsflowers_chest.vox
new file mode 100644
index 0000000000000000000000000000000000000000..53292faf1f1cc98d381455b17176a5fa351ef8c1
GIT binary patch
literal 2640
zcmeIzzl$AJ6u|Lw&#(Jq-bTbiunLHkSVR=X1WAOT%VGorAtqHC(aQfo!N&i<{~&+V
zY?t!6RoJ)1`;m;_XJKVZyB+v&XXc!HXU=(ZcOQNC_~xG?^6kCT2Mls&h&()fa({Ka
z;JAT`j>kVdIb9_u9KRP47da1+nOo=NteeOS^43=5(u>T2L`6f#fT?U<r34Zc4IM+}
zr5SM}jzmR6$1vhf+=(Mm(a<rRc<}s?ZG@a>5J%&@V;o~Cn@Cw_%8Sa_QnsCYEdLiv
z>_|UPDRX6PQZBlb!ysm*Y`l~bNK`a*3}UK<+DdT*5)};{L(9vF9JR7F7IOp=6%8H3
z$RkIcJRax>Bq|y@hLd;93EnFT_43}lTt(x&V-T|}YtJ$VGRsBHvTs>-J<E3Fv1UDl
z=q^S19d&Muoog+6W$>cZtkkU3tkkU3tkkSm6GZj0s9q@zFgOB<iiVD%O8r_^<eo4`
zjCsa9nr3hW5)};{!<fgoBKL$j;>>gA(P)Dskf><r7|uM#6}czO(a?<r^@Q#slwOgK
z#(BpeHj(2=Jc*~yHTBR^_nmttcHv^LLhO)YyDG-_VRIMT4zV?FvoUxv`epRX=$Fwi
zqhCh9Y%@XB=$Fwivf&6MDjGV58vQc*W%SGF7xRpHd^`q6AW_lKF^qYPD{@bmBhEZ$
z9v_^+5lB=tbPQ)6<BHr9=4jY#K|Nvg%jg$1Gd6S#V$(4v=}X!^(snKF&^aGzYZreV
z;;&NtP{nsmobSqKezBRi;BSP}C#O$NpPW89eRBHbmlHWfojv8}#^`K@K%%0dV-TCj
zSus)^y<u%eXX6AC6%8GO*hJ2Xkw$FPS)b9_WP#+my3dXCjzMhV-s+ee<Oc7}7~zK&
zzVDn5?oEuI{<?#ewo&3LOKfV1%f@-<o@?wvgBpSwf*OJvV&@k7U=t@Q8ansf;}C4@
zL`6eC-qU1_WQ}AEp27xCR5S#eJyFpRTFI~ESMqry;~EtW;asDlA+(X-$ZzEH_Qo|T
z8p63oMZ@=Be|7Kp&)|409A{@|*RFeT{SEvN-@yC#r{$xw`o`Wa`@3(99rxu=xBpn4
zefHb(>o?E;Gw;!@x0k1%yt_R3@SWxE2X8H(-@LK>eEYqBb3f(TA3v<it*3SQ;#ph1
P{Bc_D{L=r4ANT*?Lwd1w
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/chest/twigsleaves_chest.vox b/assets/voxygen/voxel/armor/chest/twigsleaves_chest.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7c74ad5d4c6555a91e6cf48764b8af4dc5363808
GIT binary patch
literal 2624
zcmeIy&59gV6u|Lw&)5B^o=9*ZxC)3XbrDezBa#R~hQSC1LQGa}L|49nTi?KUt9gqs
zJ&W$HnaaOhxQjb?)9~Zgt#eNGy{GH;iyvP;_*+DNcyj)XK|UQK&(B{y-E9*-_fXOC
z^5<9QOK`#G&m!U?mrUnmB<I*fPUPKKkt;7U2ND$x9RsFvaFr5BR5Wx9l{aR@jW`k&
z4IRUXJ8>tDL`6f#aN@!Dha4j0GJ`l8*BxVvrR*bR$&^z~)}3<b+@t(R>SaoqD`R8c
zr7Tv;-b*QgL`6f#Af{T_Qz?!>qN1T=Xn8Y{qgD>a!yJJ`MMK9h^2kvqk1uot5)};{
z!^zunf^|h<pRAe1RWz<U1~JQW>sjVNW?5>MQ%m-g<uJCGC_kqjQ<UFN=f>EXYtd_i
z7iG`No|Qc-dsg<W>{+iTi0V~Qy;d4va0C(+4IM+3{cG8gdq#~Ibw(XcGdKc?iiVD1
z)G_YJJ)=gPI;W0C8ytZ|MMKAM>KJ$Ao>8NrdkgjxdW=wdMLrtW9fR0JjwkUXo;ugm
zrKO%a_gw5I#Fi90Rx#cSo4eS7RqPF3j6NBCGWuln$>@{OC)-aDHTq=qiEKCmiHe4f
zp+=vKJ{f&7`b3>k$4g^y1QHbu9mA+&+>v`mjW~5q9WR=}5lB=tbPT7CaYybMH5xWs
zu%9scWb}#sGB$J!V$+tB#(QO_NaO6-(zzbnJ@MNRze(|>it~TqyiY#!OU<l;{{*K`
zPM@4UIel{a<n+m}CUS~8XUQ*((K!TxL`6f#AU2V+V`OvmhG#Q62PTlHXy_QkCUSO+
zG-9vL^BJAP6-egQeQsQL3}O@ac3W<c8?2i#!j~3)>Rb=*O^lv?+rg6#QQ|sF>}!du
z#&zeOYaBy^Jp_9Q_7LnLj&5-Z4sW8Op>xkYmf%1qDjNEBPm^aP&q$uZw{Wl%6%D~5
zPgFF7R`M(Pm3&rY%u&%0&KwmDp^f}Tej}gN8*@}NgfmA)!%yFT_hkF?-##m!i;Igp
zcRjd!2mXh5;G?J0`q@Q&XK&Zj<9EikbNSn&zy34+;^F=E^%ozk&pvs7ef;rz>sJr%
lt-n9|@ZXv*`R>o3*Y)A+x_<pjTfhBvTEF?D{}bQN|63XbuCxFE
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/foot/druid.vox b/assets/voxygen/voxel/armor/foot/druid.vox
new file mode 100644
index 0000000000000000000000000000000000000000..934efa1cfc5809258a84cae48023c7d825e055bb
GIT binary patch
literal 1376
zcmbW0Z%mt26voee?^`6IhDj+<uwci8mSxDFfmp<{(rsm98$)q)h<`G&k&d`DrrDZi
z$yT=n3CfVLwGk_th8Q#4NF|zmK(Y{ALY4&=V`2zdjNkoWjPc9k)6GwcGw~+Bob#M>
z-+SJ3-uw0*JW??wB3<o)12nSVBGMBG`X9>*E=qZXnB+)bFi@uGaP1~^6NX4y(^90B
zq9&S{)M7|N5rb%A64BhJ86%pQ)I2<)h(R<l2@9u{g)yRunbkSeIjl#kL?sPT2~8_X
zB~2oRVhzO_v_wqBa~03!K4KEFD5Z#DVT{(y>Ky7EmDIHKl7=$agOOB*k<>(K#)u|L
z>9j#KQ3idYiPH3mCWrUzYQH})&InwwSPb_j1be5KvDNxJezjV$wA7VN;cDQ^hm!BL
z!PCDJ{*!HRrCK0<3ncU?Wadf8vJLrNf}&wTjlT-puL*KPg2&^6f^mWEb3tQQ9y*8f
z5j<CbcNd;QM@-N?DR^^EaOMu5?Y6@)<V0o6ji!tjrC}?aV|KXH<)~Y!LQ%h<@|<A%
zl%RD{ATP0gG#4`Y1Z3Wdk*Y12eYOyHUnm7SpN5Am2gvv2XEJ$OF!zCAX;yISI<;3Y
z;}?8&Sg?Lv5TricD;Ph<ctqfH2?m}ML^=e2tW2Z3(T*X%6VdK!Obyl}_Hr|(PWUh}
z*bc1Dpk}KLt@Y*D_hK~$dz%sJ6vST@q}~=RzAtEU*b#77qQ7Ye!W}K>b=xr1Sc<Vd
z+mIQkMetBNLa!e{?9@?=o;{A}TS1Ip2q80j5o<T6k(ZZ;;({%xsHi}l%Za8P&*1rb
z7yPYtIJmn7<L{JV?qer@xaG$B?HYW@nwhj<^@iZ5?*!4IYFvpoVEL*Kzx>#P@Mu29
zKC|Nbof5309EYlWIN8{Tm}l@G{a@i+{;hv}n*uhL(dx6}l{Xy!yZ?rU23%@Rp|)-Y
zo{{q?iI-sI6T#i1yt?T$TrL+PkqGwhorlDuC=3^3;qrrTc-GFl<8a{8g-Nt|CU9)@
zB8mr!aQlmGSO}J2f;0R3{ImPAXZ7{0B76ckb9ol=PcwLL{w5ONtYPP=5wx98Vc$oK
z=()BAuh)xvd=<$h_zikZu<`YS_uJt8`mg+7zaTcXH`4e2!A*0_WaAIZWgjlvHH_kx
M*HBtJx7l9#6LTy}eE<Le
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/foot/twigs_foot.vox b/assets/voxygen/voxel/armor/foot/twigs_foot.vox
new file mode 100644
index 0000000000000000000000000000000000000000..933ac0ba9e80322c8529f981e3053b5a3b43fe1c
GIT binary patch
literal 1360
zcmeH{Jxc>Y5QgVtH)lu!QLs}~Y%DDW6-?le<50msh_SWsUs&2(_}|Wd5p$_htk0#h
zh@IUnJj}ea@7)c<-cBE8$Dbl{H!AK4aur1;#XRpff`ya}0?eM~MPEr+V<4?fWaUJ}
zO2NP(fEYEy18!0Uw7Ap?2JX~|ynLa78hD_F=EL6_sewmojqb?WI<j!0ihh}B<wQ|k
z1`yLafH)d7Xl3A_5r5RB6IG2qjXsSYjUJ8ujAzN6Jx4b&Sgq=K9k1gf2M2X>aCp2O
zk2V8hCW%#+WlKAQ_6+>P8Ho8HW#w?|Y}5K?>t6F;zFxlnxnG`j)AM;R<)=I8`lypG
g4&pC=R_>;3GECWYFLht`Q}69C4L(jbp5|Ws0aYj?3;+NC
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/foot/twigsflowers_foot.vox b/assets/voxygen/voxel/armor/foot/twigsflowers_foot.vox
new file mode 100644
index 0000000000000000000000000000000000000000..26a07e673bafdd731b354058a54f9001bb02d596
GIT binary patch
literal 1352
zcmeH`ze)o^5Qk@W_HvPkA{K&GK&-?f5>brEMF<)WBNzxVsnUp6zJZp$fp6eL#V%!H
z<)5oW*Y8qTnbIx`AHVs{47<y)+d1!+A4TM>-fSUKjYQhbUSlygEUXm4L-(@R^h&@=
zfbheKWQJlUs**V{pl>2hM(XGRb29XJF&V3o12b}XHh)!54$PCobMTu+<iH|wxi83<
zE6CVT6@7N1LqkRN-GexN@gRl=^*VH3Cx&XIV;AYja*g#{)p1wHU0tRQ1vPSDplZ~O
zx=|+v12tkWxHvhkPY1&+0xM0^IrACJ-@re-fsIBfY^U+e*@n+#W-b4h*R_W**t-vR
zr%!+Obt)^NUtJ5Wt<{ihE{FZ{Qn;zD|Mu>3_D(wvm3|x!2E}l6RSJi<3)4E^Uw!~J
Cnj(t;
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/foot/twigsleaves_foot.vox b/assets/voxygen/voxel/armor/foot/twigsleaves_foot.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a5607491058222f0e716338e4a32d880b24362d5
GIT binary patch
literal 1352
zcmeH`ze)o^5Qpc_UM><*#6qwNh?Q7GB8ZW25rQ0t5e$TwR5qfOkKr5mZt*SDq)C+Z
zyA*b@v&+KAZ{|01x680QxEa=8MdZ4Z_Yi3&BK>^S-7FIpsZ=4r@NSd`C17PhI5m-(
zqa-s00|)wMVt7UmxXC1ti_28Oz#R|e=kFTuzylsR8-Hkm2cF=Sc}2dgB6CMo^vy&k
zj*9AM05P2g5GMx>^aOfPO>|+2&b`!Bzg3O18fP`mh=MvEIH)>xr|#5=!9krE9B!{J
zJIlc^i^wX9V$FI6>pSodci^B~i^oN}a<*}it*n*r^0D>uXMNDviR0#8>>cgK>~K4t
j)wkkPYybC~Q}#aTr?D|k<N19xwjXNo;(23P=lRPI<;x;%
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/druid_left.vox b/assets/voxygen/voxel/armor/hand/druid_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7d3e7cbaabedb5fddc329aeaa16a270437ba885c
GIT binary patch
literal 1240
zcmbW0ZA@EL7{{MpSVBY%lTx6}f*liDmLV?#vB=6w-O6MeLveJ7FB#cLM_d}yY)!Ld
zt6Rbd%CKR>$T~DlW6W?Pm1y<>$t1XhEDJ8i#1OI=zx%-$<CmY$9sA_iOnmPB<^Q~#
zbI;2?r+eSQvT+gVXbtRDk?*rbx&lG}lV+fn^?(hk2YZ5ngqc(;UlWU%k0BO|A}Si1
z?|l<PMKKf+V?rBFh(%QqLsc;p9VKm13`H#JTe7s9`iA<7p@?LEVv+0#Lscy5D~2M5
z`iACJ5A536Dms7DP>aQ4+#3^iPcE?8`WJs#t<2ANm?f?TzJ4ruUK^g??f8$i;7T?j
z{tZaz31sRSWWh#Whfp{uRQW5|dQHd)2~Wj^{87R7rBL6IOZ#9R!PEJipM93Ln9!LJ
z-klas-qF6Db{qpv%42RCGG0o;R-7Yt+^JG(7Aq+170OQwTgQdwIYD02@uN9N;%Q{Y
z%235d(k~Qn_vI33e-4i>IiUQc{H7#M2-6=6^J(GMb&b8klwbJffUt5z2x@$yTNpj8
z`H0|i34JdLkv8G)#YsBr?F{&xL^~@P@2@5HdL!dUeT?<D!qOB~n{71Lma=C@CH>uv
zgxZDpn?mw^VeTWL!C@!hE~mF)8{xJly4^Mg>Pr~ewS`PyHNpL@gx=mu?D!#uPaPrp
zUXanVAu{Q6EZ>|YH#e7}{Ed{Al~Lnz(y;A$UaEEBZ?0kAD@}}ku!-p_PJX`SX61Gj
zpX!*Il(2L|`1MC2I#9`_cpVE@ef<7Q7vbSNM!v9e{Z26}l(N6V$FcezVxIno)_+O&
z<x%VBha{{n(CoAF#ygJxz5cqoIxaLOsjivAGjxXHcrlBg33m_a(M_drxm-jd5nkOr
zgT$j0gbSFxxb_cE+4bx=99%e?pv5!B;o)->^%Zjat1Zk1iy6~B`}h8v?aXiWbS)7+
z3MVh7iGQBq!<m~*e7DT@<3qHZNwVki99`Fz@p`@7)2T>~!k=U<3#;F*&2LrD*MHR?
jTtU{=8>#zuaNU|#%>3hOX6H>i2PtZLi<0W;_1elm;~p~t
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/druid_right.vox b/assets/voxygen/voxel/armor/hand/druid_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bb4d31d95cad58b383b461ffc414b591d9b7b772
GIT binary patch
literal 1240
zcmbW0e@L8l7{H(R)q!M%%k$K8opy8Sonz*YX?AAk&TBiD+ni<dX7+>0CQceh9NTdW
zwrc|u%h}=P$S#ZHh?s41NwGgnme@eXun|FsjOhRVh=~6A^t|a`Wea-X^FF`6zn<^=
ze7g@GDVq?Hj@IA-Rq{=?NLMfvc-V4OvNqVF`bbYGn6QE><%%g{n1&dJsan}E4NFW#
ztdC-@JCmlElj=>HikNCErlPx~4aHQ%P}|7TX=<BlE2binebta`T_gLd7-}n~BBt7=
z##JBQyQfw3{Fa~+i^aG<F6^6HWV`Kmezn<HSm>})Tnm2jK=OQcyuG^#oNU3JY(fHC
zkimzL>Bo>oJ9!;K;gC=js9@)HA!kr{BrfES3HHx~`i@-Mhw=!W%jccB$7zcRoeANM
z8R5)bo!jZaIpCr^=Aj|uqa<v@HR`~VDy3$rg2G;*{G70JLTH{B<VD>-nu8=BMP_Xb
zS8OHyQ~~#%ErIqY@M_6H<$L94C2?Aqd0$va3%75m?-Qm2!k34I)#E}){nOpT*fEVq
z1ixG8ds>LJ34bh2(OK_cAmAd}S;<6yEwPsxnK<ERyuTHer>WX*r@6M2{m)g>-`&Vy
zyAXdxNWLY^zb7;}9Rxk)^fv4w+}1?5$Id`~38Q;=km;)?bf}fV*A5Unb(E2_$BDif
zV(h{one;_gZcUM!n@dstR?5oCsByb!*!3jO)Vc{Y*KqLpCdS_0#>_`9ez@&n^-dKZ
z=$@IBuzXYa={q4hP|1~e9gEle{PJTL;gLK>Kech=ZZWHra;U=3$@(5*-u{2oe?{-*
z-|FYvB&;pc?6>jq>(2jOe_dT2ml~5)*G%IbK2LGHn5B<}dq=f(Qz_hTH<3t$7xv8}
z@hAo10_HBS|HHEm?H#9+OBWKfc*i+5a*?9GLhgLNgSk*K<9cU*zkh3-wN_8pGT{?&
z=5m_&CmG(Iy~X6$E9^csOw0Ks`#+qg>-q{lpO5=`6v<KejjR=6?W^_kt!aP#SAOFO
ivZ=nA`s)pDn$wIGe^Abvylu}AMNO|#Qa!WTSosqoc{30I
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigs_glove_left.vox b/assets/voxygen/voxel/armor/hand/twigs_glove_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..98e764dcc595d502f3836760c3973b56f42dd16c
GIT binary patch
literal 1240
zcmeHGK}rKb5Uj2pStX)~2f<T7J&A{if*1*j5M)`5U?9Zg<VE!4GyH(~B0r(O2%B6s
zLR%BWTfBMOVrr_Uo1urMXK*vDzX7=JWIYMq1JKV#-Sv17k{_-}hj*jwH3o%!(X<$8
z_#ziaGnislnn1I8+(;_{P7Ev<)i|ZGP@*6?QI)A7nNbQ$W+qYu6{oxu2p@*<NrVz6
zZ}JxApgiRn%G;~U4)p#A7xFx>SoNTqfq$5Ry>88q@^oo$ecoQ0i~sVm`SNFe(Ae_v
s$&U99x4nI^>1Xu~e`@aj-Z@q6<9_Omaq8#ytKNF3`Ni|vA|L<%H!Yk2pa1{>
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigs_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigs_glove_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..98e764dcc595d502f3836760c3973b56f42dd16c
GIT binary patch
literal 1240
zcmeHGK}rKb5Uj2pStX)~2f<T7J&A{if*1*j5M)`5U?9Zg<VE!4GyH(~B0r(O2%B6s
zLR%BWTfBMOVrr_Uo1urMXK*vDzX7=JWIYMq1JKV#-Sv17k{_-}hj*jwH3o%!(X<$8
z_#ziaGnislnn1I8+(;_{P7Ev<)i|ZGP@*6?QI)A7nNbQ$W+qYu6{oxu2p@*<NrVz6
zZ}JxApgiRn%G;~U4)p#A7xFx>SoNTqfq$5Ry>88q@^oo$ecoQ0i~sVm`SNFe(Ae_v
s$&U99x4nI^>1Xu~e`@aj-Z@q6<9_Omaq8#ytKNF3`Ni|vA|L<%H!Yk2pa1{>
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigsflowers_glove_left.vox b/assets/voxygen/voxel/armor/hand/twigsflowers_glove_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6f409f646075bf9dd3dfab005d474dd9e8eb5c88
GIT binary patch
literal 1260
zcmeH{F-rqM5QXQ>teg^2#6qwNh=qtnL{W@LA_P4SBNzxVsnUp6{sS%j2mS-WpJZ!k
ztW0-jF}}UR%9M6D?01iMZ((+qz3X2N>dzu_(N4P*c?%-Fbl6#phD9qz=E&fBn7&eD
zZ4q#21X8G$77*|q3a}K&<3kmNh)zK?DyYPu6NXbI?D7So#Ka~7dZNT&@1pcXiK%^X
zWjQ1iN)-h53%ODa;Zu~EGNWFdowmzOaJ|mTvaF&ygX#|a!yVY@)O;sPW}dBow`OMX
zyS!~a`S{?`AI@L?oY!xx_-Jp<yW6YY+FbU-`jX!@*MH~kv-fT<@y00eqw&0-+|>N|
Kexc0cKkEm6>j%*Q
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigsflowers_glove_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6f409f646075bf9dd3dfab005d474dd9e8eb5c88
GIT binary patch
literal 1260
zcmeH{F-rqM5QXQ>teg^2#6qwNh=qtnL{W@LA_P4SBNzxVsnUp6{sS%j2mS-WpJZ!k
ztW0-jF}}UR%9M6D?01iMZ((+qz3X2N>dzu_(N4P*c?%-Fbl6#phD9qz=E&fBn7&eD
zZ4q#21X8G$77*|q3a}K&<3kmNh)zK?DyYPu6NXbI?D7So#Ka~7dZNT&@1pcXiK%^X
zWjQ1iN)-h53%ODa;Zu~EGNWFdowmzOaJ|mTvaF&ygX#|a!yVY@)O;sPW}dBow`OMX
zyS!~a`S{?`AI@L?oY!xx_-Jp<yW6YY+FbU-`jX!@*MH~kv-fT<@y00eqw&0-+|>N|
Kexc0cKkEm6>j%*Q
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigsleaves_glove_left.vox b/assets/voxygen/voxel/armor/hand/twigsleaves_glove_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bda45dec342d90073449a4357ea915b4fb2cb0db
GIT binary patch
literal 1252
zcmeH{u}T9$5QhKx_v8!_MJxoXfCLM%h$x5=NrWKBkpv8cm{c~Rm5<>YSo=u6is|lx
zj{ja^7dyKf_S=7FhGm9jcc<f7>kYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3
zp(HEU45pZsCZkyqC(=rQOB0N0QW1<RC6^Sc@@ax1Abi8*3kpzcK@k|f)Ky_fN=jjg
zY9$4wpyE_qdUt!%ubNk%F3a=0rapuE4*bI%I2<(nBv03#t*?4(bMak1bzlF?PdmH5
tINSHp@t*hEJATpH_UG=w@1AqjKAoiAS)_jXu<6&2O}~0+RQdQ<{QxCB1zi9D
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox b/assets/voxygen/voxel/armor/hand/twigsleaves_glove_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bda45dec342d90073449a4357ea915b4fb2cb0db
GIT binary patch
literal 1252
zcmeH{u}T9$5QhKx_v8!_MJxoXfCLM%h$x5=NrWKBkpv8cm{c~Rm5<>YSo=u6is|lx
zj{ja^7dyKf_S=7FhGm9jcc<f7>kYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3
zp(HEU45pZsCZkyqC(=rQOB0N0QW1<RC6^Sc@@ax1Abi8*3kpzcK@k|f)Ky_fN=jjg
zY9$4wpyE_qdUt!%ubNk%F3a=0rapuE4*bI%I2<(nBv03#t*?4(bMak1bzlF?PdmH5
tINSHp@t*hEJATpH_UG=w@1AqjKAoiAS)_jXu<6&2O}~0+RQdQ<{QxCB1zi9D
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/pants/cultist.vox b/assets/voxygen/voxel/armor/pants/cultist.vox
index 85bc57c427e75e361806adfb1d33a0d91be0613a..d08b6607c7b0fed2dae925593ff327e916ecc316 100644
GIT binary patch
delta 163
zcmWN|%L#x$5Cl<Xdw$@-n=zQ0$Bn>L3_&o74a+(_7^t4Lul?P0Pno78kSH{4XbuRD
kK%&qv=^CQL5l9r8X3jqZM<7vXSkU8Oz~Kla3g4sCf0xP@!vFvP
delta 163
zcmWN|yA6Oa5Cl=3_db>goKXYixD7%opcP6$q6wG91TUK1HP(1H-BYIN2qX&KbXn8Y
qnx^0gBnq8o(%D3ZBakR`nmK=`!x2anI?aL}JA+_=K%($HI{XJ;LlWfx
diff --git a/assets/voxygen/voxel/armor/pants/druid.vox b/assets/voxygen/voxel/armor/pants/druid.vox
new file mode 100644
index 0000000000000000000000000000000000000000..d299520e1da4c70751c7f278d4d9c9237cf4a9b2
GIT binary patch
literal 2272
zcmbW%Z){i99mnzS`G0=0EjUVn;tH!Mv>1^;!dMwAma4^}A{&#+&@B=rmCQ6tqfKL?
zohFR1AtPuTvEtG;%OX?Kkr^K#F@%{AW6&5ALx@@Sd=Hjo*^`g&pYG9yTe6$Ja=!O`
z&OP^@d+x8h?zw;IaWmV#rT=akyI9S3_7C)ZrFp_}4GJ>u-#yU(Ql#Lx(V6i#;myVa
z=pIjC+&JUMnP!3k6AhTBg$3GRGZtxKi5AY>v^O^q%rTE+9>+Y6dE7)LGv~$~JOVNb
zDjG0P4v&D0f{F$#ki#P&qoASzi{$VK$SA02z!Et;0x}9J8gSXo`0OSMDz!5|?#)jJ
z^AnLeAyXInDz!P!di=CUpw1}N6%A_h<enUXI-^imG^j0*2XX}Jj6z+}pteXJ$q}eC
z3Ux(;+LE7kiDyJWMnOfRnPty<$g-cvDAbicXMz0=?01-s)Crlo&{wI=1=bbVC&nNm
zA)}z80rQN5M?geEMnOdb78nPQfQW>Qf{F$#G7cUA5eXRu6%ANo96SOd5;6)Z8gMzV
ze#RhX)`^V5d2MDEc?XeiHBKjF>H_B?Yme+{oQ_DyD5zx4lY4SRBxDp+G8f1LIU*7=
z3M!e4<dGZ^2^j^I%q4P!M2>`vLSJoWnQJr8jf9LspSQ%fn%L9CdJ^kN>}i^IF7b_$
zAtE88pu+hy<2^Yd5;6)ZnG58B91#f_1(nQ2@<@(|gp7hp<`VZuKtw`LX{yjx_?%_}
zB2rFM8HM`3J8s*;|CrAYag2_R>eHj9J5QX~^)3I<-&$I9?%eifq}TfY@L$dCX;t^0
zTh;g2W_3<(l=UUq;5D+7UzeS4)!gl-1qVzk`<Cmb*G+ZM^wlxbyd$R8-<j5JpQCLD
z=4#;SdHThfZ)oeNX~!|sPfnShe4lG~w5ff6hn9_YY5i=E77w+k<8Yh0rj}^+h2>hX
z$F%He(@n=so6ef-``mw|%8q?acDh9emtU)yTjuM-?<|(KeN)|L>c>a;3ywWuI`wPQ
zxf#>DZ*bmYI@xFX<9(*fkC+BHe`1&E$iwsxn|eD<d%tBG-fH^ig%jGbu1)*<IyACl
zg^urAqtPF1(D6rmb#&hr>EcPPyuMYN)-2Io-(8`7yEbTWn`!Jvrpcd~&i=}@zP(NT
zUCXp*{mmNMx>38jTD5=OVjaHY2F>nWrGb05Xz-!CHTw7iI`q^d8u{sfjyyZ4*_r2b
z>75grGiQz#&bwAimoC-n&JL}=`9^(vO{e-ct=2uaZ`6^WU#C;Abm-%EyL9=zm3oPL
z&Q6&wzGeFJ2d0tzEA-;nTAhEbSAYFvr-lyA)#2Z^=#BRm>9UsS-sQb|Y~5~+cJKR-
z^}on_`LgxvPm|J>^V-zgq96Xa{r_J7+O=!-{Dw)bT76R82cOZRu|>M@s_DZAOq!Zf
zXJ@B|hllmOJ5S5TMl^qDzRtYx#U4J@#<$bnuIHaUrp?_)_3)wRv~ceNz4!YYbY@_Y
zj`Gg_{rxw`HRsyB^P+|xm7aWIMq|I3)h|!Kqw%*d>DI>&YV$Lby6fe$+WGn=_4M@U
zQy#@C^mm0zrYmoL@qAbKzW!IvkMQ%~*;U)OroKEQX<l>H>;9EBFTU=!16sK8K`mZ&
I>S|-{GsOhu7ytkO
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/pants/twigs_pants.vox b/assets/voxygen/voxel/armor/pants/twigs_pants.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bd8a7f0d4afe4015c0891d6b22e939aab254b5c0
GIT binary patch
literal 2152
zcmeIyy~-3x6vpxMRp(Tx>>>uHf*Of|q9D7=qJqfFiwY{@M`R+K?PYie-dp!w_!Zba
zWBVU71I^6dh96UXp3~J`Q`7V8(en%MMC8GpqlbLR(=PJl=;ggLhZBxdC^S5O@$%?W
zFyQDaqAH82%&sye<6=yG5t9#U^4Ux#N21U%$i!t;m&xEr6gq~>UP5*n<ZvVk9V6r`
z5A#7A^EYxN3LWE+rR*(b=P64vF2+4&<$+gKolSLeBnq9{AQRK~YRYqyBT?uWWa7H0
z>w9x@BnsX2({Qd2@*od#BnmyqgS;_+WBx{tM4?k3hb(nxsjH{XEp?xq7w0{7F|ozP
z<`A12l5tTJwMEq?gCkMs7-VAhQO#HrITD4AK_+gqy0Ip5Bnq9{aIO#XAP;gR3Z2>r
z^2Yp)`5QR`i9&Dm9P+f)(q>Qcw0%q4CACUhdfFEi-<kO8;!B9n4avBubuv+(Rh>0D
zYxF75kSKHvdc^#bnzL5=5NJpgItD%BKB@ah<I@pnNEG#s;mjBG1$}%v0u70x-Z6r{
z#(f+2ZS*0~kf=r<#-S&DwxlP0AL+Z6zGkvc>Ychtu*bn32YVdsaj?h1{swCg)*h^#
z42eRATCiqv1R4^BPNvTFa0D6>g$@mJI06lcLWefyZ{!FxBnthIW$Zm;7a42I;GN^S
zGp5J)@802E{(fv6$H&JfPQHVa-@tG94P3l;db@gDKmBgE_4ZG*!+ZJP-*11JKf88z
xdv)Xd_VCKN?e^tAw_6wf_@VzM_rCt5wrj6y`|EYz{(W<L`{)1hz31=;@D1m=+Qa|=
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/pants/twigsflowers_pants.vox b/assets/voxygen/voxel/armor/pants/twigsflowers_pants.vox
new file mode 100644
index 0000000000000000000000000000000000000000..05d97e252fe8708e3fc290e1b7422b066cc6ad21
GIT binary patch
literal 2176
zcmeI!%c@jI6vpv&t5ug4B{&cq3Bi##Pz(l@paIdtAqEu0%gBi+2zi4z%p3RyKGg1+
z!_$tuWME(1`F98z#bIV=!;h+6>!Yey@7{;=@YhG@-iXLAw+`+x$g3vu;NZ#a6Z;#k
z{a8`(=<$<-8^MI@q>8x6iule{)~>P)m8mjs%sZo+d^D3k-DC<>G;|DVY_L+7jk!#Y
zKt)5xaM@|d)`B_$6%8FD<m)2Xqi{~)oI(Z_4IN`&OWAqKHd5A=d1Ky_b46D!`YuF|
zs_54)x>ePUsV-ghOQ_P1PK|kIZBP@_BQ^bCru3!sMFtHWgPOR$Q`fb*esCv)iiYm`
zdAM#Ct}6*$X^;zYK@JrSJ;(*QV6Vb?h4Ts-R5Wzf2Np$-EOqOtn@C+|>aKF%xbMmS
zVjCBG-x*bHZEBON@w|-wjQ))0Wz(RhW}nQA-i+R;qoHF^6Sw#3wlp_-BZG>D&f0MH
z2<kySsH38xvo^xki(rq!IfZiy85C4B^g?c5Pd<0@Ig@(YF4MM^wU)N-X<uA?9pcN1
z#$46u&3Se{1qu=s4V~H`qvoH@oF2)cAW_lKG03R<WbU7wF;I}GXsmY(_oW88AjcRe
zNK`b|J4TQzoLe}zkV8SDq7`x&`%Kb9l1bl{^lheZYWljd-dQgaQ%WpNgZD0YjzO=i
zp`x+YshI^m20c<oqN1TwGY{T7>L^H5G;~-{N1z~4(a>Rq{R?#zBq|#EzLv3zjBUx-
zWCrhEEL+BO|IW|1<e$GIGuPqa;j!cI;P^N2Kl}#1zrC0*9@cMuxAW%aH*5R%^2PN(
z=4V%5&%fV&`=7aom%f{yUO6-0yKs8GdH&S=<GGXb%j;+V&HljImmk#m($hL$d)DTk
Qo-gJbzxBWC`~M^U0ur#}E&u=k
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/pants/twigsleaves_pants.vox b/assets/voxygen/voxel/armor/pants/twigsleaves_pants.vox
new file mode 100644
index 0000000000000000000000000000000000000000..270aa4c55548ab16e64b4462c04337674d6829fe
GIT binary patch
literal 2128
zcmeIyyNVP+6vpv$t8=PcQN%znS`Z^KP!vQ(Tw#%AaRmkO5}AlbK8A1LyY;-qt{ONO
z+y5Att(n<2{OIcXPFK&Fo|;$BU+;buk!O1cN1Wtg7kPQ`cK`hLg5w+t4X@w4Jvbi>
zI7}h3A={|RlIw-5Ov$(ycg_@?sL2mAnH-5i#~>4zmAXs@N21U%Ts9K2)*y!?QRo;U
zzxYrm+E~AlBT?uW+bm^cDQizzCgWn<lV^&qUG!I?GZxjAsxD0Rr>oL~PQ|!0H^^xA
zSWW3e>4O}FjzK1_OLaXqCr6^tUB3_K{vZ$XAV;FmgFMI^>o?YK<VX}c^JAN(t}S)t
zsf(7nNv@0Qo~$dj>JYW1s!gWGdoX%1dNAIDO@mC#zNr~K7(I}q&@srwZJ}=TK#oMA
zGdG<3gFMKC9En0_ZUlK_{l@x@9DzikH)^(d+RBp8m*i=imbOmjDs9=*ewz5w#TSWU
zEb8>+yceGwfrdn(lMQOb{JWad8+8aYBnlma8gZZ0{hM)i1R4^>e8+HKNKhBladre6
z62*MS2<jToZ9KP8hd@K38g&@knxu!MCVdm>>z2OC^kp&MnGcDnNi0-@eH6UEpjYOQ
zDCRnuTF_(ABRLupg-)g(>?Lvp8WM#L4RSaF4T(aBHr8+C2s9)LeVb)$JYyXhtCqo@
zibZ8iFP=WxW3T=>W{$(d!!u{!!P#%%Kl}!+?eEMt59`$Lc3wR`HQVmXj}N~5Gk<mK
z(){kumHFt#<@xdTi}StR3-hN3SO4B~muKI8S@W%THQ#^V=SLrQ=7*ohpM3iV@EeKn
B)$ITP
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/druid_left.vox b/assets/voxygen/voxel/armor/shoulder/druid_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..8dee9ef073d988e0f2bda905fed88f4da42922b8
GIT binary patch
literal 1628
zcmbW0ZA_JA7{{;YetFI*s$m}94G1+n=p+Oog6JTg1Pv7_k|WW}WXjOxSYyi0-1LOo
zIcF3iLtzn7JFwOyWyETJAm$jkG3Us&w#JxieeXkStuO!nXrBse>)w95?*IR~U#|Op
z?x*R%;oLzHsjsfv&mgs~NMl_n_}Hpoqm)O8ha7GW)uk(T*m?-NQL81Y#EENhqE-=2
zT!)^DX=0U%Tg~XInDVN)_A2Hy$Lp9lddP8fLOFU^6GKGNQ+il2YGR009INST`dUXd
z`-WIe-_SSo88tD)8XXr)-_mE)#1Km@E`66iqb7z}m*YM3J*>sUT8JUat7F=$qvDuh
z$1&r|F){6!xG2LK&5%+is)-?@=@F&r5koAs82UsJO^l&$OiV0&qKGDjSRyWcqFk;+
z3=t1K5BK-b^O%@&ENif=!Hz3sS%V!CO-+=hCPrJ{4Lza^Jz|JhdPEUT3=x-}%e7pN
zV_$h}Tq&1la=E5EuC&WFsSUMp6UtB<mv>BUnYYyJE7y%3+Ow-#%>5@KU<-%CxYsYJ
z9ht{Q-|zU<=fm7w{b~wV>%RO~k^`xzXxWM2i7NO<%OODv>39?}_9SFJ70LC2w3C9Z
z!F+7HCh&F$9*+pt_X$!z7nIZ|VeiRggwCx;Z00HK4htFv1aD6Y&fMYLhD>C)=V4R0
z0HxCbWOe$G*PDrgL=K7;@{!ge*mO>?ZBS4-E09;Xf43Jh@C0PahiLvfOgx){yDww`
zd!I&y2<pi9<YzK)S}=J@FgGE%b)7mO7z+x%IwV*=CJ0fVZW8nzrQao}@e5j?6Ljqs
z{IM{ChLTLQ2lLR~umyu{I}m=g41>pO(BD=KERJF8##B`9$icoBx1g=53>|v~k=F&I
z?+Ru=5R_(TqOM>QT1vO0b9XtK3R2Ntl7-$qn=##5h|s}mbiBDA;ZsKtKYI+_?}X6T
z(}C%U3s|~2f~2G*q_1Cx+}vCg`SVb^{TV#J!;fHP5e~dmj=uLcVDjTU{BWxP%eS}U
zL+&}95G>vh{PdlmyL}6;M2azgwFbZZ*oe+}GI~Gr;rg8nEF%X8^J{RTq#5Cgwtt-e
z3h(7%=f}6Bz{)%-YkYX^t?d7O{^H_dTr3+!VbK^WqUVtj$-u%Vg1blfbQ1~q{eE<H
zb>ZdODM+LnDV-^px%}W8p3UUj$<D^bo&i)<^y6s!0@7R4aQlnRm<eT|pLh26`(GWm
zx>j@JB07%)XD&}5^650*pSp>mZ<et0R1{U`N3rjtSu|c-LLd;pJ(eO~g5RK*1S?-Z
usBeYu>%a2+3-AADYsMRihv%4CowMe=zjCXSH|#oz^zt{5RXDlUSostAEp*=i
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/druid_right.vox b/assets/voxygen/voxel/armor/shoulder/druid_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..8dee9ef073d988e0f2bda905fed88f4da42922b8
GIT binary patch
literal 1628
zcmbW0ZA_JA7{{;YetFI*s$m}94G1+n=p+Oog6JTg1Pv7_k|WW}WXjOxSYyi0-1LOo
zIcF3iLtzn7JFwOyWyETJAm$jkG3Us&w#JxieeXkStuO!nXrBse>)w95?*IR~U#|Op
z?x*R%;oLzHsjsfv&mgs~NMl_n_}Hpoqm)O8ha7GW)uk(T*m?-NQL81Y#EENhqE-=2
zT!)^DX=0U%Tg~XInDVN)_A2Hy$Lp9lddP8fLOFU^6GKGNQ+il2YGR009INST`dUXd
z`-WIe-_SSo88tD)8XXr)-_mE)#1Km@E`66iqb7z}m*YM3J*>sUT8JUat7F=$qvDuh
z$1&r|F){6!xG2LK&5%+is)-?@=@F&r5koAs82UsJO^l&$OiV0&qKGDjSRyWcqFk;+
z3=t1K5BK-b^O%@&ENif=!Hz3sS%V!CO-+=hCPrJ{4Lza^Jz|JhdPEUT3=x-}%e7pN
zV_$h}Tq&1la=E5EuC&WFsSUMp6UtB<mv>BUnYYyJE7y%3+Ow-#%>5@KU<-%CxYsYJ
z9ht{Q-|zU<=fm7w{b~wV>%RO~k^`xzXxWM2i7NO<%OODv>39?}_9SFJ70LC2w3C9Z
z!F+7HCh&F$9*+pt_X$!z7nIZ|VeiRggwCx;Z00HK4htFv1aD6Y&fMYLhD>C)=V4R0
z0HxCbWOe$G*PDrgL=K7;@{!ge*mO>?ZBS4-E09;Xf43Jh@C0PahiLvfOgx){yDww`
zd!I&y2<pi9<YzK)S}=J@FgGE%b)7mO7z+x%IwV*=CJ0fVZW8nzrQao}@e5j?6Ljqs
z{IM{ChLTLQ2lLR~umyu{I}m=g41>pO(BD=KERJF8##B`9$icoBx1g=53>|v~k=F&I
z?+Ru=5R_(TqOM>QT1vO0b9XtK3R2Ntl7-$qn=##5h|s}mbiBDA;ZsKtKYI+_?}X6T
z(}C%U3s|~2f~2G*q_1Cx+}vCg`SVb^{TV#J!;fHP5e~dmj=uLcVDjTU{BWxP%eS}U
zL+&}95G>vh{PdlmyL}6;M2azgwFbZZ*oe+}GI~Gr;rg8nEF%X8^J{RTq#5Cgwtt-e
z3h(7%=f}6Bz{)%-YkYX^t?d7O{^H_dTr3+!VbK^WqUVtj$-u%Vg1blfbQ1~q{eE<H
zb>ZdODM+LnDV-^px%}W8p3UUj$<D^bo&i)<^y6s!0@7R4aQlnRm<eT|pLh26`(GWm
zx>j@JB07%)XD&}5^650*pSp>mZ<et0R1{U`N3rjtSu|c-LLd;pJ(eO~g5RK*1S?-Z
usBeYu>%a2+3-AADYsMRihv%4CowMe=zjCXSH|#oz^zt{5RXDlUSostAEp*=i
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigs_left.vox b/assets/voxygen/voxel/armor/shoulder/twigs_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..75caca5c5dca7d1ed55ca0e8a2c9712df60fa1a8
GIT binary patch
literal 1492
zcmeH{&uSDw5QnSkS3Q#uQN)AbDIlK2LqtK0ghU8oS&U#H#N;G`=*h?M>dEKvHFn=(
z|AMm#?Kcs;#hbTn_~@>$>FT1pXHMUqZT~Q{HwS}bI{R77P6p?PxB7tAz$PS|y+0p(
zcLubNf4U{%ILtb88@b!B0J*KwZEArF90)ROWx@#uf|Om7eB_A(K|)DeTEQ1Q2(qxg
z!8JG#WWzo!uBDEa`3;+x`BdhY=1xsM3inR#6AR*S>T&Av&O|I?5Ttxn<V#C@;z5v5
zl6(bU@Sx(<LJZLmH{@@9rncWV7Va?*kC{cVXN)3ZY+|hFLNOM7Dy}SX5E-2yGp1H>
z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl
z_QtcVtNk12`tS1d?zex=pYGhP7tik3<Hz^v{-Znf#rEy`W%t3~HP6}m=}B96F53F?
T!$#fvv{hey-MpUff6KoC_{v2D
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigs_right.vox b/assets/voxygen/voxel/armor/shoulder/twigs_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..75caca5c5dca7d1ed55ca0e8a2c9712df60fa1a8
GIT binary patch
literal 1492
zcmeH{&uSDw5QnSkS3Q#uQN)AbDIlK2LqtK0ghU8oS&U#H#N;G`=*h?M>dEKvHFn=(
z|AMm#?Kcs;#hbTn_~@>$>FT1pXHMUqZT~Q{HwS}bI{R77P6p?PxB7tAz$PS|y+0p(
zcLubNf4U{%ILtb88@b!B0J*KwZEArF90)ROWx@#uf|Om7eB_A(K|)DeTEQ1Q2(qxg
z!8JG#WWzo!uBDEa`3;+x`BdhY=1xsM3inR#6AR*S>T&Av&O|I?5Ttxn<V#C@;z5v5
zl6(bU@Sx(<LJZLmH{@@9rncWV7Va?*kC{cVXN)3ZY+|hFLNOM7Dy}SX5E-2yGp1H>
z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl
z_QtcVtNk12`tS1d?zex=pYGhP7tik3<Hz^v{-Znf#rEy`W%t3~HP6}m=}B96F53F?
T!$#fvv{hey-MpUff6KoC_{v2D
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_left.vox b/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dbca675225e5e867fa83923ada0dd18c9a0bf7f7
GIT binary patch
literal 1564
zcmeH{F-u%Q6ov1-=iZqO27{y!tb~v%q%cGbQGyDREK3YT5Tlh%NGdB^Q~D452l-F#
zc3bY-N_Q>vtvfl-B2_HY?ZC&(Iq%*(^JeC~{Vxa07b5a`tG&xkT1jNDeYo?q5p0>X
z2yHp|cG$jD4%kjfxKt)uiR!hg-WmaMYBBAp(IX&kS_`zRphrL)S_hc#daJ|;h?8*b
zORz@JCm<e-4;@P4e2G2*@kVE@ENiV|T$A-7HW0NdRpYv-ITo`!HEIHm1=dqg6A*`S
zJ@nnW>huYSlW^7x<_CR(u!$trPu90Y&9P(~YNpOsAzN*Np$jIW7^z}x?8Q*4p=*Yo
z0C!4^fFv;1!M#AwoE}MzT7o&joM293t;AYQpE2-^iHqNh`B>mL3LhJs@8eeiXFb0$
z_ffb{d0=DDeh-N$EGk0`f#^G;g2w<kre8m9Z;3w~u@tsWr!!-=2eUiyAMU`5ow@S5
zlONsNQg1%`tobf~te=<TwO{4z)9-)A?XN79qqmD?_to>V`SMwLw>)2dt}p$KUFF<w
a_HtP{%H{oWt9<xAS2j+bJUnmy0Dl0YTUg`(
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox b/assets/voxygen/voxel/armor/shoulder/twigsflowers_shoulder_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dbca675225e5e867fa83923ada0dd18c9a0bf7f7
GIT binary patch
literal 1564
zcmeH{F-u%Q6ov1-=iZqO27{y!tb~v%q%cGbQGyDREK3YT5Tlh%NGdB^Q~D452l-F#
zc3bY-N_Q>vtvfl-B2_HY?ZC&(Iq%*(^JeC~{Vxa07b5a`tG&xkT1jNDeYo?q5p0>X
z2yHp|cG$jD4%kjfxKt)uiR!hg-WmaMYBBAp(IX&kS_`zRphrL)S_hc#daJ|;h?8*b
zORz@JCm<e-4;@P4e2G2*@kVE@ENiV|T$A-7HW0NdRpYv-ITo`!HEIHm1=dqg6A*`S
zJ@nnW>huYSlW^7x<_CR(u!$trPu90Y&9P(~YNpOsAzN*Np$jIW7^z}x?8Q*4p=*Yo
z0C!4^fFv;1!M#AwoE}MzT7o&joM293t;AYQpE2-^iHqNh`B>mL3LhJs@8eeiXFb0$
z_ffb{d0=DDeh-N$EGk0`f#^G;g2w<kre8m9Z;3w~u@tsWr!!-=2eUiyAMU`5ow@S5
zlONsNQg1%`tobf~te=<TwO{4z)9-)A?XN79qqmD?_to>V`SMwLw>)2dt}p$KUFF<w
a_HtP{%H{oWt9<xAS2j+bJUnmy0Dl0YTUg`(
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_left.vox b/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_left.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b7a5b2c41b967f4b0a78e3d0d764b5c29239d891
GIT binary patch
literal 1516
zcmeIy&1zIJ7{>AUE6LG{A}$K93gSv!R20ODv_dJvU<C`MwktPcS6+s9;5B$j&bf;j
zr$Tc&6aUkNySj5Xf#3OflDrAw%pAWz+4?Rb@AgKA+~j8xIU1er-&wuT3T}f~PClNF
zekc#L^VLPAs>;MvdNJwM<kH{>li%WGP6kInf-K13h>%M0i6$~QBFP|`ahVK`0Gp{=
z$l!>=8XXx7qB?WcK}@TfvKOsxIuqARg~6Tv(1`}`a0F6lFNtw5I07kYm8|TA9G;n9
z7zZoVFVyc?x6>iiuEcDvX1~mADsENXCg#>l*q~w6!g}YP!xoarlChpuM^0p!Ihi?`
zIfYt<TE(W(8TEZ3?sEyhP<Z$>g<nbX3rjvr$(NFS9-S{-W9eNiKODT><IJyHqm9So
zwe=aSzk&bo4LsW4XivxG#<Ok1?u~t`-{qH`Z~yE+-oD??o^Q6pClA{0<9qGp*4=i#
h^YHJS7p(p4sI={~(q4V)+MCZC?e*7N*Zr$MfIkL+O@jac
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox b/assets/voxygen/voxel/armor/shoulder/twigsleaves_shoulder_right.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b7a5b2c41b967f4b0a78e3d0d764b5c29239d891
GIT binary patch
literal 1516
zcmeIy&1zIJ7{>AUE6LG{A}$K93gSv!R20ODv_dJvU<C`MwktPcS6+s9;5B$j&bf;j
zr$Tc&6aUkNySj5Xf#3OflDrAw%pAWz+4?Rb@AgKA+~j8xIU1er-&wuT3T}f~PClNF
zekc#L^VLPAs>;MvdNJwM<kH{>li%WGP6kInf-K13h>%M0i6$~QBFP|`ahVK`0Gp{=
z$l!>=8XXx7qB?WcK}@TfvKOsxIuqARg~6Tv(1`}`a0F6lFNtw5I07kYm8|TA9G;n9
z7zZoVFVyc?x6>iiuEcDvX1~mADsENXCg#>l*q~w6!g}YP!xoarlChpuM^0p!Ihi?`
zIfYt<TE(W(8TEZ3?sEyhP<Z$>g<nbX3rjvr$(NFS9-S{-W9eNiKODT><IJyHqm9So
zwe=aSzk&bo4LsW4XivxG#<Ok1?u~t`-{qH`Z~yE+-oD??o^Q6pClA{0<9qGp*4=i#
h^YHJS7p(p4sI={~(q4V)+MCZC?e*7N*Zr$MfIkL+O@jac
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 61e06c1716..bfa4a8b224 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -60,5 +60,21 @@
vox_spec: ("armor.belt.steel-0", (-5.0, -4.5, 2.0)),
color: None
),
+ Druid:(
+ vox_spec: ("armor.belt.druid", (-4.0, -3.5, -1.0)),
+ color: None
+ ),
+ Twig:(
+ vox_spec: ("armor.belt.twigs_belt", (-4.0, -3.5, -1.0)),
+ color: None
+ ),
+ Twigsleaves:(
+ vox_spec: ("armor.belt.twigsleaves_belt", (-4.0, -3.5, -1.0)),
+ color: None
+ ),
+ Twigsflowers:(
+ vox_spec: ("armor.belt.twigsflowers_belt", (-4.0, -3.5, -1.0)),
+ color: None
+ ),
},
))
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index 06eda546f3..7ce400cab2 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -100,7 +100,23 @@
WorkerOrange1:(
vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
color: Some((135, 82, 67))
- ),
+ ),
+ Druid:(
+ vox_spec: ("armor.chest.druid", (-7.0, -3.5, 2.0)),
+ color: None
+ ),
+ Twig:(
+ vox_spec: ("armor.chest.twigs_chest", (-7.0, -3.5, 2.0)),
+ color: None
+ ),
+ Twigsleaves:(
+ vox_spec: ("armor.chest.twigsleaves_chest", (-7.0, -3.5, 2.0)),
+ color: None
+ ),
+ Twigsflowers:(
+ vox_spec: ("armor.chest.twigsflowers_chest", (-7.0, -3.5, 2.0)),
+ color: None
+ ),
// Cultists
CultistPurple: (
vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
@@ -120,4 +136,4 @@
),
},
)
-)
\ No newline at end of file
+)
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index 0b97024ac2..f611272163 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -56,5 +56,21 @@
vox_spec: ("armor.foot.jackalope_slippers", (-2.5, -3.5, -2.0)),
color: None
),
+ Druid:(
+ vox_spec: ("armor.foot.druid", (-2.5, -3.5, -2.0)),
+ color: None
+ ),
+ Twig:(
+ vox_spec: ("armor.foot.twigs_foot", (-2.5, -3.5, -2.0)),
+ color: None
+ ),
+ Twigsleaves:(
+ vox_spec: ("armor.foot.twigsleaves_foot", (-2.5, -3.5, -2.0)),
+ color: None
+ ),
+ Twigsflowers:(
+ vox_spec: ("armor.foot.twigsflowers_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 0eaa230d02..ed5ce4a131 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -120,5 +120,45 @@
color: None
)
),
+ Druid: (
+ left: (
+ vox_spec: ("armor.hand.druid_left", (-1.5, -1.5, -2.5)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.druid_right", (-1.5, -1.5, -2.5)),
+ color: None
+ )
+ ),
+ Twig: (
+ left: (
+ vox_spec: ("armor.hand.twigs_glove_left", (-1.5, -1.5, -2.5)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.twigs_glove_right", (-1.5, -1.5, -2.5)),
+ color: None
+ )
+ ),
+ Twigsleaves: (
+ left: (
+ vox_spec: ("armor.hand.twigsleaves_glove_left", (-1.5, -1.5, -2.5)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.twigsleaves_glove_right", (-1.5, -1.5, -2.5)),
+ color: None
+ )
+ ),
+ Twigsflowers: (
+ left: (
+ vox_spec: ("armor.hand.twigsflowers_glove_left", (-1.5, -1.5, -2.5)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.twigsflowers_glove_right", (-1.5, -1.5, -2.5)),
+ color: None
+ )
+ ),
},
))
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index 8115ee1524..cd784060c6 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -16,7 +16,7 @@
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
color: Some((24, 19, 17))
),
- Green: (
+ Hunting: (
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
color: Some((49, 95, 59))
),
@@ -76,5 +76,21 @@
vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
color: None
),
+ Druid:(
+ vox_spec: ("armor.pants.druid", (-5.0, -3.5, -1.0)),
+ color: None
+ ),
+ Twig:(
+ vox_spec: ("armor.pants.twigs_pants", (-5.0, -3.5, 0.0)),
+ color: None
+ ),
+ Twigsleaves:(
+ vox_spec: ("armor.pants.twigsleaves_pants", (-5.0, -3.5, 0.0)),
+ color: None
+ ),
+ Twigsflowers:(
+ vox_spec: ("armor.pants.twigsflowers_pants", (-6.0, -3.5, 0.0)),
+ color: None
+ ),
},
))
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index a6da6a565c..a002a0d97f 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -150,7 +150,38 @@
vox_spec: ("armor.shoulder.leather_right-2", (-1.0, -3.8, -0.9)),
color: None
)
- ),
+ ),
+ TwiggyShoulder: (
+ left: (
+ vox_spec: ("armor.shoulder.twigs_left", (-5.0, -4.5 , -1.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.twigs_right", (-1.0, -4.5, -1.0)),
+ color: None
+ )
+ ),
+ LeafyShoulder: (
+ left: (
+ vox_spec: ("armor.shoulder.twigsleaves_shoulder_left", (-5.5, -5.0 , 0.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.twigsleaves_shoulder_right", (-1.5, -5.0, 0.0)),
+ color: None
+ )
+ ),
+ FlowerShoulder: (
+ left: (
+ vox_spec: ("armor.shoulder.twigsflowers_shoulder_left", (-5.5, -5.0 , 0.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.twigsflowers_shoulder_right", (-1.5, -5.0, 0.0)),
+ color: None
+ ),
+
+ ),
ClothBlue1: (
left: (
vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)),
@@ -220,6 +251,16 @@
vox_spec: ("armor.shoulder.leather_strips_right", (-2.0, -2.5, -2.0)),
color: None
)
- ),
+ ),
+ DruidShoulder: (
+ left: (
+ vox_spec: ("armor.shoulder.druid_left", (-4.0, -4.5 , -3.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.druid_right", (-2.0, -4.5, -3.0)),
+ color: None
+ ),
+ ),
},
))
diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs
index e0e6f06e58..da24abb905 100644
--- a/common/src/comp/inventory/item/armor.rs
+++ b/common/src/comp/inventory/item/armor.rs
@@ -29,8 +29,12 @@ pub enum Chest {
CultistBlue = 26,
Steel0 = 27,
Leather2 = 28,
+ Druid = 29,
+ Twig = 30,
+ Twigsleaves = 31,
+ Twigsflowers = 32,
}
-pub const ALL_CHESTS: [Chest; 28] = [
+pub const ALL_CHESTS: [Chest; 32] = [
Chest::Blue,
Chest::Brown,
Chest::Dark,
@@ -59,6 +63,10 @@ pub const ALL_CHESTS: [Chest; 28] = [
Chest::CultistBlue,
Chest::Steel0,
Chest::Leather2,
+ Chest::Druid,
+ Chest::Twig,
+ Chest::Twigsleaves,
+ Chest::Twigsflowers,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -78,9 +86,13 @@ pub enum Belt {
Cultist = 11,
Leather2 = 12,
Steel0 = 13,
+ Druid = 14,
+ Twig = 15,
+ Twigsleaves = 16,
+ Twigsflowers = 17,
}
-pub const ALL_BELTS: [Belt; 14] = [
+pub const ALL_BELTS: [Belt; 18] = [
Belt::None,
Belt::Dark,
Belt::TurqCloth,
@@ -95,6 +107,10 @@ pub const ALL_BELTS: [Belt; 14] = [
Belt::Cultist,
Belt::Leather2,
Belt::Steel0,
+ Belt::Druid,
+ Belt::Twig,
+ Belt::Twigsleaves,
+ Belt::Twigsflowers,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -104,7 +120,7 @@ pub enum Pants {
Blue = 1,
Brown = 2,
Dark = 3,
- Green = 4,
+ Hunting = 4,
Orange = 5,
Kimono = 6,
Assassin = 7,
@@ -119,13 +135,17 @@ pub enum Pants {
CultistBlue = 16,
Steel0 = 17,
Leather2 = 18,
+ Druid = 19,
+ Twig = 20,
+ Twigsleaves = 21,
+ Twigsflowers = 22,
}
-pub const ALL_PANTS: [Pants; 19] = [
+pub const ALL_PANTS: [Pants; 23] = [
Pants::None,
Pants::Blue,
Pants::Brown,
Pants::Dark,
- Pants::Green,
+ Pants::Hunting,
Pants::Orange,
Pants::Kimono,
Pants::Assassin,
@@ -140,6 +160,10 @@ pub const ALL_PANTS: [Pants; 19] = [
Pants::CultistBlue,
Pants::Steel0,
Pants::Leather2,
+ Pants::Druid,
+ Pants::Twig,
+ Pants::Twigsleaves,
+ Pants::Twigsflowers,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -156,8 +180,12 @@ pub enum Hand {
CultistBlue = 9,
Steel0 = 10,
Leather2 = 11,
+ Druid = 12,
+ Twig = 13,
+ Twigsleaves = 14,
+ Twigsflowers = 15,
}
-pub const ALL_HANDS: [Hand; 11] = [
+pub const ALL_HANDS: [Hand; 15] = [
Hand::Cloth,
Hand::Assassin,
Hand::Plate0,
@@ -169,6 +197,10 @@ pub const ALL_HANDS: [Hand; 11] = [
Hand::CultistBlue,
Hand::Steel0,
Hand::Leather2,
+ Hand::Druid,
+ Hand::Twig,
+ Hand::Twigsleaves,
+ Hand::Twigsflowers,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -187,9 +219,13 @@ pub enum Foot {
Steel0 = 11,
Leather2 = 12,
JackalopeSlips = 13,
+ Druid = 14,
+ Twig = 15,
+ Twigsleaves = 16,
+ Twigsflowers = 17,
}
-pub const ALL_FEET: [Foot; 13] = [
+pub const ALL_FEET: [Foot; 17] = [
Foot::Dark,
Foot::Sandal0,
Foot::Jester,
@@ -203,6 +239,10 @@ pub const ALL_FEET: [Foot; 13] = [
Foot::Steel0,
Foot::Leather2,
Foot::JackalopeSlips,
+ Foot::Druid,
+ Foot::Twig,
+ Foot::Twigsleaves,
+ Foot::Twigsflowers,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -228,8 +268,12 @@ pub enum Shoulder {
IronLeather2 = 18,
IronLeather3 = 19,
LeatherStrips = 20,
+ LeafyShoulder = 21,
+ TwiggyShoulder = 22,
+ FlowerShoulder = 23,
+ DruidShoulder = 24,
}
-pub const ALL_SHOULDERS: [Shoulder; 20] = [
+pub const ALL_SHOULDERS: [Shoulder; 24] = [
Shoulder::Brown1,
Shoulder::Chain,
Shoulder::Assassin,
@@ -250,6 +294,10 @@ pub const ALL_SHOULDERS: [Shoulder; 20] = [
Shoulder::IronLeather2,
Shoulder::IronLeather3,
Shoulder::LeatherStrips,
+ Shoulder::LeafyShoulder,
+ Shoulder::TwiggyShoulder,
+ Shoulder::FlowerShoulder,
+ Shoulder::DruidShoulder,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
diff --git a/voxygen/src/anim/src/character/mod.rs b/voxygen/src/anim/src/character/mod.rs
index e4cd029dbd..78237a3a02 100644
--- a/voxygen/src/anim/src/character/mod.rs
+++ b/voxygen/src/anim/src/character/mod.rs
@@ -235,7 +235,7 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
(Orc, Male) => (0.0, 13.5),
(Orc, Female) => (0.0, 13.0),
(Human, Male) => (0.3, 13.0),
- (Human, Female) => (0.0, 13.5),
+ (Human, Female) => (0.0, 13.0),
(Elf, Male) => (0.5, 13.0),
(Elf, Female) => (1.0, 13.0),
(Dwarf, Male) => (0.0, 14.0),