diff options
| -rw-r--r-- | sql/updates/world/2011_10_24_01_world_creature_text.sql | 9 | ||||
| -rw-r--r-- | src/server/scripts/Outland/nagrand.cpp | 38 |
2 files changed, 26 insertions, 21 deletions
diff --git a/sql/updates/world/2011_10_24_01_world_creature_text.sql b/sql/updates/world/2011_10_24_01_world_creature_text.sql new file mode 100644 index 00000000000..a8d4a2f80db --- /dev/null +++ b/sql/updates/world/2011_10_24_01_world_creature_text.sql @@ -0,0 +1,9 @@ +-- Mag'har Prisoner +SET @ENTRY := 18428; +DELETE FROM `creature_text` WHERE `entry`=@ENTRY; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@ENTRY,0,0,"Death to the ogres!",12,0,100,0,0,0,"Mag'har Prisoner"), +(@ENTRY,0,1,"Many thanks, hero!",12,0,100,0,0,0,"Mag'har Prisoner"), +(@ENTRY,0,2,"One day, a hero will rise and lift the orcs up to their former glory.",12,0,100,0,0,0,"Mag'har Prisoner"), +(@ENTRY,0,3,"Spirits watch over you, $r!",12,0,100,0,0,0,"Mag'har Prisoner"), +(@ENTRY,0,4,"Thank you, $r! Your service to the Mag'har will not be forgotten.",12,0,100,0,0,0,"Mag'har Prisoner"); diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 726edb5efb2..c556253ecf1 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -670,37 +670,33 @@ enum FindingTheSurvivorsData QUEST_FINDING_THE_SURVIVORS = 9948, NPC_MAGHAR_PRISONER = 18428, - SAY_FREE_0 = 0, - SAY_FREE_1 = 1, - SAY_FREE_2 = 2, - SAY_FREE_3 = 3, - SAY_FREE_4 = 4, + SAY_FREE = 0, }; class go_warmaul_prison : public GameObjectScript { -public: - go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } + public: + go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) - { - if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) - return false; - - if (Creature* prisoner = go->FindNearestCreature(NPC_MAGHAR_PRISONER, 1.0f)) + bool OnGossipHello(Player* player, GameObject* go) { - if (prisoner) + if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) + return false; + + if (Creature* prisoner = go->FindNearestCreature(NPC_MAGHAR_PRISONER, 5.0f)) { - go->UseDoorOrButton(); - if (player) - player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0); + if (prisoner) + { + go->UseDoorOrButton(); + if (player) + player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0); - prisoner->AI()->Talk(RAND(SAY_FREE_0, SAY_FREE_1, SAY_FREE_2, SAY_FREE_3, SAY_FREE_4), player->GetGUID()); - prisoner->ForcedDespawn(6000); + prisoner->AI()->Talk(SAY_FREE, player->GetGUID()); + prisoner->ForcedDespawn(6000); + } } + return true; } - return true; - } }; void AddSC_nagrand() |