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

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.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/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
This commit is contained in:
Nay committed 2013-07-14 16:10:20 +01:00
2 parents f8ba2c066b bedb2e56e2
commit b56b282eee
603 files changed
+14632 -11728
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+43 -41
View File
@@ -92,7 +92,7 @@ class npc_unworthy_initiate : public CreatureScript
public:
npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_unworthy_initiateAI(creature);
}
@@ -114,7 +114,7 @@ public:
EventMap events;
void Reset()
void Reset() OVERRIDE
{
anchorGUID = 0;
phase = PHASE_CHAINED;
@@ -125,7 +125,7 @@ public:
me->LoadEquipment(0, true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) OVERRIDE
{
events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST);
events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST);
@@ -133,7 +133,7 @@ public:
events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) OVERRIDE
{
if (type != POINT_MOTION_TYPE)
return;
@@ -166,7 +166,7 @@ public:
Talk(SAY_EVENT_START);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
switch (phase)
{
@@ -281,7 +281,7 @@ class npc_unworthy_initiate_anchor : public CreatureScript
public:
npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_unworthy_initiate_anchorAI(creature);
}
@@ -292,13 +292,13 @@ public:
uint64 prisonerGUID;
void SetGUID(uint64 guid, int32 /*id*/)
void SetGUID(uint64 guid, int32 /*id*/) OVERRIDE
{
if (!prisonerGUID)
prisonerGUID = guid;
}
uint64 GetGUID(int32 /*id*/) const
uint64 GetGUID(int32 /*id*/) const OVERRIDE
{
return prisonerGUID;
}
@@ -310,7 +310,7 @@ class go_acherus_soul_prison : public GameObjectScript
public:
go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { }
bool OnGossipHello(Player* player, GameObject* go)
bool OnGossipHello(Player* player, GameObject* go) OVERRIDE
{
if (Creature* anchor = go->FindNearestCreature(29521, 15))
if (uint64 prisonerGUID = anchor->AI()->GetGUID())
@@ -352,7 +352,7 @@ class npc_death_knight_initiate : public CreatureScript
public:
npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF)
@@ -379,7 +379,7 @@ public:
return true;
}
bool OnGossipHello(Player* player, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature) OVERRIDE
{
if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth())
{
@@ -395,7 +395,7 @@ public:
return true;
}
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_death_knight_initiateAI(creature);
}
@@ -412,7 +412,7 @@ public:
uint32 m_uiDuelTimer;
bool m_bIsDuelInProgress;
void Reset()
void Reset() OVERRIDE
{
lose = false;
me->RestoreFaction();
@@ -425,7 +425,7 @@ public:
m_bIsDuelInProgress = false;
}
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
void SpellHit(Unit* pCaster, const SpellInfo* pSpell) OVERRIDE
{
if (!m_bIsDuelInProgress && pSpell->Id == SPELL_DUEL)
{
@@ -434,7 +434,7 @@ public:
}
}
void DamageTaken(Unit* pDoneBy, uint32 &uiDamage)
void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE
{
if (m_bIsDuelInProgress && pDoneBy->IsControlledByPlayer())
{
@@ -457,7 +457,7 @@ public:
}
}
void UpdateAI(uint32 uiDiff)
void UpdateAI(uint32 uiDiff) OVERRIDE
{
if (!UpdateVictim())
{
@@ -520,7 +520,7 @@ class npc_dark_rider_of_acherus : public CreatureScript
public:
npc_dark_rider_of_acherus() : CreatureScript("npc_dark_rider_of_acherus") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_dark_rider_of_acherusAI(creature);
}
@@ -534,7 +534,7 @@ public:
bool Intro;
uint64 TargetGUID;
void Reset()
void Reset() OVERRIDE
{
PhaseTimer = 4000;
Phase = 0;
@@ -542,7 +542,7 @@ public:
TargetGUID = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
if (!Intro || !TargetGUID)
return;
@@ -612,7 +612,7 @@ class npc_salanar_the_horseman : public CreatureScript
public:
npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_salanar_the_horsemanAI(creature);
}
@@ -621,7 +621,7 @@ public:
{
npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) {}
void SpellHit(Unit* caster, const SpellInfo* spell)
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
{
if (spell->Id == SPELL_DELIVER_STOLEN_HORSE)
{
@@ -643,7 +643,8 @@ public:
}
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) OVERRIDE
{
ScriptedAI::MoveInLineOfSight(who);
@@ -684,7 +685,7 @@ class npc_ros_dark_rider : public CreatureScript
public:
npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_ros_dark_riderAI(creature);
}
@@ -693,12 +694,12 @@ public:
{
npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) {}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) OVERRIDE
{
me->ExitVehicle();
}
void Reset()
void Reset() OVERRIDE
{
Creature* deathcharger = me->FindNearestCreature(28782, 30);
if (!deathcharger)
@@ -711,7 +712,7 @@ public:
me->EnterVehicle(deathcharger);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) OVERRIDE
{
Creature* deathcharger = me->FindNearestCreature(28782, 30);
if (!deathcharger)
@@ -739,7 +740,7 @@ class npc_dkc1_gothik : public CreatureScript
public:
npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_dkc1_gothikAI(creature);
}
@@ -748,7 +749,8 @@ public:
{
npc_dkc1_gothikAI(Creature* creature) : ScriptedAI(creature) {}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) OVERRIDE
{
ScriptedAI::MoveInLineOfSight(who);
@@ -782,7 +784,7 @@ class npc_scarlet_ghoul : public CreatureScript
public:
npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_scarlet_ghoulAI(creature);
}
@@ -818,7 +820,7 @@ public:
}
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) OVERRIDE
{
if (!me->IsInCombat())
{
@@ -884,7 +886,7 @@ class npc_scarlet_miner_cart : public CreatureScript
me->SetDisplayId(me->GetCreatureTemplate()->Modelid1); // Modelid2 is a horse.
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) OVERRIDE
{
if (summon->GetEntry() == NPC_MINER)
{
@@ -893,13 +895,13 @@ class npc_scarlet_miner_cart : public CreatureScript
}
}
void SummonedCreatureDespawn(Creature* summon)
void SummonedCreatureDespawn(Creature* summon) OVERRIDE
{
if (summon->GetEntry() == NPC_MINER)
_minerGUID = 0;
}
void DoAction(int32 /*param*/)
void DoAction(int32 /*param*/) OVERRIDE
{
if (Creature* miner = ObjectAccessor::GetCreature(*me, _minerGUID))
{
@@ -913,7 +915,7 @@ class npc_scarlet_miner_cart : public CreatureScript
}
}
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply)
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE
{
if (apply)
{
@@ -933,7 +935,7 @@ class npc_scarlet_miner_cart : public CreatureScript
uint64 _playerGUID;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_scarlet_miner_cartAI(creature);
}
@@ -965,14 +967,14 @@ class npc_scarlet_miner : public CreatureScript
uint32 IntroPhase;
uint64 carGUID;
void Reset()
void Reset() OVERRIDE
{
carGUID = 0;
IntroTimer = 0;
IntroPhase = 0;
}
void IsSummonedBy(Unit* summoner)
void IsSummonedBy(Unit* summoner) OVERRIDE
{
carGUID = summoner->GetGUID();
}
@@ -1010,14 +1012,14 @@ class npc_scarlet_miner : public CreatureScript
}
}
void SetGUID(uint64 guid, int32 /*id = 0*/)
void SetGUID(uint64 guid, int32 /*id = 0*/) OVERRIDE
{
InitWaypoint();
Start(false, false, guid);
SetDespawnAtFar(false);
}
void WaypointReached(uint32 waypointId)
void WaypointReached(uint32 waypointId) OVERRIDE
{
switch (waypointId)
{
@@ -1044,7 +1046,7 @@ class npc_scarlet_miner : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
if (IntroPhase)
{
@@ -1071,7 +1073,7 @@ class npc_scarlet_miner : public CreatureScript
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new npc_scarlet_minerAI(creature);
}