From 108bedecba6c85fe77abb0006caeb3bad9122f5a Mon Sep 17 00:00:00 2001
From: Dinkledork <118951051+Day36512@users.noreply.github.com>
Date: Sat, 4 Mar 2023 15:45:13 -0700
Subject: [PATCH] Fixed stupidity. Made harder

I was tired the first time around
---
 Magmadar.lua | 43 +++++++++----------------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/Magmadar.lua b/Magmadar.lua
index 4d6aca5..a8a3b9a 100644
--- a/Magmadar.lua
+++ b/Magmadar.lua
@@ -2,25 +2,22 @@
 
 local Magmadar = {}
 
-local EMOTE_FRENZY = 53
-
 local SPELL_FRENZY = 19451
-local SPELL_MAGMA_SPIT = 19449
 local SPELL_PANIC = 19408
 local SPELL_LAVA_BOMB = 19411
-local SPELL_LAVA_BOMB_EFFECT = 20494
 local SPELL_LAVA_BOMB_RANGED = 20474
-local SPELL_LAVA_BOMB_RANGED_EFFECT = 20495
 local SPELL_SUMMON_CORE_HOUND = 364726
 
-local EVENT_FRENZY = 1
-local EVENT_PANIC = 2
-local EVENT_LAVA_BOMB = 3
-local EVENT_LAVA_BOMB_RANGED = 4
-local EVENT_SUMMON_CORE_HOUND = 5
-
 local MELEE_TARGET_LOOKUP_DIST = 10.0
 
+function Magmadar.OnEnterCombat(event, creature, target)
+creature:RegisterEvent(Magmadar.Frenzy, math.random(14000, 18000), 0)
+creature:RegisterEvent(Magmadar.Panic, math.random(28000, 35000), 0)
+creature:RegisterEvent(Magmadar.LavaBomb, math.random(10000, 12000), 0)
+creature:RegisterEvent(Magmadar.LavaBombRanged, math.random(9000, 15000), 0)
+creature:RegisterEvent(Magmadar.CastSummonCoreHound, 45000, 0)
+end
+
 function Magmadar.OnLeaveCombat(event, creature)
 creature:RemoveEvents()
 end
@@ -31,13 +28,11 @@ end
 
 function Magmadar.Frenzy(event, delay, calls, creature)
 creature:CastSpell(creature, SPELL_FRENZY, true)
-creature:PerformEmote(EMOTE_FRENZY)
-creature:RegisterEvent(Magmadar.Frenzy, math.random(15000, 20000), 0)
+creature:SendUnitEmote("Magmadar goes into a killing Frenzy!")
 end
 
 function Magmadar.Panic(event, delay, calls, creature)
 creature:CastSpell(creature:GetVictim(), SPELL_PANIC, true)
-creature:RegisterEvent(Magmadar.Panic, math.random(31000, 38000), 0)
 end
 
 function Magmadar.LavaBomb(event, delay, calls, creature)
@@ -50,7 +45,6 @@ if target:GetDistance(creature) <= MELEE_TARGET_LOOKUP_DIST then
 creature:CastSpell(target, SPELL_LAVA_BOMB, true)
 end
 end
-creature:RegisterEvent(Magmadar.LavaBomb, math.random(12000, 15000), 0)
 end
 
 function Magmadar.LavaBombRanged(event, delay, calls, creature)
@@ -61,29 +55,10 @@ creature:CastSpell(target, SPELL_LAVA_BOMB_RANGED, true)
 break
 end
 end
-creature:RegisterEvent(Magmadar.LavaBombRanged, math.random(12000, 15000), 0)
 end
 
 function Magmadar.CastSummonCoreHound(event, delay, calls, creature)
 creature:CastSpell(creature, SPELL_SUMMON_CORE_HOUND, true)
-creature:RegisterEvent(Magmadar.CastSummonCoreHound, 45000, 0)
-end
-
-
-function Magmadar.OnEnterCombat(event, creature, target)
-creature:RegisterEvent(Magmadar.Frenzy, math.random(15000, 20000), 0)
-creature:RegisterEvent(Magmadar.Panic, math.random(31000, 38000), 0)
-creature:RegisterEvent(Magmadar.LavaBomb, math.random(12000, 15000), 0)
-creature:RegisterEvent(Magmadar.LavaBombRanged, math.random(12000, 15000), 0)
-creature:RegisterEvent(Magmadar.CastSummonCoreHound, 45000, 0)
-end
-
-function Magmadar.OnLeaveCombat(event, creature)
-creature:RemoveEvents()
-end
-
-function Magmadar.OnDied(event, creature, killer)
-creature:RemoveEvents()
 end
 
 RegisterCreatureEvent(11982, 1, Magmadar.OnEnterCombat)