Core/Scripts: Added enum for generic script texts, fixed one broken text

Scripts/Icecrown Citadel: Blood-Queen Lana'Thel will no longer spawn for Blood Princes intro if they were already killed

--HG--
branch : trunk

sql/scripts/world_script_texts.sql

@@ -36,8 +36,8 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (0,-1000001,'%s goes into a killing frenzy!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_FRENZY_KILL'),
    (0,-1000002,'%s goes into a frenzy!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_FRENZY'),
    (0,-1000003,'%s becomes enraged!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_ENRAGED'),
-   (0,-1000004,'goes into a berserker rage!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_BERSERK'),
-   (0,-1000005,'UNUSED',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE ME'),
+   (0,-1000004,'%s goes into a berserker rage!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_BERSERK'),
+   (0,-1000005,'%s goes into a berserker rage!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_GENERIC_BERSERK_RAID'),
 
 --
 -- Normal text entries. Say/Yell/Whisper/Emote for any regular world object.

sql/updates/10284_world_spell_script_names.sql

@@ -22,4 +22,3 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 (72087,'spell_valanar_kinetic_bomb_knockback'),
 (73001,'spell_blood_council_shadow_prison'),
 (72999,'spell_blood_council_shadow_prison_damage');
-

sql/updates/10349_world_script_texts.sql

@@ -0,0 +1,5 @@
+-- Fix broken string
+UPDATE `script_texts` SET `content_default`='%s goes into a berserker rage!' WHERE `entry`=-1000004;
+
+-- Reuse unused
+UPDATE `script_texts` SET `content_default`='%s goes into a berserker rage!',`type`=3,`comment`='EMOTE_GENERIC_BERSERK_RAID' WHERE `entry`=-1000005;

src/server/game/AI/CoreAI/UnitAI.h

@@ -27,6 +27,17 @@ class Unit;
 class Player;
 struct AISpellInfoType;
 
+// Default script texts
+enum GeneralScriptTexts
+{
+    DEFAULT_TEXT                = -1000000,
+    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
+    EMOTE_GENERIC_FRENZY        = -1000002,
+    EMOTE_GENERIC_ENRAGED       = -1000003,
+    EMOTE_GENERIC_BERSERK       = -1000004,
+    EMOTE_GENERIC_BERSERK_RAID  = -1000005, // RaidBossEmote version of the previous one
+};
+
 //Selection method used by SelectTarget
 enum SelectAggroTarget
 {

src/server/game/Scripting/ScriptMgr.h

@@ -66,7 +66,6 @@ struct ItemPrototype;
 struct OutdoorPvPData;
 
 #define VISIBLE_RANGE       (166.0f)                        //MAX visible range (size of grid)
-#define DEFAULT_TEXT        "<Trinity Script Text Entry Missing!>"
 
 // Generic scripting text function.
 void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL);

src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp

@@ -25,11 +25,6 @@ EndScriptData */
 
 #include "ScriptPCH.h"
 
-enum Yells
-{
-    EMOTE_GENERIC_FRENZY_KILL                              = -1000001
-};
-
 enum Spells
 {
     SPELL_GROUNDTREMOR                                     = 6524,

src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp

@@ -28,8 +28,6 @@ EndScriptData */
 
 enum eEnums
 {
-    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
-
     SPELL_REND                  = 16509,
     SPELL_BACKHAND              = 18103,
     SPELL_FRENZY                = 8269

src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp

@@ -27,8 +27,6 @@ EndScriptData */
 
 enum eEnums
 {
-    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
-
     SPELL_FLAMESTRIKE            = 18399,
     SPELL_BLAST_WAVE             = 16046,
     SPELL_FIRESHIELD             = 19626,

src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp

@@ -941,8 +941,14 @@ class npc_blood_queen_lana_thel : public CreatureScript
             void Reset()
             {
                 events.Reset();
-                me->SetVisibility(VISIBILITY_ON);
                 me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+                if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == DONE)
+                {
+                    me->SetVisibility(VISIBILITY_OFF);
+                    bIntroDone = true;
+                }
+                else
+                    me->SetVisibility(VISIBILITY_ON);
             }
 
             void MoveInLineOfSight(Unit* who)