item types

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

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

assets/common/items/armor/head/assa_mask_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Dark Assassin Mask",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/head/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Leather Cap",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(Leather0),
+        stats: (20),
+    ),
+)

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

@@ -0,0 +1,8 @@
+Item(
+    name: "Black Lantern",
+   description: "WIP",
+    kind: Armor(
+        kind: Lantern(Black0),
+        stats: (20),
+    ),
+)

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

@@ -0,0 +1,8 @@
+Item(
+    name: "Lime Zest Lantern",
+   description: "It has an opening that could fit a ring...",
+    kind: Armor(
+        kind: Lantern(Green0),
+        stats: (20),
+    ),
+)

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

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

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

@@ -0,0 +1,8 @@
+Item(
+    name: "Scratched Ring",
+   description: "WIP",
+    kind: Armor(
+        kind: Ring(Ring0),
+        stats: (20),
+    ),
+)

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

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

assets/voxygen/item_image_manifest.ron

@@ -222,6 +222,49 @@
         "voxel.armor.shoulder.cloth_purple_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    // Backs
+    Armor(Back(Short0)): VoxTrans(
+        "voxel.armor.back.short-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Back(Admin)): VoxTrans(
+        "voxel.armor.back.admin",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Rings
+    Armor(Ring(Ring0)): VoxTrans(
+        "voxel.armor.ring.ring-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Necks
+    Armor(Neck(Neck0)): VoxTrans(
+        "voxel.armor.neck.neck-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+
+    // Lanterns
+    Armor(Lantern(Black0)): VoxTrans(
+        "voxel.armor.lantern.lantern_black-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Lantern(Green0)): VoxTrans(
+        "voxel.armor.lantern.lantern_green-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Tabards
+    Armor(Tabard(Tabard0)): VoxTrans(
+        "voxel.armor.tabard.tabard-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Heads
+    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",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
     // Consumables
     Consumable(Apple): VoxTrans(
         "element.icons.item_apple",

assets/voxygen/voxel/humanoid_armor_back_manifest.ron

@@ -7,6 +7,10 @@
       Short0: (
           vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
           color: None
+      ), 
+      Admin: (
+          vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
+          color: None
       ),     
     },
 ))

assets/voxygen/voxel/humanoid_armor_head_manifest.ron

@@ -1,12 +0,0 @@
-((
-    default: (
-        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-        color: None
-    ),
-    map: {
-      Neck0: (
-          vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-          color: None
-      ),     
-    },
-))

assets/voxygen/voxel/humanoid_armor_lantern_manifest.ron

@@ -5,7 +5,11 @@
     ),
     map: {
       Green0: (
-          vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
+          vox_spec: ("armor.lantern.green-0", (0.0, 0.0, 0.0)),
+          color: None
+      ),  
+      Black0: (
+          vox_spec: ("armor.lantern.black-0", (0.0, 0.0, 0.0)),
           color: None
       ),     
     },

assets/voxygen/voxel/humanoid_armor_neck_manifest.ron

@@ -1,12 +0,0 @@
-((
-    default: (
-        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-        color: None
-    ),
-    map: {
-      Neck0: (
-          vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-          color: None
-      ),     
-    },
-))

assets/voxygen/voxel/humanoid_armor_ring_manifest.ron

@@ -1,12 +0,0 @@
-((
-    default: (
-        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-        color: None
-    ),
-    map: {
-      Ring0: (
-          vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-          color: None
-      ),     
-    },
-))

assets/voxygen/voxel/humanoid_armor_tabard_manifest.ron

@@ -1,12 +0,0 @@
-((
-    default: (
-        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-        color: None
-    ),
-    map: {
-      Neck0: (
-          vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
-          color: None
-      ),     
-    },
-))

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

@@ -167,8 +167,9 @@ pub const ALL_SHOULDERS: [Shoulder; 9] = [
 #[repr(u32)]
 pub enum Back {
     Short0 = 1,
+    Admin = 2,
 }
-pub const ALL_BACKS: [Back; 1] = [Back::Short0];
+pub const ALL_BACKS: [Back; 2] = [Back::Short0, Back::Admin];
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Ring {
@@ -184,15 +185,17 @@ pub const ALL_NECKS: [Neck; 1] = [Neck::Neck0];
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Lantern {
-    Lantern0 = 1,
+    Black0 = 1,
+    Green0 = 2,
 }
-pub const ALL_LANTERNS: [Lantern; 1] = [Lantern::Lantern0];
+pub const ALL_LANTERNS: [Lantern; 2] = [Lantern::Black0, Lantern::Green0];
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Head {
-    Head0 = 1,
+    Leather0 = 1,
+    AssaMask0 = 2,
 }
-pub const ALL_HEADS: [Head; 1] = [Head::Head0];
+pub const ALL_HEADS: [Head; 2] = [Head::Leather0, Head::AssaMask0];
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[repr(u32)]
 pub enum Tabard {