Merge branch 'WelshPixie/armour' into 'master'

Welsh pixie/armour

See merge request veloren/veloren!1113

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

assets/common/items/armor/pants/green_0.ron

@@ -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),
-    ),
-)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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),
+    ),
+)

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((

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",

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
+        ),
     },
 ))

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 @@
         ),
     },
 )
-)
+)

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
+        ),
     },
 ))

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
+            )
+        ),
     },
 ))

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
+        ),
     },
 ))

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
+            ),            
+        ),  
     },
 ))

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)]

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),