araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-26 08:29:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bfa'

Browse Source
This commit is contained in:
Shauren
2018-12-09 14:45:03 +01:00
parent 8725eec9c1 a70030ff25
commit f94deace76
368 changed files with 180765 additions and 58686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ public:
events.Reset();
events.ScheduleEvent(EVENT_AURA, 1 * IN_MILLISECONDS);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
DoCast(SPELL_PUTRID_MUSHROOM);
if (me->GetEntry() == NPC_POISONOUS_MUSHROOM)
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+3 -3
View File
@@ -254,10 +254,10 @@ class boss_anubarak_trial : public CreatureScript
_burrowGUID.push_back(summoned->GetGUID());
summoned->SetReactState(REACT_PASSIVE);
summoned->CastSpell(summoned, SPELL_CHURNING_GROUND, false);
summoned->SetDisplayId(summoned->GetCreatureTemplate()->Modelid2);
summoned->SetDisplayFromModel(1);
break;
case NPC_SPIKE:
summoned->SetDisplayId(summoned->GetCreatureTemplate()->Modelid1);
summoned->SetDisplayFromModel(0);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
summoned->CombatStart(target);
@@ -620,7 +620,7 @@ class npc_frost_sphere : public CreatureScript
{
me->SetReactState(REACT_PASSIVE);
DoCast(SPELL_FROST_SPHERE);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
me->GetMotionMaster()->MoveRandom(20.0f);
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+1 -1
View File
@@ -489,7 +489,7 @@ class npc_firebomb : public CreatureScript
DoCast(me, SPELL_FIRE_BOMB_DOT, true);
SetCombatMovement(false);
me->SetReactState(REACT_PASSIVE);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
}
void UpdateAI(uint32 /*diff*/) override
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+3 -3
View File
@@ -306,7 +306,7 @@ class boss_lich_king_toc : public CreatureScript
if (Creature* summoned = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[2].GetPositionX(), ToCCommonLoc[2].GetPositionY(), ToCCommonLoc[2].GetPositionZ(), 5, TEMPSUMMON_TIMED_DESPAWN, 1*MINUTE*IN_MILLISECONDS))
{
summoned->CastSpell(summoned, 51807, false);
summoned->SetDisplayId(summoned->GetCreatureTemplate()->Modelid2);
summoned->SetDisplayFromModel(1);
}
_instance->SetBossState(BOSS_LICH_KING, IN_PROGRESS);
@@ -497,11 +497,11 @@ class npc_fizzlebang_toc : public CreatureScript
me->GetMotionMaster()->MovementExpired();
Talk(SAY_STAGE_1_03);
me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST_OMNI);
if (Unit* pTrigger = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.69494f, TEMPSUMMON_MANUAL_DESPAWN))
if (Creature* pTrigger = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.69494f, TEMPSUMMON_MANUAL_DESPAWN))
{
_triggerGUID = pTrigger->GetGUID();
pTrigger->SetObjectScale(2.0f);
pTrigger->SetDisplayId(pTrigger->ToCreature()->GetCreatureTemplate()->Modelid1);
pTrigger->SetDisplayFromModel(0);
pTrigger->CastSpell(pTrigger, SPELL_WILFRED_PORTAL, false);
}
_instance->SetData(TYPE_EVENT, 1132);
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+1 -1
View File
@@ -2587,7 +2587,7 @@ class npc_quel_delar_sword : public CreatureScript
npc_quel_delar_swordAI(Creature* creature) : ScriptedAI(creature)
{
_instance = me->GetInstanceScript();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
_intro = true;
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+1 -1
View File
@@ -272,7 +272,7 @@ class npc_pit_of_saron_icicle : public CreatureScript
{
npc_pit_of_saron_icicleAI(Creature* creature) : PassiveAI(creature)
{
me->SetDisplayId(me->GetCreatureTemplate()->Modelid1);
me->SetDisplayFromModel(0);
}
void IsSummonedBy(Unit* summoner) override
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ class boss_sapphiron : public CreatureScript
switch(spell->Id)
{
case SPELL_CHECK_RESISTS:
if (target && target->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE)
if (target && target->GetResistance(SPELL_SCHOOL_MASK_FROST) > MAX_FROST_RESISTANCE)
_canTheHundredClub = false;
break;
}
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ class npc_chaotic_rift : public CreatureScript
void Reset() override
{
Initialize();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
DoCast(me, SPELL_ARCANEFORM, false);
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+1 -1
View File
@@ -586,7 +586,7 @@ class boss_flame_leviathan_seat : public CreatureScript
boss_flame_leviathan_seatAI(Creature* creature) : ScriptedAI(creature)
{
me->SetReactState(REACT_PASSIVE);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
instance = creature->GetInstanceScript();
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+5 -5
View File
@@ -188,7 +188,7 @@ class npc_flash_freeze : public CreatureScript
{
Initialize();
instance = me->GetInstanceScript();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED);
me->SetControlled(true, UNIT_STATE_ROOT);
}
@@ -264,7 +264,7 @@ class npc_ice_block : public CreatureScript
npc_ice_blockAI(Creature* creature) : ScriptedAI(creature)
{
instance = me->GetInstanceScript();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED);
me->SetControlled(true, UNIT_STATE_ROOT);
}
@@ -557,7 +557,7 @@ class npc_icicle : public CreatureScript
npc_icicleAI(Creature* creature) : ScriptedAI(creature)
{
Initialize();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid1);
me->SetDisplayFromModel(0);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_NOT_SELECTABLE);
me->SetControlled(true, UNIT_STATE_ROOT);
me->SetReactState(REACT_PASSIVE);
@@ -612,7 +612,7 @@ class npc_snowpacked_icicle : public CreatureScript
npc_snowpacked_icicleAI(Creature* creature) : ScriptedAI(creature)
{
Initialize();
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED);
me->SetControlled(true, UNIT_STATE_ROOT);
me->SetReactState(REACT_PASSIVE);
@@ -954,7 +954,7 @@ class npc_toasty_fire : public CreatureScript
{
npc_toasty_fireAI(Creature* creature) : ScriptedAI(creature)
{
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
}
void Reset() override
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ class boss_razorscale_controller : public CreatureScript
{
boss_razorscale_controllerAI(Creature* creature) : BossAI(creature, DATA_RAZORSCALE_CONTROL)
{
me->SetDisplayId(me->GetCreatureTemplate()->Modelid2);
me->SetDisplayFromModel(1);
}
void Reset() override