Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Nagrand: Fix creature text of Maghar Prisoner and remove useless RAND() in go_warmaul_prison.

Browse Source
This commit is contained in:
Discover-
2011-10-25 23:52:55 +01:00
committed by kaelima
parent f958fdf246
commit 80720358f0
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/updates/world/2011_10_24_01_world_creature_text.sql Normal file
View File

@@ -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");

40
src/server/scripts/Outland/nagrand.cpp
View File

@@ -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)
{
go->UseDoorOrButton();
if (player)
player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0);
if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE)
return false;
prisoner->AI()->Talk(RAND(SAY_FREE_0, SAY_FREE_1, SAY_FREE_2, SAY_FREE_3, SAY_FREE_4), player->GetGUID());
prisoner->ForcedDespawn(6000);
if (Creature* prisoner = go->FindNearestCreature(NPC_MAGHAR_PRISONER, 5.0f))
{
if (prisoner)
{
go->UseDoorOrButton();
if (player)
player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0);
prisoner->AI()->Talk(SAY_FREE, player->GetGUID());
prisoner->ForcedDespawn(6000);
}
}
return true;
}
return true;
}
};
void AddSC_nagrand()