diff options
| author | Aokromes <aokromes@trinitycore.contrib> | 2011-06-28 17:18:52 +0200 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-06-28 17:18:52 +0200 |
| commit | 275d2cac64533f2a0f409d30869dd51446ad30ff (patch) | |
| tree | 3b3b6aa2189767122de0294d7175286c5c8beefa | |
| parent | 86a48c1b63cc485bae31416c7f2de728b1ba20e6 (diff) | |
DB/Texts: Fix High Justice Grimstone's texts.
Original patch by sgpm
Closes #1850
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
| -rw-r--r-- | sql/scripts/world_script_texts.sql | 6 | ||||
| -rw-r--r-- | sql/updates/world/2011_06_28_00_world_script_texts.sql | 8 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp | 12 |
3 files changed, 20 insertions, 6 deletions
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql index c7cae645b83..82541c73f55 100644 --- a/sql/scripts/world_script_texts.sql +++ b/sql/scripts/world_script_texts.sql @@ -702,6 +702,12 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (9503,-1230000,'Ah, hits the spot!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'rocknot SAY_GOT_BEER'), (9019,-1230001,'Come to aid the Throne!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'dagran SAY_AGGRO'), (9019,-1230002,'Hail to the king, baby!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'dagran SAY_SLAY'), + (10096,-1230003,'You have been sentenced to death for crimes against the Dark Iron nation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT1'), + (10096,-1230004,'The Sons of Thaurissan shall watch you perish in the Ring of the Law!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT2'), + (10096,-1230005,'Unleash the fury and let it be done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT3'), + (10096,-1230006,'Haha! I bet you thought you were done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT4'), + (10096,-1230007,'But your real punishment lies ahead.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT5'), + (10096,-1230008,'Good riddance!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT6'), -- -1 249 000 ONYXIA'S LAIR (10184,-1249000,'How fortuitous. Usually, I must leave my lair to feed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'onyxia SAY_AGGRO'), diff --git a/sql/updates/world/2011_06_28_00_world_script_texts.sql b/sql/updates/world/2011_06_28_00_world_script_texts.sql new file mode 100644 index 00000000000..61e14a9c297 --- /dev/null +++ b/sql/updates/world/2011_06_28_00_world_script_texts.sql @@ -0,0 +1,8 @@ +DELETE FROM `script_texts` WHERE `npc_entry`=10096; +INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES +(10096,-1230003,'You have been sentenced to death for crimes against the Dark Iron nation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT1'), +(10096,-1230004,'The Sons of Thaurissan shall watch you perish in the Ring of the Law!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT2'), +(10096,-1230005,'Unleash the fury and let it be done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT3'), +(10096,-1230006,'Haha! I bet you thought you were done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT4'), +(10096,-1230007,'But your real punishment lies ahead.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT5'), +(10096,-1230008,'Good riddance!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'npc_grimstone SCRIPT_TEXT6'); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 9b891940376..78db15f0441 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -129,12 +129,12 @@ public: enum GrimstoneTexts { - SCRIPT_TEXT1 = -1000000, - SCRIPT_TEXT2 = -1000001, - SCRIPT_TEXT3 = -1000002, - SCRIPT_TEXT4 = -1000003, - SCRIPT_TEXT5 = -1000004, - SCRIPT_TEXT6 = -1000005 + SCRIPT_TEXT1 = -1230003, + SCRIPT_TEXT2 = -1230004, + SCRIPT_TEXT3 = -1230005, + SCRIPT_TEXT4 = -1230006, + SCRIPT_TEXT5 = -1230007, + SCRIPT_TEXT6 = -1230008 }; //TODO: implement quest part of event (different end boss) |