Ferocious armour for t5-dungeon minibosses

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
 

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],
+)

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],
+)

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],
+)

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],
+)

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],
+)

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],
+)

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],
+)

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),

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",

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

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

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

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

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)),

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)),

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)),

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(

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",
                         },
                     )),