diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b473dd5f6..45c8a9b226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added a popup when setting your character's waypoint
- Added dungeon arenas
- Added dungeon bosses and rare boss loot
+- Added 2 sets of armour. One Steel and one Leather.
+
### Changed
diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/belt/leather_2.ron
new file mode 100644
index 0000000000..ae3fd773f4
--- /dev/null
+++ b/assets/common/items/armor/belt/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Belt",
+ description: "A belt made from simple leather.",
+ kind: Armor(
+ kind: Belt(Leather2),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/belt/steel_0.ron
new file mode 100644
index 0000000000..03086db2f9
--- /dev/null
+++ b/assets/common/items/armor/belt/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Belt",
+ description: "A belt made from Steel.",
+ kind: Armor(
+ kind: Belt(Steel0),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/chest/leather_2.ron
new file mode 100644
index 0000000000..1a046a7942
--- /dev/null
+++ b/assets/common/items/armor/chest/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Cuirass",
+ description: "A cuirass made of simple leather",
+ kind: Armor(
+ kind: Chest(Leather2),
+ stats: (20),
+ ),
+)
\ No newline at end of file
diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/chest/steel_0.ron
new file mode 100644
index 0000000000..c97a49a7c4
--- /dev/null
+++ b/assets/common/items/armor/chest/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Cuirass",
+ description: "A cuirass of steel plate",
+ kind: Armor(
+ kind: Chest(Steel0),
+ stats: (20),
+ ),
+)
\ No newline at end of file
diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/foot/leather_2.ron
new file mode 100644
index 0000000000..ad91562bb3
--- /dev/null
+++ b/assets/common/items/armor/foot/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Boots",
+ description: "Boots made of simple leather",
+ kind: Armor(
+ kind: Foot(Leather2),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/foot/steel_0.ron
new file mode 100644
index 0000000000..ccd47f75fb
--- /dev/null
+++ b/assets/common/items/armor/foot/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Boots",
+ description: "Boots plated in steel",
+ kind: Armor(
+ kind: Foot(Steel0),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/hand/leather_2.ron
new file mode 100644
index 0000000000..22b52d99a1
--- /dev/null
+++ b/assets/common/items/armor/hand/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Gloves",
+ description: "Gloves made of simple leather",
+ kind: Armor(
+ kind: Hand(Leather2),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/hand/steel_0.ron
new file mode 100644
index 0000000000..ad7e237adc
--- /dev/null
+++ b/assets/common/items/armor/hand/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Gauntlets",
+ description: "Gauntlets made of steel",
+ kind: Armor(
+ kind: Hand(Steel0),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/pants/leather_2.ron
new file mode 100644
index 0000000000..31b55c6f62
--- /dev/null
+++ b/assets/common/items/armor/pants/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Leg Armour",
+ description: "Leg armour made of simple leather",
+ kind: Armor(
+ kind: Pants(Leather2),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/pants/steel_0.ron
new file mode 100644
index 0000000000..aed385a94d
--- /dev/null
+++ b/assets/common/items/armor/pants/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Chausses",
+ description: "Leg armour made of steel plates",
+ kind: Armor(
+ kind: Pants(Steel0),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/shoulder/leather_2.ron
new file mode 100644
index 0000000000..883e07d95d
--- /dev/null
+++ b/assets/common/items/armor/shoulder/leather_2.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Leather Shoulder Pad",
+ description: "A simple shoulder pad made of leather",
+ kind: Armor(
+ kind: Shoulder(Leather2),
+ stats: (20),
+ ),
+)
diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/shoulder/steel_0.ron
new file mode 100644
index 0000000000..6c48846f9a
--- /dev/null
+++ b/assets/common/items/armor/shoulder/steel_0.ron
@@ -0,0 +1,8 @@
+Item(
+ name: "Steel Shoulder Pad",
+ description: "A simple shoulder pad made of steel",
+ kind: Armor(
+ kind: Shoulder(Steel0),
+ stats: (20),
+ ),
+)
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 491f6db100..f7e62845d2 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -263,6 +263,31 @@
"voxel.armor.shoulder.plate_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
+ //Steel0 Armor
+ Armor(Chest(Steel0)): VoxTrans(
+ "voxel.armor.chest.steel-0",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Steel0)): VoxTrans(
+ "voxel.armor.pants.steel-0",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Steel0)): VoxTrans(
+ "voxel.armor.belt.steel-0",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+ ),
+ Armor(Foot(Steel0)): VoxTrans(
+ "voxel.armor.foot.steel-0",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Steel0)): VoxTrans(
+ "voxel.armor.hand.steel_right-0",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(Steel0)): VoxTrans(
+ "voxel.armor.shoulder.steel_right-0",
+ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+ ),
//Leather0 Armor
Armor(Chest(Leather0)): VoxTrans(
"voxel.armor.chest.leather-0",
@@ -284,12 +309,38 @@
"voxel.armor.hand.leather_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
+ Armor(Shoulder(Leather0)): VoxTrans(
+ "voxel.armor.shoulder.leather_right-0",
+ (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+ ),
+ //Leather1 Armor
Armor(Shoulder(Leather1)): VoxTrans(
"voxel.armor.shoulder.leather_right-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
- Armor(Shoulder(Leather0)): VoxTrans(
- "voxel.armor.shoulder.leather_right-0",
+ //Leather2 Armor
+ Armor(Chest(Leather2)): VoxTrans(
+ "voxel.armor.chest.leather-2",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Pants(Leather2)): VoxTrans(
+ "voxel.armor.pants.leather-2",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+ ),
+ Armor(Belt(Leather2)): VoxTrans(
+ "voxel.armor.belt.leather-2",
+ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+ ),
+ Armor(Foot(Leather2)): VoxTrans(
+ "voxel.armor.foot.leather-2",
+ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+ ),
+ Armor(Hand(Leather2)): VoxTrans(
+ "voxel.armor.hand.leather_right-2",
+ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+ ),
+ Armor(Shoulder(Leather2)): VoxTrans(
+ "voxel.armor.shoulder.leather_right-2",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Linen Cloth
diff --git a/assets/voxygen/voxel/armor/belt/leather-2.vox b/assets/voxygen/voxel/armor/belt/leather-2.vox
new file mode 100644
index 0000000000..ffbf92b790
Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/leather-2.vox differ
diff --git a/assets/voxygen/voxel/armor/belt/steel-0.vox b/assets/voxygen/voxel/armor/belt/steel-0.vox
new file mode 100644
index 0000000000..f74708f9ea
Binary files /dev/null and b/assets/voxygen/voxel/armor/belt/steel-0.vox differ
diff --git a/assets/voxygen/voxel/armor/chest/leather-2.vox b/assets/voxygen/voxel/armor/chest/leather-2.vox
new file mode 100644
index 0000000000..577c0d0018
Binary files /dev/null and b/assets/voxygen/voxel/armor/chest/leather-2.vox differ
diff --git a/assets/voxygen/voxel/armor/chest/steel-0.vox b/assets/voxygen/voxel/armor/chest/steel-0.vox
new file mode 100644
index 0000000000..c61d68b9bf
Binary files /dev/null and b/assets/voxygen/voxel/armor/chest/steel-0.vox differ
diff --git a/assets/voxygen/voxel/armor/foot/leather-2.vox b/assets/voxygen/voxel/armor/foot/leather-2.vox
new file mode 100644
index 0000000000..1d932ef2ab
Binary files /dev/null and b/assets/voxygen/voxel/armor/foot/leather-2.vox differ
diff --git a/assets/voxygen/voxel/armor/foot/steel-0.vox b/assets/voxygen/voxel/armor/foot/steel-0.vox
new file mode 100644
index 0000000000..0a54072247
Binary files /dev/null and b/assets/voxygen/voxel/armor/foot/steel-0.vox differ
diff --git a/assets/voxygen/voxel/armor/hand/leather_left-2.vox b/assets/voxygen/voxel/armor/hand/leather_left-2.vox
new file mode 100644
index 0000000000..c380321a6e
Binary files /dev/null and b/assets/voxygen/voxel/armor/hand/leather_left-2.vox differ
diff --git a/assets/voxygen/voxel/armor/hand/leather_right-2.vox b/assets/voxygen/voxel/armor/hand/leather_right-2.vox
new file mode 100644
index 0000000000..c380321a6e
Binary files /dev/null and b/assets/voxygen/voxel/armor/hand/leather_right-2.vox differ
diff --git a/assets/voxygen/voxel/armor/hand/steel_left-0.vox b/assets/voxygen/voxel/armor/hand/steel_left-0.vox
new file mode 100644
index 0000000000..9f29e826f0
Binary files /dev/null and b/assets/voxygen/voxel/armor/hand/steel_left-0.vox differ
diff --git a/assets/voxygen/voxel/armor/hand/steel_right-0.vox b/assets/voxygen/voxel/armor/hand/steel_right-0.vox
new file mode 100644
index 0000000000..9f29e826f0
Binary files /dev/null and b/assets/voxygen/voxel/armor/hand/steel_right-0.vox differ
diff --git a/assets/voxygen/voxel/armor/pants/leather-2.vox b/assets/voxygen/voxel/armor/pants/leather-2.vox
new file mode 100644
index 0000000000..63ab5eb7ba
Binary files /dev/null and b/assets/voxygen/voxel/armor/pants/leather-2.vox differ
diff --git a/assets/voxygen/voxel/armor/pants/steel-0.vox b/assets/voxygen/voxel/armor/pants/steel-0.vox
new file mode 100644
index 0000000000..d790632484
Binary files /dev/null and b/assets/voxygen/voxel/armor/pants/steel-0.vox differ
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_left-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_left-2.vox
new file mode 100644
index 0000000000..ac86b23b71
Binary files /dev/null and b/assets/voxygen/voxel/armor/shoulder/leather_left-2.vox differ
diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_right-2.vox
new file mode 100644
index 0000000000..ac86b23b71
Binary files /dev/null and b/assets/voxygen/voxel/armor/shoulder/leather_right-2.vox differ
diff --git a/assets/voxygen/voxel/armor/shoulder/steel_left-0.vox b/assets/voxygen/voxel/armor/shoulder/steel_left-0.vox
new file mode 100644
index 0000000000..7f1f21731e
Binary files /dev/null and b/assets/voxygen/voxel/armor/shoulder/steel_left-0.vox differ
diff --git a/assets/voxygen/voxel/armor/shoulder/steel_right-0.vox b/assets/voxygen/voxel/armor/shoulder/steel_right-0.vox
new file mode 100644
index 0000000000..7f1f21731e
Binary files /dev/null and b/assets/voxygen/voxel/armor/shoulder/steel_right-0.vox differ
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 5ad79789a8..61e06c1716 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -52,5 +52,13 @@
vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)),
color: None
),
+ Leather2:(
+ vox_spec: ("armor.belt.leather-2", (-5.0, -3.5, 2.0)),
+ color: None
+ ),
+ Steel0:(
+ vox_spec: ("armor.belt.steel-0", (-5.0, -4.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 35879ad875..06eda546f3 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -110,5 +110,14 @@
vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
color: Some((57, 81, 132))
),
+ Steel0:(
+ vox_spec: ("armor.chest.steel-0", (-8.0, -4.5, 2.0)),
+ color: None
+ ),
+ Leather2:(
+ vox_spec: ("armor.chest.leather-2", (-7.0, -3.5, 2.0)),
+ color: None
+ ),
},
-))
+)
+)
\ No newline at end of file
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index 0dd7e45e6d..5b716c6859 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -44,5 +44,13 @@
vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -9.0)),
color: None
),
+ Steel0:(
+ vox_spec: ("armor.foot.steel-0", (-2.5, -3.5, -9.0)),
+ color: None
+ ),
+ Leather2:(
+ vox_spec: ("armor.foot.leather-2", (-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 99344042b1..8658f81455 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -100,6 +100,25 @@
color: Some((57, 81, 132))
)
),
-
+ Steel0: (
+ left: (
+ vox_spec: ("armor.hand.steel_left-0", (-1.5, -1.5, -7.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.steel_right-0", (-1.5, -1.5, -7.0)),
+ color: None
+ )
+ ),
+ Leather2: (
+ left: (
+ vox_spec: ("armor.hand.leather_left-2", (-1.5, -1.5, -7.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.hand.leather_right-2", (-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 9de82d6acb..8115ee1524 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -68,5 +68,13 @@
vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
color: Some((57, 81, 132))
),
+ Steel0:(
+ vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
+ color: None
+ ),
+ Leather2:(
+ vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
+ color: None
+ ),
},
))
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index cf01dba1b4..cd9d11b7fd 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -131,5 +131,25 @@
color: Some((57, 81, 132))
)
),
+ Steel0: (
+ left: (
+ vox_spec: ("armor.shoulder.steel_left-0", (-5.0, -4.5 , 0.0)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.steel_right-0", (-1.0, -4.5, 0.0)),
+ color: None
+ )
+ ),
+ Leather2: (
+ left: (
+ vox_spec: ("armor.shoulder.leather_left-2", (-5.0, -3.8, -0.9)),
+ color: None
+ ),
+ right: (
+ vox_spec: ("armor.shoulder.leather_right-2", (-1.0, -3.8, -0.9)),
+ color: None
+ )
+ ),
},
))
diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs
index 76b6c4472d..d56c2fd3b3 100644
--- a/common/src/comp/inventory/item/armor.rs
+++ b/common/src/comp/inventory/item/armor.rs
@@ -27,8 +27,10 @@ pub enum Chest {
WorkerOrange1 = 24,
CultistPurple = 25,
CultistBlue = 26,
+ Steel0 = 27,
+ Leather2 = 28,
}
-pub const ALL_CHESTS: [Chest; 26] = [
+pub const ALL_CHESTS: [Chest; 28] = [
Chest::Blue,
Chest::Brown,
Chest::Dark,
@@ -55,6 +57,8 @@ pub const ALL_CHESTS: [Chest; 26] = [
Chest::WorkerOrange1,
Chest::CultistPurple,
Chest::CultistBlue,
+ Chest::Steel0,
+ Chest::Leather2,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -72,8 +76,11 @@ pub enum Belt {
ClothBlue0 = 9,
ClothGreen0 = 10,
Cultist = 11,
+ Leather2 = 12,
+ Steel0 = 13,
}
-pub const ALL_BELTS: [Belt; 12] = [
+
+pub const ALL_BELTS: [Belt; 14] = [
Belt::None,
Belt::Dark,
Belt::TurqCloth,
@@ -86,6 +93,8 @@ pub const ALL_BELTS: [Belt; 12] = [
Belt::ClothBlue0,
Belt::ClothGreen0,
Belt::Cultist,
+ Belt::Leather2,
+ Belt::Steel0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -108,8 +117,10 @@ pub enum Pants {
WorkerBlue0 = 14,
CultistPurple = 15,
CultistBlue = 16,
+ Steel0 = 17,
+ Leather2 = 18,
}
-pub const ALL_PANTS: [Pants; 17] = [
+pub const ALL_PANTS: [Pants; 19] = [
Pants::None,
Pants::Blue,
Pants::Brown,
@@ -127,6 +138,8 @@ pub const ALL_PANTS: [Pants; 17] = [
Pants::WorkerBlue0,
Pants::CultistPurple,
Pants::CultistBlue,
+ Pants::Steel0,
+ Pants::Leather2,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -141,8 +154,10 @@ pub enum Hand {
ClothGreen0 = 7,
CultistPurple = 8,
CultistBlue = 9,
+ Steel0 = 10,
+ Leather2 = 11,
}
-pub const ALL_HANDS: [Hand; 9] = [
+pub const ALL_HANDS: [Hand; 11] = [
Hand::Cloth,
Hand::Assassin,
Hand::Plate0,
@@ -152,6 +167,8 @@ pub const ALL_HANDS: [Hand; 9] = [
Hand::ClothGreen0,
Hand::CultistPurple,
Hand::CultistBlue,
+ Hand::Steel0,
+ Hand::Leather2,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -167,8 +184,11 @@ pub enum Foot {
ClothBlue0 = 8,
ClothGreen0 = 9,
Cultist = 10,
+ Steel0 = 11,
+ Leather2 = 12,
}
-pub const ALL_FEET: [Foot; 10] = [
+
+pub const ALL_FEET: [Foot; 12] = [
Foot::Dark,
Foot::Sandal0,
Foot::Jester,
@@ -179,6 +199,8 @@ pub const ALL_FEET: [Foot; 10] = [
Foot::ClothBlue0,
Foot::ClothGreen0,
Foot::Cultist,
+ Foot::Steel0,
+ Foot::Leather2,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -195,8 +217,10 @@ pub enum Shoulder {
ClothGreen0 = 9,
CultistPurple = 10,
CultistBlue = 11,
+ Steel0 = 12,
+ Leather2 = 13,
}
-pub const ALL_SHOULDERS: [Shoulder; 11] = [
+pub const ALL_SHOULDERS: [Shoulder; 13] = [
Shoulder::Brown1,
Shoulder::Chain,
Shoulder::Assassin,
@@ -208,6 +232,8 @@ pub const ALL_SHOULDERS: [Shoulder; 11] = [
Shoulder::ClothGreen0,
Shoulder::CultistPurple,
Shoulder::CultistBlue,
+ Shoulder::Steel0,
+ Shoulder::Leather2,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]