sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Scripts/BWL): Vaelastrasz Burning Adrenaline (#10626)

Browse Source
This commit is contained in:
Nefertumm
2022-02-14 20:47:17 -03:00
committed by GitHub
parent 5e94114abf
commit b5b4891470
2 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -14243,7 +14243,7 @@ void Unit::ModSpellCastTime(SpellInfo const* spellInfo, int32& castTime, Spell*
case SPELL_DAMAGE_CLASS_MELEE: case SPELL_DAMAGE_CLASS_MELEE:
break; // no known cases break; // no known cases
case SPELL_DAMAGE_CLASS_MAGIC: case SPELL_DAMAGE_CLASS_MAGIC:
castTime = int32(float(castTime) * GetFloatValue(UNIT_MOD_CAST_SPEED)); castTime = CanInstantCast() ? 0 : int32(float(castTime) * GetFloatValue(UNIT_MOD_CAST_SPEED));
break; break;
case SPELL_DAMAGE_CLASS_RANGED: case SPELL_DAMAGE_CLASS_RANGED:
castTime = int32(float(castTime) * m_modAttackSpeedPct[RANGED_ATTACK]); castTime = int32(float(castTime) * m_modAttackSpeedPct[RANGED_ATTACK]);
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+46 -42
View File
@@ -42,15 +42,17 @@ enum Gossip
enum Spells enum Spells
{ {
SPELL_ESSENCEOFTHERED = 23513, SPELL_ESSENCEOFTHERED = 23513,
SPELL_FLAMEBREATH = 23461, SPELL_FLAMEBREATH = 23461,
SPELL_FIRENOVA = 23462, SPELL_FIRENOVA = 23462,
SPELL_TAILSWIPE = 15847, SPELL_TAILSWIPE = 15847,
SPELL_BURNINGADRENALINE = 18173, //Cast this one. It's what 3.3.5 DBM expects. SPELL_CLEAVE = 19983, //Chain cleave is most likely named something different and contains a dummy effect
SPELL_BURNINGADRENALINE_EXPLOSION = 23478, SPELL_NEFARIUS_CORRUPTION = 23642,
SPELL_CLEAVE = 19983, //Chain cleave is most likely named something different and contains a dummy effect SPELL_RED_LIGHTNING = 19484,
SPELL_NEFARIUS_CORRUPTION = 23642,
SPELL_RED_LIGHTNING = 19484, SPELL_BURNING_ADRENALINE = 18173,
SPELL_BURNING_ADRENALINE_EXPLOSION = 23478, // AOE
SPELL_BURNING_ADRENALINE_INSTAKILL = 23644 // instakill
}; };
enum Events enum Events
@@ -67,8 +69,7 @@ enum Events
EVENT_FIRENOVA = 10, EVENT_FIRENOVA = 10,
EVENT_TAILSWIPE = 11, EVENT_TAILSWIPE = 11,
EVENT_CLEAVE = 12, EVENT_CLEAVE = 12,
EVENT_BURNINGADRENALINE_CASTER = 13, EVENT_BURNINGADRENALINE = 13,
EVENT_BURNINGADRENALINE_TANK = 14,
}; };
class boss_vaelastrasz : public CreatureScript class boss_vaelastrasz : public CreatureScript
@@ -88,6 +89,7 @@ public:
PlayerGUID.Clear(); PlayerGUID.Clear();
HasYelled = false; HasYelled = false;
_introDone = false; _introDone = false;
_burningAdrenalineCast = 0;
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
me->SetFaction(FACTION_FRIENDLY); me->SetFaction(FACTION_FRIENDLY);
@@ -109,6 +111,7 @@ public:
else else
{ {
HasYelled = false; HasYelled = false;
_burningAdrenalineCast = 0;
} }
} }
@@ -124,8 +127,7 @@ public:
events.ScheduleEvent(EVENT_FLAMEBREATH, 15000); events.ScheduleEvent(EVENT_FLAMEBREATH, 15000);
events.ScheduleEvent(EVENT_FIRENOVA, 20000); events.ScheduleEvent(EVENT_FIRENOVA, 20000);
events.ScheduleEvent(EVENT_TAILSWIPE, 11000); events.ScheduleEvent(EVENT_TAILSWIPE, 11000);
events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000); events.ScheduleEvent(EVENT_BURNINGADRENALINE, 15000);
events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
} }
void BeginSpeech(Unit* target) void BeginSpeech(Unit* target)
@@ -229,23 +231,27 @@ public:
}*/ }*/
events.ScheduleEvent(EVENT_TAILSWIPE, 15000); events.ScheduleEvent(EVENT_TAILSWIPE, 15000);
break; break;
case EVENT_BURNINGADRENALINE_CASTER: case EVENT_BURNINGADRENALINE:
{
if (_burningAdrenalineCast < 2) // It's better to use TaskScheduler for this, but zzz
{ {
//selects a random target that isn't the current victim and is a mana user (selects mana users) but not pets //selects a random target that isn't the current victim and is a mana user (selects mana users) but not pets
//it also ignores targets who have the aura. We don't want to place the debuff on the same target twice. //it also ignores targets who have the aura. We don't want to place the debuff on the same target twice.
if (Unit *target = SelectTarget(SelectTargetMethod::Random, 1, [&](Unit* u) { return u && !u->IsPet() && u->getPowerType() == POWER_MANA && !u->HasAura(SPELL_BURNINGADRENALINE); })) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [&](Unit* u) { return u && !u->IsPet() && u->getPowerType() == POWER_MANA && !u->HasAura(SPELL_BURNING_ADRENALINE) && u != me->GetVictim(); }))
{ {
me->CastSpell(target, SPELL_BURNINGADRENALINE, true); me->CastSpell(target, SPELL_BURNING_ADRENALINE, true);
} }
_burningAdrenalineCast++;
} }
//reschedule the event else
events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000); {
break; me->CastSpell(me->GetVictim(), SPELL_BURNING_ADRENALINE, true);
case EVENT_BURNINGADRENALINE_TANK: _burningAdrenalineCast = 0;
//Vael has to cast it himself; contrary to the previous commit's comment. Nothing happens otherwise. }
me->CastSpell(me->GetVictim(), SPELL_BURNINGADRENALINE, true); events.ScheduleEvent(EVENT_BURNINGADRENALINE, 15000);
events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
break; break;
}
} }
} }
@@ -284,6 +290,7 @@ public:
bool HasYelled; bool HasYelled;
bool _introDone; bool _introDone;
EventMap _eventsIntro; EventMap _eventsIntro;
uint8 _burningAdrenalineCast;
}; };
CreatureAI* GetAI(Creature* creature) const override CreatureAI* GetAI(Creature* creature) const override
@@ -292,39 +299,36 @@ public:
} }
}; };
// Need to define an aurascript for EVENT_BURNINGADRENALINE's death effect.
// 18173 - Burning Adrenaline // 18173 - Burning Adrenaline
class spell_vael_burning_adrenaline : public SpellScriptLoader class spell_vael_burning_adrenaline : public AuraScript
{ {
public: PrepareAuraScript(spell_vael_burning_adrenaline);
spell_vael_burning_adrenaline() : SpellScriptLoader("spell_vael_burning_adrenaline") { }
class spell_vael_burning_adrenaline_AuraScript : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
PrepareAuraScript(spell_vael_burning_adrenaline_AuraScript); return ValidateSpellInfo({ SPELL_BURNING_ADRENALINE_EXPLOSION, SPELL_BURNING_ADRENALINE_INSTAKILL });
}
void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (!GetTarget())
{ {
//The tooltip says the on death the AoE occurs. According to information: http://qaliaresponse.stage.lithium.com/t5/WoW-Mayhem/Surviving-Burning-Adrenaline-For-tanks/td-p/48609 return;
//Burning Adrenaline can be survived therefore Blizzard's implementation was an AoE bomb that went off if you were still alive and dealt
//damage to the target. You don't have to die for it to go off. It can go off whether you live or die.
GetTarget()->CastSpell(GetTarget(), SPELL_BURNINGADRENALINE_EXPLOSION, true);
} }
void Register() override // Do the explosion, then kill the target.
{ GetTarget()->CastSpell(GetTarget(), SPELL_BURNING_ADRENALINE_EXPLOSION, true);
AfterEffectRemove += AuraEffectRemoveFn(spell_vael_burning_adrenaline_AuraScript::OnAuraRemoveHandler, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); GetTarget()->CastSpell(GetTarget(), SPELL_BURNING_ADRENALINE_INSTAKILL, true);
} }
};
AuraScript* GetAuraScript() const override void Register() override
{ {
return new spell_vael_burning_adrenaline_AuraScript(); AfterEffectRemove += AuraEffectRemoveFn(spell_vael_burning_adrenaline::HandleRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
} }
}; };
void AddSC_boss_vaelastrasz() void AddSC_boss_vaelastrasz()
{ {
new boss_vaelastrasz(); new boss_vaelastrasz();
new spell_vael_burning_adrenaline(); RegisterSpellScript(spell_vael_burning_adrenaline);
} }