7 dwarf accessories

assets/common/items/armor/back/admin.ron

@@ -1,6 +1,7 @@
 Item(
     name: "Admin's Cape",
-   description: "With great power comes
+   description: "
+   With great power comes 
    great responsibility. ",
     kind: Armor(
         kind: Back(Admin),

assets/common/items/armor/back/short_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Short leather Cape",
-   description: "WIP",
+   description: "",
     kind: Armor(
         kind: Back(Short0),
         stats: (20),

assets/common/items/armor/lantern/black_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Black Lantern",
-   description: "WIP",
+   description: "Used by city guards.",
     kind: Armor(
         kind: Lantern(Black0),
         stats: (20),

assets/common/items/armor/neck/neck_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Plain Necklace",
-   description: "WIP",
+   description: "",
     kind: Armor(
         kind: Neck(Neck0),
         stats: (20),

assets/common/items/armor/ring/ring_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Scratched Ring",
-   description: "WIP",
+   description: "Barely fits your finger.",
     kind: Armor(
         kind: Ring(Ring0),
         stats: (20),

assets/common/items/armor/tabard/admin.ron

@@ -1,6 +1,7 @@
 Item(
     name: "Admin's Tabard",
-   description: "With great power comes
+   description: "
+   With great power comes
    great responsibility. ",
     kind: Armor(
         kind: Tabard(Admin),

assets/voxygen/item_image_manifest.ron

@@ -263,8 +263,9 @@
         "element.icons.tabard_admin",        
     ),
     // Heads
-    Armor(Head(Leather0)): Png(
-        "element.icons.head_leather-0",        
+    Armor(Head(Leather0)): VoxTrans(
+        "voxel.armor.head.leather-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     Armor(Head(AssaMask0)): VoxTrans(
         "voxel.armor.head.assa_mask-0",

assets/voxygen/voxel/humanoid_head_manifest.ron

@@ -194,8 +194,14 @@
             Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))),
         ],
         accessory: [
-            None,
-            Some(("figure.accessory.elf.warpaint-0", (6, 9, 4))), ]
+            None,            
+            Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),           
+            ]
     ),	
     (Dwarf, Female): (
         offset: (-6.0, -4.5, -6.0),
@@ -209,7 +215,14 @@
         ],
         beard: [None],
         accessory: [
-            None]
+            None,            
+            Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))),
+            Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),           
+            ]
     ),
     (Undead, Male): (
         offset: (-5.0, -4.0, -6.75),

common/src/comp/body/humanoid.rs

@@ -432,8 +432,8 @@ impl Race {
         match (self, body_type) {
             (Race::Danari, BodyType::Female) => 1,
             (Race::Danari, BodyType::Male) => 1,
-            (Race::Dwarf, BodyType::Female) => 1,
-            (Race::Dwarf, BodyType::Male) => 1,
+            (Race::Dwarf, BodyType::Female) => 7,
+            (Race::Dwarf, BodyType::Male) => 7,
             (Race::Elf, BodyType::Female) => 2,
             (Race::Elf, BodyType::Male) => 1,
             (Race::Human, BodyType::Female) => 1,

common/src/comp/inventory/item/mod.rs

@@ -164,6 +164,9 @@ impl Item {
                     "common.items.armor.pants.cloth_purple_0",
                     "common.items.armor.shoulder.cloth_purple_0",
                     "common.items.armor.hand.cloth_purple_0",
+                    "common.items.armor.ring.ring_0",
+                    "common.items.armor.back.short_0",
+                    "common.items.armor.neck.neck_0",
                 ]
                 .choose(&mut rand::thread_rng())
                 .unwrap(), // Can't fail