From 20faacd04fbde68fa615ea422f4e5532bb54e16b Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Sat, 22 May 2021 10:55:36 +0000
Subject: [PATCH] Ferocious armour for t5-dungeon minibosses

---
 CHANGELOG.md                                  |   1 +
 assets/common/items/armor/ferocious/back.ron  |  13 +++++++
 assets/common/items/armor/ferocious/belt.ron  |  13 +++++++
 assets/common/items/armor/ferocious/chest.ron |  13 +++++++
 assets/common/items/armor/ferocious/foot.ron  |  13 +++++++
 assets/common/items/armor/ferocious/hand.ron  |  13 +++++++
 assets/common/items/armor/ferocious/pants.ron |  13 +++++++
 .../common/items/armor/ferocious/shoulder.ron |  13 +++++++
 assets/server/manifests/kits.ron              |  10 ++++++
 assets/voxygen/item_image_manifest.ron        |  29 ++++++++++++++++
 assets/voxygen/voxel/armor/ferocious/back.vox | Bin 0 -> 1512 bytes
 assets/voxygen/voxel/armor/ferocious/belt.vox | Bin 0 -> 1512 bytes
 .../voxygen/voxel/armor/ferocious/chest.vox   | Bin 0 -> 2712 bytes
 assets/voxygen/voxel/armor/ferocious/foot.vox | Bin 0 -> 1376 bytes
 assets/voxygen/voxel/armor/ferocious/hand.vox | Bin 0 -> 1240 bytes
 .../voxygen/voxel/armor/ferocious/pants.vox   | Bin 0 -> 1784 bytes
 .../voxel/armor/ferocious/shoulder.vox        | Bin 0 -> 1280 bytes
 .../voxel/humanoid_armor_back_manifest.ron    |   4 +++
 .../voxel/humanoid_armor_belt_manifest.ron    |   4 +++
 .../voxel/humanoid_armor_chest_manifest.ron   |   4 +++
 .../voxel/humanoid_armor_foot_manifest.ron    |   4 +++
 .../voxel/humanoid_armor_hand_manifest.ron    |  10 ++++++
 .../voxel/humanoid_armor_pants_manifest.ron   |   4 +++
 .../humanoid_armor_shoulder_manifest.ron      |  10 ++++++
 common/src/comp/inventory/loadout_builder.rs  |  32 ++++++++++++++++++
 world/src/site/dungeon/mod.rs                 |  10 +++---
 26 files changed, 207 insertions(+), 6 deletions(-)
 create mode 100644 assets/common/items/armor/ferocious/back.ron
 create mode 100644 assets/common/items/armor/ferocious/belt.ron
 create mode 100644 assets/common/items/armor/ferocious/chest.ron
 create mode 100644 assets/common/items/armor/ferocious/foot.ron
 create mode 100644 assets/common/items/armor/ferocious/hand.ron
 create mode 100644 assets/common/items/armor/ferocious/pants.ron
 create mode 100644 assets/common/items/armor/ferocious/shoulder.ron
 create mode 100644 assets/voxygen/voxel/armor/ferocious/back.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/belt.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/chest.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/foot.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/hand.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/pants.vox
 create mode 100644 assets/voxygen/voxel/armor/ferocious/shoulder.vox

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a637f65275..479a78475a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added non-admin moderators with limit privileges and updated the security model to reflect this.
 - Chat tabs
 - NPC's now hear certain sounds
+- Renamed Animal Trainers to Beastmasters and gave them their own set of armor to wear
 
 ### Changed
 
