diff options
| -rw-r--r-- | sql/FULL/world_script_texts.sql | 26 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_emeriss.cpp | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_taerar.cpp | 4 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_ysondre.cpp | 4 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npcs_special.cpp | 4 |
5 files changed, 21 insertions, 19 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index 4ec42b91731..6bd56798a6a 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -107,16 +107,16 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (20129,-1000161,'Magnitude set. Release.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11346,1,0,0,'doomwalker SAY_EARTHQUAKE_2'), (20129,-1000162,'Trajectory locked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11347,1,0,0,'doomwalker SAY_OVERRUN_1'), (20129,-1000163,'Engage maximum speed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11348,1,0,0,'doomwalker SAY_OVERRUN_2'), - (0,-1000164,'Threat level zero.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11349,1,0,0,'doomwalker SAY_SLAY_1'), - (0,-1000165,'Directive accomplished.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11350,1,0,0,'doomwalker SAY_SLAY_2'), - (0,-1000166,'Target exterminated.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11351,1,0,0,'doomwalker SAY_SLAY_3'), - (0,-1000167,'System failure in five,f-o-u-r...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11352,1,0,0,'doomwalker SAY_DEATH'), - (0,-1000168,'Who dares awaken Aquementas?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'aquementas AGGRO_YELL_AQUE'), - (0,-1000169,'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_1'), - (0,-1000170,'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_2'), - (0,-1000171,'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_3'), - (0,-1000172,'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_4'), - (0,-1000173,'NOOOOooooooo!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_INTERRUPT'), + (12429,-1000164,'Threat level zero.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11349,1,0,0,'doomwalker SAY_SLAY_1'), + (12429,-1000165,'Directive accomplished.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11350,1,0,0,'doomwalker SAY_SLAY_2'), + (12429,-1000166,'Target exterminated.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11351,1,0,0,'doomwalker SAY_SLAY_3'), + (12429,-1000167,'System failure in five,f-o-u-r...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11352,1,0,0,'doomwalker SAY_DEATH'), + (12429,-1000168,'Who dares awaken Aquementas?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'aquementas AGGRO_YELL_AQUE'), + (12429,-1000169,'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_1'), + (12429,-1000170,'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_2'), + (12429,-1000171,'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_3'), + (12429,-1000172,'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_4'), + (12429,-1000173,'NOOOOooooooo!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'nether_drake SAY_NIHIL_INTERRUPT'), (21469,-1000174,'Good $N,you are under the spell\'s influence. I must analyze it quickly,then we can talk.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,0,'daranelle SAY_SPELL_INFLUENCE'), (0,-1000175,'Thank you,mortal.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,11,0,' SAY_JUST_EATEN'), (0,-1000176,'The last thing I remember is the ship falling and us getting into the pods. I\'ll go see how I can help. Thank you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,0,'draenei_survivor SAY_HEAL1'), @@ -346,7 +346,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (5955,-1000398,'And try not to get lost this time...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'tooga SAY_TORT_POST_6'), (20021,-1000399,'Peace is but a fleeting dream! Let the NIGHTMARE reign!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'taerar SAY_AGGRO'), (20021,-1000400,'Children of Madness - I release you upon this world!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'taerar SAY_SUMMONSHADE'), - (0,-1000401,'Hope is a DISEASE of the soul! This land shall wither and die!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'emeriss SAY_AGGRO'), + (14889,-1000401,'Hope is a DISEASE of the soul! This land shall wither and die!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'emeriss SAY_AGGRO'), (6182,-1000402,'Taste your world\'s corruption!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'emeriss SAY_CASTCORRUPTION'), (6182,-1000403,'Rin\'ji is free!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'SAY_RIN_FREE'), (6182,-1000404,'Attack my sisters! The troll must not escape!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'SAY_RIN_BY_OUTRUNNER'), @@ -462,9 +462,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (0,-1070001,'Taste blade,mongrel!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'SAY_GUARD_SIL_AGGRO1'), (0,-1070002,'Please tell me that you didn\'t just do what I think you just did. Please tell me that I\'m not going to have to hurt you...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'SAY_GUARD_SIL_AGGRO2'), (0,-1070003,'As if we don\'t have enough problems,you go and create more!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'SAY_GUARD_SIL_AGGRO3'), - (0,-1070004,'looks up at you quizzically. Maybe you should inspect it?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_A_HELLO'), + (620,-1070004,'looks up at you quizzically. Maybe you should inspect it?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_A_HELLO'), (0,-1070005,'looks at you unexpectadly.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_H_HELLO'), - (0,-1070006,'starts pecking at the feed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_CLUCK_TEXT2'); + (620,-1070006,'starts pecking at the feed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_CLUCK_TEXT2'); -- -1 090 000 GNOMEREGAN diff --git a/src/bindings/scripts/scripts/world/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp index 6733266ce11..f9d8b21e2f3 100644 --- a/src/bindings/scripts/scripts/world/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/world/boss_emeriss.cpp @@ -26,7 +26,7 @@ EndScriptData */ enum { SAY_AGGRO = -1000401, - SAY_CASTCORRUPTION = -1000402, + SAY_CASTCORRUPTION = -1000402, //signed for 6182 SPELL_SLEEP = 24777, SPELL_NOXIOUSBREATH = 24818, diff --git a/src/bindings/scripts/scripts/world/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp index 62c1a5ab63b..9fda71645aa 100644 --- a/src/bindings/scripts/scripts/world/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp @@ -25,8 +25,8 @@ EndScriptData */ enum { - SAY_AGGRO = -1000399, - SAY_SUMMONSHADE = -1000400, + SAY_AGGRO = -1000399, //signed for 20021 + SAY_SUMMONSHADE = -1000400, //signed for 20021 //Spells of Taerar SPELL_SLEEP = 24777, diff --git a/src/bindings/scripts/scripts/world/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp index 1b93f54c047..87cd23ac24f 100644 --- a/src/bindings/scripts/scripts/world/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/world/boss_ysondre.cpp @@ -25,8 +25,8 @@ EndScriptData */ enum { - SAY_AGGRO = -1000360, - SAY_SUMMONDRUIDS = -1000361, + SAY_AGGRO = -1000360, //signed for 17969 + SAY_SUMMONDRUIDS = -1000361, //signed for 17969 SPELL_SLEEP = 24777, SPELL_NOXIOUSBREATH = 24818, diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 8c6d6eee169..37654122f9d 100644 --- a/src/bindings/scripts/scripts/world/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp @@ -415,6 +415,7 @@ CreatureAI* GetAI_npc_dancing_flames(Creature* pCreature) ## Triage quest ######*/ +//signed for 9623 #define SAY_DOC1 -1000201 #define SAY_DOC2 -1000202 #define SAY_DOC3 -1000203 @@ -819,6 +820,7 @@ enum ENTRY_KORJA = 12430, ENTRY_DG_KEL = 12428, + //used by 12429,12423,12427,12430,12428, but signed for 12429 SAY_COMMON_HEALED = -1000164, SAY_DG_KEL_THANKS = -1000165, SAY_DG_KEL_GOODBYE = -1000166, @@ -829,7 +831,7 @@ enum SAY_DOLF_THANKS = -1000171, SAY_DOLF_GOODBYE = -1000172, SAY_SHAYA_THANKS = -1000173, - SAY_SHAYA_GOODBYE = -1000174, + SAY_SHAYA_GOODBYE = -1000174, //signed for 21469 }; struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI |