diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron new file mode 100644 index 0000000000..8daff395d4 --- /dev/null +++ b/assets/common/items/armor/belt/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Belt", + description: "Soft and warm", + kind: Armor( + kind: Belt(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron new file mode 100644 index 0000000000..a43723aaf6 --- /dev/null +++ b/assets/common/items/armor/belt/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Belt", + description: "Soft and warm", + kind: Armor( + kind: Belt(ClothGreen0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron new file mode 100644 index 0000000000..71c81db88f --- /dev/null +++ b/assets/common/items/armor/belt/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Linen Belt", + description: "Soft and warm", + kind: Armor( + kind: Belt(ClothPurple0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron new file mode 100644 index 0000000000..4a15fdf2dd --- /dev/null +++ b/assets/common/items/armor/chest/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Chest", + description: "Soft and warm", + kind: Armor( + kind: Chest(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron new file mode 100644 index 0000000000..ab0c087a54 --- /dev/null +++ b/assets/common/items/armor/chest/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Chest", + description: "Soft and warm", + kind: Armor( + kind: Chest(ClothGreen0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron new file mode 100644 index 0000000000..65b2c2b338 --- /dev/null +++ b/assets/common/items/armor/chest/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Linen Chest", + description: "Soft and warm", + kind: Armor( + kind: Chest(ClothPurple0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron new file mode 100644 index 0000000000..5db06d6094 --- /dev/null +++ b/assets/common/items/armor/foot/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Boots", + description: "Soft and warm", + kind: Armor( + kind: Foot(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron new file mode 100644 index 0000000000..55c4f16a99 --- /dev/null +++ b/assets/common/items/armor/foot/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Boots", + description: "Soft and warm", + kind: Armor( + kind: Foot(ClothGreen0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron new file mode 100644 index 0000000000..a94dbd78ae --- /dev/null +++ b/assets/common/items/armor/foot/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Linen Boots", + description: "Soft and warm", + kind: Armor( + kind: Foot(ClothPurple0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron new file mode 100644 index 0000000000..eb759506c4 --- /dev/null +++ b/assets/common/items/armor/hand/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Wrists", + description: "WIP", + kind: Armor( + kind: Hand(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron new file mode 100644 index 0000000000..486e106b56 --- /dev/null +++ b/assets/common/items/armor/hand/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Wrists", + description: "WIP", + kind: Armor( + kind: Hand(ClothGreen0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron new file mode 100644 index 0000000000..57dbe378d0 --- /dev/null +++ b/assets/common/items/armor/hand/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Silk Wrists", + description: "WIP", + kind: Armor( + kind: Hand(ClothPurple0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron new file mode 100644 index 0000000000..ae40e9005b --- /dev/null +++ b/assets/common/items/armor/pants/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Skirt", + description: "WIP", + kind: Armor( + kind: Belt(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron new file mode 100644 index 0000000000..402a9fe954 --- /dev/null +++ b/assets/common/items/armor/pants/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Skirt", + description: "WIP", + kind: Armor( + kind: Belt(ClothGreen0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron new file mode 100644 index 0000000000..a70280779f --- /dev/null +++ b/assets/common/items/armor/pants/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Linen Skirt", + description: "WIP", + kind: Armor( + kind: Belt(ClothPurple0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron new file mode 100644 index 0000000000..55246f765f --- /dev/null +++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Linen Coat", + description: "WIP", + kind: Armor( + kind: Belt(ClothBlue0), + stats: 20, + ), +) diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron new file mode 100644 index 0000000000..899b3568b5 --- /dev/null +++ b/assets/common/items/armor/shoulder/cloth_green_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Green Linen Coat", + description: "WIP", + kind: Armor( + kind: Belt(ClothGreen0), + stats: 20, + ), +) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron new file mode 100644 index 0000000000..bc89fea35c --- /dev/null +++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Purple Linen Coat", + description: "WIP", + kind: Armor( + kind: Belt(ClothPurple0), + stats: 20, + ), +) \ No newline at end of file diff --git a/assets/voxygen/voxel/armor/belt/cloth_blue_0.vox b/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/belt/cloth_blue_0.vox rename to assets/voxygen/voxel/armor/belt/cloth_blue-0.vox diff --git a/assets/voxygen/voxel/armor/belt/cloth_green_0.vox b/assets/voxygen/voxel/armor/belt/cloth_green-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/belt/cloth_green_0.vox rename to assets/voxygen/voxel/armor/belt/cloth_green-0.vox diff --git a/assets/voxygen/voxel/armor/belt/cloth_purple_0.vox b/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/belt/cloth_purple_0.vox rename to assets/voxygen/voxel/armor/belt/cloth_purple-0.vox diff --git a/assets/voxygen/voxel/armor/chest/cloth_blue_0.vox b/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/chest/cloth_blue_0.vox rename to assets/voxygen/voxel/armor/chest/cloth_blue-0.vox diff --git a/assets/voxygen/voxel/armor/chest/cloth_green_0.vox b/assets/voxygen/voxel/armor/chest/cloth_green-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/chest/cloth_green_0.vox rename to assets/voxygen/voxel/armor/chest/cloth_green-0.vox diff --git a/assets/voxygen/voxel/armor/chest/cloth_purple_0.vox b/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/chest/cloth_purple_0.vox rename to assets/voxygen/voxel/armor/chest/cloth_purple-0.vox diff --git a/assets/voxygen/voxel/armor/foot/cloth_blue_0.vox b/assets/voxygen/voxel/armor/foot/cloth_blue-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/foot/cloth_blue_0.vox rename to assets/voxygen/voxel/armor/foot/cloth_blue-0.vox diff --git a/assets/voxygen/voxel/armor/foot/cloth_green_0.vox b/assets/voxygen/voxel/armor/foot/cloth_green-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/foot/cloth_green_0.vox rename to assets/voxygen/voxel/armor/foot/cloth_green-0.vox diff --git a/assets/voxygen/voxel/armor/foot/cloth_purple_0.vox b/assets/voxygen/voxel/armor/foot/cloth_purple-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/foot/cloth_purple_0.vox rename to assets/voxygen/voxel/armor/foot/cloth_purple-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_0_left.vox b/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_blue_0_left.vox rename to assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_0_right.vox b/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_blue_0_right.vox rename to assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_left_0.vox b/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_green_left_0.vox rename to assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_right_0.vox b/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_green_right_0.vox rename to assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_0_left.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_purple_0_left.vox rename to assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_0_right.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/hand/cloth_purple_0_right.vox rename to assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox diff --git a/assets/voxygen/voxel/armor/pants/cloth_blue_0.vox b/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/pants/cloth_blue_0.vox rename to assets/voxygen/voxel/armor/pants/cloth_blue-0.vox diff --git a/assets/voxygen/voxel/armor/pants/cloth_green_0.vox b/assets/voxygen/voxel/armor/pants/cloth_green-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/pants/cloth_green_0.vox rename to assets/voxygen/voxel/armor/pants/cloth_green-0.vox diff --git a/assets/voxygen/voxel/armor/pants/cloth_purple_0.vox b/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/pants/cloth_purple_0.vox rename to assets/voxygen/voxel/armor/pants/cloth_purple-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_left_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_blue_left_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_blue_left-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_right_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_blue_right_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_blue_right-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_green_left_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_green_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_green_left_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_green_left-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_green_right_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_green_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_green_right_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_green_right-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_purple_left_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_purple_left_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_purple_right_0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_purple_right-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/shoulder/cloth_purple_right_0.vox rename to assets/voxygen/voxel/armor/shoulder/cloth_purple_right-0.vox diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 424821de8e..8e73ed569c 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -35,5 +35,17 @@ vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)), color: None ), + ClothPurple0:( + vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)), + color: None + ), + ClothBlue0:( + vox_spec: ("armor.belt.cloth_blue_0", (-5.0, -3.5, 2.0)), + color: None + ), + ClothGreen0:( + vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)), + color: None + ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 949b8b91a8..c6fe492716 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -43,5 +43,17 @@ vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)), color: None ), + ClothPurple0:( + vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 2.0)), + color: None + ), + ClothBlue0:( + vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 2.0)), + color: None + ), + ClothGreen0:( + vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 2.0)), + color: None + ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index dd320b7b84..a546c19310 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -27,4 +27,16 @@ vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -9.0)), color: None ), + ClothPurple0:( + vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + color: None + ), + ClothBlue0:( + vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + color: None + ), + ClothGreen0:( + vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + color: None + ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 5872dd0e77..1005bbfcc3 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -49,4 +49,34 @@ color: None ) ), + ClothPurple0: ( + left: ( + vox_spec: ("armor.hand.cloth_purple_left-0", (-1.5, -1.5, -7.0)), + color: None + ), + right: ( + vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)), + color: None + ) + ), + ClothBlue0: ( + left: ( + vox_spec: ("armor.hand.cloth_blue_left-0", (-1.5, -1.5, -7.0)), + color: None + ), + right: ( + vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)), + color: None + ) + ), + ClothGreen0: ( + left: ( + vox_spec: ("armor.hand.cloth_green_left-0", (-1.5, -1.5, -7.0)), + color: None + ), + right: ( + vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)), + color: None + ) + ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 1c28203795..1b8d93ad57 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -39,4 +39,16 @@ vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)), color: None ), + ClothPurple0:( + vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)), + color: None + ), + ClothBlue0:( + vox_spec: ("armor.pants.cloth_blue_0", (-5.0, -3.5, 2.0)), + color: None + ), + ClothGreen0:( + vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)), + color: None + ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index d0551ad6d3..c099a12fd9 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -80,4 +80,34 @@ color: None ) ), + ClothPurple0: ( + left: ( + vox_spec: ("armor.shoulder.cloth_purple_left-0", (-3.2, -3.5, 1.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 1.0)), + color: None + ) + ), + ClothBlue0: ( + left: ( + vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 1.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 1.0)), + color: None + ) + ), + ClothGreen0: ( + left: ( + vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 1.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 1.0)), + color: None + ) + ), }) diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index 12d83b9394..d271a19985 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -485,8 +485,11 @@ pub enum Chest { Assassin = 8, PlateGreen0 = 9, Leather0 = 10, + ClothPurple0 = 11, + ClothBlue0 = 12, + ClothGreen0 = 13, } -pub const ALL_CHESTS: [Chest; 11] = [ +pub const ALL_CHESTS: [Chest; 14] = [ Chest::None, Chest::Blue, Chest::Brown, @@ -498,6 +501,9 @@ pub const ALL_CHESTS: [Chest; 11] = [ Chest::Assassin, Chest::PlateGreen0, Chest::Leather0, + Chest::ClothPurple0, + Chest::ClothBlue0, + Chest::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -511,8 +517,11 @@ pub enum Belt { Assassin = 5, Plate0 = 6, Leather0 = 7, + ClothPurple0 = 8, + ClothBlue0 = 9, + ClothGreen0 = 10, } -pub const ALL_BELTS: [Belt; 8] = [ +pub const ALL_BELTS: [Belt; 11] = [ Belt::None, Belt::Dark, Belt::TurqCloth, @@ -521,6 +530,9 @@ pub const ALL_BELTS: [Belt; 8] = [ Belt::Assassin, Belt::Plate0, Belt::Leather0, + Belt::ClothPurple0, + Belt::ClothBlue0, + Belt::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -536,8 +548,11 @@ pub enum Pants { Assassin = 7, PlateGreen0 = 8, Leather0 = 9, + ClothPurple0 = 10, + ClothBlue0 = 11, + ClothGreen0 = 12, } -pub const ALL_PANTS: [Pants; 10] = [ +pub const ALL_PANTS: [Pants; 13] = [ Pants::None, Pants::Blue, Pants::Brown, @@ -548,6 +563,9 @@ pub const ALL_PANTS: [Pants; 10] = [ Pants::Assassin, Pants::PlateGreen0, Pants::Leather0, + Pants::ClothPurple0, + Pants::ClothBlue0, + Pants::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -558,13 +576,19 @@ pub enum Hand { Assassin = 2, Plate0 = 3, Leather0 = 4, + ClothPurple0 = 5, + ClothBlue0 = 6, + ClothGreen0 = 7, } -pub const ALL_HANDS: [Hand; 5] = [ +pub const ALL_HANDS: [Hand; 8] = [ Hand::Bare, Hand::Cloth, Hand::Assassin, Hand::Plate0, Hand::Leather0, + Hand::ClothPurple0, + Hand::ClothBlue0, + Hand::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -577,8 +601,11 @@ pub enum Foot { Assassin = 4, Plate0 = 5, Leather0 = 6, + ClothPurple0 = 7, + ClothBlue0 = 8, + ClothGreen0 = 9, } -pub const ALL_FEET: [Foot; 7] = [ +pub const ALL_FEET: [Foot; 10] = [ Foot::Bare, Foot::Dark, Foot::Sandal, @@ -586,6 +613,9 @@ pub const ALL_FEET: [Foot; 7] = [ Foot::Assassin, Foot::Plate0, Foot::Leather0, + Foot::ClothPurple0, + Foot::ClothBlue0, + Foot::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -598,8 +628,11 @@ pub enum Shoulder { Plate0 = 4, Leather0 = 5, Leather1 = 6, + ClothPurple0 = 7, + ClothBlue0 = 8, + ClothGreen0 = 9, } -pub const ALL_SHOULDERS: [Shoulder; 7] = [ +pub const ALL_SHOULDERS: [Shoulder; 10] = [ Shoulder::None, Shoulder::Brown1, Shoulder::Chain, @@ -607,6 +640,9 @@ pub const ALL_SHOULDERS: [Shoulder; 7] = [ Shoulder::Plate0, Shoulder::Leather0, Shoulder::Leather1, + Shoulder::ClothPurple0, + Shoulder::ClothBlue0, + Shoulder::ClothGreen0, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]