aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp28
-rw-r--r--src/bindings/scripts/scripts/kalimdor/feralas.cpp24
-rw-r--r--src/bindings/scripts/scripts/kalimdor/tanaris.cpp38
3 files changed, 49 insertions, 41 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
index f8ae2bc66ff..fbcbd2f6045 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
@@ -35,10 +35,11 @@ EndContentData */
enum
{
- SAY_OOX_START = -1000416,
- SAY_OOX_AGGRO = -1000417,
- SAY_OOX_DANGER = -1000418,
- SAY_OOX_COMPLETE = -1000419,
+ SAY_OOX_START = -1000287,
+ SAY_OOX_AGGRO1 = -1000288,
+ SAY_OOX_AGGRO2 = -1000289,
+ SAY_OOX_AMBUSH = -1000290,
+ SAY_OOX_END = -1000292,
QUEST_RESQUE_OOX_09 = 836,
@@ -60,13 +61,13 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
switch(uiPointId)
{
case 26:
- DoScriptText(SAY_OOX_DANGER, m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
break;
case 43:
- DoScriptText(SAY_OOX_DANGER, m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
break;
case 64:
- DoScriptText(SAY_OOX_COMPLETE, m_creature);
+ DoScriptText(SAY_OOX_END, m_creature);
if (Player* pPlayer = GetPlayerForEscort())
pPlayer->GroupEventHappens(QUEST_RESQUE_OOX_09, m_creature);
break;
@@ -78,19 +79,19 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
switch(uiPointId)
{
case 27:
- for(int i = 0; i < 3; ++i)
+ for(uint8 i = 0; i < 3; ++i)
{
float fX, fY, fZ;
- m_creature->GetRandomPoint(147.927444, -3851.513428, 130.893, 7.0f, fX, fY, fZ);
+ m_creature->GetRandomPoint(147.927444f, -3851.513428f, 130.893f, 7.0f, fX, fY, fZ);
m_creature->SummonCreature(NPC_MARAUDING_OWL, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
}
break;
case 44:
- for(int i = 0; i < 3; ++i)
+ for(uint8 i = 0; i < 3; ++i)
{
float fX, fY, fZ;
- m_creature->GetRandomPoint(-141.151581, -4291.213867, 120.130, 7.0f, fX, fY, fZ);
+ m_creature->GetRandomPoint(-141.151581f, -4291.213867f, 120.130f, 7.0f, fX, fY, fZ);
m_creature->SummonCreature(NPC_VILE_AMBUSHER, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
}
@@ -103,7 +104,10 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
if (pWho->GetEntry() == NPC_MARAUDING_OWL || pWho->GetEntry() == NPC_VILE_AMBUSHER)
return;
- DoScriptText(SAY_OOX_AGGRO, m_creature);
+ if (rand()%1)
+ DoScriptText(SAY_OOX_AGGRO1, m_creature);
+ else
+ DoScriptText(SAY_OOX_AGGRO2, m_creature);
}
void JustSummoned(Creature* pSummoned)
diff --git a/src/bindings/scripts/scripts/kalimdor/feralas.cpp b/src/bindings/scripts/scripts/kalimdor/feralas.cpp
index 99090b06039..04698795ffa 100644
--- a/src/bindings/scripts/scripts/kalimdor/feralas.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/feralas.cpp
@@ -60,11 +60,11 @@ bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, ui
enum
{
- SAY_START = -1060000,
- SAY_AGGRO = -1060001,
- SAY_AGGRO2 = -1060002,
- SAY_AMBUSH = -1060003,
- SAY_END = -1060005,
+ SAY_OOX_START = -1000287,
+ SAY_OOX_AGGRO1 = -1000288,
+ SAY_OOX_AGGRO2 = -1000289,
+ SAY_OOX_AMBUSH = -1000290,
+ SAY_OOX_END = -1000292,
NPC_YETI = 7848,
NPC_GORILLA = 5260,
@@ -88,28 +88,28 @@ struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI
{
// First Ambush(3 Yetis)
case 11:
- DoScriptText(SAY_AMBUSH,m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
m_creature->SummonCreature(NPC_YETI, -4841.01, 1593.91, 73.42, 3.98, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_YETI, -4837.61, 1568.58, 78.21, 3.13, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_YETI, -4841.89, 1569.95, 76.53, 0.68, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
break;
//Second Ambush(3 Gorillas)
case 21:
- DoScriptText(SAY_AMBUSH,m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
m_creature->SummonCreature(NPC_GORILLA, -4595.81, 2005.99, 53.08, 3.74, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_GORILLA, -4597.53, 2008.31, 52.70, 3.78, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_GORILLA, -4599.37, 2010.59, 52.77, 3.84, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
break;
//Third Ambush(4 Gnolls)
case 30:
- DoScriptText(SAY_AMBUSH,m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
m_creature->SummonCreature(NPC_WOODPAW_REAVER, -4425.14, 2075.87, 47.77, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68, 2077.98, 47.57, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33, 2080.24, 47.43, 3.87, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
m_creature->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04, 2075.54, 46.83, 3.81, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
break;
case 37:
- DoScriptText(SAY_END,m_creature);
+ DoScriptText(SAY_OOX_END, m_creature);
// Award quest credit
if (Player* pPlayer = GetPlayerForEscort())
{
@@ -130,8 +130,8 @@ struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI
//For an small probability the npc says something when he get aggro
switch(rand()%10)
{
- case 0: DoScriptText(SAY_AGGRO,m_creature); break;
- case 1: DoScriptText(SAY_AGGRO2,m_creature); break;
+ case 0: DoScriptText(SAY_OOX_AGGRO1, m_creature); break;
+ case 1: DoScriptText(SAY_OOX_AGGRO1, m_creature); break;
}
}
@@ -150,7 +150,7 @@ bool QuestAccept_npc_oox22fe(Player* pPlayer, Creature* pCreature, const Quest*
{
if (pQuest->GetQuestId() == QUEST_RESCUE_OOX22FE)
{
- DoScriptText(SAY_START, pCreature);
+ DoScriptText(SAY_OOX_START, pCreature);
//change that the npc is not lying dead on the ground
pCreature->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
index 813e178b6f0..de2baf10607 100644
--- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
@@ -340,16 +340,20 @@ bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCre
## npc_OOX17
######*/
-#define Q_OOX17 648
-#define SPAWN_FIRST 7803
-#define SPAWN_SECOND_1 5617
-#define SPAWN_SECOND_2 7805
-#define SAY_SCOFF -1060004
-#define SAY_CHICKEN_ACC -1060000
-#define SAY_CHICKEN_AGGRO_1 -1060001
-#define SAY_CHICKEN_AGGRO_2 -1060002
-#define SAY_CHICKEN_AMB -1060003
-#define SAY_CHICKEN_COMP -1060005
+enum
+{
+ SAY_OOX_START = -1000287,
+ SAY_OOX_AGGRO1 = -1000288,
+ SAY_OOX_AGGRO2 = -1000289,
+ SAY_OOX_AMBUSH = -1000290,
+ SAY_OOX17_AMBUSH_REPLY = -1000291,
+ SAY_OOX_END = -1000292,
+
+ Q_OOX17 = 648,
+ SPAWN_FIRST = 7803,
+ SPAWN_SECOND_1 = 5617,
+ SPAWN_SECOND_2 = 7805
+};
struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
{
@@ -367,22 +371,22 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
m_creature->SummonCreature(SPAWN_FIRST, -8350.96, -4445.79, 10.10, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
m_creature->SummonCreature(SPAWN_FIRST, -8355.96, -4447.79, 10.10, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
m_creature->SummonCreature(SPAWN_FIRST, -8353.96, -4442.79, 10.10, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
- DoScriptText(SAY_CHICKEN_AMB, m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
break;
case 56:
m_creature->SummonCreature(SPAWN_SECOND_1, -7510.07, -4795.50, 9.35, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
m_creature->SummonCreature(SPAWN_SECOND_2, -7515.07, -4797.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
m_creature->SummonCreature(SPAWN_SECOND_2, -7518.07, -4792.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
- DoScriptText(SAY_CHICKEN_AMB, m_creature);
+ DoScriptText(SAY_OOX_AMBUSH, m_creature);
if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30))
- DoScriptText(SAY_SCOFF, scoff);
+ DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff);
break;
case 86:
if (pPlayer)
{
- DoScriptText(SAY_CHICKEN_COMP, m_creature);
+ DoScriptText(SAY_OOX_END, m_creature);
pPlayer->GroupEventHappens(Q_OOX17, m_creature);
}
break;
@@ -395,8 +399,8 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
{
switch (rand()%2)
{
- case 0: DoScriptText(SAY_CHICKEN_AGGRO_1, m_creature); break;
- case 1: DoScriptText(SAY_CHICKEN_AGGRO_2, m_creature); break;
+ case 0: DoScriptText(SAY_OOX_AGGRO1, m_creature); break;
+ case 1: DoScriptText(SAY_OOX_AGGRO2, m_creature); break;
}
}
@@ -414,7 +418,7 @@ bool QuestAccept_npc_OOX17(Player* pPlayer, Creature* pCreature, Quest const* qu
pCreature->SetHealth(pCreature->GetMaxHealth());
pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
- DoScriptText(SAY_CHICKEN_ACC, pCreature);
+ DoScriptText(SAY_OOX_START, pCreature);
if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17AI, pCreature->AI()))
pEscortAI->Start(true, false, pPlayer->GetGUID());