diff options
9 files changed, 25 insertions, 14 deletions
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql index d8f9ebd8534..1bb9000b492 100644 --- a/sql/scripts/world_script_texts.sql +++ b/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. diff --git a/sql/updates/10284_world_spell_script_names.sql b/sql/updates/10284_world_spell_script_names.sql index 08bc5a3826a..571fb59d3a5 100644 --- a/sql/updates/10284_world_spell_script_names.sql +++ b/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'); - diff --git a/sql/updates/10349_world_script_texts.sql b/sql/updates/10349_world_script_texts.sql new file mode 100644 index 00000000000..c3928860fe7 --- /dev/null +++ b/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; diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 35a45c51f5a..e2d5fae6473 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/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 { diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 6a88cd622ef..8aa281c70c9 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/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); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index bf81f6144d9..8b7e48aacab 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/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, diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 1915ac60f9e..3bada0a2a08 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/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 diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index e320d3aca3b..078c99caf72 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/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, diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index da62d0d724e..2be0277b541 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/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) |