diff options
| -rw-r--r-- | sql/scripts/world_script_texts.sql | 6 | ||||
| -rw-r--r-- | sql/updates/10258_world_script_texts.sql | 7 | ||||
| -rw-r--r-- | sql/updates/10282_world_script_texts.sql | 14 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/eversong_woods.cpp | 77 |
4 files changed, 59 insertions, 45 deletions
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql index 5e7fb2e9651..4fc024299f8 100644 --- a/sql/scripts/world_script_texts.sql +++ b/sql/scripts/world_script_texts.sql @@ -486,7 +486,11 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (0,-1000634,'Our Bloodmyst scouts have located our contact. The fool, Velen, will soon leave himself open and defenseless -- long enough for us to strike! Now get out of my sight before I vaporize you...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'geezle - SPARK_SAY_6'), (0,-1000635,'Yes, sir. It won''t happen again...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'geezle - GEEZLE_SAY_7'), (0,-1000636,'picks up the naga flag.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'geezle - EMOTE_SPARK'), - + (17807,-1000637,'Let the trial begin, Bloodwrath, attack!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'npc_second_trial_controller TEXT_SECOND_TRIAL_1'), + (17807,-1000638,'Champion Lightrend, make me proud!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'npc_second_trial_controller TEXT_SECOND_TRIAL_2'), + (17807,-1000639,'Show this upstart how a real Blood Knight fights, Swiftblade!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'npc_second_trial_controller TEXT_SECOND_TRIAL_3'), + (17807,-1000640,'Show $n the meaning of pain, Sunstriker!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'npc_second_trial_controller TEXT_SECOND_TRIAL_4'), + (26588,-1800001,'Um... I think one of those wolves is back...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'12027'), (26588,-1800002,'He''s going for Mr. Floppy! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'12027'), (26588,-1800003,'Oh, no! Look, it''s another wolf, and it''s a biiiiiig one!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'12027'), diff --git a/sql/updates/10258_world_script_texts.sql b/sql/updates/10258_world_script_texts.sql deleted file mode 100644 index 6dbfae2a133..00000000000 --- a/sql/updates/10258_world_script_texts.sql +++ /dev/null @@ -1,7 +0,0 @@ -UPDATE `script_texts` SET `language`=0 WHERE `entry`='-1000600'; -DELETE FROM `script_texts` WHERE `entry` IN (-1619006,-1575021,-1619015,1619016); -INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `comment`) VALUES -(26668,-1575021,'Another soul for my master.','Svala Sorrowgrave SAY_SLAY_3'), -(29310,-1619006,'You are unworthy!','Jedoga Shadowseeker SAY_SLAY_2'), -(29309,-1619015,'Sleep now, in the cold dark.','Elder Nadox SAY_SLAY_1'), -(29309,-1619016,'For the Lich King!','Elder Nadox SAY_SLAY_2'); diff --git a/sql/updates/10282_world_script_texts.sql b/sql/updates/10282_world_script_texts.sql new file mode 100644 index 00000000000..b821dad26dc --- /dev/null +++ b/sql/updates/10282_world_script_texts.sql @@ -0,0 +1,14 @@ +UPDATE `script_texts` SET `language`=0 WHERE `entry`='-1000600'; +DELETE FROM `script_texts` WHERE `entry` IN (-1619006,-1575021,-1619015,-1619016); +INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `comment`) VALUES +(26668,-1575021,'Another soul for my master.','Svala Sorrowgrave SAY_SLAY_3'), +(29310,-1619006,'You are unworthy!','Jedoga Shadowseeker SAY_SLAY_2'), +(29309,-1619015,'Sleep now, in the cold dark.','Elder Nadox SAY_SLAY_1'), +(29309,-1619016,'For the Lich King!','Elder Nadox SAY_SLAY_2'); + +DELETE FROM `script_texts` WHERE `entry` IN (-1000637,-1000638,-1000639,-1000640); +INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `comment`) VALUES +('17807', '-1000637', 'Let the trial begin, Bloodwrath, attack!', 'npc_second_trial_controller TEXT_SECOND_TRIAL_1'), +('17807', '-1000638', 'Champion Lightrend, make me proud!', 'npc_second_trial_controller TEXT_SECOND_TRIAL_2'), +('17807', '-1000639', 'Show this upstart how a real Blood Knight fights, Swiftblade!', 'npc_second_trial_controller TEXT_SECOND_TRIAL_3'), +('17807', '-1000640', 'Show $n the meaning of pain, Sunstriker!', 'npc_second_trial_controller TEXT_SECOND_TRIAL_4'); diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 99096fb2355..da31cec2bf7 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -126,39 +126,42 @@ public: ## Quest 9686 Second Trial ######*/ -#define QUEST_SECOND_TRIAL 9686 - -#define MASTER_KELERUN_BLOODMOURN 17807 - -#define CHAMPION_BLOODWRATH 17809 -#define CHAMPION_LIGHTREND 17810 -#define CHAMPION_SWIFTBLADE 17811 -#define CHAMPION_SUNSTRIKER 17812 - -#define HARBINGER_OF_THE_SECOND_TRIAL 182052 - -#define SPELL_FLASH_OF_LIGHT 19939 -#define TIMER_FLASH_OF_LIGHT 3225 - -#define SPELL_SEAL_OF_JUSTICE 20164 -#define TIMER_SEAL_OF_JUSTICE 10000 - -#define SPELL_JUDGEMENT_OF_LIGHT 20271 -#define TIMER_JUDGEMENT_OF_LIGHT 10000 +enum SeconTrial +{ + QUEST_SECOND_TRIAL = 9686, + OFFSET_NEXT_ATTACK = 750, +}; -#define SPELL_SEAL_OF_COMMAND 20375 -#define TIMER_SEAL_OF_COMMAND 20000 +enum eSpells +{ + SPELL_FLASH_OF_LIGHT = 19939, + SPELL_SEAL_OF_JUSTICE = 20164, + SPELL_JUDGEMENT_OF_LIGHT = 20271, + SPELL_SEAL_OF_COMMAND = 20375, +}; -#define OFFSET_NEXT_ATTACK 750 +enum eNpc +{ + MASTER_KELERUN_BLOODMOURN = 17807, + CHAMPION_BLOODWRATH = 17809, + CHAMPION_LIGHTREND = 17810, + CHAMPION_SWIFTBLADE = 17811, + CHAMPION_SUNSTRIKER = 17812, +}; -#define FACTION_HOSTILE 45 -#define FACTION_FRIENDLY 7 +enum eFaction +{ + FACTION_HOSTILE = 45, + FACTION_FRIENDLY = 7, +}; -// missing from db -#define TEXT_SECOND_TRIAL_1 -1645006 -#define TEXT_SECOND_TRIAL_2 -1645007 -#define TEXT_SECOND_TRIAL_3 -1645008 -#define TEXT_SECOND_TRIAL_4 -1645009 +enum eSays +{ + TEXT_SECOND_TRIAL_1 = -1000637, + TEXT_SECOND_TRIAL_2 = -1000638, + TEXT_SECOND_TRIAL_3 = -1000639, + TEXT_SECOND_TRIAL_4 = -1000640, +}; struct Locations { @@ -191,7 +194,7 @@ public: struct npc_secondTrialAI : public ScriptedAI { - npc_secondTrialAI(Creature *c) : ScriptedAI(c) {} + npc_secondTrialAI(Creature* pCreature) : ScriptedAI(pCreature) {} uint32 timer; uint8 questPhase; @@ -226,7 +229,7 @@ public: { case CHAMPION_BLOODWRATH: spellFlashLight = true; - timerFlashLight = TIMER_FLASH_OF_LIGHT; + timerFlashLight = 3225; break; case CHAMPION_LIGHTREND: spellJustice = true; @@ -240,7 +243,7 @@ public: spellFlashLight = true; spellJudLight = false; // Misses Script Effect // http://www.wowhead.com/?spell=20271 spellCommand = false; // Misses Dummy // http://www.wowhead.com/?spell=20375 - timerFlashLight = TIMER_FLASH_OF_LIGHT; + timerFlashLight = 3225; timerJudLight = 500; timerCommand = 1500; break; @@ -278,7 +281,7 @@ public: if (timerFlashLight <= diff) { DoCast(me, SPELL_FLASH_OF_LIGHT); - timerFlashLight = TIMER_FLASH_OF_LIGHT + rand()%TIMER_FLASH_OF_LIGHT; + timerFlashLight = 3225 + rand()%3225; } else timerFlashLight -= diff; @@ -289,7 +292,7 @@ public: if (timerJustice <= diff) { DoCast(me, SPELL_SEAL_OF_JUSTICE); - timerJustice = TIMER_SEAL_OF_JUSTICE + rand()%TIMER_SEAL_OF_JUSTICE; + timerJustice = 10000 + rand()%10000; } else timerJustice -= diff; @@ -300,7 +303,7 @@ public: if (timerJudLight <= diff) { DoCast(me, SPELL_JUDGEMENT_OF_LIGHT); - timerJudLight = TIMER_JUDGEMENT_OF_LIGHT + rand()%TIMER_JUDGEMENT_OF_LIGHT; + timerJudLight = 10000 + rand()%10000; } else timerJudLight -= diff; @@ -310,8 +313,8 @@ public: { if (timerCommand <= diff) { - DoCast(me, TIMER_SEAL_OF_COMMAND); - timerCommand = TIMER_SEAL_OF_COMMAND + rand()%TIMER_SEAL_OF_COMMAND; + DoCast(me, SPELL_SEAL_OF_COMMAND); + timerCommand = 20000 + rand()%20000; } else timerCommand -= diff; |