Scripts/Texts:

* fix script texts in various locations (thanks TerrorBringer for the heads up). Closes issue #2055. Closes issue #3087.
* cleanup world_script_texts.sql file (remove spaces, order entries)
Scripts/Misc:
* remove obsolete random seed initialization from scripts
* fix some warnings in scripts
* some cleanup in chat_log.cpp

--HG--
branch : trunk
This commit is contained in:
azazel
2010-09-05 02:16:58 +06:00
parent 0f997162ee
commit f500ef201b
18 changed files with 455 additions and 353 deletions
@@ -113,7 +113,7 @@ public:
uint32 HellfireTimer;
uint32 CleanupTimer;
uint32 malchezaar;
uint64 malchezaar;
InfernalPoint *point;
void Reset() {}
@@ -34,7 +34,10 @@ EndContentData */
######*/
// signed for 6172
#define SAY_HEAL -1100280
enum eNarmFaulkData
{
SAY_HEAL = -1000187,
};
class npc_narm_faulk : public CreatureScript
{
@@ -32,8 +32,10 @@ EndContentData */
/*######
## npc_henze_faulk
######*/
#define SAY_HEAL -1100280
enum eHenzeFaulkData
{
SAY_HEAL = -1000187,
};
class npc_henze_faulk : public CreatureScript
{
@@ -66,7 +68,6 @@ public:
void MoveInLineOfSight(Unit * /*who*/)
{
return;
}
void UpdateAI(const uint32 diff)
@@ -32,12 +32,14 @@ EndContentData */
/*#######
# npc_blood_knight_stillblade
#######*/
enum eStillbladeData
{
SAY_HEAL = -1000193,
#define SAY_HEAL -1000334
#define QUEST_REDEEMING_THE_DEAD 9685
#define SPELL_SHIMMERING_VESSEL 31225
#define SPELL_REVIVE_SELF 32343
QUEST_REDEEMING_THE_DEAD = 9685,
SPELL_SHIMMERING_VESSEL = 31225,
SPELL_REVIVE_SELF = 32343,
};
class npc_blood_knight_stillblade : public CreatureScript
{
@@ -282,13 +282,13 @@ enum eTruuen
QUEST_TOMB_LIGHTBRINGER = 9446,
SAY_WP_0 = -1999981, //Beware! We are attacked!
SAY_WP_1 = -1999982, //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!
SAY_WP_2 = -1999983, //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now...
SAY_WP_3 = -1999984, //Be welcome, friends!
SAY_WP_4 = -1999985, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart.
SAY_WP_5 = -1999986, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire.
SAY_WP_6 = -1999987 //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here.
SAY_WP_0 = -1800064, //Beware! We are attacked!
SAY_WP_1 = -1800065, //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!
SAY_WP_2 = -1800066, //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now...
SAY_WP_3 = -1800067, //Be welcome, friends!
SAY_WP_4 = -1800068, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart.
SAY_WP_5 = -1800069, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire.
SAY_WP_6 = -1800070 //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here.
};
class npc_anchorite_truuen : public CreatureScript