Skip to content

Commit 9e53591

Browse files
committed
Scripts/ICC: improve Lich King's Valkyr charge and path cosmetics
1 parent a1940ab commit 9e53591

2 files changed

Lines changed: 30 additions & 1 deletion

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--
2+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_the_lich_king_valkyr_charge';
3+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
4+
(74399, 'spell_the_lich_king_valkyr_charge');

src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ struct npc_valkyr_shadowguard : public ScriptedAI
14751475

14761476
triggers.sort(Trinity::ObjectDistanceOrderPred(me));
14771477
DoCast(target, SPELL_VALKYR_CARRY);
1478-
_dropPoint.Relocate(triggers.front());
1478+
_dropPoint.Relocate(triggers.front()->GetPositionX(), triggers.front()->GetPositionY(), me->GetFloorZ() + 2.f);
14791479
_events.ScheduleEvent(EVENT_MOVE_TO_DROP_POS, 1s + 500ms);
14801480
}
14811481
}
@@ -2821,6 +2821,30 @@ class spell_the_lich_king_harvest_souls_teleport : public SpellScript
28212821
}
28222822
};
28232823

2824+
// 74399 - Charge (Valkyr)
2825+
class spell_the_lich_king_valkyr_charge : public SpellScript
2826+
{
2827+
PrepareSpellScript(spell_the_lich_king_valkyr_charge);
2828+
2829+
void ChargeDest(SpellEffIndex effIndex)
2830+
{
2831+
PreventHitDefaultEffect(effIndex);
2832+
2833+
Unit* caster = GetCaster();
2834+
Unit* target = GetExplTargetUnit();
2835+
if (!target)
2836+
return;
2837+
2838+
Position pos = target->GetPosition();
2839+
caster->GetMotionMaster()->MoveCharge(pos.m_positionX, pos.m_positionY, caster->GetFloorZ() + 2.f);
2840+
}
2841+
2842+
void Register() override
2843+
{
2844+
OnEffectLaunch += SpellEffectFn(spell_the_lich_king_valkyr_charge::ChargeDest, EFFECT_0, SPELL_EFFECT_CHARGE_DEST);
2845+
}
2846+
};
2847+
28242848
class achievement_been_waiting_long_time : public AchievementCriteriaScript
28252849
{
28262850
public:
@@ -2895,6 +2919,7 @@ void AddSC_boss_the_lich_king()
28952919
RegisterSpellScriptWithArgs(spell_trigger_spell_from_caster, "spell_the_lich_king_mass_resurrection", SPELL_MASS_RESURRECTION_REAL);
28962920
RegisterSpellScript(spell_the_lich_king_play_movie);
28972921
RegisterSpellScript(spell_the_lich_king_harvest_souls_teleport);
2922+
RegisterSpellScript(spell_the_lich_king_valkyr_charge);
28982923

28992924
// Achievements
29002925
new achievement_been_waiting_long_time();

0 commit comments

Comments
 (0)