From dc7e45c8bdfa54da4e4e2bb101c4d32488e3916a Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Wed, 5 May 2021 14:13:37 -0400
Subject: [PATCH] Rebalancing

---
 .../abilities/custom/mindflayer/cursedflames.ron    |  2 +-
 .../abilities/custom/mindflayer/necroticvortex.ron  |  2 +-
 .../items/npc_armor/biped_large/mindflayer.ron      | 13 +++++++++++++
 common/src/comp/body.rs                             |  2 +-
 common/src/comp/inventory/loadout_builder.rs        | 13 ++++++++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 assets/common/items/npc_armor/biped_large/mindflayer.ron

diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron
index 4559957598..9d83b5a243 100644
--- a/assets/common/abilities/custom/mindflayer/cursedflames.ron
+++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.40,
     recover_duration: 0.50,
     beam_duration: 1.0,
-    damage: 500,
+    damage: 400,
     tick_rate: 0.9,
     range: 22.0,
     max_angle: 15.0,
diff --git a/assets/common/abilities/custom/mindflayer/necroticvortex.ron b/assets/common/abilities/custom/mindflayer/necroticvortex.ron
index 82f8416777..3b9e308d96 100644
--- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron
+++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron
@@ -2,7 +2,7 @@ SpinMelee(
     buildup_duration: 0.5,
     swing_duration: 0.2,
     recover_duration: 0.6,
-    base_damage: 100.0,
+    base_damage: 80.0,
     base_poise_damage: 1.0,
     knockback: ( strength: 7.0, direction: Towards),
     range: 16.0,
diff --git a/assets/common/items/npc_armor/biped_large/mindflayer.ron b/assets/common/items/npc_armor/biped_large/mindflayer.ron
new file mode 100644
index 0000000000..27e4035a44
--- /dev/null
+++ b/assets/common/items/npc_armor/biped_large/mindflayer.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Mindflayer Armor",
+    description: "Worn by mindflayer.",
+    kind: Armor((
+        kind: Chest("Mindflayer"),
+        stats: (
+            protection: Normal(60.0),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Legendary,
+    tags: [],
+)
\ No newline at end of file
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 2b29a2f480..87237bef92 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -441,7 +441,7 @@ impl Body {
                 biped_large::Species::Wendigo => 2800,
                 biped_large::Species::Troll => 2400,
                 biped_large::Species::Dullahan => 3000,
-                biped_large::Species::Mindflayer => 25000,
+                biped_large::Species::Mindflayer => 12500,
                 biped_large::Species::Tidalwarrior => 2500,
                 biped_large::Species::Yeti => 4000,
                 biped_large::Species::Minotaur => 30000,
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index c1f0f76e8d..7b2cd16c79 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -970,7 +970,18 @@ impl LoadoutBuilder {
                     .build(),
             }
         } else {
-            LoadoutBuilder::new().active_item(active_item).build()
+            match body {
+                Body::BipedLarge(b) => match b.species {
+                    biped_large::Species::Mindflayer => LoadoutBuilder::new()
+                        .active_item(active_item)
+                        .chest(Some(Item::new_from_asset_expect(
+                            "common.items.npc_armor.biped_large.mindflayer",
+                        )))
+                        .build(),
+                    _ => LoadoutBuilder::new().active_item(active_item).build(),
+                },
+                _ => LoadoutBuilder::new().active_item(active_item).build(),
+            }
         };
 
         Self(loadout)