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

fix(Core/Script): Molten Core: Gehennas (#5680)

Browse Source 
Co-authored-by: @T1ti
Co-authored-by: @sanctum32
This commit is contained in:
Hacki95
2021-07-05 00:12:35 +02:00
committed by GitHub
parent a0fafa8f52
commit ab5ce3e372
2 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1620337536404777343.sql
+11
View File
@@ -0,0 +1,11 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1620337536404777343');
-- Timers update for NPC "Flamewaker Protector"
UPDATE `smart_scripts` SET `event_param1`=5000, `event_param2`=5000, `event_param3`=6500, `event_param4`=6500 WHERE `entryorguid`=12119 AND `source_type`=0 AND `id`=0 AND `link`=0;
UPDATE `smart_scripts` SET `event_param1`=5000, `event_param2`=10000, `event_param3`=7000, `event_param4`=7000 WHERE `entryorguid`=12119 AND `source_type`=0 AND `id`=1 AND `link`=0;
-- Timers update for NPC "Flamewaker"
UPDATE `smart_scripts` SET `event_param1`=3000, `event_param2`=6000, `event_param3`=10000, `event_param4`=13000 WHERE `entryorguid`=11661 AND `source_type`=0 AND `id`=1 AND `link`=0;
UPDATE `smart_scripts` SET `event_param1`=3000, `event_param3`=4000, `event_param4`=6000 WHERE `entryorguid`=11661 AND `source_type`=0 AND `id`=0 AND `link`=0;
UPDATE `smart_scripts` SET `event_param1`=4000, `event_param2`=9000, `event_param3`=5000, `event_param4`=8000 WHERE `entryorguid`=11661 AND `source_type`=0 AND `id`=2 AND `link`=0;
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+48 -19
View File
@@ -11,23 +11,23 @@ SDComment: Adds MC NYI
SDCategory: Molten Core SDCategory: Molten Core
EndScriptData */ EndScriptData */
#include "molten_core.h"
#include "ObjectMgr.h"
#include "ScriptedCreature.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "molten_core.h"
enum Spells enum Spells
{ {
SPELL_GEHENNAS_CURSE = 19716, SPELL_GEHENNAS_CURSE = 19716,
SPELL_RAIN_OF_FIRE = 19717, SPELL_RAIN_OF_FIRE = 19717,
SPELL_SHADOW_BOLT = 19728, SPELL_SHADOW_BOLT_RANDOM = 19728,
SPELL_SHADOW_BOLT_VICTIM = 19729,
}; };
enum Events enum Events
{ {
EVENT_GEHENNAS_CURSE = 1, EVENT_GEHENNAS_CURSE = 1,
EVENT_RAIN_OF_FIRE = 2, EVENT_RAIN_OF_FIRE,
EVENT_SHADOW_BOLT = 3, EVENT_SHADOW_BOLT,
}; };
class boss_gehennas : public CreatureScript class boss_gehennas : public CreatureScript
@@ -41,47 +41,76 @@ public:
{ {
} }
void EnterCombat(Unit* victim) override void EnterCombat(Unit* /*attacker*/) override
{ {
BossAI::EnterCombat(victim); _EnterCombat();
events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000); events.ScheduleEvent(EVENT_GEHENNAS_CURSE, urand(6000, 9000));
events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000); events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000); events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 5000));
} }
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if (!UpdateVictim()) if (!UpdateVictim())
{
return; return;
}
events.Update(diff); events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
{
return; return;
}
while (uint32 eventId = events.ExecuteEvent()) while (uint32 const eventId = events.ExecuteEvent())
{ {
switch (eventId) switch (eventId)
{ {
case EVENT_GEHENNAS_CURSE: case EVENT_GEHENNAS_CURSE:
{
DoCastVictim(SPELL_GEHENNAS_CURSE); DoCastVictim(SPELL_GEHENNAS_CURSE);
events.ScheduleEvent(EVENT_GEHENNAS_CURSE, urand(22000, 30000)); events.RepeatEvent(urand(25000, 30000));
break; break;
}
case EVENT_RAIN_OF_FIRE: case EVENT_RAIN_OF_FIRE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) {
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
DoCast(target, SPELL_RAIN_OF_FIRE); DoCast(target, SPELL_RAIN_OF_FIRE);
events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(4000, 12000)); }
events.RepeatEvent(6000);
break; break;
}
case EVENT_SHADOW_BOLT: case EVENT_SHADOW_BOLT:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) {
DoCast(target, SPELL_SHADOW_BOLT); if (urand(0, 1))
events.ScheduleEvent(EVENT_SHADOW_BOLT, 7000); {
break; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
default: {
DoCast(target, SPELL_SHADOW_BOLT_RANDOM);
}
else
{
DoCastVictim(SPELL_SHADOW_BOLT_VICTIM);
}
}
else
{
DoCastVictim(SPELL_SHADOW_BOLT_VICTIM);
}
events.RepeatEvent(5000);
break; break;
} }
} }
if (me->HasUnitState(UNIT_STATE_CASTING))
{
return;
}
}
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
}; };