josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: Code style cleanup in ScriptedAI and BossAI

Browse Source
This commit is contained in:
Shauren
2011-03-19 10:54:16 +01:00
parent 6eb5014182
commit 1a4a618d81
19 changed files with 266 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ public:
void Reset()
{
if (!IsCombatMovement())
if (!IsCombatMovementAllowed())
SetCombatMovement(true);
m_uiPhase = PHASE_START;
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+1 -1
View File
@@ -547,7 +547,7 @@ public:
me->SetInCombatWith(pWho);
pWho->SetInCombatWith(me);
if (IsCombatMovement())
if (IsCombatMovementAllowed())
me->GetMotionMaster()->MoveChase(pWho);
}
}
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+2 -2
View File
@@ -143,10 +143,10 @@ public:
if (me->HasAura(SPELL_WEB_FRONT_DOORS) || me->HasAura(SPELL_WEB_SIDE_DOORS))
{
if (IsCombatMovement())
if (IsCombatMovementAllowed())
SetCombatMovement(false);
}
else if (!IsCombatMovement())
else if (!IsCombatMovementAllowed())
SetCombatMovement(true);
if (uiPierceTimer <= diff)
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ public:
m_uiLegionFlameTimer = 30*IN_MILLISECONDS;
} else m_uiLegionFlameTimer -= uiDiff;
if (getDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_TOUCH_OF_JARAXXUS);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+2 -2
View File
@@ -140,8 +140,8 @@ public:
m_uiStaggeringStompTimer = 15*IN_MILLISECONDS;
m_uiSummonTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS);;
if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL ||
getDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL ||
GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
m_uiSummonCount = 5;
else
m_uiSummonCount = 4;
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ class boss_lady_deathwhisper : public CreatureScript
events.ScheduleEvent(EVENT_P1_SUMMON_WAVE, 5000, 0, PHASE_ONE);
events.ScheduleEvent(EVENT_P1_SHADOW_BOLT, urand(5500, 6000), 0, PHASE_ONE);
events.ScheduleEvent(EVENT_P1_EMPOWER_CULTIST, urand(20000, 30000), 0, PHASE_ONE);
if (getDifficulty() != RAID_DIFFICULTY_10MAN_NORMAL)
if (GetDifficulty() != RAID_DIFFICULTY_10MAN_NORMAL)
events.ScheduleEvent(EVENT_DOMINATE_MIND_H, 27000);
Talk(SAY_AGGRO);
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
-34
View File
@@ -1418,40 +1418,6 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader
}
};
class spell_trigger_spell_from_caster : public SpellScriptLoader
{
public:
spell_trigger_spell_from_caster(char const* scriptName, uint32 _triggerId) : SpellScriptLoader(scriptName), triggerId(_triggerId) { }
class spell_trigger_spell_from_caster_SpellScript : public SpellScript
{
PrepareSpellScript(spell_trigger_spell_from_caster_SpellScript);
public:
spell_trigger_spell_from_caster_SpellScript(uint32 _triggerId) : SpellScript(), triggerId(_triggerId) { }
void HandleTrigger()
{
GetCaster()->CastSpell(GetHitUnit(), triggerId, true);
}
void Register()
{
AfterHit += SpellHitFn(spell_trigger_spell_from_caster_SpellScript::HandleTrigger);
}
uint32 triggerId;
};
SpellScript* GetSpellScript() const
{
return new spell_trigger_spell_from_caster_SpellScript(triggerId);
}
private:
uint32 triggerId;
};
class at_sindragosa_lair : public AreaTriggerScript
{
public:
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+41
View File
@@ -326,4 +326,45 @@ enum WorldStatesICC
WORLDSTATE_ATTEMPTS_MAX = 4942,
};
class spell_trigger_spell_from_caster : public SpellScriptLoader
{
public:
spell_trigger_spell_from_caster(char const* scriptName, uint32 _triggerId) : SpellScriptLoader(scriptName), triggerId(_triggerId) { }
class spell_trigger_spell_from_caster_SpellScript : public SpellScript
{
PrepareSpellScript(spell_trigger_spell_from_caster_SpellScript);
public:
spell_trigger_spell_from_caster_SpellScript(uint32 _triggerId) : SpellScript(), triggerId(_triggerId) { }
bool Validate(SpellEntry const* /*spell*/)
{
if (!sSpellStore.LookupEntry(triggerId))
return false;
return true;
}
void HandleTrigger()
{
GetCaster()->CastSpell(GetHitUnit(), triggerId, true);
}
void Register()
{
AfterHit += SpellHitFn(spell_trigger_spell_from_caster_SpellScript::HandleTrigger);
}
uint32 triggerId;
};
SpellScript* GetSpellScript() const
{
return new spell_trigger_spell_from_caster_SpellScript(triggerId);
}
private:
uint32 triggerId;
};
#endif // ICECROWN_CITADEL_H_
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ public:
hasTaunted = false;
if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
{
Position pos;
@@ -115,7 +115,7 @@ public:
events.ScheduleEvent(EVENT_LOCUST, 90000);
events.ScheduleEvent(EVENT_BERSERK, 600000);
if (getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000,20000));
}
src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+2 -2
View File
@@ -197,7 +197,7 @@ public:
void Reset()
{
if (getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) {
if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) {
me->ApplySpellImmune(0, IMMUNITY_MECHANIC, SPELL_EFFECT_BIND, true);
me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_CHARM, true);
}
@@ -205,7 +205,7 @@ public:
void JustDied(Unit * /*killer*/)
{
if (pInstance && getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
if (pInstance && GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
{
if (Creature *pFaerlina = pInstance->instance->GetCreature(pInstance->GetData64(DATA_FAERLINA)))
DoCast(pFaerlina, SPELL_WIDOWS_EMBRACE);
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+6 -6
View File
@@ -248,9 +248,9 @@ public:
void DoGothikSummon(uint32 entry)
{
if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
{
switch(entry)
switch (entry)
{
case MOB_LIVE_TRAINEE:
{
@@ -406,9 +406,9 @@ public:
case EVENT_SUMMON:
if (waves[waveCount].entry)
{
if ((waves[waveCount].mode == 2) && (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL))
if ((waves[waveCount].mode == 2) && (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL))
DoGothikSummon(waves[waveCount].entry);
else if ((waves[waveCount].mode == 0) && (getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL))
else if ((waves[waveCount].mode == 0) && (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL))
DoGothikSummon(waves[waveCount].entry);
else if (waves[waveCount].mode == 1)
DoGothikSummon(waves[waveCount].entry);
@@ -428,9 +428,9 @@ public:
if (waves[waveCount].mode == 1)
events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time);
else if ((waves[waveCount].mode == 2) && (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL))
else if ((waves[waveCount].mode == 2) && (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL))
events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time);
else if ((waves[waveCount].mode == 0) && (getDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL))
else if ((waves[waveCount].mode == 0) && (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL))
events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time);
else
events.ScheduleEvent(EVENT_SUMMON, 0);
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+1 -1
View File
@@ -430,7 +430,7 @@ public:
events.ScheduleEvent(EVENT_DETONATE, urand(30000,40000));
events.ScheduleEvent(EVENT_FISSURE, urand(10000,30000));
events.ScheduleEvent(EVENT_BLAST, urand(60000,120000));
if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
events.ScheduleEvent(EVENT_CHAIN, urand(30000,60000));
Phase = 2;
break;
src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ public:
events.ScheduleEvent(EVENT_BALCONY, 110000);
events.ScheduleEvent(EVENT_CURSE, 10000+rand()%15000);
events.ScheduleEvent(EVENT_WARRIOR, 30000);
if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
events.ScheduleEvent(EVENT_BLINK, 20000 + rand()%20000);
}
}