Merge branch 'master' into 4.x
Conflicts: src/server/authserver/Server/AuthSocket.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp
This commit is contained in:
commit
37b66384f3
491 files changed
+15328
-4368
No files matched your search
@@ -187,7 +187,7 @@ public:
|
||||
|
||||
//expire movement, will prevent from running right back to victim after cast
|
||||
//(but should MoveChase be used again at a certain time or should he not move?)
|
||||
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
|
||||
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
|
||||
me->GetMotionMaster()->MovementExpired();
|
||||
|
||||
DoCast(me, SPELL_BLINK);
|
||||
|
||||
@@ -1982,7 +1982,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence()
|
||||
Akama->GetMotionMaster()->Clear(false);
|
||||
// Akama->GetMotionMaster()->MoveIdle();
|
||||
Akama->SetPosition(x, y, z, 0.0f);
|
||||
Akama->SendMonsterMove(x, y, z, 0, MOVEMENTFLAG_NONE, 0); // Illidan must not die until Akama arrives.
|
||||
Akama->MonsterMoveWithSpeed(x, y, z, 0); // Illidan must not die until Akama arrives.
|
||||
Akama->GetMotionMaster()->MoveChase(me);
|
||||
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ set(scripts_STAT_SRCS
|
||||
Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
|
||||
Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
|
||||
Outland/shattrath_city.cpp
|
||||
Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
|
||||
Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
|
||||
Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
|
||||
Outland/TempestKeep/Mechanar/mechanar.h
|
||||
|
||||
@@ -151,7 +151,7 @@ public:
|
||||
m_bPerformingGroundSlam = false;
|
||||
|
||||
//and correct movement, if not already
|
||||
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
|
||||
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
|
||||
{
|
||||
if (me->getVictim())
|
||||
me->GetMotionMaster()->MoveChase(me->getVictim());
|
||||
|
||||
@@ -820,7 +820,7 @@ class boss_kaelthas : public CreatureScript
|
||||
me->GetMotionMaster()->Clear();
|
||||
me->GetMotionMaster()->MoveIdle();
|
||||
me->SetPosition(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0);
|
||||
me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, 0, 0);
|
||||
me->MonsterMoveWithSpeed(afGravityPos[0], afGravityPos[1], afGravityPos[2], 1);
|
||||
|
||||
me->InterruptNonMeleeSpells(false);
|
||||
DoCast(me, SPELL_FULLPOWER);
|
||||
@@ -887,7 +887,7 @@ class boss_kaelthas : public CreatureScript
|
||||
me->GetMotionMaster()->Clear();
|
||||
me->GetMotionMaster()->MoveIdle();
|
||||
me->SetPosition(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0);
|
||||
me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, MOVEMENTFLAG_NONE, 0);
|
||||
me->MonsterMoveWithSpeed(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0);
|
||||
|
||||
// 1) Kael'thas will portal the whole raid right into his body
|
||||
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
//! TODO - Boss not scripted, just ported required spellscript from core
|
||||
|
||||
#include "ScriptMgr.h"
|
||||
#include "SpellScript.h"
|
||||
|
||||
enum Spells
|
||||
{
|
||||
SPELL_POSITIVE_CHARGE = 39090,
|
||||
SPELL_POSITIVE_CHARGE_STACK = 39089,
|
||||
SPELL_NEGATIVE_CHARGE = 39093,
|
||||
SPELL_NEGATIVE_CHARGE_STACK = 39092
|
||||
};
|
||||
|
||||
class spell_capacitus_polarity_shift : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_capacitus_polarity_shift() : SpellScriptLoader("spell_capacitus_polarity_shift") { }
|
||||
|
||||
class spell_capacitus_polarity_shift_SpellScript : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript);
|
||||
|
||||
bool Validate(SpellInfo const* /*spell*/)
|
||||
{
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE))
|
||||
return false;
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE_STACK))
|
||||
return false;
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_CHARGE))
|
||||
return false;
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_CHARGE_STACK))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandleTargets(std::list<Unit*>& targetList)
|
||||
{
|
||||
uint8 count = 0;
|
||||
for (std::list<Unit*>::iterator ihit = targetList.begin(); ihit != targetList.end(); ++ihit)
|
||||
if ((*ihit)->GetGUID() != GetCaster()->GetGUID())
|
||||
if (Player* target = (*ihit)->ToPlayer())
|
||||
if (target->HasAura(GetTriggeringSpell()->Id))
|
||||
++count;
|
||||
|
||||
if (count)
|
||||
{
|
||||
uint32 spellId = 0;
|
||||
|
||||
if (GetSpellInfo()->Id == SPELL_POSITIVE_CHARGE)
|
||||
spellId = SPELL_POSITIVE_CHARGE_STACK;
|
||||
else // if (GetSpellInfo()->Id == SPELL_NEGATIVE_CHARGE)
|
||||
spellId = SPELL_NEGATIVE_CHARGE_STACK;
|
||||
|
||||
GetCaster()->SetAuraStack(spellId, GetCaster(), count);
|
||||
}
|
||||
}
|
||||
|
||||
void HandleDamage(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
if (!GetTriggeringSpell())
|
||||
return;
|
||||
|
||||
Unit* target = GetHitUnit();
|
||||
|
||||
if (target->HasAura(GetTriggeringSpell()->Id))
|
||||
SetHitDamage(0);
|
||||
}
|
||||
|
||||
void Register()
|
||||
{
|
||||
OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
|
||||
OnUnitTargetSelect += SpellUnitTargetFn(spell_capacitus_polarity_shift_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
|
||||
}
|
||||
};
|
||||
|
||||
SpellScript* GetSpellScript() const
|
||||
{
|
||||
return new spell_capacitus_polarity_shift_SpellScript();
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_boss_mechano_lord_capacitus()
|
||||
{
|
||||
new spell_capacitus_polarity_shift();
|
||||
}
|
||||
@@ -38,19 +38,18 @@ EndContentData */
|
||||
|
||||
enum eMillhouseSays
|
||||
{
|
||||
SAY_INTRO_1 = -1552010,
|
||||
SAY_INTRO_2 = -1552011,
|
||||
SAY_WATER = -1552012,
|
||||
SAY_BUFFS = -1552013,
|
||||
SAY_DRINK = -1552014,
|
||||
SAY_READY = -1552015,
|
||||
SAY_KILL_1 = -1552016,
|
||||
SAY_KILL_2 = -1552017,
|
||||
SAY_PYRO = -1552018,
|
||||
SAY_ICEBLOCK = -1552019,
|
||||
SAY_LOWHP = -1552020,
|
||||
SAY_DEATH = -1552021,
|
||||
SAY_COMPLETE = -1552022,
|
||||
SAY_INTRO_1 = 0,
|
||||
SAY_INTRO_2 = 1,
|
||||
SAY_WATER = 2,
|
||||
SAY_BUFFS = 3,
|
||||
SAY_DRINK = 4,
|
||||
SAY_READY = 5,
|
||||
SAY_KILL = 6,
|
||||
SAY_PYRO = 7,
|
||||
SAY_ICEBLOCK = 8,
|
||||
SAY_LOWHP = 9,
|
||||
SAY_DEATH = 10,
|
||||
SAY_COMPLETE = 11,
|
||||
};
|
||||
|
||||
enum eMillhouseSpells
|
||||
@@ -107,7 +106,7 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
Init = true;
|
||||
|
||||
if (instance->GetData(TYPE_HARBINGERSKYRISS) == DONE)
|
||||
DoScriptText(SAY_COMPLETE, me);
|
||||
Talk(SAY_COMPLETE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,12 +125,12 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
|
||||
void KilledUnit(Unit* /*victim*/)
|
||||
{
|
||||
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
|
||||
Talk(SAY_KILL);
|
||||
}
|
||||
|
||||
void JustDied(Unit* /*victim*/)
|
||||
{
|
||||
DoScriptText(SAY_DEATH, me);
|
||||
Talk(SAY_DEATH);
|
||||
|
||||
/*for questId 10886 (heroic mode only)
|
||||
if (instance && instance->GetData(TYPE_HARBINGERSKYRISS) != DONE)
|
||||
@@ -149,30 +148,30 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
switch (Phase)
|
||||
{
|
||||
case 1:
|
||||
DoScriptText(SAY_INTRO_1, me);
|
||||
Talk(SAY_INTRO_1);
|
||||
EventProgress_Timer = 18000;
|
||||
break;
|
||||
case 2:
|
||||
DoScriptText(SAY_INTRO_2, me);
|
||||
Talk(SAY_INTRO_2);
|
||||
EventProgress_Timer = 18000;
|
||||
break;
|
||||
case 3:
|
||||
DoScriptText(SAY_WATER, me);
|
||||
Talk(SAY_WATER);
|
||||
DoCast(me, SPELL_CONJURE_WATER);
|
||||
EventProgress_Timer = 7000;
|
||||
break;
|
||||
case 4:
|
||||
DoScriptText(SAY_BUFFS, me);
|
||||
Talk(SAY_BUFFS);
|
||||
DoCast(me, SPELL_ICE_ARMOR);
|
||||
EventProgress_Timer = 7000;
|
||||
break;
|
||||
case 5:
|
||||
DoScriptText(SAY_DRINK, me);
|
||||
Talk(SAY_DRINK);
|
||||
DoCast(me, SPELL_ARCANE_INTELLECT);
|
||||
EventProgress_Timer = 7000;
|
||||
break;
|
||||
case 6:
|
||||
DoScriptText(SAY_READY, me);
|
||||
Talk(SAY_READY);
|
||||
EventProgress_Timer = 6000;
|
||||
break;
|
||||
case 7:
|
||||
@@ -192,7 +191,7 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
return;
|
||||
if (!LowHp && HealthBelowPct(20))
|
||||
{
|
||||
DoScriptText(SAY_LOWHP, me);
|
||||
Talk(SAY_LOWHP);
|
||||
LowHp = true;
|
||||
}
|
||||
|
||||
@@ -201,7 +200,7 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
if (me->IsNonMeleeSpellCasted(false))
|
||||
return;
|
||||
|
||||
DoScriptText(SAY_PYRO, me);
|
||||
Talk(SAY_PYRO);
|
||||
|
||||
DoCast(me->getVictim(), SPELL_PYROBLAST);
|
||||
Pyroblast_Timer = 40000;
|
||||
@@ -232,14 +231,14 @@ class npc_millhouse_manastorm : public CreatureScript
|
||||
|
||||
enum eWardenSays
|
||||
{
|
||||
YELL_INTRO1 = -1552023,
|
||||
YELL_INTRO2 = -1552024,
|
||||
YELL_RELEASE1 = -1552025,
|
||||
YELL_RELEASE2A = -1552026,
|
||||
YELL_RELEASE2B = -1552027,
|
||||
YELL_RELEASE3 = -1552028,
|
||||
YELL_RELEASE4 = -1552029,
|
||||
YELL_WELCOME = -1552030,
|
||||
YELL_INTRO1 = 0,
|
||||
YELL_INTRO2 = 1,
|
||||
YELL_RELEASE1 = 2,
|
||||
YELL_RELEASE2A = 3,
|
||||
YELL_RELEASE2B = 4,
|
||||
YELL_RELEASE3 = 5,
|
||||
YELL_RELEASE4 = 6,
|
||||
YELL_WELCOME = 7,
|
||||
};
|
||||
|
||||
enum eWardenUnits
|
||||
@@ -274,10 +273,10 @@ class npc_warden_mellichar : public CreatureScript
|
||||
{
|
||||
public:
|
||||
|
||||
npc_warden_mellichar()
|
||||
: CreatureScript("npc_warden_mellichar")
|
||||
npc_warden_mellichar() : CreatureScript("npc_warden_mellichar")
|
||||
{
|
||||
}
|
||||
|
||||
struct npc_warden_mellicharAI : public ScriptedAI
|
||||
{
|
||||
npc_warden_mellicharAI(Creature* creature) : ScriptedAI(creature)
|
||||
@@ -330,7 +329,7 @@ class npc_warden_mellichar : public CreatureScript
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
{
|
||||
DoScriptText(YELL_INTRO1, me);
|
||||
Talk(YELL_INTRO1);
|
||||
DoCast(me, SPELL_BUBBLE_VISUAL);
|
||||
|
||||
if (instance)
|
||||
@@ -437,7 +436,7 @@ class npc_warden_mellichar : public CreatureScript
|
||||
me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
|
||||
break;
|
||||
case 4:
|
||||
DoScriptText(YELL_RELEASE2B, me);
|
||||
Talk(YELL_RELEASE2B);
|
||||
break;
|
||||
case 5:
|
||||
switch (urand(0, 1))
|
||||
@@ -463,7 +462,7 @@ class npc_warden_mellichar : public CreatureScript
|
||||
break;
|
||||
case 7:
|
||||
me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
|
||||
DoScriptText(YELL_WELCOME, me);
|
||||
Talk(YELL_WELCOME);
|
||||
break;
|
||||
}
|
||||
CanSpawn = false;
|
||||
@@ -474,17 +473,17 @@ class npc_warden_mellichar : public CreatureScript
|
||||
switch (Phase)
|
||||
{
|
||||
case 1:
|
||||
DoScriptText(YELL_INTRO2, me);
|
||||
Talk(YELL_INTRO2);
|
||||
EventProgress_Timer = 10000;
|
||||
++Phase;
|
||||
break;
|
||||
case 2:
|
||||
DoScriptText(YELL_RELEASE1, me);
|
||||
Talk(YELL_RELEASE1);
|
||||
DoPrepareForPhase();
|
||||
EventProgress_Timer = 7000;
|
||||
break;
|
||||
case 3:
|
||||
DoScriptText(YELL_RELEASE2A, me);
|
||||
Talk(YELL_RELEASE2A);
|
||||
DoPrepareForPhase();
|
||||
EventProgress_Timer = 10000;
|
||||
break;
|
||||
@@ -493,12 +492,12 @@ class npc_warden_mellichar : public CreatureScript
|
||||
EventProgress_Timer = 15000;
|
||||
break;
|
||||
case 5:
|
||||
DoScriptText(YELL_RELEASE3, me);
|
||||
Talk(YELL_RELEASE3);
|
||||
DoPrepareForPhase();
|
||||
EventProgress_Timer = 15000;
|
||||
break;
|
||||
case 6:
|
||||
DoScriptText(YELL_RELEASE4, me);
|
||||
Talk(YELL_RELEASE4);
|
||||
DoPrepareForPhase();
|
||||
EventProgress_Timer = 15000;
|
||||
break;
|
||||
@@ -524,14 +523,16 @@ class npc_warden_mellichar : public CreatureScript
|
||||
# mob_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0')
|
||||
#####*/
|
||||
|
||||
#define SPELL_VOID_ZONE_DAMAGE 36120
|
||||
enum ZerekethSpell
|
||||
{
|
||||
SPELL_VOID_ZONE_DAMAGE = 36120,
|
||||
};
|
||||
|
||||
class mob_zerekethvoidzone : public CreatureScript
|
||||
{
|
||||
public:
|
||||
|
||||
mob_zerekethvoidzone()
|
||||
: CreatureScript("mob_zerekethvoidzone")
|
||||
mob_zerekethvoidzone() : CreatureScript("mob_zerekethvoidzone")
|
||||
{
|
||||
}
|
||||
struct mob_zerekethvoidzoneAI : public ScriptedAI
|
||||
@@ -555,10 +556,10 @@ class mob_zerekethvoidzone : public CreatureScript
|
||||
return new mob_zerekethvoidzoneAI(creature);
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_arcatraz()
|
||||
{
|
||||
new npc_millhouse_manastorm();
|
||||
new npc_warden_mellichar();
|
||||
new mob_zerekethvoidzone();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user