aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/3.3.5/2019_12_19_00_world.sql10
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp17
2 files changed, 23 insertions, 4 deletions
diff --git a/sql/updates/world/3.3.5/2019_12_19_00_world.sql b/sql/updates/world/3.3.5/2019_12_19_00_world.sql
new file mode 100644
index 00000000000..deaa251dc65
--- /dev/null
+++ b/sql/updates/world/3.3.5/2019_12_19_00_world.sql
@@ -0,0 +1,10 @@
+--
+UPDATE `creature_template` SET `speed_walk`=2.4, `speed_run`=0.857143 WHERE `entry` IN (20405,21534);
+UPDATE `creature_template_addon` SET `auras`="" WHERE `entry` IN (20405,21534);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (20405) AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(20405, 0, 0, 0, 60, 0, 100, 0, 1000, 1000, 2000, 2000, 11, 35151, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Nether Charge - IN Update - CAST 'Nether Charge Pulse' (NO REPEAT)"),
+(20405, 0, 1, 2, 25, 0, 100, 0, 0, 0, 0, 0, 75, 35150, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Nether Charge - IN Reset - Add aura Nether Charge Passive"),
+(20405, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 11, 37670, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Nether Charge - IN Reset - Cast Nether Charge Timer"),
+(20405, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Nether Charge - IN Reset - React passive"),
+(20405, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 89, 20, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Nether Charge - IN Reset - Random movement");
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 467568be240..0872165e9cd 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -30,7 +30,12 @@ enum Spells
SPELL_POLARITY_SHIFT = 39096,
SPELL_BERSERK = 26662,
SPELL_NETHER_CHARGE_TIMER = 37670,
- SPELL_NETHER_CHARGE_PASSIVE = 37670,
+ SPELL_NETHER_CHARGE_PASSIVE = 35150,
+
+ SPELL_SUMMON_NETHER_CHARGE_NE = 35153,
+ SPELL_SUMMON_NETHER_CHARGE_NW = 35904,
+ SPELL_SUMMON_NETHER_CHARGE_SE = 35905,
+ SPELL_SUMMON_NETHER_CHARGE_SW = 35906,
SPELL_POSITIVE_POLARITY = 39088,
SPELL_POSITIVE_CHARGE_STACK = 39089,
@@ -134,9 +139,13 @@ class boss_mechano_lord_capacitus : public CreatureScript
break;
case EVENT_SUMMON_NETHER_CHARGE:
{
- Position pos = me->GetRandomNearPosition(5.0f);
- me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
- events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
+ uint32 spellId = RAND(SPELL_SUMMON_NETHER_CHARGE_NE,
+ SPELL_SUMMON_NETHER_CHARGE_NW,
+ SPELL_SUMMON_NETHER_CHARGE_SE,
+ SPELL_SUMMON_NETHER_CHARGE_SW);
+ uint32 netherChargeTimer = DUNGEON_MODE(urand(9000, 11000), urand(2000, 5000));
+ DoCastSelf(spellId);
+ events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, netherChargeTimer);
break;
}
case EVENT_BERSERK: