Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SD] Moam and Ouro use Double Attack manually #578

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SD] Moam and Ouro use Double Attack manually #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/game/AI/ScriptDevAI/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ enum
EMOTE_ENERGIZING = -1509028,

SPELL_TRAMPLE = 15550,
SPELL_DOUBLE_ATTACK = 18941,
SPELL_DRAIN_MANA = 25676,
SPELL_ARCANE_ERUPTION = 25672,
SPELL_SUMMON_MANAFIENDS = 25684,
Expand All @@ -52,6 +53,7 @@ enum MoamActions
MOAM_MANA_FIENDS,
MOAM_ENERGIZE,
MOAM_TRAMPLE,
MOAM_DOUBLE_ATTACK,
MOAM_MANA_DRAIN,
MOAM_ACTION_MAX,
MOAM_CANCEL_ENERGIZE,
Expand All @@ -65,6 +67,7 @@ struct boss_moamAI : public CombatAI
{
AddCombatAction(MOAM_ARCANE_ERUPTION, 0u);
AddCombatAction(MOAM_TRAMPLE, 9000u);
AddCombatAction(MOAM_DOUBLE_ATTACK, 8000, 12000);
AddCombatAction(MOAM_MANA_DRAIN, 6000u);
AddCombatAction(MOAM_MANA_FIENDS, 90000u);
AddCombatAction(MOAM_ENERGIZE, 90000u);
Expand Down Expand Up @@ -138,6 +141,12 @@ struct boss_moamAI : public CombatAI
ResetCombatAction(action, 15000);
break;
}
case MOAM_DOUBLE_ATTACK:
{
if (DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK) == CAST_OK)
ResetCombatAction(action, urand(8000, 12000));
break;
}
case MOAM_MANA_DRAIN:
{
if (DoCastSpellIfCan(nullptr, SPELL_DRAIN_MANA) == CAST_OK)
Expand Down
9 changes: 9 additions & 0 deletions src/game/AI/ScriptDevAI/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ EndScriptData
enum
{
// ground spells
SPELL_DOUBLE_ATTACK = 18941,
SPELL_SWEEP = 26103,
SPELL_SANDBLAST = 26102,
SPELL_BOULDER = 26616,
Expand Down Expand Up @@ -75,6 +76,7 @@ enum OuroActions
OURO_BOULDER,
OURO_SAND_BLAST,
OURO_SWEEP,
OURO_DOUBLE_ATTACK,
OURO_NO_MELEE_BURROW,
OURO_ACTION_MAX,
OURO_SPAWN_DELAY_ATTACK,
Expand Down Expand Up @@ -112,6 +114,7 @@ struct boss_ouroAI : public CombatAI
AddCombatAction(OURO_BOULDER, true);
AddCombatAction(OURO_SAND_BLAST, 25000u);
AddCombatAction(OURO_SWEEP, 20000u);
AddCombatAction(OURO_DOUBLE_ATTACK, urand(1000, 10000));
AddCombatAction(OURO_NO_MELEE_BURROW, 2000u);
AddCustomAction(OURO_SPAWN_DELAY_ATTACK, true, [&]() {HandleSpawnDelay(); });
m_creature->SetImmobilizedState(true);
Expand Down Expand Up @@ -272,6 +275,12 @@ struct boss_ouroAI : public CombatAI
ResetCombatAction(action, 20000);
break;
}
case OURO_DOUBLE_ATTACK:
{
if (DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK) == CAST_OK)
ResetCombatAction(action, urand(7000, 13000));
break;
}
case OURO_BOULDER:
{
uint32 timer = 500;
Expand Down