From 9887e5d45df57170a61969a3f1aca86611f99760 Mon Sep 17 00:00:00 2001 From: WelshPixie Date: Thu, 25 Jun 2020 18:36:24 +0200 Subject: [PATCH] added seven new shoulder armour types --- .../items/armor/shoulder/cloth_blue_1.ron | 8 +++ .../items/armor/shoulder/iron_spikes.ron | 8 +++ .../items/armor/shoulder/leather_iron_0.ron | 8 +++ .../items/armor/shoulder/leather_iron_1.ron | 8 +++ .../items/armor/shoulder/leather_iron_2.ron | 8 +++ .../items/armor/shoulder/leather_iron_3.ron | 8 +++ .../items/armor/shoulder/leather_strips.ron | 8 +++ assets/voxygen/item_image_manifest.ron | 30 +++++++- .../armor/shoulder/cloth_blue_left-1.vox | 3 + .../armor/shoulder/cloth_blue_right-1.vox | 3 + .../voxel/armor/shoulder/iron_spikes_left.vox | 3 + .../armor/shoulder/iron_spikes_right.vox | 3 + .../armor/shoulder/leather_iron_left-0.vox | 3 + .../armor/shoulder/leather_iron_left-1.vox | 3 + .../armor/shoulder/leather_iron_left-2.vox | 3 + .../armor/shoulder/leather_iron_left-3.vox | 3 + .../armor/shoulder/leather_iron_right-0.vox | 3 + .../armor/shoulder/leather_iron_right-1.vox | 3 + .../armor/shoulder/leather_iron_right-2.vox | 3 + .../armor/shoulder/leather_iron_right-3.vox | 3 + .../armor/shoulder/leather_strips_left.vox | 3 + .../armor/shoulder/leather_strips_right.vox | 3 + .../humanoid_armor_shoulder_manifest.ron | 70 +++++++++++++++++++ common/src/comp/inventory/item/armor.rs | 16 ++++- 24 files changed, 210 insertions(+), 4 deletions(-) create mode 100644 assets/common/items/armor/shoulder/cloth_blue_1.ron create mode 100644 assets/common/items/armor/shoulder/iron_spikes.ron create mode 100644 assets/common/items/armor/shoulder/leather_iron_0.ron create mode 100644 assets/common/items/armor/shoulder/leather_iron_1.ron create mode 100644 assets/common/items/armor/shoulder/leather_iron_2.ron create mode 100644 assets/common/items/armor/shoulder/leather_iron_3.ron create mode 100644 assets/common/items/armor/shoulder/leather_strips.ron create mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/shoulder/cloth_blue_1.ron new file mode 100644 index 0000000000..c63a33dbd3 --- /dev/null +++ b/assets/common/items/armor/shoulder/cloth_blue_1.ron @@ -0,0 +1,8 @@ +Item( + name: "Blue Cloth Pads", + description: "Simple shoulderpads made from blue cloth.\n\n", + kind: Armor( + kind: Shoulder(ClothBlue1), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/shoulder/iron_spikes.ron new file mode 100644 index 0000000000..a2c95c9360 --- /dev/null +++ b/assets/common/items/armor/shoulder/iron_spikes.ron @@ -0,0 +1,8 @@ +Item( + name: "Iron Spiked Pauldrons", + description: "Iron shoulder pads with spikes attached.\n\n", + kind: Armor( + kind: Shoulder(IronSpikes), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/shoulder/leather_iron_0.ron new file mode 100644 index 0000000000..f19799ca90 --- /dev/null +++ b/assets/common/items/armor/shoulder/leather_iron_0.ron @@ -0,0 +1,8 @@ +Item( + name: "Iron and Leather Spaulders", + description: "Robust spaulders made from iron and leather.\n\n", + kind: Armor( + kind: Shoulder(IronLeather0), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/shoulder/leather_iron_1.ron new file mode 100644 index 0000000000..aaac593da4 --- /dev/null +++ b/assets/common/items/armor/shoulder/leather_iron_1.ron @@ -0,0 +1,8 @@ +Item( + name: "Iron and Leather Spaulders", + description: "Robust spaulders made from iron and leather.\n\n", + kind: Armor( + kind: Shoulder(IronLeather1), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/shoulder/leather_iron_2.ron new file mode 100644 index 0000000000..c939e0e0e7 --- /dev/null +++ b/assets/common/items/armor/shoulder/leather_iron_2.ron @@ -0,0 +1,8 @@ +Item( + name: "Iron and Leather Spaulders", + description: "Robust spaulders made from iron and leather.\n\n", + kind: Armor( + kind: Shoulder(IronLeather2), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/shoulder/leather_iron_3.ron new file mode 100644 index 0000000000..2c30a2452a --- /dev/null +++ b/assets/common/items/armor/shoulder/leather_iron_3.ron @@ -0,0 +1,8 @@ +Item( + name: "Iron and Leather Spaulders", + description: "Robust spaulders made from iron and leather.\n\n", + kind: Armor( + kind: Shoulder(IronLeather3), + stats: (20), + ), +) diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/shoulder/leather_strips.ron new file mode 100644 index 0000000000..e8a84127f8 --- /dev/null +++ b/assets/common/items/armor/shoulder/leather_strips.ron @@ -0,0 +1,8 @@ +Item( + name: "Leather Strips", + description: "Shoulder wraps made from leather strips.\n\n", + kind: Armor( + kind: Shoulder(LeatherStrips), + stats: (20), + ), +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index fc165f4260..a06cd716b5 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -571,11 +571,35 @@ (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder(ClothPurple0)): VoxTrans( - "voxel.armor.shoulder.cloth_purple_right-1", + "voxel.armor.shoulder.cloth_purple_right-0", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - Armor(Shoulder(ClothPurple0)): VoxTrans( - "voxel.armor.shoulder.cloth_purple_right-0", + Armor(Shoulder(ClothBlue1)): VoxTrans( + "voxel.armor.shoulder.cloth_blue_right-1", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(IronSpikes)): VoxTrans( + "voxel.armor.shoulder.iron_spikes_right", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(IronLeather3)): VoxTrans( + "voxel.armor.shoulder.leather_iron_right-3", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(IronLeather2)): VoxTrans( + "voxel.armor.shoulder.leather_iron_right-2", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(IronLeather1)): VoxTrans( + "voxel.armor.shoulder.leather_iron_right-1", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(IronLeather0)): VoxTrans( + "voxel.armor.shoulder.leather_iron_right-0", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(LeatherStrips)): VoxTrans( + "voxel.armor.shoulder.leather_strips_right", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), // Backs diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox new file mode 100644 index 0000000000..acda698d98 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0313c85f43ccdb170e584ac3fde41a0b19c3da6dc8a7618f8cd6fa44ec24453 +size 1176 diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox b/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox new file mode 100644 index 0000000000..acda698d98 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0313c85f43ccdb170e584ac3fde41a0b19c3da6dc8a7618f8cd6fa44ec24453 +size 1176 diff --git a/assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox b/assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox new file mode 100644 index 0000000000..2709f30cd8 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d37523a8e708322e24eb5c43079fbe64e8f5ea593e815542ce3dca07d8a01ed +size 1320 diff --git a/assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox b/assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox new file mode 100644 index 0000000000..2709f30cd8 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d37523a8e708322e24eb5c43079fbe64e8f5ea593e815542ce3dca07d8a01ed +size 1320 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox new file mode 100644 index 0000000000..f9baa8a1a7 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e85a2c03e3c676406c4caf59cecac7ee167a63e606e8161d812e8e02e6d7f5e +size 1228 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox new file mode 100644 index 0000000000..f066a12b4a --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7174789c433c554d265276d969274ce444e633def6071f51ae4da8f4a21c2a2 +size 1236 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox new file mode 100644 index 0000000000..225a33de9c --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c26750b882eabeb992898a82777e4417c4a9e0e13c7556cb0f5707cc381c5aae +size 1240 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox new file mode 100644 index 0000000000..644ba5efb7 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c2f079d27ca4a69ae5d408f132e624c39189d56d7ab86ca80f329145c8f838 +size 1216 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox new file mode 100644 index 0000000000..f9baa8a1a7 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e85a2c03e3c676406c4caf59cecac7ee167a63e606e8161d812e8e02e6d7f5e +size 1228 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox new file mode 100644 index 0000000000..f066a12b4a --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7174789c433c554d265276d969274ce444e633def6071f51ae4da8f4a21c2a2 +size 1236 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox new file mode 100644 index 0000000000..225a33de9c --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c26750b882eabeb992898a82777e4417c4a9e0e13c7556cb0f5707cc381c5aae +size 1240 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox new file mode 100644 index 0000000000..644ba5efb7 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c2f079d27ca4a69ae5d408f132e624c39189d56d7ab86ca80f329145c8f838 +size 1216 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox b/assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox new file mode 100644 index 0000000000..5c4de03e12 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b0d2146890e14599f9434564fd7fa5b58d449acdd6e21e33ce54f6da0fd4c70 +size 1172 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox b/assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox new file mode 100644 index 0000000000..5c4de03e12 --- /dev/null +++ b/assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b0d2146890e14599f9434564fd7fa5b58d449acdd6e21e33ce54f6da0fd4c70 +size 1172 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 44c3a23507..a6da6a565c 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -151,5 +151,75 @@ color: None ) ), + ClothBlue1: ( + left: ( + vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.cloth_blue_right-1", (-1.0, -2.5, -0.5)), + color: None + ) + ), + IronSpikes: ( + left: ( + vox_spec: ("armor.shoulder.iron_spikes_left", (-5.5, -3.8, -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.iron_spikes_right", (-1.5, -3.8, -2.0)), + color: None + ) + ), + IronLeather3: ( + left: ( + vox_spec: ("armor.shoulder.leather_iron_left-3", (-4.0, -2.5, -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.leather_iron_right-3", (-2.0, -2.5, -1.0)), + color: None + ) + ), + IronLeather2: ( + left: ( + vox_spec: ("armor.shoulder.leather_iron_left-2", (-5.0, -2.5, -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.leather_iron_right-2", (-2.0, -2.5, -0.5)), + color: None + ) + ), + IronLeather1: ( + left: ( + vox_spec: ("armor.shoulder.leather_iron_left-1", (-5.0, -2.5, -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.leather_iron_right-1", (-2.0, -2.5, -0.5)), + color: None + ) + ), + IronLeather0: ( + left: ( + vox_spec: ("armor.shoulder.leather_iron_left-0", (-6.0, -2.5, -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.leather_iron_right-0", (-2.0, -2.5, -0.5)), + color: None + ) + ), + LeatherStrips: ( + left: ( + vox_spec: ("armor.shoulder.leather_strips_left", (-3.0, -2.5, -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.shoulder.leather_strips_right", (-2.0, -2.5, -2.0)), + color: None + ) + ), }, )) diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index d56c2fd3b3..871d7266c6 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -219,8 +219,15 @@ pub enum Shoulder { CultistBlue = 11, Steel0 = 12, Leather2 = 13, + ClothBlue1 = 14, + IronSpikes = 15, + IronLeather0 = 16, + IronLeather1 = 17, + IronLeather2 = 18, + IronLeather3 = 19, + LeatherStrips = 20, } -pub const ALL_SHOULDERS: [Shoulder; 13] = [ +pub const ALL_SHOULDERS: [Shoulder; 20] = [ Shoulder::Brown1, Shoulder::Chain, Shoulder::Assassin, @@ -234,6 +241,13 @@ pub const ALL_SHOULDERS: [Shoulder; 13] = [ Shoulder::CultistBlue, Shoulder::Steel0, Shoulder::Leather2, + Shoulder::ClothBlue1, + Shoulder::IronSpikes, + Shoulder::IronLeather0, + Shoulder::IronLeather1, + Shoulder::IronLeather2, + Shoulder::IronLeather3, + Shoulder::LeatherStrips, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[repr(u32)]