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

fix(Scripts/Naxxramas): Improve Four Horsemen (#14247)

Browse Source 
* init

* remove aggro reduction

* add visibility sql file

---------

Co-authored-by: Si1ker <Si1ker@users.noreply.github.com>
This commit is contained in:
Eddy Vega
2023-03-21 12:04:18 -06:00
committed by GitHub
parent 2396638a70
commit 80ac0c958d
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1677603589341678000.sql
+3
View File
@@ -0,0 +1,3 @@
--
UPDATE `creature_addon` SET `visibilityDistanceType` = 3 WHERE `guid` IN (130964, 130961, 130962, 130963);
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+23 -21
View File
@@ -56,8 +56,7 @@ enum Events
EVENT_MARK_CAST = 1, EVENT_MARK_CAST = 1,
EVENT_PRIMARY_SPELL = 2, EVENT_PRIMARY_SPELL = 2,
EVENT_SECONDARY_SPELL = 3, EVENT_SECONDARY_SPELL = 3,
EVENT_PUNISH = 4, EVENT_BERSERK = 4
EVENT_BERSERK = 5
}; };
enum Misc enum Misc
@@ -75,12 +74,12 @@ enum Misc
enum FourHorsemen enum FourHorsemen
{ {
SAY_AGGRO = 0, SAY_AGGRO = 0,
SAY_TAUNT = 1, SAY_TAUNT = 1,
SAY_SPECIAL = 2, SAY_SPECIAL = 2,
SAY_SLAY = 3, SAY_SLAY = 3,
SAY_DEATH = 4, SAY_DEATH = 4,
EMOTE_RAGECAST = 7 EMOTE_RAGECAST = 7
}; };
// MARKS // MARKS
@@ -201,7 +200,6 @@ public:
} }
else else
{ {
events.RescheduleEvent(EVENT_PUNISH, 5s);
events.RescheduleEvent(EVENT_SECONDARY_SPELL, 15s); events.RescheduleEvent(EVENT_SECONDARY_SPELL, 15s);
} }
if (pInstance) if (pInstance)
@@ -348,25 +346,29 @@ public:
me->CastSpell(me->GetVictim(), RAID_MODE(TABLE_SPELL_PRIMARY_10[horsemanId], TABLE_SPELL_PRIMARY_25[horsemanId]), false); me->CastSpell(me->GetVictim(), RAID_MODE(TABLE_SPELL_PRIMARY_10[horsemanId], TABLE_SPELL_PRIMARY_25[horsemanId]), false);
events.Repeat(15s); events.Repeat(15s);
return; return;
case EVENT_PUNISH:
if (!SelectTarget(SelectTargetMethod::MaxDistance, 0, 45.0f, true))
{
me->CastSpell(me, TABLE_SPELL_PUNISH[horsemanId], false);
Talk(EMOTE_RAGECAST);
}
events.Repeat(2s);
return;
case EVENT_SECONDARY_SPELL: case EVENT_SECONDARY_SPELL:
me->CastSpell(me->GetVictim(), RAID_MODE(TABLE_SPELL_SECONDARY_10[horsemanId], TABLE_SPELL_SECONDARY_25[horsemanId]), false); me->CastSpell(me->GetVictim(), RAID_MODE(TABLE_SPELL_SECONDARY_10[horsemanId], TABLE_SPELL_SECONDARY_25[horsemanId]), false);
events.Repeat(15s); events.Repeat(15s);
return; return;
} }
if ((me->GetEntry() == NPC_LADY_BLAUMEUX || me->GetEntry() == NPC_SIR_ZELIEK)) if (me->GetEntry() == NPC_LADY_BLAUMEUX || me->GetEntry() == NPC_SIR_ZELIEK)
{ {
if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 45.0f, true)) if (Unit* pTarget = me->SelectNearestPlayer(300.0f))
{ {
me->CastSpell(target, RAID_MODE(TABLE_SPELL_PRIMARY_10[horsemanId], TABLE_SPELL_PRIMARY_25[horsemanId]), false); if (pTarget && me->IsValidAttackTarget(pTarget))
{
AttackStart(pTarget);
}
}
if (me->IsWithinDistInMap(me->GetVictim(), 45.0f) && me->IsValidAttackTarget(me->GetVictim()))
{
DoCastVictim(RAID_MODE(TABLE_SPELL_PRIMARY_10[horsemanId], TABLE_SPELL_PRIMARY_25[horsemanId]));
}
else if (!me->IsWithinDistInMap(me->GetVictim(), 45.0f) || !me->IsValidAttackTarget(me->GetVictim()))
{
DoCastAOE(TABLE_SPELL_PUNISH[horsemanId]);
Talk(EMOTE_RAGECAST);
} }
} }
else else
@@ -406,7 +408,7 @@ public:
damage = 4000; damage = 4000;
break; break;
case 5: case 5:
damage = 12000; damage = 12500;
break; break;
case 6: case 6:
damage = 20000; damage = 20000;