From 126c93d72be2fca660d6f276e7dfdf1e3bcd3150 Mon Sep 17 00:00:00 2001
From: WelshPixie <delyth.angharad@gmail.com>
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 | Bin 0 -> 1176 bytes
.../armor/shoulder/cloth_blue_right-1.vox | Bin 0 -> 1176 bytes
.../voxel/armor/shoulder/iron_spikes_left.vox | Bin 0 -> 1320 bytes
.../armor/shoulder/iron_spikes_right.vox | Bin 0 -> 1320 bytes
.../armor/shoulder/leather_iron_left-0.vox | Bin 0 -> 1228 bytes
.../armor/shoulder/leather_iron_left-1.vox | Bin 0 -> 1236 bytes
.../armor/shoulder/leather_iron_left-2.vox | Bin 0 -> 1240 bytes
.../armor/shoulder/leather_iron_left-3.vox | Bin 0 -> 1216 bytes
.../armor/shoulder/leather_iron_right-0.vox | Bin 0 -> 1228 bytes
.../armor/shoulder/leather_iron_right-1.vox | Bin 0 -> 1236 bytes
.../armor/shoulder/leather_iron_right-2.vox | Bin 0 -> 1240 bytes
.../armor/shoulder/leather_iron_right-3.vox | Bin 0 -> 1216 bytes
.../armor/shoulder/leather_strips_left.vox | Bin 0 -> 1172 bytes
.../armor/shoulder/leather_strips_right.vox | Bin 0 -> 1172 bytes
.../humanoid_armor_shoulder_manifest.ron | 70 ++++++++++++++++++
common/src/comp/inventory/item/armor.rs | 16 +++-
24 files changed, 168 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<Right-click to use>",
+ 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<Right-click to use>",
+ 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<Right-click to use>",
+ 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<Right-click to use>",
+ 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<Right-click to use>",
+ 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<Right-click to use>",
+ 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<Right-click to use.>",
+ 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 0000000000000000000000000000000000000000..8e731444982db9cb0f55149b2b6d99e5ca570a9a
GIT binary patch
literal 1176
zcmWIZk5HJ#z`)?^=;;Tf7+P2u7=k^cTzNnoAYg@JpfE#3WRzzJNDv4_fS8$)VHYzK
z!%h|^AkECMn~9NeHwz=<E+!_%olMM(yI6pjfq`i^10&NeMj&QjV%o_F#0<<pJ`gjo
zfaI8g;><uX=G{T=PL2#9i-6$%?#chXy}d{AXc!F3G+^mh{@*dI{=Y+X?|-lK#Tb74
z|KZR7|EIqEZ$JG1|EoLC|KDU_Mp0vHYy02X+4;YppC5`iEYCRTtNnL2RQc~`q5VJ3
z%?v}0vMcw0U2k>_ahU%9za4POfz)JJx8s!$GZg$EZ6f~PPh0rEgDU@j3kAOanbuNp
gJ*Ggrje^<#8%DGLw@T#rZ<ogX-zJ|EEDy^60G#0ZX#fBK
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..8e731444982db9cb0f55149b2b6d99e5ca570a9a
GIT binary patch
literal 1176
zcmWIZk5HJ#z`)?^=;;Tf7+P2u7=k^cTzNnoAYg@JpfE#3WRzzJNDv4_fS8$)VHYzK
z!%h|^AkECMn~9NeHwz=<E+!_%olMM(yI6pjfq`i^10&NeMj&QjV%o_F#0<<pJ`gjo
zfaI8g;><uX=G{T=PL2#9i-6$%?#chXy}d{AXc!F3G+^mh{@*dI{=Y+X?|-lK#Tb74
z|KZR7|EIqEZ$JG1|EoLC|KDU_Mp0vHYy02X+4;YppC5`iEYCRTtNnL2RQc~`q5VJ3
z%?v}0vMcw0U2k>_ahU%9za4POfz)JJx8s!$GZg$EZ6f~PPh0rEgDU@j3kAOanbuNp
gJ*Ggrje^<#8%DGLw@T#rZ<ogX-zJ|EEDy^60G#0ZX#fBK
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..cca6ba68eba7b8670c51e418f20689846b3578b0
GIT binary patch
literal 1320
zcmeH{&nrYx6vxj!=iWC&BuZH+KQ@v^Xu>dK8k#0gQDUZ)jUT0C#a1aRE9IZDw0igc
z1xnc{Wo2PU9p4#|Y2pu%SD((g-|zRl*L}Tr*H<?BuZU<lUy4zv#}TcSD#iBN0$1uA
z8=IBVLtQ1xpbAm2LO~)x2E9RV0uu)|oQPpB%!vge44;DoVxa+c&>ee@IN)yHkOX5S
zVI!Vd5&<j{1XvIOw$Oob@SJ#xFc(Q6V-sVnC$`?OO&E}%7aJG|Ad9ty2go7sYI)~L
z9C8jhmsnJ?&a*^eb!j0__G82M*Oyu@m;d>H2Y>P#m_I(yrLz-Vxj5C?qur)G>hqhb
zf6?<B)u+2hy(MYLWV2Z<6bc&0afAN(&*a92wU8dvI5VPKi&IURfnuAEmQzjo=e)k=
ze)MXYy_xf0{q=O0RwsHj9_iNHP^V`4J9K}h?`vif&mLb(X}X%y>FpMs+iBC;!`8ZA
HI|1GSN|hQH
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..cca6ba68eba7b8670c51e418f20689846b3578b0
GIT binary patch
literal 1320
zcmeH{&nrYx6vxj!=iWC&BuZH+KQ@v^Xu>dK8k#0gQDUZ)jUT0C#a1aRE9IZDw0igc
z1xnc{Wo2PU9p4#|Y2pu%SD((g-|zRl*L}Tr*H<?BuZU<lUy4zv#}TcSD#iBN0$1uA
z8=IBVLtQ1xpbAm2LO~)x2E9RV0uu)|oQPpB%!vge44;DoVxa+c&>ee@IN)yHkOX5S
zVI!Vd5&<j{1XvIOw$Oob@SJ#xFc(Q6V-sVnC$`?OO&E}%7aJG|Ad9ty2go7sYI)~L
z9C8jhmsnJ?&a*^eb!j0__G82M*Oyu@m;d>H2Y>P#m_I(yrLz-Vxj5C?qur)G>hqhb
zf6?<B)u+2hy(MYLWV2Z<6bc&0afAN(&*a92wU8dvI5VPKi&IURfnuAEmQzjo=e)k=
ze)MXYy_xf0{q=O0RwsHj9_iNHP^V`4J9K}h?`vif&mLb(X}X%y>FpMs+iBC;!`8ZA
HI|1GSN|hQH
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..80123efb3d7aa99fe60abc84d74023256b2c2914
GIT binary patch
literal 1228
zcmeH{Pf7z(491f$uboOo5f_51ihnjmq@q%+mDZt3863evsVxX@L{}c8p1`wsg_&7R
zr?+ttGX>qWdV&UigqJVjg^>69cZ13Y5#6@Cp*i|=M7{2?vzi~wN=Cu3Fby7t-FNf3
z?HEEdbxfH9r3KKW2#TCgCXS{cPK7xWaO#W#IP$=;2xo9S0U=?=1dNn`lnoeSI3V$W
zn8kFlxI+S#m?04ifh0u(BJusrReRQ)^`mA%5G+~FV7UVecA(j8s_*+6hT+2bw2ltc
zukC4Auj=FV*<8+Ur>uv8Hy8hTbNbc#Q_FK+8smTUer-cXCtDg;H?_6DuJy{AzBaah
cYfkO%<DRFrk*DWRCB1wu>&4s3Owa$MZvoT*H2?qr
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..ea897cd492d7082799387a27a429ebf6dfe571c2
GIT binary patch
literal 1236
zcmeH{ze)o^5XR@vo~J|<u@I~RQJWwVQ3=MAi%0ar;RyypOhB*^t$d8M0l}BC5v*c&
zcWDH{Qn0eHQyAw05kfEzAQ|{E?Dx&Gv&-(*Pa4@f05~pJLrw5t0BY4{Wi}mX*ovj7
z42`p9wWB$WoWcN!>OF&ySc)NtEP{B7plet)hM0}&26_Y-F<{Jyi9yYTkx?wdgjqGl
zh>X@4j1eg&q==CcAc{~Sg%v~8MOL46%&E^^QcjN!%Kav_uh;uq34&n4<P84h9q@gB
z?7rmVTjc3e+K(ddFK_Y;JXG&Ej(DCYVHghSgE!-Dtch1xk+7JT^TVBynp`C#>w!I@
z59Z64`=^)IT$S2m{d!?RT3bsJ<`>0XotI*EPOeMKzjL;A?ai7kg_bS57t^wTnUTGl
JnZBR?O+VHc2y6fV
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..cd6b536cf47d80c584ddc42219a68cf55c0b58b9
GIT binary patch
literal 1240
zcmeH{O-chn5QXcf$5A4RxDZ?gjBbL+h)OU<5{D?m;0OjnOh9lWy7CxaAb27-NmiX4
z$3^)jpqoTbFa;k)zj{qKMRj-YdgTuyx@{#H5`8+NPSS6$=L<v#0sxtM5B+3_oJR#H
z(G0qGOtXNIg?u11T@ji%g{I`y!Q;pavDX~tnPZ-+F#HTZk5!>5dvVYmduEvm3%ue<
z#4`|}z=@1lQCF-1i;hHetfG_qo2%CRqPUwO(ljk7dQi;3k{M_;8WzW~Wm&egKh2{9
zi=&EVwW>W{pDlRy+9f+o!v+24&DmG;&sy$zslWeQ??ziTIN7nRx^2z<O{<kR?6to8
dyXO>VA9q5F2BDolt=i>t$u8d3=Jou4`Udyx0{H*{
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..33ddedf5a99848c421e2d9e1e2834ac02e8f1371
GIT binary patch
literal 1216
zcmeH`yGjF55QgV+Vw8v?7J`KYyfi^1q7sZN8<%Lp;tB>rOhB*^t$YFdJb>U+_y(3%
z*;Kn*34*0yWnrf<&JiPoU>-m+@G+NvhI8SZ`cWf$3jl|uYM>783_z{gEKk}*ZA?l1
z&^T#UuWeCnK}ivW1~D;&QHro*7!v}D7$|0>#Grbj$SBO3GsR>yHtK=9h#V7g#K;K{
zN2rj(HfGgWW9EbmcL_~MWIDtqJU-Yff$r1V^ZkwZzCU7g2mkU7R4SFB=aRQik?>vG
z4<fHmFY*Z7*Y7xvc%COg5cJi1f5u%~5ih?aK_Mrn`&$D&i{*^0`ssmsZ(cs!KQ-HP
zQEU&@>-iaJZOloKn-zC?S_;`Ixh&5A&TQ)1>$SAxTWQ%o8<*YljO<)ZeCziAe*r`v
B1P1^B
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..80123efb3d7aa99fe60abc84d74023256b2c2914
GIT binary patch
literal 1228
zcmeH{Pf7z(491f$uboOo5f_51ihnjmq@q%+mDZt3863evsVxX@L{}c8p1`wsg_&7R
zr?+ttGX>qWdV&UigqJVjg^>69cZ13Y5#6@Cp*i|=M7{2?vzi~wN=Cu3Fby7t-FNf3
z?HEEdbxfH9r3KKW2#TCgCXS{cPK7xWaO#W#IP$=;2xo9S0U=?=1dNn`lnoeSI3V$W
zn8kFlxI+S#m?04ifh0u(BJusrReRQ)^`mA%5G+~FV7UVecA(j8s_*+6hT+2bw2ltc
zukC4Auj=FV*<8+Ur>uv8Hy8hTbNbc#Q_FK+8smTUer-cXCtDg;H?_6DuJy{AzBaah
cYfkO%<DRFrk*DWRCB1wu>&4s3Owa$MZvoT*H2?qr
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..ea897cd492d7082799387a27a429ebf6dfe571c2
GIT binary patch
literal 1236
zcmeH{ze)o^5XR@vo~J|<u@I~RQJWwVQ3=MAi%0ar;RyypOhB*^t$d8M0l}BC5v*c&
zcWDH{Qn0eHQyAw05kfEzAQ|{E?Dx&Gv&-(*Pa4@f05~pJLrw5t0BY4{Wi}mX*ovj7
z42`p9wWB$WoWcN!>OF&ySc)NtEP{B7plet)hM0}&26_Y-F<{Jyi9yYTkx?wdgjqGl
zh>X@4j1eg&q==CcAc{~Sg%v~8MOL46%&E^^QcjN!%Kav_uh;uq34&n4<P84h9q@gB
z?7rmVTjc3e+K(ddFK_Y;JXG&Ej(DCYVHghSgE!-Dtch1xk+7JT^TVBynp`C#>w!I@
z59Z64`=^)IT$S2m{d!?RT3bsJ<`>0XotI*EPOeMKzjL;A?ai7kg_bS57t^wTnUTGl
JnZBR?O+VHc2y6fV
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..cd6b536cf47d80c584ddc42219a68cf55c0b58b9
GIT binary patch
literal 1240
zcmeH{O-chn5QXcf$5A4RxDZ?gjBbL+h)OU<5{D?m;0OjnOh9lWy7CxaAb27-NmiX4
z$3^)jpqoTbFa;k)zj{qKMRj-YdgTuyx@{#H5`8+NPSS6$=L<v#0sxtM5B+3_oJR#H
z(G0qGOtXNIg?u11T@ji%g{I`y!Q;pavDX~tnPZ-+F#HTZk5!>5dvVYmduEvm3%ue<
z#4`|}z=@1lQCF-1i;hHetfG_qo2%CRqPUwO(ljk7dQi;3k{M_;8WzW~Wm&egKh2{9
zi=&EVwW>W{pDlRy+9f+o!v+24&DmG;&sy$zslWeQ??ziTIN7nRx^2z<O{<kR?6to8
dyXO>VA9q5F2BDolt=i>t$u8d3=Jou4`Udyx0{H*{
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..33ddedf5a99848c421e2d9e1e2834ac02e8f1371
GIT binary patch
literal 1216
zcmeH`yGjF55QgV+Vw8v?7J`KYyfi^1q7sZN8<%Lp;tB>rOhB*^t$YFdJb>U+_y(3%
z*;Kn*34*0yWnrf<&JiPoU>-m+@G+NvhI8SZ`cWf$3jl|uYM>783_z{gEKk}*ZA?l1
z&^T#UuWeCnK}ivW1~D;&QHro*7!v}D7$|0>#Grbj$SBO3GsR>yHtK=9h#V7g#K;K{
zN2rj(HfGgWW9EbmcL_~MWIDtqJU-Yff$r1V^ZkwZzCU7g2mkU7R4SFB=aRQik?>vG
z4<fHmFY*Z7*Y7xvc%COg5cJi1f5u%~5ih?aK_Mrn`&$D&i{*^0`ssmsZ(cs!KQ-HP
zQEU&@>-iaJZOloKn-zC?S_;`Ixh&5A&TQ)1>$SAxTWQ%o8<*YljO<)ZeCziAe*r`v
B1P1^B
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..66aad3d0337414b4ddee43bd0ab1553f1999696c
GIT binary patch
literal 1172
zcmWIZk5HJ#z`)?^=;;Tf7#dg@7=k^cTzNnoAYetp5s^`z0bo%E24Nu0#K3Tcg^A$`
z6AKVCFap_(mzh`?fo!JBEKE$7m{^!DGchn<VrF6nvY9V2GO%1?WMsL>z{GNq5r~;U
zG&2yhuv`jqcXDI^+6@B#fxz3_dlZj`!Dt#FBMms{tNnL2RQc~`q5VJ3%?u+9m0h|2
z>w2?eh{N*S|KAQc<v?mOtlRO*hZzd~k2Vqi@24&N-$9lCzl8$d|4eHsxE@oW-A2Le
Z{|%$r|63(;{I^Tv{%@1d36=-te*ltG^mPCL
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..66aad3d0337414b4ddee43bd0ab1553f1999696c
GIT binary patch
literal 1172
zcmWIZk5HJ#z`)?^=;;Tf7#dg@7=k^cTzNnoAYetp5s^`z0bo%E24Nu0#K3Tcg^A$`
z6AKVCFap_(mzh`?fo!JBEKE$7m{^!DGchn<VrF6nvY9V2GO%1?WMsL>z{GNq5r~;U
zG&2yhuv`jqcXDI^+6@B#fxz3_dlZj`!Dt#FBMms{tNnL2RQc~`q5VJ3%?u+9m0h|2
z>w2?eh{N*S|KAQc<v?mOtlRO*hZzd~k2Vqi@24&N-$9lCzl8$d|4eHsxE@oW-A2Le
Z{|%$r|63(;{I^Tv{%@1d36=-te*ltG^mPCL
literal 0
HcmV?d00001
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)]