diff --git a/assets/voxygen/voxel/armor/belt/assa.vox b/assets/voxygen/voxel/armor/belt/assa.vox new file mode 100644 index 0000000000..ec5ecc92ab Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/assa.vox differ diff --git a/assets/voxygen/voxel/armor/belt/cloth_black.vox b/assets/voxygen/voxel/armor/belt/cloth_black.vox new file mode 100644 index 0000000000..47b805ddae Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/cloth_black.vox differ diff --git a/assets/voxygen/voxel/armor/belt/cloth_blood.vox b/assets/voxygen/voxel/armor/belt/cloth_blood.vox new file mode 100644 index 0000000000..ec5e757142 Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/cloth_blood.vox differ diff --git a/assets/voxygen/voxel/armor/belt/cloth_grey.vox b/assets/voxygen/voxel/armor/belt/cloth_grey.vox new file mode 100644 index 0000000000..86f60c5c78 Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/cloth_grey.vox differ diff --git a/assets/voxygen/voxel/armor/chest/assa.vox b/assets/voxygen/voxel/armor/chest/assa.vox new file mode 100644 index 0000000000..ff2d40cdb5 Binary files /dev/null and b/assets/voxygen/voxel/armor/chest/assa.vox differ diff --git a/assets/voxygen/voxel/armor/foot/assa.vox b/assets/voxygen/voxel/armor/foot/assa.vox new file mode 100644 index 0000000000..46c2254257 Binary files /dev/null and b/assets/voxygen/voxel/armor/foot/assa.vox differ diff --git a/assets/voxygen/voxel/armor/pants/assa.vox b/assets/voxygen/voxel/armor/pants/assa.vox new file mode 100644 index 0000000000..0e0dcf2d9d Binary files /dev/null and b/assets/voxygen/voxel/armor/pants/assa.vox differ diff --git a/assets/voxygen/voxel/armor/shoulder/assa_left.vox b/assets/voxygen/voxel/armor/shoulder/assa_left.vox new file mode 100644 index 0000000000..864ae9ab55 Binary files /dev/null and b/assets/voxygen/voxel/armor/shoulder/assa_left.vox differ diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index b43bf5b3e1..6e14eb515a 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -3,8 +3,20 @@ vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)), color: None ), - Cloth:( + TurqCloth:( vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)), color: None + ), + BloodCloth:( + vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)), + color: Some((29, 26, 33)) + ), + BlackCloth:( + vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)), + color: Some((29, 26, 33)) + ), + Assassin:( + vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)), + color: None ) -}) +}) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 7a064a4f7f..d17a52d081 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -23,6 +23,10 @@ vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), color: Some((29, 26, 33)) ), + Assassin: ( + vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)), + color: None + ), Kimono: ( vox_spec: ("armor.chest.cloth_red_kimono", (-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 c768042040..d95587b47d 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -8,6 +8,10 @@ vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)), color: None ), + Assassin: ( + vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)), + color: None + ), Sandal: ( vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.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 1ae362d168..b5b90c6cc4 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -9,6 +9,16 @@ color: None ) ), + Assassin: ( + left: ( + vox_spec: ("armor.hand.assa_left", (-1.5, -1.5, -7.0)), + color: None + ), + right: ( + vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)), + color: None + ) + ), Cloth: ( left: ( vox_spec: ("armor.hand.cloth_basic_left", (-1.5, -1.5, -7.0)), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index bb194d054a..bf1c7e6303 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -19,8 +19,12 @@ vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), color: Some((148, 52, 33)) ), + Assassin: ( + vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)), + color: None + ), Kimono: ( - vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 1.0)), + vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)), color: None ) -}) +}) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index bbe758f142..f259f51850 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -20,6 +20,16 @@ color: None ) ), + Assassin: ( + left: ( + vox_spec: ("armor.shoulder.assa_left", (-4.5, -3.0, 0.1)), + color: None + ), + right: ( + vox_spec: ("armor.empty", (-2.0, -3.5, 0.1)), + color: None + ) + ), Chain: ( left: ( vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 0.1)), diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index 557956e790..157812a9d9 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -487,8 +487,9 @@ pub enum Chest { Orange = 4, Midnight = 5, Kimono = 6, + Assassin = 7, } -pub const ALL_CHESTS: [Chest; 7] = [ +pub const ALL_CHESTS: [Chest; 8] = [ Chest::Blue, Chest::Brown, Chest::Dark, @@ -496,15 +497,25 @@ pub const ALL_CHESTS: [Chest; 7] = [ Chest::Orange, Chest::Midnight, Chest::Kimono, + Chest::Assassin, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)] pub enum Belt { Dark = 0, - Cloth = 1, + TurqCloth = 1, + BloodCloth = 2, + BlackCloth = 3, + Assassin = 4, } -pub const ALL_BELTS: [Belt; 2] = [Belt::Dark, Belt::Cloth]; +pub const ALL_BELTS: [Belt; 5] = [ + Belt::Dark, + Belt::TurqCloth, + Belt::BloodCloth, + Belt::BlackCloth, + Belt::Assassin, +]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)] @@ -515,14 +526,16 @@ pub enum Pants { Green = 3, Orange = 4, Kimono = 5, + Assassin = 6, } -pub const ALL_PANTS: [Pants; 6] = [ +pub const ALL_PANTS: [Pants; 7] = [ Pants::Blue, Pants::Brown, Pants::Dark, Pants::Green, Pants::Orange, Pants::Kimono, + Pants::Assassin, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -530,8 +543,9 @@ pub const ALL_PANTS: [Pants; 6] = [ pub enum Hand { Bare = 0, Cloth = 1, + Assassin = 2, } -pub const ALL_HANDS: [Hand; 2] = [Hand::Bare, Hand::Cloth]; +pub const ALL_HANDS: [Hand; 3] = [Hand::Bare, Hand::Cloth, Hand::Assassin]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)] @@ -540,8 +554,15 @@ pub enum Foot { Dark = 1, Sandal = 2, Jester = 3, + Assassin = 4, } -pub const ALL_FEET: [Foot; 4] = [Foot::Bare, Foot::Dark, Foot::Sandal, Foot::Jester]; +pub const ALL_FEET: [Foot; 5] = [ + Foot::Bare, + Foot::Dark, + Foot::Sandal, + Foot::Jester, + Foot::Assassin, +]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)] @@ -549,8 +570,14 @@ pub enum Shoulder { None = 0, Brown1 = 1, Chain = 2, + Assassin = 3, } -pub const ALL_SHOULDERS: [Shoulder; 3] = [Shoulder::None, Shoulder::Brown1, Shoulder::Chain]; +pub const ALL_SHOULDERS: [Shoulder; 4] = [ + Shoulder::None, + Shoulder::Brown1, + Shoulder::Chain, + Shoulder::Assassin, +]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)]