From c4c8235c6be97e6e67d8ff7e55ebbb88fd4885c3 Mon Sep 17 00:00:00 2001 From: Delyth Williams 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", - 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + 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", + name: "Potent Potion", + description: "A potent healing potion.\n\nRestores 100 health on use.\n\n", 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%~QBU$0{`hTf8mtGw+|4cK@uG8CgU2b!h%{#L{%ry)I$cWzeA|iV8?R&PpDp$~f56?Nj?|II7 ze&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{~ 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#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@^pD{B)7?>3lM5A2H0!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#%@Amx7-41*>ch7H_y=Qi24|We1eu&7@sIxPDVAVBf4I&S6I-adg?j2Xz_2qc+QV+L|4430oTlpGZbgCmd-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 HcmDv73^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#*VZ z@!^5k*CUg{(dl%?#`j?S4*bJAuyoWatDX4u-jDGw-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&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)zzI6+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)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#(%(&oEAtEVnwO*ars4H*u>rcPmtC8aibmAv%dh7kAx}oKIcvZii+O%Ke zy@&pz{#WVCf2&`=o{?@|(YF3Jef682|9AZxH*VC+TV}Lw{WG9()YRSRHdhcg< z>Eh5*ouX&|-v4G^^I7}%Uem~v(zCBLH1XqkegDEcn)=ms-ShOMwm(0k2VT3Ry>DJu zUtga-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!xj66kYvSDxp5`}>&N}rTIDScA>S)c zqA;#=5f6x_H+qTo{G7x_g#t5@!kD7bNt zMB$q+K7VrkCx882_-!_u2M;}X_y+!mZ{V$)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?U5J%&@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>-JcZtkkU3tkkU3tkkSm6GZj0s9q@zFgOB>gA(P)Dskf>o?E;Gw;!@x0k1%yt_R3@SWxE2X8H(-@LK>eEYqBb3f(TA3vtDL`6f#aN@!Dha4j0GJ`l8*BxVvrR*bR$&^z~)}3SaoqD`R8c zr7Tv;-b*QgL`6f#Af{T_Qz?!>qN1T=Xn8Y{qgD>a!yJJ`MMK9h^2kvqk1uot5)};{ z!^zunf^|hsjVNW?5>MQ%m-gEXYtd_i z7iG`No|Qc-dsg{+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#!OURb=*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_ z-+SJ3-uw0*JW??wB3*E=qZXnB+)bFi@uGaP1~^6NX4y(^90B zq9&S{)M7|N5rb%A64BhJ86%pQ)I2<)h(RKy7EmDIHKl7=$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 z5jb=xr1Sc#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}eEY5QgVtH)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?WIaCp2O 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-fSUKjYQhbUSlygEUXm4L-(@R^h&@= zfbheKWQJlUs**V{pl>2hM(XGRb29XJF&V3o12b}XHh)!54$PCobMTu+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$T~DlW6W?Pm1y<>$t1XhEDJ8i#1OI=zx%-$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?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^%Zjat1Zk1iy6~B`}h8v?aXiWbS)7+ z3MVh7iGQBq!~!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+ni0CQceh9NTdW 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=})Tnm2jK=OQcyuG^#oNU3JY(fHC zkimzL>Bo>oJ9!;K;gC=js9@)HA!kr{BrfES3HHx~`i@-Mhw=!W%jccB$7zcRoeANM z8R5)bo!jZaIpCr^=Aj|uqa-nu8=BMP_Xb zS8OHyQ~~#%ErIqY@M_6H<$L94C2?Aqd0$va3%75m?-Qm2!k34I)#E}){nOpT*fEVq z1ixG8ds>LJ34bh2(OK_cAmAd}S;<6yEwPsxnKWX*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=`6vSoNTqfq$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)~2fSoNTqfq$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_-JpN| 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_-JpN| 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=7FhGm9jcckYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3 zp(HEU45pZsCZkyqC(=rQOB0N0QW1YSo=u6is|lx zj{ja^7dyKf_S=7FhGm9jcckYuLpN%B=NPtN;A8bWOCKo|$h}r!-dzVH#5~jh3 zp(HEU45pZsCZkyqC(=rQOB0N0QW1L3_&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_hQf{F$#G7cUA5eXRu6%ANo96SOd5;6)Z8gMzV ze#RhX)`^V5d2MDEc?XeiHBKjF>H_B?Yme+{oQ_DyD5zx4lY4SRBxDp+G8f1LIU*7= z3M!e4`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`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|eDEcPPyuMYN)-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)OroKEQXH>;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 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 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&WFsSUMp6UtBBUnYYyJE7y%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&y2pO(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{eEZdODM+LnDV-^px%}W8p3UUj$j@JB07%)XD&}5^650*pSp>mZ%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 z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl z_QtcVtNk12`tS1d?zex=pYGhP7tik3dEKvHFn=( 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 z5QQ}jxf*gceJ;&STDUZqG_lkoQZp->zdL$;aD7SKOQj8m!!_$OSigb)@CF_pZq+Bl z_QtcVtNk12`tS1d?zex=pYGhP7tik3vtvfl-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@JCmhuYSlW^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;g2wV`SMwLw>)2dt}p$KUFFvtvfl-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@JCmhuYSlW^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;g2wV`SMwLw>)2dt}p$KUFFAUE6LG{A}$K93gSv!R20ODv_dJvU;MvdNJwMli%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?` zIfYtgAUE6LG{A}$K93gSv!R20ODv_dJvU;MvdNJwMli%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?` zIfYtg 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),