From 4bab4ab5e13aeea7b13d463c06a04f4c67661830 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:18:20 -0300
Subject: [PATCH] chore: keep all creature overrides in the same file to avoid
 inconsistency (#46)

---
 ...ifficulty_mythicmode_creatureoverrides.sql | 20 +++++++++++++++++--
 ...iculty_mythicmode_creatureoverrides_bt.sql | 18 -----------------
 2 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides_bt.sql

diff --git a/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides.sql b/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides.sql
index 93fed37c..91aa6b44 100644
--- a/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides.sql
+++ b/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides.sql
@@ -7,10 +7,26 @@ CREATE TABLE `zone_difficulty_mythicmode_creatureoverrides` (
 	`Comment` TEXT
 );
 
-DELETE FROM `zone_difficulty_mythicmode_creatureoverrides` WHERE `CreatureEntry` IN (1128001, 18831, 19044, 17257, 17881);
+DELETE FROM `zone_difficulty_mythicmode_creatureoverrides`;
 INSERT INTO `zone_difficulty_mythicmode_creatureoverrides` (`CreatureEntry`, `HPModifier`, `HPModifierNormal`, `Enabled`, `Comment`) VALUES
 (1128001, 1, 1, 1, 'Chromie NPC - prevent changing hp.'),
 (18831, 1.8, 1, 1, 'Maulgar, Gruul\'s Lair HPx1.8'),
 (19044, 1.8, 1, 1, 'Gruul, Gruul\'s Lair HPx1.8'),
 (17257, 1.8, 1, 1, 'Magtheridon, Magtheridon\'s Lair HPx1.8'),
-(17881, 3.2, 1, 1, 'Aeonus, Black Morass HPx3.2');
+(17881, 3.2, 1, 1, 'Aeonus, Black Morass HPx3.2'),
+(22887, 3.5, 2.2, 1, 'Najentus, Black Temple HPx3.5'),
+(22898, 3.5, 2.2, 1, 'Supremus, Black Temple HPx3.5'),
+(22841, 3.5, 2.2, 1, 'Shade of Akama, Black Temple HPx3.5'),
+(22871, 3.2, 2.2, 1, 'Teron Gorefiend, Black Temple HPx3.2'),
+(22948, 3.2, 2.2, 1, 'Gurtogg Bloodboil, Black Temple HPx3.2'),
+(22856, 3, 2.2, 1, 'Reliquary of the Lost, Black Temple HPx3'),
+(23418, 3, 2.2, 1, 'Essence of Suffering, Black Temple HPx3'),
+(23419, 2, 1.5, 1, 'Essence of Desire, Black Temple HPx2'),
+(23420, 3, 2.2, 1, 'Essence of Anger, Black Temple HPx3'),
+(22947, 3.5, 2.3, 1, 'Mother Shahraz, Black Temple HPx3.5'),
+(23426, 3.5, 2.3, 1, 'Illidari Council, Black Temple HPx3.5'),
+(22949, 3.5, 2.3, 1, 'Gathios, Black Temple HPx3.5'),
+(22950, 3.5, 2.3, 1, 'Zerevor, Black Temple HPx3.5'),
+(22951, 3.5, 2.3, 1, 'Malande, Black Temple HPx3.5'),
+(22952, 3.5, 2.3, 1, 'Veras, Black Temple HPx3.5'),
+(22917, 3.2, 2.3, 1, 'Illidan, Black Temple HPx3.2');
diff --git a/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides_bt.sql b/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides_bt.sql
deleted file mode 100644
index 5067036d..00000000
--- a/data/sql/db-world/zone_difficulty_mythicmode_creatureoverrides_bt.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-DELETE FROM `zone_difficulty_mythicmode_creatureoverrides` WHERE CreatureEntry IN (22887, 22898, 22841, 22871, 22948, 22856, 23418, 23419, 23420, 22947, 23426, 22949, 22950, 22951, 22952, 22917);
-INSERT INTO `zone_difficulty_mythicmode_creatureoverrides` (`CreatureEntry`, `HPModifier`, `HPModifierNormal`, `Enabled`, `Comment`) VALUES
-(22887, 3.5, 2.2, 1, 'Najentus, Black Temple HPx3.5'),
-(22898, 3.5, 2.2, 1, 'Supremus, Black Temple HPx3.5'),
-(22841, 3.5, 2.2, 1, 'Shade of Akama, Black Temple HPx3.5'),
-(22871, 3.2, 2.2, 1, 'Teron Gorefiend, Black Temple HPx3.2'),
-(22948, 3.2, 2.2, 1, 'Gurtogg Bloodboil, Black Temple HPx3.2'),
-(22856, 3, 2.2, 1, 'Reliquary of the Lost, Black Temple HPx3'),
-(23418, 3, 2.2, 1, 'Essence of Suffering, Black Temple HPx3'),
-(23419, 2, 1.5, 1, 'Essence of Desire, Black Temple HPx2'),
-(23420, 3, 2.2, 1, 'Essence of Anger, Black Temple HPx3'),
-(22947, 3.5, 2.3, 1, 'Mother Shahraz, Black Temple HPx3.5'),
-(23426, 3.5, 2.3, 1, 'Illidari Council, Black Temple HPx3.5'),
-(22949, 3.5, 2.3, 1, 'Gathios, Black Temple HPx3.5'),
-(22950, 3.5, 2.3, 1, 'Zerevor, Black Temple HPx3.5'),
-(22951, 3.5, 2.3, 1, 'Malande, Black Temple HPx3.5'),
-(22952, 3.5, 2.3, 1, 'Veras, Black Temple HPx3.5'),
-(22917, 3.2, 2.3, 1, 'Illidan, Black Temple HPx3.2');