Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/VP: minor cleanups and improved Holwing Gale behaivior

Browse Source 
* Howling Gale will no longer get stuck in combat when applying periodic damage effects on them
* When damaging a Howling Gale, the target will now stop casting any knockbacks for 10 seconds before slowly starting to build up again
This commit is contained in:
Ovahlord
2020-09-28 19:36:22 +02:00
parent 44be244ced
commit df60a4d848
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/4.3.4/2020_09_28_00_world.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE `creature_template` SET `RegenHealth`= 0 WHERE `entry`= 45572;
UPDATE `creature` SET `curhealth`= 0 WHERE `id`= 45572;

77
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
View File

@@ -128,7 +128,7 @@ struct npc_vp_howling_gale : public NullCreatureAI
{
npc_vp_howling_gale(Creature* creature) : NullCreatureAI(creature) { }
void JustEngagedWith(Unit* /*who*/) override
void JustEnteredCombat(Unit* /*who*/) override
{
me->GetThreatManager().ClearAllThreat();
me->CombatStop(false);
@@ -138,31 +138,26 @@ struct npc_vp_howling_gale : public NullCreatureAI
enum Slipstreams
{
// Spells
SPELL_SLIPSTREAM_ENTER = 84965,
SPELL_SLIPSTREAM_FIRST = 84980,
SPELL_SLIPSTREAM_SECOND = 84988,
SPELL_SLIPSTREAM_THIRD = 85394,
SPELL_SLIPSTREAM_FOURTH = 85397,
SPELL_SLIPSTREAM_LAST = 85016,
SPELL_SLIPSTREAM_ASAAD = 95911,
SPELL_SLIPSTREAM_SHORTCUT_ALTAIRUS = 89498,
SPELL_SLIPSTREAM_SHORTCUT_ASAAD = 89500,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_FIRST = 84978,
SPELL_SLIPSTREAM_ENTER = 84965,
SPELL_SLIPSTREAM_FIRST = 84980,
SPELL_SLIPSTREAM_SECOND = 84988,
SPELL_SLIPSTREAM_THIRD = 85394,
SPELL_SLIPSTREAM_FOURTH = 85397,
SPELL_SLIPSTREAM_LAST = 85016,
SPELL_SLIPSTREAM_ASAAD = 95911,
SPELL_SLIPSTREAM_SHORTCUT_ALTAIRUS = 89498,
SPELL_SLIPSTREAM_SHORTCUT_ASAAD = 89500,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_FIRST = 84978,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_SECOND = 84989,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_THIRD = 85395,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_THIRD = 85395,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_FOURTH = 85396,
SPELL_SLIPSTREAM_CONTROL_VEHICLE_LAST = 85017
SPELL_SLIPSTREAM_CONTROL_VEHICLE_LAST = 85017
};
// 45455 - Slipstream
struct npc_slipstream : public NullCreatureAI
{
npc_slipstream(Creature* creature) : NullCreatureAI(creature), _instance(me->GetInstanceScript()), _guid(me->GetGUID())
{
Initialize();
}
void Initialize()
{
me->SetExtraUnitMovementFlags(MOVEMENTFLAG2_NO_STRAFE | MOVEMENTFLAG2_NO_JUMPING);
}
@@ -515,7 +510,9 @@ class spell_vp_lurk_search : public SpellScript
return ValidateSpellInfo(
{
SPELL_LURK_SEARCH_FACING_PLAYERS,
SPELL_LURK_SEARCH_DEATH_CHECK
SPELL_LURK_SEARCH_DEATH_CHECK,
SPELL_LURK_SEARCH_SELECT_TARGET,
SPELL_LURK_RESSURECT
});
}
@@ -534,19 +531,17 @@ class spell_vp_lurk_search : public SpellScript
return !target->HasInArc(float(M_PI), caster);
});
if (!caster->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29))
if (!targets.empty() && GetSpellInfo()->Id == SPELL_LURK_SEARCH_FACING_PLAYERS)
caster->CastSpell(caster, SPELL_FEIGN_DEATH);
if (!caster->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29) && !targets.empty())
caster->CastSpell(caster, SPELL_FEIGN_DEATH);
break;
case SPELL_LURK_SEARCH_DEATH_CHECK:
targets.remove_if([caster](WorldObject const* target)->bool
{
return target->HasInArc(float(M_PI), caster);
return !target->HasInArc(float(M_PI), caster);
});
if (caster->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29))
if (!targets.empty() && GetSpellInfo()->Id == SPELL_LURK_SEARCH_DEATH_CHECK && !caster->HasAura(SPELL_LURK_RESSURECT, caster->GetGUID()))
caster->CastSpell(caster, SPELL_LURK_RESSURECT);
if (caster->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29) && targets.empty() && !caster->HasAura(SPELL_LURK_RESSURECT, caster->GetGUID()))
caster->CastSpell(caster, SPELL_LURK_RESSURECT);
break;
case SPELL_LURK_SEARCH_SELECT_TARGET:
{
@@ -656,18 +651,42 @@ class spell_vp_howling_gale : public AuraScript
});
}
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
{
_inactiveTicks = 20;
_weakTicks = 10;
}
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
Unit* caster = GetTarget();
bool weakOrb = GetAura()->IsProcOnCooldown(std::chrono::steady_clock::now());
caster->CastSpell(caster, weakOrb ? SPELL_HOWLING_GALE_VISUAL_WEAK : SPELL_HOWLING_GALE_VISUAL_STRONG);
caster->CastSpell(caster, weakOrb ? SPELL_HOWLING_GALE_KNOCKBACK_WEAK : SPELL_HOWLING_GALE_KNOCKBACK_STRONG);
if (_inactiveTicks > 0)
{
--_inactiveTicks;
return;
}
if (_weakTicks > 0)
{
--_weakTicks;
caster->CastSpell(caster, SPELL_HOWLING_GALE_VISUAL_WEAK);
caster->CastSpell(caster, SPELL_HOWLING_GALE_KNOCKBACK_WEAK);
}
else
{
caster->CastSpell(caster, SPELL_HOWLING_GALE_VISUAL_STRONG);
caster->CastSpell(caster, SPELL_HOWLING_GALE_KNOCKBACK_STRONG);
}
}
void Register() override
{
OnEffectProc.Register(&spell_vp_howling_gale::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_vp_howling_gale::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
private:
uint8 _inactiveTicks = 0;
uint8 _weakTicks = 0;
};
// 85159, 85085 - Howling Gale