diff --git a/BlackcharCave/HillmenDefender(600637).sql b/BlackcharCave/HillmenDefender(600637).sql
index de5c1d2..3ef64e0 100644
--- a/BlackcharCave/HillmenDefender(600637).sql
+++ b/BlackcharCave/HillmenDefender(600637).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600637);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600637, 38101, 0, 0, 0, 0, 'Hillmen Defender', 'Delve', '', 0, 82, 82, 0, 128, 0, 1, 1.9048, 1, 1, 20, 1, 1, 0, 36.9, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 6, 72, 600637, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 38, 10, 1, 1, 0, 0, 1, 8388624, 0, 0, '', 11159);
+(600637, 38101, 0, 0, 0, 0, 'Hillmen Defender', 'Delve', '', 0, 82, 82, 0, 168, 0, 1, 1.9048, 1, 1, 20, 1, 1, 0, 36.9, 2000, 2000, 1, 1, 2, 32768, 2048, 0, 0, 0, 0, 0, 0, 6, 72, 600637, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 38, 10, 1, 1, 0, 0, 1, 8388624, 0, 0, '', 11159);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600637, 0, 2314, 1, 1, 12340),
diff --git a/BlackcharCave/Rock-OgreBrawler(600638).sql b/BlackcharCave/Rock-OgreBrawler(600638).sql
index 93c7996..893af8f 100644
--- a/BlackcharCave/Rock-OgreBrawler(600638).sql
+++ b/BlackcharCave/Rock-OgreBrawler(600638).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600638);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600638, 0, 0, 0, 0, 0, 'Rock-Ogre Brawler', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1.6, 1.19048, 1, 1, 20, 0.78, 1, 0, 36.9, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600638, 600638, 0, 0, 0, 180, 240, 'SmartAI', 1, 1, 38, 1, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
+(600638, 0, 0, 0, 0, 0, 'Rock-Ogre Brawler', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1.6, 1.19048, 1, 1, 20, 0.78, 1, 0, 36.9, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600638, 600638, 0, 0, 0, 180, 240, 'SmartAI', 1, 1, 38, 1, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
 
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
 (600638, 0, 19905, 1, 1, 12340);
diff --git a/BlackcharCave/Rock-OgreFlesheater(600639).sql b/BlackcharCave/Rock-OgreFlesheater(600639).sql
index 5b0a340..120ca3e 100644
--- a/BlackcharCave/Rock-OgreFlesheater(600639).sql
+++ b/BlackcharCave/Rock-OgreFlesheater(600639).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600639);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600639, 0, 0, 0, 0, 0, 'Rock-Ogre Flesheater', 'Delve', NULL, 0, 83, 83, 0, 28, 0, 1, 1.14286, 1, 1, 18, 0.78, 1, 0, 34.3, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600639, 600639, 0, 0, 0, 8, 58, 'SmartAI', 1, 1, 75, 1, 1, 1, 0, 0, 1, 528, 0, 0, '', 12340);
+(600639, 0, 0, 0, 0, 0, 'Rock-Ogre Flesheater', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1, 1.14286, 1, 1, 18, 0.78, 1, 0, 34.3, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600639, 600639, 0, 0, 0, 8, 58, 'SmartAI', 1, 1, 75, 1, 1, 1, 0, 0, 1, 528, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600639);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/BlackcharCave/Rock-OgreHurler(600640).sql b/BlackcharCave/Rock-OgreHurler(600640).sql
index 98d1d63..e56724d 100644
--- a/BlackcharCave/Rock-OgreHurler(600640).sql
+++ b/BlackcharCave/Rock-OgreHurler(600640).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600640);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600640, 0, 0, 0, 0, 0, 'Rock-Ogre Hurler', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1.6, 1.14286, 1, 1, 20, 0.78, 1, 0, 7.5, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600640, 600640, 0, 0, 0, 176, 235, 'SmartAI', 1, 1, 40, 10, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
+(600640, 0, 0, 0, 0, 0, 'Rock-Ogre Hurler', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1.6, 1.14286, 1, 1, 20, 0.78, 1, 0, 7.5, 2000, 2000, 1, 1, 8, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600640, 600640, 0, 0, 0, 176, 235, 'SmartAI', 1, 1, 40, 10, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600640);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/BlackcharCave/Rock-OgreLobber(600641).sql b/BlackcharCave/Rock-OgreLobber(600641).sql
index 4ca4d16..f31203d 100644
--- a/BlackcharCave/Rock-OgreLobber(600641).sql
+++ b/BlackcharCave/Rock-OgreLobber(600641).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600641);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600641, 0, 0, 0, 0, 0, 'Rock-Ogre Lobber', 'Delve', '', 0, 83, 83, 0, 28, 0, 3.2, 1.71429, 1, 1, 20, 0.78, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 20, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 9767);
+(600641, 0, 0, 0, 0, 0, 'Rock-Ogre Lobber', 'Delve', '', 0, 83, 83, 0, 168, 0, 3.2, 1.71429, 1, 1, 20, 0.78, 1, 0, 7.5, 2000, 2000, 1, 1, 2, 32832, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 1, 20, 10, 1, 1, 0, 0, 1, 0, 0, 0, '', 9767);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600641);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
diff --git a/BlackcharCave/Rock-OgreWildarm(600642).sql b/BlackcharCave/Rock-OgreWildarm(600642).sql
index e40ca7a..d279ca1 100644
--- a/BlackcharCave/Rock-OgreWildarm(600642).sql
+++ b/BlackcharCave/Rock-OgreWildarm(600642).sql
@@ -1,6 +1,6 @@
 DELETE FROM `creature_template` WHERE (`entry` = 600642);
 INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES
-(600642, 0, 0, 0, 19991, 0, 'Rock-Ogre Wildarm', 'Delve', NULL, 0, 83, 83, 0, 128, 0, 1.1, 1.14286, 1, 1, 20, 0.78, 1, 0, 31.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600642, 600642, 0, 0, 0, 180, 240, 'SmartAI', 1, 1, 60, 1, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
+(600642, 0, 0, 0, 19991, 0, 'Rock-Ogre Wildarm', 'Delve', NULL, 0, 83, 83, 0, 168, 0, 1.1, 1.14286, 1, 1, 20, 0.78, 1, 0, 31.5, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 600642, 600642, 0, 0, 0, 180, 240, 'SmartAI', 1, 1, 60, 1, 1, 1, 0, 51, 1, 0, 0, 0, '', 12340);
 
 DELETE FROM `creature_template_model` WHERE (`CreatureID` = 600642);
 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES