Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
This commit is contained in:
DDuarte committed 2014-01-10 18:32:05 +00:00
2 parents 352a2682b1 a63780fd90
commit 33c2bd5ce1
417 files changed
+6670 -6423
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
+38 -49
View File
@@ -24,7 +24,7 @@ SDCategory: The Hinterlands
EndScriptData */
/* ContentData
npc_00x09hl
npc_oox09hl
EndContentData */
#include "ScriptMgr.h"
@@ -33,7 +33,7 @@ EndContentData */
#include "Player.h"
/*######
## npc_00x09hl
## npc_oox09hl
######*/
enum eOOX
@@ -43,51 +43,48 @@ enum eOOX
SAY_OOX_AMBUSH = 2,
SAY_OOX_AMBUSH_REPLY = 3,
SAY_OOX_END = 4,
QUEST_RESQUE_OOX_09 = 836,
NPC_MARAUDING_OWL = 7808,
NPC_VILE_AMBUSHER = 7809,
FACTION_ESCORTEE_A = 774,
FACTION_ESCORTEE_H = 775
};
class npc_00x09hl : public CreatureScript
class npc_oox09hl : public CreatureScript
{
public:
npc_00x09hl() : CreatureScript("npc_00x09hl") { }
npc_oox09hl() : CreatureScript("npc_oox09hl") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest)
struct npc_oox09hlAI : public npc_escortAI
{
if (quest->GetQuestId() == QUEST_RESQUE_OOX_09)
{
creature->SetStandState(UNIT_STAND_STATE_STAND);
if (player->GetTeam() == ALLIANCE)
creature->setFaction(FACTION_ESCORTEE_A);
else if (player->GetTeam() == HORDE)
creature->setFaction(FACTION_ESCORTEE_H);
creature->AI()->Talk(SAY_OOX_START, player);
if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI()))
pEscortAI->Start(false, false, player->GetGUID(), quest);
}
return true;
}
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_00x09hlAI(creature);
}
struct npc_00x09hlAI : public npc_escortAI
{
npc_00x09hlAI(Creature* creature) : npc_escortAI(creature) { }
npc_oox09hlAI(Creature* creature) : npc_escortAI(creature) { }
void Reset() OVERRIDE { }
void EnterCombat(Unit* who) OVERRIDE
{
if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER)
return;
Talk(SAY_OOX_AGGRO);
}
void JustSummoned(Creature* summoned) OVERRIDE
{
summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
}
void sQuestAccept(Player* player, Quest const* quest)
{
if (quest->GetQuestId() == QUEST_RESQUE_OOX_09)
{
me->SetStandState(UNIT_STAND_STATE_STAND);
me->setFaction(player->GetTeam() == ALLIANCE ? FACTION_ESCORTEE_A : FACTION_ESCORTEE_H);
Talk(SAY_OOX_START, player);
npc_escortAI::Start(false, false, player->GetGUID(), quest);
}
}
void WaypointReached(uint32 waypointId)
{
switch (waypointId)
@@ -106,9 +103,9 @@ public:
}
}
void WaypointStart(uint32 uiPointId)
void WaypointStart(uint32 pointId) OVERRIDE
{
switch (uiPointId)
switch (pointId)
{
case 27:
for (uint8 i = 0; i < 3; ++i)
@@ -130,23 +127,15 @@ public:
break;
}
}
void EnterCombat(Unit* who)
{
if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER)
return;
Talk(SAY_OOX_AGGRO);
}
void JustSummoned(Creature* summoned) OVERRIDE
{
summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
}
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_oox09hlAI(creature);
}
};
void AddSC_hinterlands()
{
new npc_00x09hl();
new npc_oox09hl();
}