DB/Creature:

- Nuke the hacky column DeathState.
- Removed some hacks from Kologarn script, including some cleanup.
- Removed set deathstate command.

BIG thanks to Malcrom for replacing all creatures that had deathstate with proper dynamicflags/auras.

3 files changed, 5 insertions, 2 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 036937cf1e9..03d6572bff3 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -562,7 +562,6 @@ INSERT INTO `command` VALUES
 ('npc move',2,'Syntax: .npc move [#creature_guid]\r\n\r\nMove the targeted creature spawn point to your coordinates.'),
 ('npc playemote',3,'Syntax: .npc playemote #emoteid\r\n\r\nMake the selected creature emote with an emote of id #emoteid.'),
 ('npc say',1,'Syntax: .npc say $message\nMake selected creature say specified message.'),
-('npc set deathstate',2,'Syntax: .npc set deathstate on/off\r\n\r\nSet default death state (dead/alive) for npc at spawn.'),
 ('npc set link',2,'Syntax: .npc set link $creatureGUID\r\n\r\nLinks respawn of selected creature to the condition that $creatureGUID defined is alive.'),
 ('npc set model',2,'Syntax: .npc set model #displayid\r\n\r\nChange the model id of the selected creature to #displayid.'),
 ('npc set movetype',2,'Syntax: .npc set movetype [#creature_guid] stay/random/way [NODEL]\r\n\r\nSet for creature pointed by #creature_guid (or selected if #creature_guid not provided) movement type and move it to respawn position (if creature alive). Any existing waypoints for creature will be removed from the database if you do not use NODEL. If the creature is dead then movement type will applied at creature respawn.\r\nMake sure you use NODEL, if you want to keep the waypoints.'),
@@ -822,7 +821,6 @@ CREATE TABLE `creature` (
   `currentwaypoint` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `curhealth` int(10) unsigned NOT NULL DEFAULT '1',
   `curmana` int(10) unsigned NOT NULL DEFAULT '0',
-  `DeathState` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MovementType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `npcflag` int(10) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/world/2011_06_27_06_world_command.sql b/sql/updates/world/2011_06_27_06_world_command.sql
new file mode 100644
index 00000000000..7b3f1e5765f
--- /dev/null
+++ b/sql/updates/world/2011_06_27_06_world_command.sql
@@ -0,0 +1 @@
+DELETE FROM `command` WHERE `name`= 'npc set deathstate';
diff --git a/sql/updates/world/2011_06_27_06_world_creature.sql b/sql/updates/world/2011_06_27_06_world_creature.sql
new file mode 100644
index 00000000000..e4e6d3c98ce
--- /dev/null
+++ b/sql/updates/world/2011_06_27_06_world_creature.sql
@@ -0,0 +1,4 @@
+-- Drop DeathState column
+ALTER TABLE `creature` DROP COLUMN `DeathState`;
+-- Remove spawns for Kologarn (not boss) and Focused Eyebeam (summoned).
+DELETE FROM `creature` WHERE `id` IN (34297,33632,33802);