josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4806 from Venugh/texts

Browse Source 
DB/SQL: Fixed my typo from previous Commit.
This commit is contained in:
Nay
2012-01-13 17:08:21 -08:00
parent 4479c7285b ab923f7157
commit 1371bd8919
4 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_01_13_04_world_creature_texts.sql
+9 -9
View File
@@ -3,16 +3,16 @@ DELETE FROM `script_texts` WHERE `entry` IN (-1552010, -1552022);
-- Add new creature_text for Millhouse ManaStorm
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(20977, 0, 0, 'Where in Bonzo\'\'s brass buttons am I? And who are-- yaaghh, that\'\'s one mother of a headache!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 1, 0, '"Lowly"? I don\'\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as "Lowly"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 0, 0, 'Where in Bonzo\'\'s brass buttons am I? And who are-- yaaghh, that\'s one mother of a headache!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 1, 0, '"Lowly"? I don\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as "Lowly"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 2, 0, 'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 3, 0, 'Fantastic! Next, some protective spells. Yes! Now we\'\'re cookin\'\'', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 4, 0, 'And of course i\'\'ll need some mana. You guys are gonna love this, just wait.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 3, 0, 'Fantastic! Next, some protective spells. Yes! Now we\'re cookin\'', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 4, 0, 'And of course i\'ll need some mana. You guys are gonna love this, just wait.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 5, 0, 'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 6, 0, 'I didn\'\'t even break a sweat on that one.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 6, 0, 'I didn\'t even break a sweat on that one.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 6, 1, 'You guys, feel free to jump in anytime.', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 7, 0, 'I\'\'m gonna light you up, sweet cheeks!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 7, 0, 'I\'m gonna light you up, sweet cheeks!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 8, 0, 'Ice, ice, baby!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 9, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I\'\'m dying!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 10, 0, 'You\'\'ll be hearing from my lawyer...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 11, 0, 'Who\'\'s bad? Who\'\'s bad? That\'\'s right: we bad!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm');
(20977, 9, 0, 'Heal me! Oh, for the love of all that is holy, HEAL me! I\'m dying!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 10, 0, 'You\'ll be hearing from my lawyer...', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm'),
(20977, 11, 0, 'Who\'s bad? Who\'s bad? That\'s right: we bad!', 0, 0, 100, 0, 0, 0, 'Millhouse Manastorm');
sql/updates/world/2012_01_13_05_world_creature_texts.sql
+5 -4
View File
@@ -2,12 +2,13 @@
DELETE FROM `script_texts` WHERE `entry` IN (-1552023, -1552030);
-- Add new creature_text for Warden Mellichar
(20904, 0, 0, 'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'\'thas did not send you! Good... I\'\'ll just tell the prince you released the prisoners!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(20904, 0, 0, 'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'thas did not send you! Good... I\'ll just tell the prince you released the prisoners!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 1, 0, 'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 2, 0, 'Yes, yes... another! Your will is mine!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 3, 0, 'Behold another terrifying creature of incomprehensible power!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 4, 0, 'What is this? A lowly gnome? I will do better, O\'\'great one.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 4, 0, 'What is this? A lowly gnome? I will do better, O\'great one.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 5, 0, 'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 6, 0, 'One final cell remains. Yes, O\'\'great one, right away!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 7, 0, 'Welcome, O\'\'great one. I am your humble servant.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar');
(20904, 6, 0, 'One final cell remains. Yes, O\'great one, right away!', 0, 0, 100, 0, 0, 0, 'Warden Mellichar'),
(20904, 7, 0, 'Welcome, O\'great one. I am your humble servant.', 0, 0, 100, 0, 0, 0, 'Warden Mellichar');
sql/updates/world/2012_01_13_06_world_creature_text.sql
+10
View File
@@ -0,0 +1,10 @@
-- Remove old script text for npc_torek
DELETE FROM `script_texts` WHERE `entry` IN (-1000106, -1000110);
-- Add creature texts for Torek
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(12858, 0, 0, 'Everyone ready?', 0, 0, 100, 0, 0, 0, 'Torek'),
(12858, 1, 0, 'Ok, Lets move out!', 0, 0, 100, 0, 0, 0, 'Torek'),
(12858, 2, 0, 'Prepare yourselves. Silverwing is just around the bend.', 0, 0, 100, 0, 0, 0, 'Torek'),
(12858, 3, 0, 'Silverwing is ours!', 0, 0, 100, 0, 0, 0, 'Torek'),
(12858, 4, 0, 'Go report that the outpost is taken. We will remain here.', 0, 0, 100, 0, 0, 0, 'Torek');
src/server/scripts/Kalimdor/ashenvale.cpp
+27 -19
View File
@@ -35,34 +35,42 @@ EndContentData */
# npc_torek
####*/
#define SAY_READY -1000106
#define SAY_MOVE -1000107
#define SAY_PREPARE -1000108
#define SAY_WIN -1000109
#define SAY_END -1000110
enum TorekSays
{
SAY_READY = 0,
SAY_MOVE = 1,
SAY_PREPARE = 2,
SAY_WIN = 3,
SAY_END = 4,
};
#define SPELL_REND 11977
#define SPELL_THUNDERCLAP 8078
enum TorekSpells
{
SPELL_REND = 11977,
SPELL_THUNDERCLAP = 8078,
};
#define QUEST_TOREK_ASSULT 6544
enum
{
QUEST_TOREK_ASSULT = 6544,
#define ENTRY_SPLINTERTREE_RAIDER 12859
#define ENTRY_DURIEL 12860
#define ENTRY_SILVERWING_SENTINEL 12896
#define ENTRY_SILVERWING_WARRIOR 12897
ENTRY_SPLINTERTREE_RAIDER = 12859,
ENTRY_DURIEL = 12860,
ENTRY_SILVERWING_SENTINEL = 12896,
ENTRY_SILVERWING_WARRIOR = 12897,
};
class npc_torek : public CreatureScript
{
public:
npc_torek()
: CreatureScript("npc_torek")
npc_torek() : CreatureScript("npc_torek")
{
}
struct npc_torekAI : public npc_escortAI
{
npc_torekAI(Creature* c) : npc_escortAI(c) {}
npc_torekAI(Creature* creature) : npc_escortAI(creature) {}
uint32 Rend_Timer;
uint32 Thunderclap_Timer;
@@ -78,10 +86,10 @@ class npc_torek : public CreatureScript
switch (i)
{
case 1:
DoScriptText(SAY_MOVE, me, player);
Talk(SAY_MOVE, player->GetGUID());
break;
case 8:
DoScriptText(SAY_PREPARE, me, player);
Talk(SAY_PREPARE, player->GetGUID());
break;
case 19:
//TODO: verify location and creatures amount.
@@ -96,7 +104,7 @@ class npc_torek : public CreatureScript
player->GroupEventHappens(QUEST_TOREK_ASSULT, me);
break;
case 21:
DoScriptText(SAY_END, me, player);
Talk(SAY_END, player->GetGUID());
break;
}
}
@@ -148,7 +156,7 @@ class npc_torek : public CreatureScript
if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
{
//TODO: find companions, make them follow Torek, at any time (possibly done by core/database in future?)
DoScriptText(SAY_READY, creature, player);
creature->AI()->Talk(SAY_READY, player->GetGUID());
creature->setFaction(113);
if (npc_escortAI* pEscortAI = CAST_AI(npc_torekAI, creature->AI()))