diff --git a/assets/common/items/armor/ferocious/back.ron b/assets/common/items/armor/ferocious/back.ron
new file mode 100644
index 0000000000..2fe58fc063
--- /dev/null
+++ b/assets/common/items/armor/ferocious/back.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Mantle",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Back("Ferocious"),
+        stats: (
+            protection: Normal(3.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/belt.ron b/assets/common/items/armor/ferocious/belt.ron
new file mode 100644
index 0000000000..4486641465
--- /dev/null
+++ b/assets/common/items/armor/ferocious/belt.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Sash",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Belt("Ferocious"),
+        stats: (
+            protection: Normal(6.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/chest.ron b/assets/common/items/armor/ferocious/chest.ron
new file mode 100644
index 0000000000..b39b5cfa60
--- /dev/null
+++ b/assets/common/items/armor/ferocious/chest.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Shirt",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Chest("Ferocious"),
+        stats: (
+            protection: Normal(30.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/foot.ron b/assets/common/items/armor/ferocious/foot.ron
new file mode 100644
index 0000000000..2d9e2667aa
--- /dev/null
+++ b/assets/common/items/armor/ferocious/foot.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Waraji",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Foot("Ferocious"),
+        stats: (
+            protection: Normal(6.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/hand.ron b/assets/common/items/armor/ferocious/hand.ron
new file mode 100644
index 0000000000..b7bb7cc90e
--- /dev/null
+++ b/assets/common/items/armor/ferocious/hand.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Wraps",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Hand("Ferocious"),
+        stats: (
+            protection: Normal(12.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/pants.ron b/assets/common/items/armor/ferocious/pants.ron
new file mode 100644
index 0000000000..fc1d0be115
--- /dev/null
+++ b/assets/common/items/armor/ferocious/pants.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Shorts",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Pants("Ferocious"),
+        stats: (
+            protection: Normal(24.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/common/items/armor/ferocious/shoulder.ron b/assets/common/items/armor/ferocious/shoulder.ron
new file mode 100644
index 0000000000..b73b090e95
--- /dev/null
+++ b/assets/common/items/armor/ferocious/shoulder.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Ferocious Guards",
+    description: "The dark side of nature",
+    kind: Armor((
+        kind: Shoulder("Ferocious"),
+        stats: (
+            protection: Normal(18.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Epic,
+    tags: [ClothItem],
+)
diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron
index 80139d62ae..0db709f48b 100644
--- a/assets/server/manifests/kits.ron
+++ b/assets/server/manifests/kits.ron
@@ -34,6 +34,16 @@
         ("common.items.weapons.axe.malachite_axe-0",1),
         ("common.items.weapons.sceptre.sceptre_velorite_0",1),
     ],
+    "ferocious": [
+        ("common.items.armor.ferocious.chest",1),
+        ("common.items.armor.ferocious.pants",1),
+        ("common.items.armor.ferocious.hand",1),
+        ("common.items.armor.ferocious.foot",1),
+        ("common.items.armor.ferocious.shoulder",1),
+        ("common.items.armor.ferocious.belt",1),    
+        ("common.items.armor.ferocious.back",1),  
+        ("common.items.weapons.sword.bloodsteel-1",1),    
+    ],
     "consumables": [
         ("common.items.consumable.potion_minor", 100),
         ("common.items.consumable.potion_med", 100),
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 1bdc21201c..561492b219 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1375,6 +1375,35 @@
         "voxel.armor.agile.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    //Ferocious Armor
+    Armor(Chest("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.belt",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.foot",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.hand",
+        (0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.shoulder",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    Armor(Back("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.back",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
     //Blue Leather Armor
     Armor(Chest("BlueLeather")): VoxTrans(
         "voxel.armor.leather_blue.chest",
diff --git a/assets/voxygen/voxel/armor/ferocious/back.vox b/assets/voxygen/voxel/armor/ferocious/back.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a8b97bf3ffd472b3e0a0011edbac8d8595ebeba8
GIT binary patch
literal 1512
zcmah|T}+#07=8NpeP3HxP#7Da43P<i$x?o$R8}ZuD}w<;$mk|91~L$b3t0$|X33~q
zG6Ba3>1N^toXs3&bCOClOTfhtFu`S3VoZcA#K<)l;srOyQ+A`qWp8rwocDRo_dY-G
z`!&~{NDGQcZMpXtjjWhN8ofSGOmxF#A@sy9;zWzj`<ae}tAj9#I4E}*L|0)Ho!dkx
z<a*Ip8$@4Yq%{!=xk{@O17ilaK@8PKaucDDtMqB)Ix#x*VyrZXk>?qCw$Y)GtMqB)
zA|{7UOqF^u@qClRNNXY#a+OwN%uFt#@GQlxr!|N|ox)rSb1Bp*6&hn^S`n2ssWp00
zsZ*&_sZ*&_sZ*&_Ys}P$Xw+%cY3x;FZ5s1x%&W0B&7m=7=3c~1otb&f)S2x@F_)MK
zg<PdiW6VsAh=ui8*oTFFi(Ml((<fqOe^&afB`Tqjn|FLM^u@5om~w?s$u)`LoMJi0
z*m4u0kn41@m3l%YG~)Q-it^|sMHjgIem~a71V?TxU~6j&e<md0!Gqdp2zR_+KNXw5
zH6qTHh|*Jq@Vr|F+e8V(V}f*9AXCpn77`IxE7)^JkmJe3fqMe2OAs3n#E%LRzYrAE
zT2Xx_4!#TV_+a)$RQd%C<AS&E3i==M+lFMMcBUi4pN*oh3n@JbNFPZ?c4!~$i<ua)
zF?K<4ASiIo3*-&vAJ8D<yC5?OxM|OX>s%97UQYq4UqUHc_7cAke-LxUucGeCJ8;=E
zP-siVxJxkQ5qxu8uy$JD<K7qQ$7q|N@lY<@HbLuag5FBO_TmjR6eOe5la7IgECk#0
z;BP8Mu)~e9_Htl(3OO$)!kM=ZM-OG8y}1}&)q=pAf{Am2`745=)MR+GGjOUX7d@3F
zXwFVVXF&=^4(~^}^&oup<>-3r82o2XV(9#747}&V=*2FCZ(YLrPoKkTwPJ7lb4W`|
zgPpS|%6$cnJR3YtJL;-RF#7%rxI3ASUw_EP+QS@t%$(tnVEMk__n!p=omsdZ$j8DR
zH=_61GZcrB+X?vUQ4-d$Z>RshX4&a~s#pHi|8@HRuYb%2fTaoG$J@{BKRWXkPySQ;
z&(F`t)#3>pv`?Y*@*t7|Nm%?;uyT@5Hxz=+W<zgpFKUj=Kmr5U-Lo6B*Ph(r`DDJG
z)Kpx(IF7Q?F|-X`!rs<Bc=+Xh%=(fr#+m(h{tdPBXlaU|rEwWO9YFuJTL|0?<HMQn
z@zHk?6rR0|vcU-){bU}E_abn)Tv%r*q7nEDhKS(tw@>PO%=h)Ic(lF*{%;lw{~7B4
z3EU51b8{2h+uJ+-`uciQRaL?1bRsV=4_R4Rn4Fx%^z<~s;V|ar=CHK1gh(WU)zwvO
gY;3^i^P#P+4c*<{=<Dml;NT#Jhlddi2BT-n-y%3dmH+?%

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/belt.vox b/assets/voxygen/voxel/armor/ferocious/belt.vox
new file mode 100644
index 0000000000000000000000000000000000000000..56d0fec32f6c4853f8a5ecbca858a82265bb8d6d
GIT binary patch
literal 1512
zcmajee@NVA90%~v_qS+;<;_hkHFJ5V%W>zgF3sId&rO$8XUe=SiBP85Y{(FmV=%7`
zmfD=iZ9z+I$(pgX<dR~bjSvlNtV<$D84~%oe`J67&%5`z{-|i|3ooAM`@HX-@AG-S
z&$qGWXnIIQs=bwm*~qdXQeWx!JrTX(74tU^%h4u(<)=z?RHTgzOPrdeI1NkjYL@CX
zEY+=u=2k^>YHW2f*f-gVqPZ1CbE>3~P6nA|F%wmDDx{J|IvHe=MWQh$l{C`HAd@T-
zo%8F=Nh6&MGRcZ&1~bw~Cxc8<O^%UHMzn8n-4^?7716z_=x&XzP6qoXTTyhcqUdgw
zG}6f+lPqSU>TZQp(nu$ROtMHc=A@EFIvHe=MWS<lojGZwlR+j~(ac~*8tG(^Nvf%P
zHIrjxuz%#hey`};uS>uy5C~vxL~!uxJT^Bs@rTWZyLYRj5pGs~^++4P)+64Nh~nb~
z@V!$C$Cw-9GawzYkcnp?^NEPB7VJDJ$nj-i&uu|Whv3PeAYoXL__-jzIu2DQ<KaJ>
zfcIyfLwP_@H!67RmZ0}O|67-g)b<Qy2C`8Y_8_IphK!+PWKX8SxsZh+2eY$+Jt0BK
zoIqaZ^ZQ~TqfbGmZMf#lg6DJtmS0T)s-8!&2rB7k`kiKrUP8^qx8ZSSqQH@gQIBB4
zC;0k^VD*H+&wKx5FNRwL_4{&B<`6W$Ea)y5Y%N?xU4Am!eHrMhvm?~%LZG1tp|&!N
zw0eQ13FN$xh!R&C4(+p}wXp~tRf6Cfg0a(rxr>6r)MQj<XX1EaF1pIyXv|JTdwvRr
z4(vv_c`y96UUa;97=csAFmUDs`rh?p_*@6V*Uw|^$IlQK7l&O5Pa{1&9Zv2=VeX4~
z#pQsn#EF^;H-_JP7PrPT@XPnvSiP5nkNC{+q+sce;J2RyeeHH!3Fcw`W*MUIvuhw8
zLpN;r@_rIlk+xlbPor$tKhZ7!s{abd|F3?`1cAjd;D;NJtv|ZwO}@NG)}NP`hf76c
z*z24?@r8aQ1(UGwiD3B{kM86o91aJ%ySwq)!D&da4?DVcVCM3}cX%e5XD2lkm(Go%
zw0Hz91Lv`;c_;3Du^Th~B#dy+{=5Hm)pKZSh@h!{30-YK@8#<VUJK)c>F@C2w-FSa
zx`5LDF&z4M4)wPq@OV5}<5DDs@F%p0;K4T!*Y|+u>v4H>eKvk?v9bJS`1^mtok?tL
zY+!3^YkR!5wiXo?6(}hwfy?EB-EPPD_&BDfrVtK?F*`ep#l=NLA`z^ttYCe89e%$b
bEiEnR?CeBOPY?S0`!P5;h)^gLom2h-xY#{q

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/chest.vox b/assets/voxygen/voxel/armor/ferocious/chest.vox
new file mode 100644
index 0000000000000000000000000000000000000000..c40e3403c26bd65281dc34f92ca18b280b33a245
GIT binary patch
literal 2712
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
SnwXf-;lqbDH8oYgrujF({jfa%

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/foot.vox b/assets/voxygen/voxel/armor/ferocious/foot.vox
new file mode 100644
index 0000000000000000000000000000000000000000..66f182c889ed51fb131f87dfb5710a4ded6b4973
GIT binary patch
literal 1376
zcmaizZ%oxy7{{OU`$J5sQ6LH$5NUG3bQc67NH1P43W9(HldG}TU`nJp<`}X&H@WF%
zN+M%d+cH4MOqyoy#%gYmYfReA+0C`Kbk4PW&5P&-Z$3R2-&D(aw$JZ8-{+j)dCv2k
zb6V<mW=BM%uA+Loc2et#G*t%!&&Gu|mGX?@C_7t&)hmq}+Nu;aD=o!VR8$%x=Pkun
z9Mxip-&pEXY{gM6w$8KFr`U?4S{L^lM}3N|II1;prE%4#*oqU^2^vqa6(h!PiK(@<
z7h}ARB9<|ZWlF`?-ZmBD7_V_mspaTA$5c3Ki))N=jcd8;b4{t^>YM~)tOVn?6Vx`A
z*HUc7SeCIB{TNHJ6&0>puC1ukwG>;?LDy1jWyhAy8hf!!g0@g7#KR$B>$w@`=jZt|
zHI*AT>f%FOuKxOo%>C9xvM-IY-9-f6--u_V6bZOU*AisxMPw$8<T_#5J|RD_hP79P
z#4h2vu#hq+q<tZ5s7s<|UoycXDSR~f5|tsLaaefwig4(T{@a*AW@iqoLU|NNeXQtC
zC1)Umyzwl&H`g%W(Xk`K+K5m-Ey!CMzb_FPejd4&$_4Kld<UDk`{oL$d6_a1s+C`q
zKa{DG*Qh`B9zO3XiaePN`-HK8@XZe4{vIKyIyioa!FHi((>nYfq3v~{r&3tBd5*>n
z8FU76=xfX+(osODxrE4GKSLcAaBGbGSJEgi$YR^3Tsm4x=&BLIZwn&_h3Qj5ab^b9
zd8^o6ypHb5Qd;uT=-jY^fi0_vwyh`FP(jx_+X)@m#figv==&hZ;L$Fk7mxAqr_V`B
zN@97+3uI?!<JDReuX~j@3OoeLz0_BgGWg+2u8ijJ>koO{zn#yg8Z$aB+`2CO{<F~6
znakO5Av2f##Lu()L^1=HQu*pmI`_$1%)hrq7V{tLk$>fXR{j5%Ka*jY9f2P&JvIM$
z&07P7Pt3otu#nRwBdqt1QFgqa^l&;i&kJ{V>D3({$K&zP)6+xk)@w+(kEPv9nLP9O
z3=e1M-O0@4^wD89mJQK<;uy=@mT~*b)l3G{8Pb~lxBiWF)3i3nXl=Sh_g*-3<|5$>
zQ9i!*J)e9Rqv*hKHujIO?Xzi`uEy~Bd_2^xNTR}D*fHV3w~zPtK=0Sn#^d`-)%Uh!
ziM|<~|4+C+&fMG_3kwU2{)UDIs;a6eFE6K{pn%-mTt-JnnV6U$8jUhFHO1`gEU{RO
ld-v|~=+PsB!65DJ?d;#bpWfbH`uqDidGaKYNF=_d{0(=HHW2^-

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/hand.vox b/assets/voxygen/voxel/armor/ferocious/hand.vox
new file mode 100644
index 0000000000000000000000000000000000000000..e4d0e0f8b085b7005b9e66ec9ea811f2bd7fec27
GIT binary patch
literal 1240
zcmaize@L8l7{H(RRYA1E^5&+Nnz_8w<v4$4UheGf+;lm0rp()t2xT*y4H=?x4Cb}L
zQkxUGEokXAjx}Rz$tA@=8zmapSl5UkWk}@T{*nFRKcAj+`=g?<2R`rfe4poi-{;5o
z`)#Q|lob$>x~iH3s^t4vk)|52=ZWY-CFUV<st>h#YsRBal^n$sF-$`Y!&I$2G+l;@
zX&5fiN7OJ)!)1sWXNu|8Rh(&<ZZXX`4Y*B3v)B!ZDK{miN{pCt!-xr*s>M{lseV)a
z6084@)l{*XMs3AZ#8g``m4ka<s}ik0DyaB;K32zseV6Ci*x2Ati-p^_>!Km9*L?Lz
z)_-dv$(cgMkrF)bR$`kdM?7&zR{|1z2ANMGsZQ8_T*&w2vg@W0-z7Zh7m`PXl+T6Y
zx<qP^C*eJv%m*{i;r0oQ<HFlFg#NqwZDSf4o!R90@+b{EN$;_cJ(5OVC=>faE+aOL
zofdWl1jn2pZ)pC3cx3!3WZJ?NdoIqC&D?u69crJaLR+p;eo_8VX3Jip{`@;Q?Kza#
zG8lIXL67kDL1E>n;MKJ^)X!+U(6pxjmrZDUS?F~On+um|EKZ}-lg&V*l|V-!zUDFl
z$6SncRKZe^{1;Mi6lSu2kCl#=GP-I7|C_?ZNn!51P@0iOO<oR1N(<<5m(!A$LT7P0
zBYSreZrhEwp^C1z4&Xa+n4wcg8F<gj=$S6USI@Hg(`O_mCbA>>X|l4iu<I;J3tr@v
zLK_~3o%-r>M&Eyy8<W}m`a>Qock=mIbB060(k<clpM`-=E0_F5%wKmA-Orw(Bu1`T
z`0{QlD`al<-`65r{ReyHU;STF|Nr&Rj2{*!;Kyr^?LRv6R!`9*`!6ag;zHR3yX`?L
z&JB|4Pi5g#;of0Ax}gv@n~mPyUS8ifjra%H*0YV7ix2kjRGOZhj0`TE8K<&hjP{|k
z>}cE0oiBDW<4t8uXZGLuH`dM3+8m*^X^Ea=(0}nN{wrZVoc@lFzKu|F;vAKO6YT$F
zj;5OtoK7dJT8hLg{6$Pexc|+A`tIxbdR#nOpGEImLW15IegB_uE5!QxI-8rDTmFWI
z2CA#8aX1_l78YW)TA7@jWNK=Pa5&8D>@16mi$o$3mY0`VTU*2H_0rznPIq@VeSLil
Q4h}LrJWL=Ei2hUl2B<nGxc~qF

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/pants.vox b/assets/voxygen/voxel/armor/ferocious/pants.vox
new file mode 100644
index 0000000000000000000000000000000000000000..1fc85d6be7f28767e9bee1a479a2bdb260b85ef2
GIT binary patch
literal 1784
zcmajeZ%kEn7zgm@_xqiH7phSr3KkM+a?x}b6cR`;+<Q?_6eO8k&9#P8BF!<!kTEy8
z>1IG8V^`ZUAjeEgGk0S(H^?<7ZRYIeT3b5jDqr&=d%>G;--~am<viPG=ef`KIe&iV
zoZGZ{TV7m5>MCnCaVNh!B8@fC$Wy5w+|tM;i?%gKYZ96Tx6er_32So6BheC8T9hW2
zJo2$8hJC|6x#W?LJ)ShIEcVGIk9?_~s4^Z}#j#q4T-F|YN~w@ms@EtLcF1Mzu_s!E
zlvcf(jAlkIYma=)#4tC^$r$G3vi8WwOf2S>3Tulw_YS$NJ??$Xw5`gFt*RVyS!>ZD
zLzd`Tn;h0IDW%J_(tU<3rNcHktX=Y$iPlwoIDMK7S(-ECuy)BKA7{kqT4gv#hAhK5
za#*|Mk&iQC@q8BN$dF}mjvUr5dE`sY*t{=W_ZpisHfP9T?Xu^kGKcGNbd}|BJ>;-<
z+0$Y+8nVQMY;st;q?8G0Wx|FmvdJNrJZ5~+A+4E{MK(F)lE+LLvr!x7WRXn{x#TfZ
z7LT`>lSMW;<dVls*}T5ZoGh}*A(y;V=J3896S5p;<gj+x+p?~za`r>!w+n9F-QBo9
zC|G~`8Xi7;h(9wkarJ6lD#C@DuO4gq*G6OnvrxWc6(aAffq!^4Bw|C_(jcSHL9S&X
zqfRhyuV86p36@<Fcx{5GV}dyYf~?O3E9=rxyEg;T!*lTd_zMVk3mS$5Z(S4|yv1W1
za**4ak44>uC`kmdpgj}${W&NcTZq8*CFu7vJ1kfh7gS6N<aJ)Z%YzI(1G$`uGl3-t
z9@vW8uPp#-Uqm^VTth$8A2d<=3N{~q8^ORLtn%k#C@2_>2)^DTxVu{r<?ra&K@7AA
z8rLpI$S>IWs-Pn*n7Mu$4J&id8p%gjLjmHuiqO5a6!ASF4DPA~Zj55-OIfHWT8Is6
z3$UxH6m7MF*c*c31A@upf|A@E)D$klj*{hQ53fd3VHR3fE<pdf#YpU2foOdt+TPrR
z?)}@*duTVh-i>15NE;GokK+E1pCUay9rNcri@dx%1o$jUmcNX$B0nM(0c@^bje+-`
z$HkF+{PKMv?%rIAk9f_*nBc}0!EZkax>^fxDprhZ7eYwA&-UI7^q<Sbm$$NU7Yk?C
z-`OOy>mTiqf35!%`~SCojK_efVc>^zPh5ZMnKws@AG`kI;$oaA9ma~lD9VrZAUl?g
z>z@d2Z|A2wHU_`nkB*KGY+QdC66?a;_PH28`RE-U%Hg+@n~M`ihOnl55G}n&F@NVg
z-27rO#-rI7<TLy4^KYn|MDx}pnj3GReGhQ(<XObdB=EuI@9^QbNvzs`3~PFZvEk!M
zG+s&~7!2Y*Z$&)9Uoc6*y>A}f-#va`Ps&sGm&yNIS{nZ|oc||W8N>ASG-hUIX8ZN^
z^{B3{Mny#hii(O*P*8x8krA9fe;$cM0uvJxn3|eGGMU7kJ9qHl!2?92QM9zQVBfxd
V=<Mu7Pfri}`uY%$$5ZE&zX6N)UV{Jt

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/armor/ferocious/shoulder.vox b/assets/voxygen/voxel/armor/ferocious/shoulder.vox
new file mode 100644
index 0000000000000000000000000000000000000000..3fb7ce5da1dc5362ab8114741e874e8a5579d231
GIT binary patch
literal 1280
zcmaizZ%kEX9LIm>IR_=EMu8|$NQA)!!`%x){0T4Idr=SsB$!;ywFXln$uY-}-MPt4
zHv<wGyV{lkxjU1l8N0EX4RVb^8#%kV)|Sk%7O#52i|7S!K0OzEQ7z|h`|SMwo%1~3
z-+7+qx&vte5veV&+NU4#yCu?C<@G!n3A8<-iTaxZE#9iHBS~$!8l87-Fr;XM68A=>
zeN&2}EOA+4xS|Zh9i<HS24$2-D;=AL+q4X~Wf{7zs+FParlE>0LsclH+@{7-$`z$l
zakNr3%G7mJ*G*MnS*ltL(`^{0OBrU7seMs8)+mjsv6SiBsLUEMb>7r{rtZ_eC`<QQ
zE~Tt;Q~RbE?)|$f%0=sp7}|V3A4|i+p3AeWuCDS&LISsM*G5WQulnMVto+hQoHLP<
zLp$-jU50J62=PQA9WluGv&d{BakawcV?vH6lkGQ!=nmm2zYsqpBz`L7*TzzPEDrDK
zc;1_O9=A_u7!lsQA)LIc-)%@HwLP5-Up56HCn;SCqz@*O9o&k2E|Wo<uALUP2ZYiY
zL0;4A_eLWlPa~5FT(M{3Jki9xS5u(+1xmE!D$P%t-!#*OFH?8^Eu8iYcG^-IaSG!e
z;miHP;t|2CV{h;zL#;yNu3TI;;qWU$w_8}7yG%oVGVPvpdK<C`v^nrK6%sh=Vz{jw
z7RJeWF_BWoR`%}7qOG}*j%vaGx-fb|m^m*Lq$X39ox!1kT)NyvG-oH$o}a?t?rnq)
z@4#DMPRASj@Et!$|EVMNzT;)+Ob4N>XIc8;6Jldy*%JQ@X=!QL^(+c<U!vGy!&7Rf
zuCj=scc0_NSUNv{m(Ajx96r=*hJwPvE#cQ6h2HioF8TAAz3w9NKfC(l7`&Fi=XaA>
zWb3;Ao@QCsKi)0>(tk<k|4%<tewZJH@2@>pe`Mw@p1eou&&$i>Lg6So?BkT2>m$jZ
z#N5Ziy@UGb27}maHoCjJso67$_<PyZwTY>V5C7q*WPNs0Q@L<vgtC%hTKmtk<?v?i
ze721#ZxX|LX8)akL+uPLO<`IZ7w9?)Cof*be<j5Gli%{eH(_=jKSx>LD0@Geq48!I
zr_;%j-ikzP_!BcMJoxJ2{vPP_^|*Rue+l}&#l+}4qx=5}w}Py!tgyDWww|xAucxxI
zlG4&r91aIrSy_yYjWIDXK`0brdU~4q`FX<OF!%4@XL)%Uuh&a!Yb%|do%Hnd(AU?;
Nz`y{3Kp^r>`3uh_FgySN

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index 81e30417f8..2b242dbaae 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -24,6 +24,10 @@
             vox_spec: ("armor.agile.back", (-5.0, -1.0, -11.0)),
             color: None
         ),
+        "Ferocious": (
+            vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)),
+            color: None
+        ),
         "Backpack": (
             vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
             color: None
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index d9be59fe73..b16a29bee0 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -24,6 +24,10 @@
             vox_spec: ("armor.assassin.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
+        "Ferocious": (
+            vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)),
+            color: None
+        ),
         "Plate": (
             vox_spec: ("armor.plate.belt", (-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 e06b45db3f..8b624b319f 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -28,6 +28,10 @@
             vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)),
             color: Some((29, 26, 33))
         ),
+        "Ferocious": (
+            vox_spec: ("armor.ferocious.chest", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
         "Assassin": (
             vox_spec: ("armor.assassin.chest", (-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 43235c8e94..f41ee92a53 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -28,6 +28,10 @@
             vox_spec: ("armor.cloth_purple.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
+        "Ferocious": (
+            vox_spec: ("armor.ferocious.foot", (-2.5, -3.5, -2.0)),
+            color: None
+        ),
         "ClothBlue": (
             vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)),
             color: None
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index 1bf311f527..a95bd554a6 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -30,6 +30,16 @@
                 color: None
             )
         ),
+        "Ferocious": (
+            left: (
+                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
+                color: None
+            )
+        ),
         "Plate": (
             left: (
                 vox_spec: ("armor.plate.hand", (-1.5, -1.5, -2.5)),
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index d3ce20aa93..fde3b5b2cb 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -31,6 +31,10 @@
         "Kimono": (
             vox_spec: ("armor.misc.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
             color: None
+        ),
+         "Ferocious": (
+            vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)),
+            color: None
         ),
         "Plate": (
             vox_spec: ("armor.plate.pants", (-5.0, -3.5, 1.0)),
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index 4a97ad7ea2..2c25cce062 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -41,6 +41,16 @@
                 color: None
             )
         ),
+        "Ferocious": (
+            left: (
+                vox_spec: ("armor.ferocious.shoulder", (-6.0, -2.5, -1.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.ferocious.shoulder", (-3.0, -2.5, -1.0)),
+                color: None
+            )
+        ),
         "Plate": (
             left: (
                 vox_spec: ("armor.plate.shoulder", (-3.6, -3.5, -0.0)),
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 030851e417..d3b52d248a 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -52,6 +52,7 @@ pub enum LoadoutConfig {
     Bandit,
     CultistNovice,
     CultistAcolyte,
+    Beastmaster,
     Warlord,
     Warlock,
 }
@@ -884,6 +885,37 @@ impl LoadoutBuilder {
                         "common.items.glider.glider_blue",
                     )))
                     .build(),
+                Beastmaster => LoadoutBuilder::new()
+                    .active_mainhand(active_item)
+                    .shoulder(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.shoulder",
+                    )))
+                    .chest(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.chest",
+                    )))
+                    .belt(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.belt",
+                    )))
+                    .hands(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.hand",
+                    )))
+                    .pants(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.pants",
+                    )))
+                    .feet(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.foot",
+                    )))
+                    .back(Some(Item::new_from_asset_expect(
+                        "common.items.armor.ferocious.back",
+                    )))
+                    .lantern(match rand::thread_rng().gen_range(0..3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    })
+                    .glider(Some(Item::new_from_asset_expect(
+                        "common.items.glider.glider_blue",
+                    )))
+                    .build(),
                 Warlord => LoadoutBuilder::new()
                     .active_mainhand(active_item)
                     .shoulder(Some(Item::new_from_asset_expect(
diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index 42adb0ef0c..78bb38ca27 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -1313,16 +1313,14 @@ fn mini_boss_5(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<Entit
             entities.push(
                 EntityInfo::at(tile_wcenter.map(|e| e as f32))
                     .with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
-                    .with_name("Animal Trainer".to_string())
+                    .with_name("Beastmaster".to_string())
                     .with_loot_drop(trainer_loot.read().choose().to_item())
-                    .with_loadout_config(loadout_builder::LoadoutConfig::CultistAcolyte)
+                    .with_loadout_config(loadout_builder::LoadoutConfig::Beastmaster)
                     .with_skillset_config(common::skillset_builder::SkillSetConfig::CultistAcolyte)
                     .with_main_tool(comp::Item::new_from_asset_expect(
-                        match dynamic_rng.gen_range(0..6) {
+                        match dynamic_rng.gen_range(0..3) {
                             0 => "common.items.weapons.axe.malachite_axe-0",
-                            1..=2 => "common.items.weapons.sword.cultist",
-                            3 => "common.items.weapons.hammer.cultist_purp_2h-0",
-                            4 => "common.items.weapons.staff.cultist_staff",
+                            1 => "common.items.weapons.sword.bloodsteel-1",
                             _ => "common.items.weapons.bow.velorite",
                         },
                     )),