item images

assets/common/items/armor/belt_plate-0.ron

@@ -1,8 +1,8 @@
 Item(
-    name: "Assassin Belt",
-    description: "Only the best for a member of the creed.",
+    name: "Iron Belt",
+   description: "WIP",
     kind: Armor(
-        kind: Belt(Assassin),
+        kind: Belt(Plate0),
         stats: 20,
     ),
 )

assets/common/items/armor/chest_plate_green-0.ron

@@ -2,7 +2,7 @@ Item(
     name: "Iron Chestplate",
     description: "Arrows to the stomach are soooo last update.",
     kind: Armor(
-        kind: Chest(Plate),
+        kind: Chest(PlateGreen0),
         stats: 20,
     ),
 )

assets/common/items/armor/foot_plate-0.ron

@@ -1,8 +1,8 @@
 Item(
-    name: "Assassin Belt",
-    description: "Only the best for a member of the creed.",
+    name: "Iron Feet",
+    description: "WIP",
     kind: Armor(
-        kind: Belt(Assassin),
+        kind: Foot(Plate0),
         stats: 20,
     ),
 )

assets/common/items/armor/hand_plate-0.ron

@@ -1,8 +1,8 @@
 Item(
-    name: "Assassin Shoulder Guard",
-    description: "Only the best for a member of the creed.",
+    name: "Iron Handguards",
+    description: "WIP",
     kind: Armor(
-        kind: Shoulder(Assassin),
+        kind: Hand(Plate0),
         stats: 20,
     ),
 )

assets/common/items/armor/pants_plate_green-0.ron

@@ -1,8 +1,8 @@
 Item(
-    name: "Iron Chestplate",
-    description: "Arrows to the stomach are soooo last update.",
+    name: "Iron Legguards",
+    description: "WIP",
     kind: Armor(
-        kind: Chest(Plate),
+        kind: Pants(PlateGreen0),
         stats: 20,
     ),
 )

assets/common/items/armor/shoulder_plate-0.ron

@@ -1,8 +1,8 @@
 Item(
-    name: "Assassin Shoulder Guard",
-    description: "Only the best for a member of the creed.",
+    name: "Iron Shoulderguards",
+    description: "A strong shoulder to lean on.",
     kind: Armor(
-        kind: Shoulder(Assassin),
+        kind: Shoulder(Plate0),
         stats: 20,
     ),
 )

assets/voxygen/item_image_manifest.ron

@@ -66,7 +66,7 @@
         "voxel.armor.chest.plate_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
-    Armor(Pants((PlateGreen0)): VoxTrans(
+    Armor(Pants(PlateGreen0)): VoxTrans(
         "voxel.armor.pants.plate_green-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),

assets/voxygen/voxel/humanoid_armor_belt_manifest.ron

@@ -20,11 +20,11 @@
         color: None
     ),
     Dark:(
-        vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)),
+        vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
         color: None
     ),
     Plate0:(
-        vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)),
+        vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
         color: None
     ),
 })

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -26,11 +26,7 @@
     Kimono: (
         vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
         color: None
-    ),
-    Assassin: (
-        vox_spec: ("armor.pants.plate-0", (-5.0, -3.5, 1.0)),
-        color: None
-    ),
+    ),    
     PlateGreen0: (
         vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
         color: None

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -2,51 +2,51 @@
     //This shouldn't be the none option, but what is?
     None: (
         left: (
-            vox_spec: ("armor.empty", (-3.0, -3.5, 0.1)),
+            vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.empty", (-2.0, -3.5, 0.1)),
+            vox_spec: ("armor.empty", (-2.0, -3.5, 1.0)),
             color: None
         )
     ),
     Brown1: (
         left: (
-            vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 1.0)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)),
             color: None
         )
     ),
     Assassin: (
         left: (
-            vox_spec: ("armor.shoulder.assa_left", (-4.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.assa_left", (-4.0, -3.5, 1.0)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
             color: None
         )
     ),
     Chain: (
         left: (
-            vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 1.0)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)),
             color: None
         )
     ),
     Plate0: (
         left: (
-            vox_spec: ("armor.shoulder.plate_left-0", (-4.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.plate_left-0", (-3.6, -3.5, 1.0)),
             color: None
         ),
         right: (
-            vox_spec: ("armor.shoulder.plate_right-0", (-2.0, -3.5, 0.1)),
+            vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)),
             color: None
         )
     ),

common/src/comp/body/humanoid.rs

@@ -125,7 +125,7 @@ impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
 }
 
 // Hair Colors
-pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 11] = [
+pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 12] = [
     (198, 169, 113), // Philosopher's Grey
     //(245, 232, 175), // Cream Blonde
     //(228, 208, 147), // Gold Blonde
@@ -141,9 +141,10 @@ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 11] = [
     (107, 32, 60), // Grape Purple
     (135, 38, 39), // Dark Red
     (88, 26, 29),  // Wine Red
-                   //(146, 32, 32), // Autumn Red
+    //(146, 32, 32), // Autumn Red
+    (20, 19, 17), // Black
 ];
-pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [
+pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
@@ -164,8 +165,9 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [
     (163, 186, 192), // Matte Green
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
+    (20, 19, 17),    // Black
 ];
-pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [
+pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [
     (66, 83, 113),   // Mysterious Blue
     (13, 76, 41),    // Rainforest Green
     (245, 232, 175), // Cream Blonde
@@ -189,8 +191,9 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [
     (163, 186, 192), // Matte Green
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
+    (20, 19, 17),    // Black
 ];
-pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [
+pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [
     (245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     (228, 223, 141), // Platinum Blonde
@@ -212,8 +215,9 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (163, 186, 192), // Matte Green
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
+    (20, 19, 17),    // Black
 ];
-pub const ORC_HAIR_COLORS: [(u8, u8, u8); 10] = [
+pub const ORC_HAIR_COLORS: [(u8, u8, u8); 11] = [
     (66, 66, 59), // Wise Grey
     //(107, 76, 51),  // Oak Skin4
     //(203, 154, 98), // Light Skin4
@@ -226,8 +230,9 @@ pub const ORC_HAIR_COLORS: [(u8, u8, u8); 10] = [
     (135, 38, 39), // Dark Red
     (88, 26, 29),  // Wine Red
     (66, 83, 113), // Mysterious Blue
+    (20, 19, 17),  // Black
 ];
-pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 21] = [
+pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 22] = [
     //(245, 232, 175), // Cream Blonde
     (228, 208, 147), // Gold Blonde
     //(228, 223, 141), // Platinum Blonde
@@ -252,6 +257,7 @@ pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 21] = [
     (163, 186, 192), // Matte Green
     (84, 139, 107),  // Grass Green
     (48, 61, 52),    // Dark Green
+    (20, 19, 17),    // Black
 ];
 
 // Skin colors