mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-01-26 06:56:24 +00:00
Compare commits
1 Commits
master
...
hermensbas
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3649da0da6 |
@@ -45,19 +45,8 @@ bool RaidOnyxiaSpreadOutAction::Execute(Event event)
|
|||||||
if (!boss)
|
if (!boss)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Trigger may fire on one tick, but the action can execute on a later tick.
|
Player* target = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_targets.GetUnitTarget()->ToPlayer();
|
||||||
// By that time the cast may have finished, so current spell can be null.
|
if (target != bot)
|
||||||
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
|
||||||
if (!currentSpell || !currentSpell->m_spellInfo)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// Fireball
|
|
||||||
if (currentSpell->m_spellInfo->Id != 18392)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
Unit* unitTarget = currentSpell->m_targets.GetUnitTarget();
|
|
||||||
Player* target = unitTarget ? unitTarget->ToPlayer() : nullptr;
|
|
||||||
if (!target || target != bot)
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// bot->Yell("Spreading out — I'm the Fireball target!", LANG_UNIVERSAL);
|
// bot->Yell("Spreading out — I'm the Fireball target!", LANG_UNIVERSAL);
|
||||||
@@ -71,7 +60,7 @@ bool RaidOnyxiaMoveToSafeZoneAction::Execute(Event event)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
||||||
if (!currentSpell || !currentSpell->m_spellInfo)
|
if (!currentSpell)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
uint32 spellId = currentSpell->m_spellInfo->Id;
|
uint32 spellId = currentSpell->m_spellInfo->Id;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ bool OnyxiaDeepBreathTrigger::IsActive()
|
|||||||
// Check if Onyxia is casting
|
// Check if Onyxia is casting
|
||||||
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
||||||
|
|
||||||
if (!currentSpell || !currentSpell->m_spellInfo)
|
if (!currentSpell)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
uint32 spellId = currentSpell->m_spellInfo->Id;
|
uint32 spellId = currentSpell->m_spellInfo->Id;
|
||||||
@@ -65,7 +65,7 @@ bool RaidOnyxiaFireballSplashTrigger::IsActive()
|
|||||||
|
|
||||||
// Check if Onyxia is casting Fireball
|
// Check if Onyxia is casting Fireball
|
||||||
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
Spell* currentSpell = boss->GetCurrentSpell(CURRENT_GENERIC_SPELL);
|
||||||
if (!currentSpell || !currentSpell->m_spellInfo || currentSpell->m_spellInfo->Id != 18392) // 18392 is the classic Fireball ID // 18392 is the classic Fireball ID
|
if (!currentSpell || currentSpell->m_spellInfo->Id != 18392) // 18392 is the classic Fireball ID
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
GuidVector nearbyUnits = AI_VALUE(GuidVector, "nearest friendly players");
|
GuidVector nearbyUnits = AI_VALUE(GuidVector, "nearest friendly players");
|
||||||
|
|||||||
Reference in New Issue
Block a user