nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 11:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Scripts): restyle scripts lib with astyle (#3467)

Browse Source
This commit is contained in:
Kargatum
2020-10-11 15:35:34 +07:00
committed by GitHub
parent 4cca286a4d
commit 5e20b46812
538 changed files with 92888 additions and 91297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
View File

@@ -94,7 +94,7 @@ public:
summons.DespawnAll();
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false);
instance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void JustSummoned(Creature* summon)
@@ -108,7 +108,7 @@ public:
void InitializeAI()
{
ScriptedAI::InitializeAI();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
void JustDied(Unit*)
@@ -146,11 +146,11 @@ public:
{
if (damage >= me->GetHealth())
{
damage = me->GetHealth()-1;
damage = me->GetHealth() - 1;
if (me->isRegeneratingHealth())
{
me->SetRegeneratingHealth(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE|UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
me->CombatStop();
me->SetReactState(REACT_PASSIVE);
LapseAction(ACTION_REMOVE_FLY);
@@ -160,7 +160,7 @@ public:
}
}
}
void LapseAction(uint8 action)
{
uint8 counter = 0;
@@ -169,7 +169,7 @@ public:
if (Player* player = itr->GetSource())
{
if (action == ACTION_TELEPORT_PLAYERS)
me->CastSpell(player, SPELL_GRAVITY_LAPSE_PLAYER+counter, true);
me->CastSpell(player, SPELL_GRAVITY_LAPSE_PLAYER + counter, true);
else if (action == ACTION_KNOCKUP)
player->CastSpell(player, SPELL_GRAVITY_LAPSE_DOT, true, nullptr, nullptr, me->GetGUID());
else if (action == ACTION_ALLOW_FLY)
@@ -188,7 +188,7 @@ public:
switch (events2.ExecuteEvent())
{
case EVENT_INIT_COMBAT:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
if (Unit* target = SelectTargetFromPlayerList(50.0f))
AttackStart(target);
return;
@@ -285,29 +285,29 @@ public:
class spell_mt_phoenix_burn : public SpellScriptLoader
{
public:
spell_mt_phoenix_burn() : SpellScriptLoader("spell_mt_phoenix_burn") { }
public:
spell_mt_phoenix_burn() : SpellScriptLoader("spell_mt_phoenix_burn") { }
class spell_mt_phoenix_burn_SpellScript : public SpellScript
class spell_mt_phoenix_burn_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mt_phoenix_burn_SpellScript);
void HandleAfterCast()
{
PrepareSpellScript(spell_mt_phoenix_burn_SpellScript);
void HandleAfterCast()
{
uint32 damage = CalculatePct(GetCaster()->GetMaxHealth(), 5);
Unit::DealDamage(GetCaster(), GetCaster(), damage);
}
void Register()
{
AfterCast += SpellCastFn(spell_mt_phoenix_burn_SpellScript::HandleAfterCast);
}
};
SpellScript* GetSpellScript() const
{
return new spell_mt_phoenix_burn_SpellScript();
uint32 damage = CalculatePct(GetCaster()->GetMaxHealth(), 5);
Unit::DealDamage(GetCaster(), GetCaster(), damage);
}
void Register()
{
AfterCast += SpellCastFn(spell_mt_phoenix_burn_SpellScript::HandleAfterCast);
}
};
SpellScript* GetSpellScript() const
{
return new spell_mt_phoenix_burn_SpellScript();
}
};
void AddSC_boss_felblood_kaelthas()

113
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
View File

@@ -33,7 +33,7 @@ enum Misc
MAX_HELPERS_COUNT = 8
};
const Position helpersLocations[MAX_ACTIVE_HELPERS]=
const Position helpersLocations[MAX_ACTIVE_HELPERS] =
{
{123.77f, 17.6007f, -19.921f, 4.98f},
{131.731f, 15.0827f, -19.921f, 4.98f},
@@ -163,7 +163,7 @@ public:
{
Talk(SAY_DEATH);
if (HelpersKilled == MAX_ACTIVE_HELPERS+1)
if (HelpersKilled == MAX_ACTIVE_HELPERS + 1)
instance->SetData(DATA_DELRISSA_EVENT, DONE);
}
@@ -197,28 +197,34 @@ public:
events.ScheduleEvent(EVENT_SPELL_RENEW, 7000);
break;
case EVENT_SPELL_PW_SHIELD:
{
std::list<Creature*> cList = DoFindFriendlyMissingBuff(40.0f, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H));
if (Unit* target = acore::Containers::SelectRandomContainerElement(cList))
me->CastSpell(target, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H), false);
events.ScheduleEvent(EVENT_SPELL_PW_SHIELD, 10000);
break;
}
case EVENT_SPELL_DISPEL:
{
Unit* target = nullptr;
switch (urand(0, 2))
{
case 0: target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); break;
case 1: target = me; break;
case 2: target = ObjectAccessor::GetCreature(*me, acore::Containers::SelectRandomContainerElement(summons)); break;
std::list<Creature*> cList = DoFindFriendlyMissingBuff(40.0f, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H));
if (Unit* target = acore::Containers::SelectRandomContainerElement(cList))
me->CastSpell(target, DUNGEON_MODE(SPELL_POWER_WORD_SHIELD_N, SPELL_POWER_WORD_SHIELD_H), false);
events.ScheduleEvent(EVENT_SPELL_PW_SHIELD, 10000);
break;
}
case EVENT_SPELL_DISPEL:
{
Unit* target = nullptr;
switch (urand(0, 2))
{
case 0:
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true);
break;
case 1:
target = me;
break;
case 2:
target = ObjectAccessor::GetCreature(*me, acore::Containers::SelectRandomContainerElement(summons));
break;
}
if (target)
me->CastSpell(target, SPELL_DISPEL_MAGIC, false);
events.ScheduleEvent(EVENT_SPELL_DISPEL, 12000);
break;
}
if (target)
me->CastSpell(target, SPELL_DISPEL_MAGIC, false);
events.ScheduleEvent(EVENT_SPELL_DISPEL, 12000);
break;
}
case EVENT_SPELL_IMMUNITY:
if (me->HasUnitState(UNIT_STATE_LOST_CONTROL))
{
@@ -269,11 +275,12 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
float GetThreatMod(float dist, float /*armor*/, uint32 health, uint32 /*maxhealth*/, Unit* target)
{
float unimportant_dist = (aiType == AI_TYPE_MELEE ? 5.0f : 25.0f);
if (dist > unimportant_dist) dist -= unimportant_dist; else dist = 0.0f;
if (dist > unimportant_dist) dist -= unimportant_dist;
else dist = 0.0f;
const float dist_factor = (aiType == AI_TYPE_MELEE ? 15.0f : 25.0f);
float mod_dist = dist_factor/(dist_factor + dist); // 0.2 .. 1.0
float mod_health = health > 20000 ? 2.0f : (40000-health)/10000.0f; // 2.0 .. 4.0
float mod_armor = aiType == AI_TYPE_MELEE ? Unit::CalcArmorReducedDamage(me, target, 10000, nullptr)/10000.0f : 1.0f;
float mod_dist = dist_factor / (dist_factor + dist); // 0.2 .. 1.0
float mod_health = health > 20000 ? 2.0f : (40000 - health) / 10000.0f; // 2.0 .. 4.0
float mod_armor = aiType == AI_TYPE_MELEE ? Unit::CalcArmorReducedDamage(me, target, 10000, nullptr) / 10000.0f : 1.0f;
return mod_dist * mod_health * mod_armor;
}
@@ -299,7 +306,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
summons.DespawnAll();
actualEventId = 0;
}
void JustSummoned(Creature* summon)
{
summons.Summon(summon);
@@ -496,7 +503,7 @@ enum WarlockEnum
EVENT_SPELL_IMMOLATE = 1,
EVENT_SPELL_SHADOW_BOLT = 2,
EVENT_SPELL_SEED_OF_CORRUPTION= 3,
EVENT_SPELL_SEED_OF_CORRUPTION = 3,
EVENT_SPELL_CURSE_OF_AGONY = 4,
EVENT_SPELL_FEAR = 5,
};
@@ -721,22 +728,22 @@ public:
events.ScheduleEvent(EVENT_SPELL_FROSTBOLT, 8000);
break;
case EVENT_SPELL_BLINK:
{
bool InMeleeRange = false;
ThreatContainer::StorageType const &t_list = me->getThreatManager().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (target->IsWithinMeleeRange(me))
{
InMeleeRange = true;
break;
}
{
bool InMeleeRange = false;
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (target->IsWithinMeleeRange(me))
{
InMeleeRange = true;
break;
}
if (InMeleeRange)
me->CastSpell(me, SPELL_BLINK, false);
events.ScheduleEvent(EVENT_SPELL_BLINK, 15000);
break;
}
if (InMeleeRange)
me->CastSpell(me, SPELL_BLINK, false);
events.ScheduleEvent(EVENT_SPELL_BLINK, 15000);
break;
}
}
DoMeleeAttackIfReady();
@@ -1083,17 +1090,17 @@ public:
events.ScheduleEvent(EVENT_SPELL_IRON_BOMB, 20000);
break;
case EVENT_SPELL_RECOMBOBULATE:
{
std::list<Creature*> cList = DoFindFriendlyMissingBuff(30.0f, SPELL_RECOMBOBULATE);
for (std::list<Creature*>::const_iterator itr = cList.begin(); itr != cList.end(); ++itr)
if ((*itr)->IsPolymorphed())
{
me->CastSpell(*itr, SPELL_RECOMBOBULATE, false);
break;
}
events.ScheduleEvent(EVENT_SPELL_RECOMBOBULATE, 10000);
break;
}
{
std::list<Creature*> cList = DoFindFriendlyMissingBuff(30.0f, SPELL_RECOMBOBULATE);
for (std::list<Creature*>::const_iterator itr = cList.begin(); itr != cList.end(); ++itr)
if ((*itr)->IsPolymorphed())
{
me->CastSpell(*itr, SPELL_RECOMBOBULATE, false);
break;
}
events.ScheduleEvent(EVENT_SPELL_RECOMBOBULATE, 10000);
break;
}
case EVENT_SPELL_EXPLOSIVE_SHEEP:
me->CastSpell(me, SPELL_HIGH_EXPLOSIVE_SHEEP, false);
events.ScheduleEvent(EVENT_SPELL_EXPLOSIVE_SHEEP, 60000);

4
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
View File

@@ -106,10 +106,10 @@ public:
events.ScheduleEvent(EVENT_SPELL_DRAIN_LIFE, 2500, 1);
events.ScheduleEvent(EVENT_SPELL_FEL_EXPLOSION, 2000);
events.ScheduleEvent(EVENT_DRAIN_CRYSTAL, 14000);
if (IsHeroic())
events.ScheduleEvent(EVENT_SPELL_DRAIN_MANA, 7500, 1);
}
}
void KilledUnit(Unit* victim)
{

2
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
View File

@@ -140,7 +140,7 @@ public:
me->CastSpell(me, SPELL_OVERLOAD, true);
return;
}
Talk(SAY_ENERGY);
Talk(EMOTE_DISCHARGE_ENERGY);

4
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
View File

@@ -30,7 +30,7 @@ public:
void Initialize()
{
memset(&Encounter, 0, sizeof(Encounter));
VexallusDoorGUID = 0;
SelinDoorGUID = 0;
SelinEncounterDoorGUID = 0;
@@ -130,7 +130,7 @@ public:
HandleGameObject(0, true, go);
VexallusDoorGUID = go->GetGUID();
break;
case GO_DELRISSA_DOOR:
if (GetData(DATA_DELRISSA_EVENT) == DONE)
HandleGameObject(0, true, go);