From d63cb81dd99c8770f688831539a65a072a5d9b0b Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 12:04:16 +0200
Subject: [PATCH 01/62] Added Electroshock debuff. Added Electroshock datachron
 message. Added message for Liquidate stack. Added message when Electroshock
 is being cast. Added suspected timer values as locals for Electroshock.

---
 Encounters/RMT/Engineers.lua | 53 +++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index d2a2299..bacbd0d 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -27,15 +27,18 @@ mod:RegisterEnglishLocale({
     ["Cooling Turbine"] = "Cooling Turbine",
     ["Spark Plug"] = "Spark Plug",
     ["Lubricant Nozzle"] = "Lubricant Nozzle",
+	-- Engineer
     ["Head Engineer Orvulgh"] = "Head Engineer Orvulgh",
+	-- Warrior
     ["Chief Engineer Wilbargh"] = "Chief Engineer Wilbargh",
     ["Air Current"] = "Air Current",
     ["Friendly Invisible Unit for Fields"] = "Friendly Invisible Unit for Fields",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
     -- Cast names
     ["Liquidate"] = "Liquidate",
+	["Electroshock"] = "Electroshock",
     -- Datachron
-    ["Hornious Eversong suffers from Electroshock"] = "",
+    ["suffers from Electroshock"] = "suffers from Electroshock",
   })
 ----------------------------------------------------------------------------------------------------
 -- Constants.
@@ -47,6 +50,13 @@ mod:RegisterEnglishLocale({
 local GetUnitById = GameLib.GetUnitById
 local GetPlayerUnit = GameLib.GetPlayerUnit
 local GetGameTime = GameLib.GetGameTime
+
+local DEBUFF_ION_CLASH = 84051
+local DEBUFF_UNSTABLE_VOLTAGE = 84045
+
+local FIRST_ELECTROSHOCK_TIMER = 12
+local ELECTROSHOCK_TIMER = 20
+
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
@@ -61,7 +71,19 @@ function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
 end
 
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+  if DEBUFF_ION_CLASH == nSpellId then
+    mod:AddMsg("ION_CLASH_MSG", "KITE THE ORB", 5, "RunAway")
+	core:AddPicture(nId, nId, "Crosshair", 20)
+  end
+  if DEBUFF_UNSTABLE_VOLTAGE == nSpellId then
+    mod:AddMsg("UNSTABLE_VOLTAGE_MSG", "GET AWAY FROM THE CENTER", 5, "RunAway")
+  end
+end
 
+function mod:OnDebuffRemove(nId, nSpellId, nStack, fTimeRemaining)
+  if nSpellId == DEBUFF_ION_CLASH then
+    core:RemovePicture(nId)
+  end
 end
 
 function mod:OnUnitDestroyed(nId, tUnit, sName)
@@ -85,15 +107,44 @@ mod:RegisterUnitEvents({
     end,
   }
 )
+
+-- Warrior
 mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
+		mod:AddMsg("LIQUIDATE", "Stack", 5, "Info")
+      end
+    end,
+  }
+)
+
+-- Engineer
+mod:RegisterUnitEvents("Head Engineer Orvulgh",{
+    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
+      if self.L["Electroshock"] == sCastName then
+		mod:AddMsg("Electroshock", "Electroshock", 5, "Info")
+		
       end
     end,
   }
 )
 
+mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
+    local tElectroshockTarget = GetPlayerUnitByName(string.match(sMessage, "([^%s]+%s[^%s]+)".." "..self.L["suffers from Electroshock"]))
+    local bIsOnMyself = tElectroshockTarget == playerUnit
+    local sSound = "Info"
+    local sElectroshockOnX = ""
+    if bIsOnMyself then
+      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
+    else
+      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(tElectroshockTarget:GetName())
+    end
+
+    mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")
+  end
+)
+
 -- mod:RegisterUnitEvents({"Friendly Invisible Unit for Fields"},{
 -- ["OnUnitCreated"] = function (self, nId, tUnit, sName)
 -- core:AddPixie(nId, 2, tUnit, nil, "Green", 10, 50, 0)

From 461d1362e868b05fedc19a5496aefc03190ef7b3 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 12:04:53 +0200
Subject: [PATCH 02/62] Added minibosses. Addes lines to the bombs. Added
 bosses ability warnings.

---
 Encounters/RMT/miniboss/Skooty.lua | 68 ++++++++++++++++++++++++++++++
 Encounters/RMT/miniboss/Thrag.lua  | 68 ++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 Encounters/RMT/miniboss/Skooty.lua
 create mode 100644 Encounters/RMT/miniboss/Thrag.lua

diff --git a/Encounters/RMT/miniboss/Skooty.lua b/Encounters/RMT/miniboss/Skooty.lua
new file mode 100644
index 0000000..981bac3
--- /dev/null
+++ b/Encounters/RMT/miniboss/Skooty.lua
@@ -0,0 +1,68 @@
+----------------------------------------------------------------------------------------------------
+-- Client Lua Script for RaidCore Addon on WildStar Game.
+--
+-- Copyright (C) 2015 RaidCore
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- Description:
+-- TODO
+----------------------------------------------------------------------------------------------------
+local core = Apollo.GetPackage("Gemini:Addon-1.1").tPackage:GetAddon("RaidCore")
+local mod = core:NewEncounter("Skooty", 104, 548, 552)
+if not mod then return end
+
+----------------------------------------------------------------------------------------------------
+-- Registering combat.
+----------------------------------------------------------------------------------------------------
+mod:RegisterTrigMob("ALL", { "Assistant Technician Skooty" })
+mod:RegisterEnglishLocale({
+    ["Assistant Technician Skooty"] = "Assistant Technician Skooty",
+	["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
+    ["Pulse Cannon"] = "Pulse Cannon",
+	["Jumpstart Charge"] = "Jumpstart Charge",
+  })
+----------------------------------------------------------------------------------------------------
+-- Settings.
+----------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------
+-- Constants.
+----------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------
+-- Locals.
+----------------------------------------------------------------------------------------------------
+local jumpStarts
+
+----------------------------------------------------------------------------------------------------
+-- Encounter description.
+----------------------------------------------------------------------------------------------------
+function mod:OnBossEnable()
+
+end
+
+mod:RegisterUnitEvents("Assistant Technician Skooty",{
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      core:AddUnit(tUnit)
+      core:WatchUnit(tUnit)
+    end,
+	["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
+      if self.L["Pulse Cannon"] == sCastName then
+        mod:AddMsg("PULSECANNON", "GET OUT", 5, "RunAway")
+      end
+	end,
+  }
+)
+
+mod:RegisterUnitEvents("Jumpstart Charge",{
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      jumpStarts[nId] = tUnit
+      --core:WatchUnit(tUnit)
+      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", nId), playerUnit:GetId(), nId, 5)
+    end,
+    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
+      jumpStarts[nId] = nil
+      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
+    end,
+  }
+)
\ No newline at end of file
diff --git a/Encounters/RMT/miniboss/Thrag.lua b/Encounters/RMT/miniboss/Thrag.lua
new file mode 100644
index 0000000..9273358
--- /dev/null
+++ b/Encounters/RMT/miniboss/Thrag.lua
@@ -0,0 +1,68 @@
+----------------------------------------------------------------------------------------------------
+-- Client Lua Script for RaidCore Addon on WildStar Game.
+--
+-- Copyright (C) 2015 RaidCore
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- Description:
+-- TODO
+----------------------------------------------------------------------------------------------------
+local core = Apollo.GetPackage("Gemini:Addon-1.1").tPackage:GetAddon("RaidCore")
+local mod = core:NewEncounter("Thrag", 104, 548, 552)
+if not mod then return end
+
+----------------------------------------------------------------------------------------------------
+-- Registering combat.
+----------------------------------------------------------------------------------------------------
+mod:RegisterTrigMob("ALL", { "Chief Engine Scrubber Thrag" })
+mod:RegisterEnglishLocale({
+    ["Chief Engine Scrubber Thrag"] = "Chief Engine Scrubber Thrag",
+	["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
+    ["Gigavolt"] = "Gigavolt",	
+	["Jumpstart Charge"] = "Jumpstart Charge",
+  })
+----------------------------------------------------------------------------------------------------
+-- Settings.
+----------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------
+-- Constants.
+----------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------
+-- Locals.
+----------------------------------------------------------------------------------------------------
+local jumpStarts
+
+----------------------------------------------------------------------------------------------------
+-- Encounter description.
+----------------------------------------------------------------------------------------------------
+function mod:OnBossEnable()
+
+end
+
+mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      core:AddUnit(tUnit)
+      core:WatchUnit(tUnit)
+    end,
+	["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
+      if self.L["Gigavolt"] == sCastName then
+        mod:AddMsg("GIGAVOLT", "GET OUT", 5, "RunAway")
+      end
+	end,
+  }
+)
+
+mod:RegisterUnitEvents("Jumpstart Charge",{
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      jumpStarts[nId] = tUnit
+      --core:WatchUnit(tUnit)
+      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", nId), playerUnit:GetId(), nId, 5)
+    end,
+    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
+      jumpStarts[nId] = nil
+      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
+    end,
+  }
+)
\ No newline at end of file

From 3ba1c5e4a603c46592a7f4da4b956eaa8e2230fb Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 12:05:11 +0200
Subject: [PATCH 03/62] Added new encounters to toc.

---
 toc.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toc.xml b/toc.xml
index 2c38ec2..17fd49f 100644
--- a/toc.xml
+++ b/toc.xml
@@ -68,4 +68,6 @@
     <Script Name="Encounters/RMT/Engineers.lua"/>
     <Script Name="Encounters/RMT/Mordechai.lua"/>
     <Script Name="Encounters/RMT/miniboss/Lockjaw.lua"/>
+	<Script Name="Encounters/RMT/miniboss/Skooty.lua"/>
+	<Script Name="Encounters/RMT/miniboss/Thrag.lua"/>
 </Addon>

From e85116dabf4abebc2a5dfa90ef40a3b830aad529 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 12:17:10 +0200
Subject: [PATCH 04/62] Small fix to readme.

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57cd006..ac8d32c 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,11 @@ RaidCore
 ================
 
 Raidcore is a boss-mods addon for Wildstar game, it's intend to:
- - Aid with fights in Genetic Archives, Datascape and Core-Y83 raids.
+ - Aid with fights in Genetic Archives, Datascape, Core-Y83 and Red Moon Terror raids.
  - It supports the english and french game version, for german some translations are missing.
 
 Please open an issue if you notice problems, or if you have a idea of improvement.
 
+Bloodpact, if you ever manage to read this, fuck you.
+
 All rights reserved.
\ No newline at end of file

From 3411c4a68b94234d47285a264e1e691d800deca7 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 13:07:57 +0200
Subject: [PATCH 05/62] Fixed whitespaces for you guys.

---
 Encounters/RMT/Engineers.lua       |  6 +++---
 Encounters/RMT/miniboss/Skooty.lua | 10 +++++-----
 Encounters/RMT/miniboss/Thrag.lua  | 12 ++++++------
 README.md                          |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index bacbd0d..b369947 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -113,7 +113,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-		mod:AddMsg("LIQUIDATE", "Stack", 5, "Info")
+		mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
       end
     end,
   }
@@ -123,8 +123,8 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-		mod:AddMsg("Electroshock", "Electroshock", 5, "Info")
-		
+		mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
+
       end
     end,
   }
diff --git a/Encounters/RMT/miniboss/Skooty.lua b/Encounters/RMT/miniboss/Skooty.lua
index 981bac3..b22cde6 100644
--- a/Encounters/RMT/miniboss/Skooty.lua
+++ b/Encounters/RMT/miniboss/Skooty.lua
@@ -17,9 +17,9 @@ if not mod then return end
 mod:RegisterTrigMob("ALL", { "Assistant Technician Skooty" })
 mod:RegisterEnglishLocale({
     ["Assistant Technician Skooty"] = "Assistant Technician Skooty",
-	["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
+    ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
     ["Pulse Cannon"] = "Pulse Cannon",
-	["Jumpstart Charge"] = "Jumpstart Charge",
+    ["Jumpstart Charge"] = "Jumpstart Charge",
   })
 ----------------------------------------------------------------------------------------------------
 -- Settings.
@@ -46,11 +46,11 @@ mod:RegisterUnitEvents("Assistant Technician Skooty",{
       core:AddUnit(tUnit)
       core:WatchUnit(tUnit)
     end,
-	["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
+    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Pulse Cannon"] == sCastName then
         mod:AddMsg("PULSECANNON", "GET OUT", 5, "RunAway")
       end
-	end,
+    end,
   }
 )
 
@@ -65,4 +65,4 @@ mod:RegisterUnitEvents("Jumpstart Charge",{
       core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
     end,
   }
-)
\ No newline at end of file
+)
diff --git a/Encounters/RMT/miniboss/Thrag.lua b/Encounters/RMT/miniboss/Thrag.lua
index 9273358..30d5a32 100644
--- a/Encounters/RMT/miniboss/Thrag.lua
+++ b/Encounters/RMT/miniboss/Thrag.lua
@@ -17,9 +17,9 @@ if not mod then return end
 mod:RegisterTrigMob("ALL", { "Chief Engine Scrubber Thrag" })
 mod:RegisterEnglishLocale({
     ["Chief Engine Scrubber Thrag"] = "Chief Engine Scrubber Thrag",
-	["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
-    ["Gigavolt"] = "Gigavolt",	
-	["Jumpstart Charge"] = "Jumpstart Charge",
+    ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
+    ["Gigavolt"] = "Gigavolt",
+    ["Jumpstart Charge"] = "Jumpstart Charge",
   })
 ----------------------------------------------------------------------------------------------------
 -- Settings.
@@ -46,11 +46,11 @@ mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
       core:AddUnit(tUnit)
       core:WatchUnit(tUnit)
     end,
-	["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
+    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Gigavolt"] == sCastName then
         mod:AddMsg("GIGAVOLT", "GET OUT", 5, "RunAway")
       end
-	end,
+    end,
   }
 )
 
@@ -65,4 +65,4 @@ mod:RegisterUnitEvents("Jumpstart Charge",{
       core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
     end,
   }
-)
\ No newline at end of file
+)
diff --git a/README.md b/README.md
index ac8d32c..1d57620 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@ Please open an issue if you notice problems, or if you have a idea of improvemen
 
 Bloodpact, if you ever manage to read this, fuck you.
 
-All rights reserved.
\ No newline at end of file
+All rights reserved.

From cbba7a8061e4f0c8c57f4383192619c47468fd22 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Fri, 2 Sep 2016 13:33:09 +0200
Subject: [PATCH 06/62] Whitespace

---
 Encounters/RMT/Engineers.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index b369947..bf6cd3c 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -27,16 +27,16 @@ mod:RegisterEnglishLocale({
     ["Cooling Turbine"] = "Cooling Turbine",
     ["Spark Plug"] = "Spark Plug",
     ["Lubricant Nozzle"] = "Lubricant Nozzle",
-	-- Engineer
+    -- Engineer
     ["Head Engineer Orvulgh"] = "Head Engineer Orvulgh",
-	-- Warrior
+    -- Warrior
     ["Chief Engineer Wilbargh"] = "Chief Engineer Wilbargh",
     ["Air Current"] = "Air Current",
     ["Friendly Invisible Unit for Fields"] = "Friendly Invisible Unit for Fields",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
     -- Cast names
     ["Liquidate"] = "Liquidate",
-	["Electroshock"] = "Electroshock",
+    ["Electroshock"] = "Electroshock",
     -- Datachron
     ["suffers from Electroshock"] = "suffers from Electroshock",
   })
@@ -73,7 +73,7 @@ end
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
   if DEBUFF_ION_CLASH == nSpellId then
     mod:AddMsg("ION_CLASH_MSG", "KITE THE ORB", 5, "RunAway")
-	core:AddPicture(nId, nId, "Crosshair", 20)
+    core:AddPicture(nId, nId, "Crosshair", 20)
   end
   if DEBUFF_UNSTABLE_VOLTAGE == nSpellId then
     mod:AddMsg("UNSTABLE_VOLTAGE_MSG", "GET AWAY FROM THE CENTER", 5, "RunAway")
@@ -113,7 +113,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-		mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
+        mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
       end
     end,
   }
@@ -123,7 +123,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-		mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
+        mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
 
       end
     end,

From f5882f92c8fb0d7e01df1745ad7eec284b31541e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sat, 3 Sep 2016 01:12:30 +0200
Subject: [PATCH 07/62] Add warning for mid saw and info for safe spot

---
 Encounters/RMT/Shredder.lua | 60 +++++++++++++++++++++++++++++++++++++
 RaidCore.xml                | 12 +++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Shredder.lua b/Encounters/RMT/Shredder.lua
index 2bd5be2..6d5172c 100644
--- a/Encounters/RMT/Shredder.lua
+++ b/Encounters/RMT/Shredder.lua
@@ -48,6 +48,11 @@ mod:RegisterEnglishLocale({
     ["Swabbie Swoop"] = "Swabbie Swoop",
     --Messages
     ["%d BILE STACKS!"] = "%d BILE STACKS!",
+    ["SAW IN MIDDLE"] = "SAW IN MIDDLE",
+    ["SAFE SPOT %s"] = "SAFE SPOT %s",
+    ["LEFT"] = "LEFT",
+    ["MIDDLE"] = "MIDDLE",
+    ["RIGHT"] = "RIGHT",
   })
 
 mod:RegisterFrenchLocale({
@@ -87,6 +92,8 @@ mod:RegisterDefaultSetting("SoundMiniboss")
 mod:RegisterDefaultSetting("SoundNecroticLash")
 mod:RegisterDefaultSetting("SoundMinibossCast")
 mod:RegisterDefaultSetting("SoundOozeStacksWarning")
+mod:RegisterDefaultSetting("SoundMidSawWarning")
+mod:RegisterDefaultSetting("SoundSawSafeSpot")
 ----------------------------------------------------------------------------------------------------
 -- Constants.
 ----------------------------------------------------------------------------------------------------
@@ -116,6 +123,18 @@ local WALKING = 0
 local SHREDDER = 1
 local ADD_PHASES = circular{ 11, 45, 66, 0 }
 local DEBUFF_OOZING_BILE = 84321
+local WEST_POSITION = -42
+local MIDDLE_WEST_POSITION = -28
+local MIDDLE_EAST_POSITION = -14
+local EAST_POSITION = 0
+local SAW_WEST = 1
+local SAW_MID = 2
+local SAW_WEST = 4
+local SAW_SAFESPOT = {
+  [3] = "LEFT", --SAW_WEST + SAW_MID
+  [5] = "MIDDLE", --SAW_WEST + SAW_EAST
+  [6] = "RIGHT", --SAW_MID + SAW_EAST
+}
 ----------------------------------------------------------------------------------------------------
 -- Locals.
 ----------------------------------------------------------------------------------------------------
@@ -126,6 +145,8 @@ local tNabberList
 local phase
 local addPhase
 local previousAddPhase
+local firstShredderSaw
+local secondShredderSaw
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 -----------------------------------------------------------------------------------------------------
@@ -135,6 +156,8 @@ function mod:OnBossEnable()
   phase = WALKING
   addPhase = 4
   previousAddPhase = 0
+  firstShredderSaw = nil
+  secondShredderSaw = nil
 end
 
 function mod:OnDebuffUpdate(nId, nSpellId, nStack, fTimeRemaining)
@@ -210,6 +233,8 @@ function mod:PhaseChange()
   else
     sText = sText.." South"
     phase = SHREDDER
+    firstShredderSaw = nil
+    secondShredderSaw = nil
   end
   mod:AddProgressBar("WALKING_PROGRESS", sText, mod.GetWalkingProgress, mod, mod.PhaseChange)
 end
@@ -279,11 +304,46 @@ mod:RegisterUnitEvents("Swabbie Ski'Li",{
   }
 )
 
+function mod:DetermineSawLocation(tUnit)
+  local x = tUnit:GetPosition().x
+  if WEST_POSITION < x and x < MIDDLE_WEST_POSITION then
+    return SAW_WEST
+  elseif MIDDLE_WEST_POSITION < x and x < MIDDLE_EAST_POSITION then
+    return SAW_MID
+  elseif MIDDLE_EAST_POSITION < x and x < EAST_POSITION then
+    return SAW_EAST
+  end
+end
+
+function mod:HandleShredderSaw(sawLocation)
+  if firstShredderSaw == nil then
+    firstShredderSaw = sawLocation
+    return
+  elseif secondShredderSaw == nil then
+    secondShredderSaw = sawLocation
+  else
+    return
+  end
+
+  local safeSpotLocation = SAW_SAFESPOT[firstShredderSaw + secondShredderSaw]
+  local message = string.format(self.L["SAFE SPOT %s"], self.L[safeSpotLocation])
+  local sound = mod:GetSetting("SoundSawSafeSpot") == true and "Info"
+  mod:AddMsg("SAW_MSG", message, 5, sound)
+end
+
 mod:RegisterUnitEvents("Sawblade",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       if mod:GetSetting("LineSawblade") then
         core:AddPixie(nId, 2, tUnit, nil, "Red", 10, 60, 0)
       end
+      local sawLocation = mod:DetermineSawLocation(tUnit)
+      if phase == WALKING and sawLocation == SAW_MID then
+        mod:AddMsg("SAW_MSG", self.L["SAW IN MIDDLE"], 5,
+          mod:GetSetting("SoundMidSawWarning") == true and "Beware"
+        )
+      elseif phase == SHREDDER then
+        mod:HandleShredderSaw(sawLocation)
+      end
     end,
     ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
       core:DropPixie(nId)
diff --git a/RaidCore.xml b/RaidCore.xml
index fcfe556..4a801cf 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1573,7 +1573,7 @@
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
         </Control>
-        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="127" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="242" RelativeToClient="1" Font="Nameplates" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="127" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="269" RelativeToClient="1" Font="Nameplates" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
             <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Shredder_SoundAdds" TooltipColor="" Text="Adds spawn" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
@@ -1599,6 +1599,16 @@
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Shredder_SoundMidSawWarning" TooltipColor="" Text="Middle saw warning" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="105" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="127" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Shredder_SoundSawSafeSpot" TooltipColor="" Text="First saw safespot" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
         </Control>
     </Form>
     <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="0" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Robomination" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="0" Overlapped="0" TooltipColor="" TextId="" Visible="0" Tooltip="" NotRelative="1" AutoHideScroll="1" VScroll="1">

From 3d900ca7b12b7d508d06221ae025f52d8bb7742c Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 01:16:55 +0200
Subject: [PATCH 08/62] Small change in formatting

---
 Encounters/RMT/Engineers.lua | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index bf6cd3c..c625e84 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -27,10 +27,8 @@ mod:RegisterEnglishLocale({
     ["Cooling Turbine"] = "Cooling Turbine",
     ["Spark Plug"] = "Spark Plug",
     ["Lubricant Nozzle"] = "Lubricant Nozzle",
-    -- Engineer
-    ["Head Engineer Orvulgh"] = "Head Engineer Orvulgh",
-    -- Warrior
-    ["Chief Engineer Wilbargh"] = "Chief Engineer Wilbargh",
+    ["Head Engineer Orvulgh"] = "Head Engineer Orvulgh", -- Engineer
+    ["Chief Engineer Wilbargh"] = "Chief Engineer Wilbargh", -- Warrior
     ["Air Current"] = "Air Current",
     ["Friendly Invisible Unit for Fields"] = "Friendly Invisible Unit for Fields",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
@@ -72,7 +70,7 @@ end
 
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
   if DEBUFF_ION_CLASH == nSpellId then
-    mod:AddMsg("ION_CLASH_MSG", "KITE THE ORB", 5, "RunAway")
+    mod:AddMsg("ION_CLASH_MSG", "KITE THE FIRE ORB", 5, "RunAway")
     core:AddPicture(nId, nId, "Crosshair", 20)
   end
   if DEBUFF_UNSTABLE_VOLTAGE == nSpellId then

From 5208cc98d6b9e5e605242c65b4e778fafb420aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sat, 3 Sep 2016 01:18:34 +0200
Subject: [PATCH 09/62] Fix Lline typo

---
 RaidCore.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RaidCore.xml b/RaidCore.xml
index 4a801cf..d626671 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1547,7 +1547,7 @@
     </Form>
     <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="0" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Shredder" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="0" Overlapped="0" TooltipColor="" TextId="" Visible="0" Tooltip="" NotRelative="1" AutoHideScroll="1" VScroll="1">
         <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="129" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Shredder_LineSawblade" TooltipColor="" Text="Lline on big sawblades" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Shredder_LineSawblade" TooltipColor="" Text="Line on big sawblades" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>

From c323cad1289e65bd1a877b0f80d4da12bd514dff Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 01:26:58 +0200
Subject: [PATCH 10/62] Small cleanup

---
 Encounters/RMT/Engineers.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index c625e84..c3558f9 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -122,7 +122,6 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
         mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
-
       end
     end,
   }

From 4f80164bcafef6965883c9d92dfb50656c847569 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <Jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 01:44:45 +0200
Subject: [PATCH 11/62] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d57620..9496732 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ RaidCore
 ================
 
 Raidcore is a boss-mods addon for Wildstar game, it's intend to:
- - Aid with fights in Genetic Archives, Datascape, Core-Y83 and Red Moon Terror raids.
+ - Aid with fights in Genetic Archives, Datascape, Core-Y83 and Red Moon Terror Raids.
  - It supports the english and french game version, for german some translations are missing.
 
 Please open an issue if you notice problems, or if you have a idea of improvement.

From e575b502405b47d1c93ae3c1e890330969807aa6 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 01:45:56 +0200
Subject: [PATCH 12/62] Comment on the timers

---
 Encounters/RMT/Engineers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index c3558f9..ec7e053 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -52,6 +52,7 @@ local GetGameTime = GameLib.GetGameTime
 local DEBUFF_ION_CLASH = 84051
 local DEBUFF_UNSTABLE_VOLTAGE = 84045
 
+-- Timers
 local FIRST_ELECTROSHOCK_TIMER = 12
 local ELECTROSHOCK_TIMER = 20
 

From 08446cda203ed415c977f1af349559274853143d Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 13:05:34 +0200
Subject: [PATCH 13/62] Added in framework for platform check.

---
 Encounters/RMT/Engineers.lua | 59 +++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index ec7e053..972e0c8 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -41,7 +41,14 @@ mod:RegisterEnglishLocale({
 ----------------------------------------------------------------------------------------------------
 -- Constants.
 ----------------------------------------------------------------------------------------------------
+local DEBUFF_ION_CLASH = 84051
+local DEBUFF_UNSTABLE_VOLTAGE = 84045
+
+-- Timers
+local FIRST_ELECTROSHOCK_TIMER = 12
+local ELECTROSHOCK_TIMER = 20
 
+local BUFF_STATIONS = {self.L["Spark Plug"], self.L["Cooling Turbine"], self.L["Fusion Core"], self.L["Lubricant Nozzle"]}
 ----------------------------------------------------------------------------------------------------
 -- Locals.
 ----------------------------------------------------------------------------------------------------
@@ -49,13 +56,8 @@ local GetUnitById = GameLib.GetUnitById
 local GetPlayerUnit = GameLib.GetPlayerUnit
 local GetGameTime = GameLib.GetGameTime
 
-local DEBUFF_ION_CLASH = 84051
-local DEBUFF_UNSTABLE_VOLTAGE = 84045
-
--- Timers
-local FIRST_ELECTROSHOCK_TIMER = 12
-local ELECTROSHOCK_TIMER = 20
-
+local currentWarriorPlatform
+local currentEngineerPlatform
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
@@ -63,6 +65,33 @@ function mod:OnBossEnable()
 
 end
 
+function mod:GetCurrentPlatform(tUnit, sName)
+  local i
+  local shortestDistance = 100000
+  local currentDistance
+  local currentPlatform
+  for i=1,4,1
+  do
+    currentDistance = mod:GetDistanceBetweenUnits(tUnit, BUFF_STATIONS[i])
+    if shortestDistance > currentDistance then
+      shortestDistance = currentDistance
+      currentPlatform = BUFF_STATIONS[i]
+    end
+  end
+
+  -- Engineer
+  if sName == self.L["Head Engineer Orvulgh"] then
+    currentEngineerPlatform = currentPlatform
+  end
+
+  -- Warrior
+  if sName == self.L["Chief Engineer Wilbargh"] then
+    currentEngineerPlatform = currentPlatform
+  end
+  Print("Engineer Platform: " .. currentEngineerPlatform)
+  Print("Warrior Platform: " .. currentWarriorPlatform)
+end
+
 function mod:OnBuffAdd(nId, nSpellId, nStack, fTimeRemaining)
 end
 
@@ -115,6 +144,14 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
         mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
       end
     end,
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      mod:GetCurrentPlatform(tUnit, sName)
+    end,
+    ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
+      if self.L["Rocket Jump"] == sCastName then
+        mod:GetCurrentPlatform(tUnit, sName)
+      end
+    end,
   }
 )
 
@@ -125,6 +162,14 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
       end
     end,
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      mod:GetCurrentPlatform(tUnit, sName)
+    end,
+    ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
+      if self.L["Rocket Jump"] == sCastName then
+        mod:GetCurrentPlatform(tUnit, sName)
+      end
+    end,
   }
 )
 

From 2e7b75bc4241ceb14c6733ba64e13673a3a169d3 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 13:12:39 +0200
Subject: [PATCH 14/62] Disabled adding the cores HP bars.

---
 Encounters/RMT/Engineers.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 972e0c8..64aef89 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -130,7 +130,6 @@ mod:RegisterUnitEvents({
     "Lubricant Nozzle"
     },{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
       core:WatchUnit(tUnit)
     end,
   }
@@ -145,6 +144,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
       end
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      core:AddUnit(tUnit)
       mod:GetCurrentPlatform(tUnit, sName)
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
@@ -163,6 +163,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
       end
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      core:AddUnit(tUnit)
       mod:GetCurrentPlatform(tUnit, sName)
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)

From d5085ff0e55faec0b51545daf6bd4e16a0ef8da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sat, 3 Sep 2016 13:32:15 +0200
Subject: [PATCH 15/62] Save cores and engineers with their start location

---
 Encounters/RMT/Engineers.lua | 43 +++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 64aef89..ababd52 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -48,7 +48,27 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local FIRST_ELECTROSHOCK_TIMER = 12
 local ELECTROSHOCK_TIMER = 20
 
-local BUFF_STATIONS = {self.L["Spark Plug"], self.L["Cooling Turbine"], self.L["Fusion Core"], self.L["Lubricant Nozzle"]}
+local FUSION_CORE = 1
+local COOLING_TURBINE = 2
+local SPARK_PLUG = 3
+local LUBRICANT_NOZZLE = 4
+local CORE_NAMES = {
+  ["Fusion Core"] = FUSION_CORE,
+  ["Cooling Turbine"] = COOLING_TURBINE,
+  ["Spark Plug"] = SPARK_PLUG,
+  ["Lubricant Nozzle"] = LUBRICANT_NOZZLE
+}
+
+local WARRIOR = 1
+local ENGINEER = 2
+local ENGINEER_NAMES = {
+  ["Chief Engineer Wilbargh"] = WARRIOR,
+  ["Head Engineer Orvulgh"] = ENGINEER,
+}
+local ENGINEER_START_LOCATION = {
+  [WARRIOR] = SPARK_PLUG,
+  [ENGINEER] = COOLING_TURBINE,
+}
 ----------------------------------------------------------------------------------------------------
 -- Locals.
 ----------------------------------------------------------------------------------------------------
@@ -58,11 +78,24 @@ local GetGameTime = GameLib.GetGameTime
 
 local currentWarriorPlatform
 local currentEngineerPlatform
+local coreUnits
+local engineerUnits
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
+  coreUnits = {}
+  engineerUnits = {}
 
+  --locales
+  for name, id in pairs(CORE_NAMES) do
+    CORE_NAMES[name] = nil
+    CORE_NAMES[self.L[name]] = id
+  end
+  for name, id in pairs(ENGINEER_NAMES) do
+    ENGINEER_NAMES[name] = nil
+    ENGINEER_NAMES[self.L[name]] = id
+  end
 end
 
 function mod:GetCurrentPlatform(tUnit, sName)
@@ -131,6 +164,14 @@ mod:RegisterUnitEvents({
     },{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       core:WatchUnit(tUnit)
+      if CORE_NAMES[sName] ~= nil then
+        coreUnits[CORE_NAMES[sName]] = tUnit
+      elseif ENGINEER_NAMES[sName] ~= nil then
+        engineerUnits[ENGINEER_NAMES[sName]] = {
+          unit = tUnit,
+          location = ENGINEER_START_LOCATION[ENGINEER_NAMES[sName]],
+        }
+      end
     end,
   }
 )

From 97da0c936d8e01b7fa7dba493f6fcd0c267fb552 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 13:37:24 +0200
Subject: [PATCH 16/62] Changed some Discharged Plasma casts

---
 Encounters/RMT/Engineers.lua | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index ababd52..d56fba2 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -32,11 +32,15 @@ mod:RegisterEnglishLocale({
     ["Air Current"] = "Air Current",
     ["Friendly Invisible Unit for Fields"] = "Friendly Invisible Unit for Fields",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
+    ["Discharged Plasma"] = "Discharged Plasma", -- Fire Orb
     -- Cast names
     ["Liquidate"] = "Liquidate",
     ["Electroshock"] = "Electroshock",
     -- Datachron
     ["suffers from Electroshock"] = "suffers from Electroshock",
+    -- Messages
+    ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
+    ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
   })
 ----------------------------------------------------------------------------------------------------
 -- Constants.
@@ -132,19 +136,23 @@ function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
 end
 
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+  --[=====[
   if DEBUFF_ION_CLASH == nSpellId then
-    mod:AddMsg("ION_CLASH_MSG", "KITE THE FIRE ORB", 5, "RunAway")
+    mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
     core:AddPicture(nId, nId, "Crosshair", 20)
   end
   if DEBUFF_UNSTABLE_VOLTAGE == nSpellId then
     mod:AddMsg("UNSTABLE_VOLTAGE_MSG", "GET AWAY FROM THE CENTER", 5, "RunAway")
   end
+  --]=====]
 end
 
 function mod:OnDebuffRemove(nId, nSpellId, nStack, fTimeRemaining)
+  --[=====[
   if nSpellId == DEBUFF_ION_CLASH then
     core:RemovePicture(nId)
   end
+  --]=====]
 end
 
 function mod:OnUnitDestroyed(nId, tUnit, sName)
@@ -215,6 +223,13 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
   }
 )
 
+mod:RegisterUnitEvents("Discharged Plasma",{
+    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+      mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
+    end,
+  }
+)
+
 mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
     local tElectroshockTarget = GetPlayerUnitByName(string.match(sMessage, "([^%s]+%s[^%s]+)".." "..self.L["suffers from Electroshock"]))
     local bIsOnMyself = tElectroshockTarget == playerUnit

From 150c70136a9c87cace4ab226b836e30b19506795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sat, 3 Sep 2016 14:28:44 +0200
Subject: [PATCH 17/62] Keep track of platform changes based on distance Wait
 1.5s for the boss to jump and then calculate the distance to the shortest
 core.

---
 Encounters/RMT/Engineers.lua | 63 ++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index d56fba2..b019d00 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -62,6 +62,13 @@ local CORE_NAMES = {
   ["Spark Plug"] = SPARK_PLUG,
   ["Lubricant Nozzle"] = LUBRICANT_NOZZLE
 }
+--shorten these
+local CORE_NICKNAMES = {
+  [FUSION_CORE] = "Fusion Core",
+  [COOLING_TURBINE] = "Cooling Turbine",
+  [SPARK_PLUG] = "Spark Plug",
+  [LUBRICANT_NOZZLE] = "Lubricant Nozzle"
+}
 
 local WARRIOR = 1
 local ENGINEER = 2
@@ -73,6 +80,14 @@ local ENGINEER_START_LOCATION = {
   [WARRIOR] = SPARK_PLUG,
   [ENGINEER] = COOLING_TURBINE,
 }
+local ENGINEER_TIMER_NAMES = {
+  [WARRIOR] = "OnWarriorLocationTimer",
+  [ENGINEER] = "OnEngineerLocationTimer",
+}
+local ENGINEER_NICKNAMES = {
+  [WARRIOR] = "Warrior",
+  [ENGINEER] = "Engineer",
+}
 ----------------------------------------------------------------------------------------------------
 -- Locals.
 ----------------------------------------------------------------------------------------------------
@@ -90,7 +105,6 @@ local engineerUnits
 function mod:OnBossEnable()
   coreUnits = {}
   engineerUnits = {}
-
   --locales
   for name, id in pairs(CORE_NAMES) do
     CORE_NAMES[name] = nil
@@ -102,31 +116,31 @@ function mod:OnBossEnable()
   end
 end
 
-function mod:GetCurrentPlatform(tUnit, sName)
-  local i
+function mod:CheckBossLocation(engineerId)
+  if engineerUnits[engineerId].firstCheck then
+    engineerUnits[engineerId].firstCheck = false
+    return
+  end
+
   local shortestDistance = 100000
   local currentDistance
-  local currentPlatform
-  for i=1,4,1
-  do
-    currentDistance = mod:GetDistanceBetweenUnits(tUnit, BUFF_STATIONS[i])
+  for coreId, coreUnit in pairs(coreUnits) do
+    currentDistance = mod:GetDistanceBetweenUnits(
+      engineerUnits[engineerId].unit, coreUnit
+    )
     if shortestDistance > currentDistance then
       shortestDistance = currentDistance
-      currentPlatform = BUFF_STATIONS[i]
+      engineerUnits[engineerId].location = coreId
     end
   end
+end
 
-  -- Engineer
-  if sName == self.L["Head Engineer Orvulgh"] then
-    currentEngineerPlatform = currentPlatform
-  end
+function mod:OnWarriorLocationTimer()
+  mod:CheckBossLocation(WARRIOR)
+end
 
-  -- Warrior
-  if sName == self.L["Chief Engineer Wilbargh"] then
-    currentEngineerPlatform = currentPlatform
-  end
-  Print("Engineer Platform: " .. currentEngineerPlatform)
-  Print("Warrior Platform: " .. currentWarriorPlatform)
+function mod:OnEngineerLocationTimer()
+  mod:CheckBossLocation(ENGINEER)
 end
 
 function mod:OnBuffAdd(nId, nSpellId, nStack, fTimeRemaining)
@@ -175,9 +189,12 @@ mod:RegisterUnitEvents({
       if CORE_NAMES[sName] ~= nil then
         coreUnits[CORE_NAMES[sName]] = tUnit
       elseif ENGINEER_NAMES[sName] ~= nil then
-        engineerUnits[ENGINEER_NAMES[sName]] = {
+        local id = ENGINEER_NAMES[sName]
+        engineerUnits[id] = {
           unit = tUnit,
-          location = ENGINEER_START_LOCATION[ENGINEER_NAMES[sName]],
+          location = ENGINEER_START_LOCATION[id],
+          timer = ApolloTimer.Create(1.5, false, ENGINEER_TIMER_NAMES[id], mod),
+          firstCheck = true,
         }
       end
     end,
@@ -194,11 +211,10 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       core:AddUnit(tUnit)
-      mod:GetCurrentPlatform(tUnit, sName)
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
-        mod:GetCurrentPlatform(tUnit, sName)
+        engineerUnits[WARRIOR].timer:Start()
       end
     end,
   }
@@ -213,11 +229,10 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       core:AddUnit(tUnit)
-      mod:GetCurrentPlatform(tUnit, sName)
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
-        mod:GetCurrentPlatform(tUnit, sName)
+        engineerUnits[ENGINEER].timer:Start()
       end
     end,
   }

From b4f52111ba7ec54fe5fbfadd5ccd9b1174565a5e Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 15:24:54 +0200
Subject: [PATCH 18/62] Made changed to detecting when someone should swap to
 warrior.

---
 Encounters/RMT/Engineers.lua | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index b019d00..7addded 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -37,7 +37,7 @@ mod:RegisterEnglishLocale({
     ["Liquidate"] = "Liquidate",
     ["Electroshock"] = "Electroshock",
     -- Datachron
-    ["suffers from Electroshock"] = "suffers from Electroshock",
+    ["(.*) suffers from Electroshock"] = "(.*) suffers from Electroshock",
     -- Messages
     ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
     ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
@@ -177,6 +177,23 @@ function mod:OnUnitCreated(nId, unit, sName)
 
 end
 
+function mod:OnDatachron(sMessage)
+  local sPlayerNameElectroshock = sMessage:match(self.L["(.*) suffers from Electroshock"])
+  if sPlayerNameElectroshock then
+    local bIsOnMyself = sPlayerNameElectroshock == playerUnit
+    local sSound = "Info"
+    local sElectroshockOnX = ""
+    if bIsOnMyself then
+      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
+      sSound = "RunAway"
+    else
+      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(sPlayerNameElectroshock)
+    end
+
+    mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")
+  end
+end
+
 mod:RegisterUnitEvents({
     "Head Engineer Orvulgh", "Chief Engineer Wilbargh",
     "Fusion Core",
@@ -245,21 +262,6 @@ mod:RegisterUnitEvents("Discharged Plasma",{
   }
 )
 
-mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
-    local tElectroshockTarget = GetPlayerUnitByName(string.match(sMessage, "([^%s]+%s[^%s]+)".." "..self.L["suffers from Electroshock"]))
-    local bIsOnMyself = tElectroshockTarget == playerUnit
-    local sSound = "Info"
-    local sElectroshockOnX = ""
-    if bIsOnMyself then
-      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
-    else
-      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(tElectroshockTarget:GetName())
-    end
-
-    mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")
-  end
-)
-
 -- mod:RegisterUnitEvents({"Friendly Invisible Unit for Fields"},{
 -- ["OnUnitCreated"] = function (self, nId, tUnit, sName)
 -- core:AddPixie(nId, 2, tUnit, nil, "Green", 10, 50, 0)

From a7ae6ed6f28a3722a4d0ffe9169da95fe26ae2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Sat, 3 Sep 2016 16:52:29 +0200
Subject: [PATCH 19/62] Add configuration for engineers to raidcore

---
 RaidCore.xml     | 17 +++++++++++++++++
 RaidCore_GUI.lua |  1 +
 2 files changed, 18 insertions(+)

diff --git a/RaidCore.xml b/RaidCore.xml
index d626671..cad8402 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1686,4 +1686,21 @@
     <SpriteFile Name="Textures_Bars.xml"/>
     <SpriteFile Name="RaidCore_Draw.xml"/>
     <TemplateFile Name="RaidCore_Templates.xml"/>
+    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="1" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="1" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Engineers" Border="1" Picture="1" SwallowMouseClicks="1" Moveable="1" Escapable="1" Overlapped="1" TooltipColor="">
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="100" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Electroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Liquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Fire_Orb" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Unstable_Vortex" TooltipColor="" FocusedTextColor="ffffffff" Text="Unstable Vortex" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            </Control>
+        </Control>
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="0" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="0" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1"/>
+    </Form>
 </Forms>
diff --git a/RaidCore_GUI.lua b/RaidCore_GUI.lua
index f820d52..2fbaf1f 100644
--- a/RaidCore_GUI.lua
+++ b/RaidCore_GUI.lua
@@ -266,6 +266,7 @@ function RaidCore:GUI_init(sVersion)
     Shredder = Apollo.LoadForm(self.xmlDoc, "ConfigForm_Shredder", self.wndEncounterTarget, self),
     MinibossesRedmoon = Apollo.LoadForm(self.xmlDoc, "ConfigForm_MinibossesRedmoon", self.wndEncounterTarget, self),
     Robomination = Apollo.LoadForm(self.xmlDoc, "ConfigForm_Robomination", self.wndEncounterTarget, self),
+	Engineers = Apollo.LoadForm(self.xmlDoc, "ConfigForm_Engineers", self.wndEncounterTarget, self),
   }
   -- Initialize Left Menu in Main RaidCore window.
   local wndGeneralButton = self.wndMain:FindChild("Static"):FindChild("General")

From 135d2fdbe7a8c4a243af6fcc4b39a6fe22e15fad Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sat, 3 Sep 2016 17:07:53 +0200
Subject: [PATCH 20/62] "Reverted" the random change for checking datachron.
 Fixed the message check with the Regex. Compared unit names to see if
 Elektroshock is on you.

---
 Encounters/RMT/Engineers.lua | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 7addded..fa52a45 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -37,7 +37,7 @@ mod:RegisterEnglishLocale({
     ["Liquidate"] = "Liquidate",
     ["Electroshock"] = "Electroshock",
     -- Datachron
-    ["(.*) suffers from Electroshock"] = "(.*) suffers from Electroshock",
+    ["suffers from Electroshock"] = "suffers from Electroshock",
     -- Messages
     ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
     ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
@@ -177,22 +177,21 @@ function mod:OnUnitCreated(nId, unit, sName)
 
 end
 
-function mod:OnDatachron(sMessage)
-  local sPlayerNameElectroshock = sMessage:match(self.L["(.*) suffers from Electroshock"])
-  if sPlayerNameElectroshock then
-    local bIsOnMyself = sPlayerNameElectroshock == playerUnit
+mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
+    local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)" .. " " .. self.L["suffers from Electroshock"])
+    local bIsOnMyself = tElectroshockTarget == GetPlayerUnit():GetName()
     local sSound = "Info"
     local sElectroshockOnX = ""
     if bIsOnMyself then
       sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
       sSound = "RunAway"
     else
-      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(sPlayerNameElectroshock)
+      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(tElectroshockTarget)
     end
 
     mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")
   end
-end
+)
 
 mod:RegisterUnitEvents({
     "Head Engineer Orvulgh", "Chief Engineer Wilbargh",
@@ -258,6 +257,8 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
+      local tOrbTarget = tUnit:GetTarget()
+      Print(tOrbTarget)
     end,
   }
 )

From a13a522fc0221de3a14815015c00dfe677e5af45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 11:45:15 +0200
Subject: [PATCH 21/62] Seriously?

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 9496732..e721024 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,4 @@ Raidcore is a boss-mods addon for Wildstar game, it's intend to:
 
 Please open an issue if you notice problems, or if you have a idea of improvement.
 
-Bloodpact, if you ever manage to read this, fuck you.
-
 All rights reserved.

From aae5e6fcd5d89785ceb8d6d49d30751be0b116d4 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 17:14:38 +0200
Subject: [PATCH 22/62] Upped the version number for tonight

---
 RaidCore.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RaidCore.lua b/RaidCore.lua
index 84be361..d7cc071 100644
--- a/RaidCore.lua
+++ b/RaidCore.lua
@@ -32,7 +32,7 @@ local next, pcall = next, pcall
 -- Should be 5.23 when replacement tokens will works (see #88 issue).
 local RAIDCORE_CURRENT_VERSION = "6"
 -- Should be deleted.
-local ADDON_DATE_VERSION = 16082301
+local ADDON_DATE_VERSION = 16090417
 -- Sometimes Carbine have inserted some no-break-space, for fun.
 -- Behavior seen with French language. This problem is not present in English.
 local NO_BREAK_SPACE = string.char(194, 160)

From bc3ba523b6e493280a6b685dd0460dde16b26b8e Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 17:15:01 +0200
Subject: [PATCH 23/62] Fixed the settings boxes and added multiple settings
 for the encounter.

---
 RaidCore.xml | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/RaidCore.xml b/RaidCore.xml
index cad8402..e5f9fa4 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1611,7 +1611,7 @@
             </Control>
         </Control>
     </Form>
-    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="0" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Robomination" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="0" Overlapped="0" TooltipColor="" TextId="" Visible="0" Tooltip="" NotRelative="1" AutoHideScroll="1" VScroll="1">
+    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="-1" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="-1" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="0" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Robomination" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="0" Overlapped="0" TooltipColor="" TextId="" Visible="0" Tooltip="" NotRelative="1" AutoHideScroll="1" VScroll="1">
         <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="87" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
             <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_CrosshairSnake" TooltipColor="" Text="Crosshair on snake target" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
@@ -1677,7 +1677,7 @@
             </Control>
         </Control>
     </Form>
-    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="0" RAnchorOffset="1" BAnchorPoint="0" BAnchorOffset="1" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Default" TooltipType="OnCursor" Name="ActionBarShortcutItem" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="1" Overlapped="1" TooltipColor="" Tooltip="" Visible="0" IgnoreTooltipDelay="0" DoNotBlockTooltip="1" IgnoreMouse="1" Sprite="" RightEdgeControlsAnchor="">
+    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="1" RAnchorPoint="0" RAnchorOffset="1" BAnchorPoint="0" BAnchorOffset="2" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Default" TooltipType="OnCursor" Name="ActionBarShortcutItem" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="1" Overlapped="1" TooltipColor="" Tooltip="" Visible="0" IgnoreTooltipDelay="0" DoNotBlockTooltip="1" IgnoreMouse="1" Sprite="" RightEdgeControlsAnchor="">
         <Control Class="ActionBarButton" Name="ActionBarShortcutBtn" ContentType="SBar" ContentId="0" Base="CRB_DEMO_WrapperSprites:btnDemo_CharInvisible" RelativeToClient="1" IfHoldNoSignal="1" DT_VCENTER="1" DT_CENTER="1" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" NeverBringToFront="1" Picture="0" WindowSoundTemplate="ActionBarButton" BGColor="white" TextColor="white" IgnoreMouse="0" TooltipType="OnCursor" IgnoreTooltipDelay="1" TooltipColor="" DrawShortcutBottom="1" TopEdgeControlsAnchor="">
             <Event Name="GenerateTooltip" Function="OnGenerateTooltip"/>
         </Control>
@@ -1686,21 +1686,40 @@
     <SpriteFile Name="Textures_Bars.xml"/>
     <SpriteFile Name="RaidCore_Draw.xml"/>
     <TemplateFile Name="RaidCore_Templates.xml"/>
-    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="1" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="1" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Engineers" Border="1" Picture="1" SwallowMouseClicks="1" Moveable="1" Escapable="1" Overlapped="1" TooltipColor="">
-        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="100" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" UseTemplateBG="1">
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Electroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
-                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+    <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Engineers" Border="1" Picture="1" SwallowMouseClicks="1" Moveable="1" Escapable="1" Overlapped="1" TooltipColor="" Visible="0">
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="65" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="29" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="51" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_CoreHealth" TooltipColor="" Text="Add cores as health bars" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Liquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
-                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+        </Control>
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="1" TAnchorPoint="0" TAnchorOffset="63" RAnchorPoint="1" RAnchorOffset="1" BAnchorPoint="0" BAnchorOffset="182" RelativeToClient="1" Font="Nameplates" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_Electroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Fire_Orb" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
-                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_ElectroshockSwapYou" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap on YOU" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_Unstable_Vortex" TooltipColor="" FocusedTextColor="ffffffff" Text="Unstable Vortex" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
-                <Event Name="ButtonSignal" Function="YourFunctionName"/>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_Liquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_FireOrb" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_ElectroshockSwap" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap message" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
         </Control>
-        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="0" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="0" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1"/>
     </Form>
 </Forms>

From 42b4fa51183544b550843c68ce73cf97e03bb864 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 17:15:36 +0200
Subject: [PATCH 24/62] Registered default settings and added range checks for
 each ability that's currently being tracked. This will need some more
 testing.

---
 Encounters/RMT/Engineers.lua | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index fa52a45..b32ba46 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -100,6 +100,15 @@ local currentEngineerPlatform
 local coreUnits
 local engineerUnits
 ----------------------------------------------------------------------------------------------------
+-- Settings.
+----------------------------------------------------------------------------------------------------
+mod:RegisterDefaultSetting("CoreHealth", false)
+mod:RegisterDefaultSetting("Liquidate")
+mod:RegisterDefaultSetting("Electroshock")
+mod:RegisterDefaultSetting("ElectroshockSwap")
+mod:RegisterDefaultSetting("ElectroshockSwapYou")
+mod:RegisterDefaultSetting("FireOrb")
+----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
@@ -114,6 +123,16 @@ function mod:OnBossEnable()
     ENGINEER_NAMES[name] = nil
     ENGINEER_NAMES[self.L[name]] = id
   end
+  -- This ensures that the core healths get added on the bottom, or else the engineers health will be mixed in with the core healths.
+  if mod:GetSetting("CoreHealth") then
+    timer = ApolloTimer.Create(1, false, "RegisterCoreHealth", mod)
+  end
+end
+
+function mod:RegisterCoreHealth()
+  for coreId, coreUnit in pairs(coreUnits) do
+    core:AddUnit(coreUnit)
+  end
 end
 
 function mod:CheckBossLocation(engineerId)
@@ -222,7 +241,9 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-        mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
+        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[WARRIOR]) < 75 and mod:GetSetting("Liquidate") then
+          mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
+        end
       end
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
@@ -240,7 +261,9 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-        mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
+        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[ENGINEER]) < 75 and mod:GetSetting("Electroshock") then
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
+        end
       end
     end,
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
@@ -256,9 +279,11 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
-      local tOrbTarget = tUnit:GetTarget()
-      Print(tOrbTarget)
+      if mod:GetDistanceBetweenUnits(GetPlayerUnit(), tUnit) < 75 and mod:GetSetting("FireOrb") then
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
+        local tOrbTarget = tUnit:GetTarget()
+        --Print(tOrbTarget)
+      end
     end,
   }
 )

From 1a472413f3672b15a262b6340d41d06eddc52d0f Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 17:55:53 +0200
Subject: [PATCH 25/62] Added timers for Electroshock and Liquidate

---
 Encounters/RMT/Engineers.lua | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index b32ba46..85cccda 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -49,8 +49,13 @@ local DEBUFF_ION_CLASH = 84051
 local DEBUFF_UNSTABLE_VOLTAGE = 84045
 
 -- Timers
-local FIRST_ELECTROSHOCK_TIMER = 12
-local ELECTROSHOCK_TIMER = 20
+local FIRST_ELECTROSHOCK_TIMER = 11
+local ELECTROSHOCK_TIMER = 18
+local JUMP_ELECTROSHOCK_TIMER = 17
+
+local FIRST_LIQUIDATE_TIMER = 14
+local LIQUIDATE_TIMER = 22
+local JUMP_LIQUIDATE_TIMER = 17
 
 local FUSION_CORE = 1
 local COOLING_TURBINE = 2
@@ -127,6 +132,8 @@ function mod:OnBossEnable()
   if mod:GetSetting("CoreHealth") then
     timer = ApolloTimer.Create(1, false, "RegisterCoreHealth", mod)
   end
+  mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", FIRST_ELECTROSHOCK_TIMER)
+  mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", FIRST_LIQUIDATE_TIMER)
 end
 
 function mod:RegisterCoreHealth()
@@ -241,7 +248,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[WARRIOR]) < 75 and mod:GetSetting("Liquidate") then
+        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[WARRIOR].unit) < 75 and mod:GetSetting("Liquidate") then
           mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
         end
       end
@@ -252,6 +259,12 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         engineerUnits[WARRIOR].timer:Start()
+        mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
+        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", JUMP_LIQUIDATE_TIMER)
+      end
+      if self.L["Liquidate"] == sCastName then
+        mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
+        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", LIQUIDATE_TIMER)
       end
     end,
   }
@@ -261,8 +274,8 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[ENGINEER]) < 75 and mod:GetSetting("Electroshock") then
-          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Info")
+        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[ENGINEER].unit) < 75 and mod:GetSetting("Electroshock") then
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Beware")
         end
       end
     end,
@@ -272,6 +285,12 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         engineerUnits[ENGINEER].timer:Start()
+        mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", JUMP_ELECTROSHOCK_TIMER)
+      end
+      if self.L["Electroshock"] == sCastName then
+        mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", ELECTROSHOCK_TIMER)
       end
     end,
   }

From 6396f4d3229a4cb57645557ba30a74f0e07023e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 18:02:17 +0200
Subject: [PATCH 26/62] Keep playerUnit

---
 Encounters/RMT/Engineers.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 85cccda..16a136b 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -97,13 +97,13 @@ local ENGINEER_NICKNAMES = {
 -- Locals.
 ----------------------------------------------------------------------------------------------------
 local GetUnitById = GameLib.GetUnitById
-local GetPlayerUnit = GameLib.GetPlayerUnit
 local GetGameTime = GameLib.GetGameTime
 
 local currentWarriorPlatform
 local currentEngineerPlatform
 local coreUnits
 local engineerUnits
+local playerUnit
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
@@ -117,6 +117,7 @@ mod:RegisterDefaultSetting("FireOrb")
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
+  playerUnit = GameLib.GetPlayerUnit()
   coreUnits = {}
   engineerUnits = {}
   --locales
@@ -199,13 +200,13 @@ function mod:OnUnitDestroyed(nId, tUnit, sName)
 
 end
 
-function mod:OnUnitCreated(nId, unit, sName)
+function mod:IsPlayerClose(unit)
 
 end
 
 mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
     local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)" .. " " .. self.L["suffers from Electroshock"])
-    local bIsOnMyself = tElectroshockTarget == GetPlayerUnit():GetName()
+    local bIsOnMyself = tElectroshockTarget == playerUnit:GetName()
     local sSound = "Info"
     local sElectroshockOnX = ""
     if bIsOnMyself then
@@ -248,7 +249,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[WARRIOR].unit) < 75 and mod:GetSetting("Liquidate") then
+        if mod:GetDistanceBetweenUnits(playerunit, engineerUnits[WARRIOR].unit) < 75 and mod:GetSetting("Liquidate") then
           mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
         end
       end
@@ -274,7 +275,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-        if mod:GetDistanceBetweenUnits(GetPlayerUnit(), engineerUnits[ENGINEER].unit) < 75 and mod:GetSetting("Electroshock") then
+        if mod:GetDistanceBetweenUnits(playerUnit, engineerUnits[ENGINEER].unit) < 75 and mod:GetSetting("Electroshock") then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Beware")
         end
       end
@@ -298,7 +299,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      if mod:GetDistanceBetweenUnits(GetPlayerUnit(), tUnit) < 75 and mod:GetSetting("FireOrb") then
+      if mod:GetDistanceBetweenUnits(playerUnit, tUnit) < 75 and mod:GetSetting("FireOrb") then
         mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
         local tOrbTarget = tUnit:GetTarget()
         --Print(tOrbTarget)

From 59d0b1850ae916524ccf3f6f5e0073b652d9f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 18:05:25 +0200
Subject: [PATCH 27/62] Refactor to check if player is close

---
 Encounters/RMT/Engineers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 16a136b..a425a77 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -201,7 +201,7 @@ function mod:OnUnitDestroyed(nId, tUnit, sName)
 end
 
 function mod:IsPlayerClose(unit)
-
+  return mod:GetDistanceBetweenUnits(playerunit, unit) < 75
 end
 
 mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
@@ -249,7 +249,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-        if mod:GetDistanceBetweenUnits(playerunit, engineerUnits[WARRIOR].unit) < 75 and mod:GetSetting("Liquidate") then
+        if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) and mod:GetSetting("Liquidate") then
           mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
         end
       end
@@ -275,7 +275,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-        if mod:GetDistanceBetweenUnits(playerUnit, engineerUnits[ENGINEER].unit) < 75 and mod:GetSetting("Electroshock") then
+        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) and mod:GetSetting("Electroshock") then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Beware")
         end
       end
@@ -299,7 +299,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      if mod:GetDistanceBetweenUnits(playerUnit, tUnit) < 75 and mod:GetSetting("FireOrb") then
+      if mod:IsPlayerClose(tUnit) and mod:GetSetting("FireOrb") then
         mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
         local tOrbTarget = tUnit:GetTarget()
         --Print(tOrbTarget)

From a41c9f2e830abf6bfe950672cd36d85400cb1883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 18:07:29 +0200
Subject: [PATCH 28/62] Only disable sound with settings and keep message

---
 Encounters/RMT/Engineers.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index a425a77..3d6725f 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -249,8 +249,8 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         --Stack
-        if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) and mod:GetSetting("Liquidate") then
-          mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, "Info")
+        if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
+          mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, mod:GetSetting("Liquidate") == true and "Info")
         end
       end
     end,
@@ -275,8 +275,8 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
-        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) and mod:GetSetting("Electroshock") then
-          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, "Beware")
+        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, mod:GetSetting("Electroshock") == true and "Beware")
         end
       end
     end,
@@ -299,8 +299,8 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      if mod:IsPlayerClose(tUnit) and mod:GetSetting("FireOrb") then
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
+      if mod:IsPlayerClose(tUnit) then
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, mod:GetSetting("FireOrb") == true and "RunAway")
         local tOrbTarget = tUnit:GetTarget()
         --Print(tOrbTarget)
       end

From c3a71c93225d3a0f652aac9dfc39a2b37fa75ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 18:15:10 +0200
Subject: [PATCH 29/62] Added the extra space to the pattern

---
 Encounters/RMT/Engineers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 3d6725f..829b0bd 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -205,7 +205,7 @@ function mod:IsPlayerClose(unit)
 end
 
 mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
-    local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)" .. " " .. self.L["suffers from Electroshock"])
+    local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)%s" .. self.L["suffers from Electroshock"])
     local bIsOnMyself = tElectroshockTarget == playerUnit:GetName()
     local sSound = "Info"
     local sElectroshockOnX = ""

From 310f22e7d7eb8206644b32c610555268763c065a Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 18:25:21 +0200
Subject: [PATCH 30/62] Adjusted timers and settings

---
 Encounters/RMT/Engineers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 829b0bd..4dc7bd5 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -51,9 +51,9 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 -- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
 local ELECTROSHOCK_TIMER = 18
-local JUMP_ELECTROSHOCK_TIMER = 17
+local JUMP_ELECTROSHOCK_TIMER = 12
 
-local FIRST_LIQUIDATE_TIMER = 14
+local FIRST_LIQUIDATE_TIMER = 12
 local LIQUIDATE_TIMER = 22
 local JUMP_LIQUIDATE_TIMER = 17
 
@@ -207,13 +207,13 @@ end
 mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
     local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)%s" .. self.L["suffers from Electroshock"])
     local bIsOnMyself = tElectroshockTarget == playerUnit:GetName()
-    local sSound = "Info"
     local sElectroshockOnX = ""
     if bIsOnMyself then
       sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
-      sSound = "RunAway"
+      sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
     else
       sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(tElectroshockTarget)
+      sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
     end
 
     mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")

From 1ab186458eecd6d2c39c643cc29064b880734f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 19:00:44 +0200
Subject: [PATCH 31/62] Add MATCH to datachron events and added arguments
 Renamed old MATCH to EQUAL. Handlers will now also recieve results from :find
 and :match to be able to use them directly

---
 Encounters/BossPrototype.lua    |  4 ++--
 Encounters/RMT/Robomination.lua |  4 ++--
 RaidCore.lua                    | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Encounters/BossPrototype.lua b/Encounters/BossPrototype.lua
index dbb266f..88f6f1e 100644
--- a/Encounters/BossPrototype.lua
+++ b/Encounters/BossPrototype.lua
@@ -93,10 +93,10 @@ end
 function EncounterPrototype:RegisterDatachronEvent(sSearchMessage, sMatch, fHandler)
   assert(type(sSearchMessage) == "string")
   assert(type(fHandler) == "function")
-  assert(sMatch == "MATCH" or sMatch == "FIND")
+  assert(sMatch == "MATCH" or sMatch == "FIND" or sMatch == "EQUAL")
   sSearchMessage = self.L[sSearchMessage]
   self.tDatachronEvents[sSearchMessage] = self.tDatachronEvents[sSearchMessage] or {}
-  table.insert(self.tDatachronEvents[sSearchMessage], {fHandler = fHandler, bMatch = sMatch == "MATCH"})
+  table.insert(self.tDatachronEvents[sSearchMessage], {fHandler = fHandler, sMatch = sMatch })
 end
 
 -- Register events to a single unit
diff --git a/Encounters/RMT/Robomination.lua b/Encounters/RMT/Robomination.lua
index 59cebe3..8bc4c46 100644
--- a/Encounters/RMT/Robomination.lua
+++ b/Encounters/RMT/Robomination.lua
@@ -127,7 +127,7 @@ mod:RegisterDatachronEvent("Robomination tries to crush", "FIND", function (self
   end
 )
 
-mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "MATCH", function (self, sMessage)
+mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "EQUAL", function (self, sMessage)
     phase = MAZE_PHASE
     core:RemoveMsg("ROBO_MAZE")
     mod:RemoveTimerBar("NEXT_SNAKE_TIMER")
@@ -137,7 +137,7 @@ mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "MATCH
   end
 )
 
-mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "MATCH", function (self, sMessage)
+mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "EQUAL", function (self, sMessage)
     phase = DPS_PHASE
     mod:AddTimerBar("NEXT_SNAKE_TIMER", "Next snake in", FIRST_SNAKE_TIMER)
     mod:AddTimerBar("NEXT_INCINERATE_TIMER", "Next incinerate in", FIRST_INCINERATE_TIMER)
diff --git a/RaidCore.lua b/RaidCore.lua
index d7cc071..3cec59b 100644
--- a/RaidCore.lua
+++ b/RaidCore.lua
@@ -107,11 +107,20 @@ local function OnEncounterDatachronEvents(sMethod, ...)
   for sSearchMessage, tEvents in pairs(_tCurrentEncounter.tDatachronEvents) do
     for _, tEvent in pairs(tEvents) do
       local sMessage = ...
-      local bMatch = tEvent.bMatch
+      local sMatch = tEvent.sMatch
       local fHandler = tEvent.fHandler
-      if (bMatch == true and sSearchMessage == sMessage) or
-      (bMatch == false and sMessage:find(sSearchMessage)) then
-        fHandler(_tCurrentEncounter, ...)
+      local result = nil
+
+      if sMatch == "EQUAL" then
+        result = sSearchMessage == sMessage
+      elseif sMatch == "FIND" then
+        result = sMessage:find(sSearchMessage)
+      elseif sMatch == "MATCH" then
+        result = sMessage:match(sSearchMessage)
+      end
+
+      if result ~= nil then
+        fHandler(_tCurrentEncounter, sMessage, result)
       end
     end
   end

From 67fe490e8964b8cfc626ae0ae673498f63df0dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 19:09:29 +0200
Subject: [PATCH 32/62] Refactor datachron event with new format

---
 Encounters/RMT/Engineers.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 4dc7bd5..28e8ea5 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -37,7 +37,7 @@ mod:RegisterEnglishLocale({
     ["Liquidate"] = "Liquidate",
     ["Electroshock"] = "Electroshock",
     -- Datachron
-    ["suffers from Electroshock"] = "suffers from Electroshock",
+    ["([^%s]+%s[^%s]+) suffers from Electroshock"] = "([^%s]+%s[^%s]+) suffers from Electroshock",
     -- Messages
     ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
     ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
@@ -204,15 +204,16 @@ function mod:IsPlayerClose(unit)
   return mod:GetDistanceBetweenUnits(playerunit, unit) < 75
 end
 
-mod:RegisterDatachronEvent("suffers from Electroshock", "FIND", function (self, sMessage)
-    local tElectroshockTarget = string.match(sMessage, "([^%s]+%s[^%s]+)%s" .. self.L["suffers from Electroshock"])
-    local bIsOnMyself = tElectroshockTarget == playerUnit:GetName()
+mod:RegisterDatachronEvent(
+  "([^%s]+%s[^%s]+) suffers from Electroshock", "MATCH",
+  function (self, sMessage, sElectroshockTarget)
+    local bIsOnMyself = sElectroshockTarget == playerUnit:GetName()
     local sElectroshockOnX = ""
     if bIsOnMyself then
       sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
       sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
     else
-      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(tElectroshockTarget)
+      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(sElectroshockTarget)
       sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
     end
 

From 87aaccf06f7bf2a30cdf71e56be69391fdd5b510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 20:52:26 +0200
Subject: [PATCH 33/62] Fix typo

---
 Encounters/RMT/Engineers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 28e8ea5..bbc94df 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -201,7 +201,7 @@ function mod:OnUnitDestroyed(nId, tUnit, sName)
 end
 
 function mod:IsPlayerClose(unit)
-  return mod:GetDistanceBetweenUnits(playerunit, unit) < 75
+  return mod:GetDistanceBetweenUnits(playerUnit, unit) < 75
 end
 
 mod:RegisterDatachronEvent(

From 97f949487f61080e62d03a32df57d982a18c123a Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Sun, 4 Sep 2016 21:04:09 +0200
Subject: [PATCH 34/62] Core health fix

---
 Encounters/RMT/Engineers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index bbc94df..4ed0613 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -131,7 +131,7 @@ function mod:OnBossEnable()
   end
   -- This ensures that the core healths get added on the bottom, or else the engineers health will be mixed in with the core healths.
   if mod:GetSetting("CoreHealth") then
-    timer = ApolloTimer.Create(1, false, "RegisterCoreHealth", mod)
+    ApolloTimer.Create(1, false, "RegisterCoreHealth", mod)
   end
   mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", FIRST_ELECTROSHOCK_TIMER)
   mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", FIRST_LIQUIDATE_TIMER)

From 225d88065369e80ad774b6eab74c1d79342de3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 21:15:39 +0200
Subject: [PATCH 35/62] Create different message ids for electroshock

---
 Encounters/RMT/Engineers.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 4ed0613..30d34a6 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -209,6 +209,7 @@ mod:RegisterDatachronEvent(
   function (self, sMessage, sElectroshockTarget)
     local bIsOnMyself = sElectroshockTarget == playerUnit:GetName()
     local sElectroshockOnX = ""
+    local sMessageId = string.format("ELECTROSHOCK_MSG_%s", sElectroshockTarget)
     if bIsOnMyself then
       sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
       sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
@@ -217,7 +218,7 @@ mod:RegisterDatachronEvent(
       sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
     end
 
-    mod:AddMsg("ELECTROSHOCK_MSG", sElectroshockOnX, 5, sSound, "Red")
+    mod:AddMsg(sMessageId, sElectroshockOnX, 5, sSound, "Red")
   end
 )
 

From b906c4e2e16cce8d5230c2e0c3698b0b5504c2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 4 Sep 2016 22:23:45 +0200
Subject: [PATCH 36/62] Add OnEnteredCombat to unit events

---
 RaidCore.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RaidCore.lua b/RaidCore.lua
index 3cec59b..3099d72 100644
--- a/RaidCore.lua
+++ b/RaidCore.lua
@@ -89,6 +89,9 @@ local function OnEncounterUnitEvents(sMethod, ...)
   elseif sMethod == "OnHealthChanged" then
     local nId, nPourcent, sName = ...
     tEncounter = _tCurrentEncounter.tUnitEvents[sMethod][sName]
+  elseif sMethod == "OnEnteredCombat" then
+    local nId, tUnit, sName, bInCombat = ...
+    tEncounter = _tCurrentEncounter.tUnitEvents[sMethod][sName]
   end
 
   if tEncounter then

From 263ef86dd3737a5c0d92529931396a1f168a53c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 00:13:22 +0200
Subject: [PATCH 37/62] Add Fire Orb messages

---
 Encounters/RMT/Engineers.lua | 54 ++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 30d34a6..897121b 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -41,6 +41,7 @@ mod:RegisterEnglishLocale({
     -- Messages
     ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
     ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
+    ["Next Fire Orb in"] = "Next Fire Orb in",
   })
 ----------------------------------------------------------------------------------------------------
 -- Constants.
@@ -52,6 +53,8 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local FIRST_ELECTROSHOCK_TIMER = 11
 local ELECTROSHOCK_TIMER = 18
 local JUMP_ELECTROSHOCK_TIMER = 12
+local NEXT_FIRE_ORB_TIMER = 24
+local FIRE_ORB_SAFE_TIMER = 14
 
 local FIRST_LIQUIDATE_TIMER = 12
 local LIQUIDATE_TIMER = 22
@@ -104,6 +107,7 @@ local currentEngineerPlatform
 local coreUnits
 local engineerUnits
 local playerUnit
+local orbUnits
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
@@ -120,6 +124,7 @@ function mod:OnBossEnable()
   playerUnit = GameLib.GetPlayerUnit()
   coreUnits = {}
   engineerUnits = {}
+  orbUnits = {}
   --locales
   for name, id in pairs(CORE_NAMES) do
     CORE_NAMES[name] = nil
@@ -301,15 +306,54 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
 
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      if mod:IsPlayerClose(tUnit) then
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, mod:GetSetting("FireOrb") == true and "RunAway")
-        local tOrbTarget = tUnit:GetTarget()
-        --Print(tOrbTarget)
-      end
+      core:WatchUnit(tUnit)
+      mod:RemoveTimerBar("NEXT_FIRE_ORB_TIMER")
+      mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["Next Fire Orb in"], NEXT_FIRE_ORB_TIMER)
+      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId), "Fire Orb is safe to pop in", FIRE_ORB_SAFE_TIMER)
+      local testTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
+      testTimer:Start()
+      orbUnits[nId] = {
+        unit = tUnit,
+        checkedTarget = false,
+        popMessageSent = false,
+        timer = testTimer
+      }
+    end,
+    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
+      orbUnits[nId] = nil
+      mod:RemoveTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId))
     end,
   }
 )
 
+function mod:RegisterOrbTarget()
+  for orbId, orbUnit in pairs(orbUnits) do
+    if not orbUnit.checkedTarget then
+      orbUnit.checkedTarget = true
+      local target = orbUnit.unit:GetTarget()
+      local isOnMyself = target == playerUnit
+      if isOnMyself then
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", "FIRE ORB ON YOU", 5, mod:GetSetting("FireOrb") == true and "RunAway")
+      else
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", "Fire Orb spawned", 2, mod:GetSetting("FireOrbAlt") == true and "Info")
+    end
+  end
+end
+
+--function mod:OnBuffUpdate(nId, nSpellId, nOldStack, nStack, fTimeRemaining)
+--  if nSpellId == 87214 and nStack > 7 then
+--    local orbUnit = orbUnits[nId]
+--    if not orbUnit.popMessageSent then
+--      orbUnit.popMessageSent = true
+--      local target = orbUnit.unit:GetTarget()
+--      local isOnMyself = target == playerUnit
+--      if isOnMyself then
+--        mod:AddMsg("DISCHARGED_PLASMA_MSG_POP", "POP THE FIRE ORB", 5, mod:GetSetting("FireOrbPop") == true and "Inferno")
+--      end
+--    end
+--  end
+--end
+
 -- mod:RegisterUnitEvents({"Friendly Invisible Unit for Fields"},{
 -- ["OnUnitCreated"] = function (self, nId, tUnit, sName)
 -- core:AddPixie(nId, 2, tUnit, nil, "Green", 10, 50, 0)

From 8fabe12b7932c350104575f83cc517ce0f503e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 00:35:38 +0200
Subject: [PATCH 38/62] Change how we track Electroshock

---
 Encounters/RMT/Engineers.lua | 37 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 897121b..07e6d90 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -48,6 +48,8 @@ mod:RegisterEnglishLocale({
 ----------------------------------------------------------------------------------------------------
 local DEBUFF_ION_CLASH = 84051
 local DEBUFF_UNSTABLE_VOLTAGE = 84045
+local DEBUFF_ELECTROSHOCK_VULNERABILITY = 83798
+local DEBUFF_DIMINISHING_FUSION_REACTION = 87214
 
 -- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
@@ -182,6 +184,22 @@ function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
 end
 
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+  if DEBUFF_ELECTROSHOCK_VULNERABILITY == nSpellId then
+    local target = GetUnitById(nId)
+    local targetName = target:GetName()
+    local isOnMyself = targetName == playerUnit:GetName()
+    local sElectroshockOnX = ""
+    local sMessageId = string.format("ELECTROSHOCK_MSG_%s", targetName)
+    if bIsOnMyself then
+      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
+      sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
+    else
+      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(targetName)
+      sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
+    end
+
+    mod:AddMsg(sMessageId, sElectroshockOnX, 5, sSound, "Red")
+  end
   --[=====[
   if DEBUFF_ION_CLASH == nSpellId then
     mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
@@ -209,24 +227,6 @@ function mod:IsPlayerClose(unit)
   return mod:GetDistanceBetweenUnits(playerUnit, unit) < 75
 end
 
-mod:RegisterDatachronEvent(
-  "([^%s]+%s[^%s]+) suffers from Electroshock", "MATCH",
-  function (self, sMessage, sElectroshockTarget)
-    local bIsOnMyself = sElectroshockTarget == playerUnit:GetName()
-    local sElectroshockOnX = ""
-    local sMessageId = string.format("ELECTROSHOCK_MSG_%s", sElectroshockTarget)
-    if bIsOnMyself then
-      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
-      sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
-    else
-      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(sElectroshockTarget)
-      sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
-    end
-
-    mod:AddMsg(sMessageId, sElectroshockOnX, 5, sSound, "Red")
-  end
-)
-
 mod:RegisterUnitEvents({
     "Head Engineer Orvulgh", "Chief Engineer Wilbargh",
     "Fusion Core",
@@ -336,6 +336,7 @@ function mod:RegisterOrbTarget()
         mod:AddMsg("DISCHARGED_PLASMA_MSG", "FIRE ORB ON YOU", 5, mod:GetSetting("FireOrb") == true and "RunAway")
       else
         mod:AddMsg("DISCHARGED_PLASMA_MSG", "Fire Orb spawned", 2, mod:GetSetting("FireOrbAlt") == true and "Info")
+      end
     end
   end
 end

From 04385a54fe62eb54497c892d901539dd054c8102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 00:53:52 +0200
Subject: [PATCH 39/62] Fix tracking/watching of cores. Cores don't get
 destroyed after each pull so there will only be a single UnitCreated event.
 The cores unit table now doesn't get reset anymore to circumvent this. Also
 listen to the raw UnitDestroyed event incase a player walks too far away and
 they do get destroyed.

---
 Encounters/RMT/Engineers.lua | 57 ++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 07e6d90..d02d215 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -106,7 +106,8 @@ local GetGameTime = GameLib.GetGameTime
 
 local currentWarriorPlatform
 local currentEngineerPlatform
-local coreUnits
+--Do not reset coreUnits since they don't get destroyed after each pull
+local coreUnits = {}
 local engineerUnits
 local playerUnit
 local orbUnits
@@ -119,12 +120,16 @@ mod:RegisterDefaultSetting("Electroshock")
 mod:RegisterDefaultSetting("ElectroshockSwap")
 mod:RegisterDefaultSetting("ElectroshockSwapYou")
 mod:RegisterDefaultSetting("FireOrb")
+
+----------------------------------------------------------------------------------------------------
+-- Raw event handlers.
+----------------------------------------------------------------------------------------------------
+Apollo.RegisterEventHandler("UnitDestroyed", "OnUnitDestroyedRaw", mod)
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
   playerUnit = GameLib.GetPlayerUnit()
-  coreUnits = {}
   engineerUnits = {}
   orbUnits = {}
   --locales
@@ -136,17 +141,36 @@ function mod:OnBossEnable()
     ENGINEER_NAMES[name] = nil
     ENGINEER_NAMES[self.L[name]] = id
   end
-  -- This ensures that the core healths get added on the bottom, or else the engineers health will be mixed in with the core healths.
-  if mod:GetSetting("CoreHealth") then
-    ApolloTimer.Create(1, false, "RegisterCoreHealth", mod)
-  end
+
   mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", FIRST_ELECTROSHOCK_TIMER)
   mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", FIRST_LIQUIDATE_TIMER)
 end
 
-function mod:RegisterCoreHealth()
+function mod:OnBossDisable()
+  mod:RemoveUnits()
+end
+
+function mod:AddUnits()
+  for engineerId, engineer in pairs(engineerUnits) do
+    core:WatchUnit(engineer.unit)
+    core:AddUnit(engineer.unit)
+  end
+  for coreId, coreUnit in pairs(coreUnits) do
+    core:WatchUnit(coreUnit)
+    if mod:GetSetting("CoreHealth") then
+      core:AddUnit(coreUnit)
+    end
+  end
+end
+
+function mod:RemoveUnits()
+  for engineerId, engineer in pairs(engineerUnits) do
+    core:RemoveUnit(engineer.unit)
+  end
   for coreId, coreUnit in pairs(coreUnits) do
-    core:AddUnit(coreUnit)
+    if mod:GetSetting("CoreHealth") then
+      core:RemoveUnit(coreUnit)
+    end
   end
 end
 
@@ -227,6 +251,13 @@ function mod:IsPlayerClose(unit)
   return mod:GetDistanceBetweenUnits(playerUnit, unit) < 75
 end
 
+function mod:OnUnitDestroyedRaw(tUnit)
+  local sName = tUnit:GetName()
+  if CORE_NAMES[sName] ~= nil then
+    coreUnits[CORE_NAMES[sName]] = nil
+  end
+end
+
 mod:RegisterUnitEvents({
     "Head Engineer Orvulgh", "Chief Engineer Wilbargh",
     "Fusion Core",
@@ -235,7 +266,6 @@ mod:RegisterUnitEvents({
     "Lubricant Nozzle"
     },{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:WatchUnit(tUnit)
       if CORE_NAMES[sName] ~= nil then
         coreUnits[CORE_NAMES[sName]] = tUnit
       elseif ENGINEER_NAMES[sName] ~= nil then
@@ -247,6 +277,9 @@ mod:RegisterUnitEvents({
           firstCheck = true,
         }
       end
+      if #coreUnits == 4 and #engineerUnits == 2 then
+        mod:AddUnits()
+      end
     end,
   }
 )
@@ -261,9 +294,6 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
         end
       end
     end,
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-    end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         engineerUnits[WARRIOR].timer:Start()
@@ -287,9 +317,6 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         end
       end
     end,
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-    end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         engineerUnits[ENGINEER].timer:Start()

From 0fe9b762b63884c4b85a05b539e6ae6666486fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 02:20:30 +0200
Subject: [PATCH 40/62] Get location of bosses based on Insulation Everytime
 one of the engi jumps he removes the Insulation buff from the core he jumps
 to. Use that event to recheck the distance to each core to tell on what
 platform they are on.

---
 Encounters/RMT/Engineers.lua | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index d02d215..50d2917 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -50,6 +50,7 @@ local DEBUFF_ION_CLASH = 84051
 local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local DEBUFF_ELECTROSHOCK_VULNERABILITY = 83798
 local DEBUFF_DIMINISHING_FUSION_REACTION = 87214
+local BUFF_INSULATION = 83987
 
 -- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
@@ -90,10 +91,6 @@ local ENGINEER_START_LOCATION = {
   [WARRIOR] = SPARK_PLUG,
   [ENGINEER] = COOLING_TURBINE,
 }
-local ENGINEER_TIMER_NAMES = {
-  [WARRIOR] = "OnWarriorLocationTimer",
-  [ENGINEER] = "OnEngineerLocationTimer",
-}
 local ENGINEER_NICKNAMES = {
   [WARRIOR] = "Warrior",
   [ENGINEER] = "Engineer",
@@ -175,33 +172,33 @@ function mod:RemoveUnits()
 end
 
 function mod:CheckBossLocation(engineerId)
-  if engineerUnits[engineerId].firstCheck then
-    engineerUnits[engineerId].firstCheck = false
-    return
-  end
-
   local shortestDistance = 100000
   local currentDistance
+  local oldLocation = engineerUnits[engineerId].location
+  local newLocation = oldLocation
   for coreId, coreUnit in pairs(coreUnits) do
     currentDistance = mod:GetDistanceBetweenUnits(
       engineerUnits[engineerId].unit, coreUnit
     )
     if shortestDistance > currentDistance then
       shortestDistance = currentDistance
-      engineerUnits[engineerId].location = coreId
+      newLocation = coreId
     end
   end
+  if newLocation ~= oldLocation then
+    engineerUnits[engineerId].location = newLocation
+    mod:OnEngiChangeLocation(engineerId, oldLocation, newLocation)
+  end
 end
 
-function mod:OnWarriorLocationTimer()
-  mod:CheckBossLocation(WARRIOR)
-end
-
-function mod:OnEngineerLocationTimer()
-  mod:CheckBossLocation(ENGINEER)
+function mod:OnEngiChangeLocation(engineerId, oldCoreId, newCoreId)
 end
 
-function mod:OnBuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+function mod:OnBuffRemove(nId, nSpellId)
+  if nSpellId == BUFF_INSULATION then
+    mod:CheckBossLocation(ENGINEER)
+    mod:CheckBossLocation(WARRIOR)
+  end
 end
 
 function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
@@ -273,8 +270,6 @@ mod:RegisterUnitEvents({
         engineerUnits[id] = {
           unit = tUnit,
           location = ENGINEER_START_LOCATION[id],
-          timer = ApolloTimer.Create(1.5, false, ENGINEER_TIMER_NAMES[id], mod),
-          firstCheck = true,
         }
       end
       if #coreUnits == 4 and #engineerUnits == 2 then
@@ -296,7 +291,6 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
-        engineerUnits[WARRIOR].timer:Start()
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
         mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", JUMP_LIQUIDATE_TIMER)
       end
@@ -319,7 +313,6 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
-        engineerUnits[ENGINEER].timer:Start()
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
         mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", JUMP_ELECTROSHOCK_TIMER)
       end

From a58895f88fb4c4e8af847abd3144392b7f34529e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 02:25:23 +0200
Subject: [PATCH 41/62] Removed unused code

---
 Encounters/RMT/Engineers.lua | 52 ------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 50d2917..3c36317 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -101,8 +101,6 @@ local ENGINEER_NICKNAMES = {
 local GetUnitById = GameLib.GetUnitById
 local GetGameTime = GameLib.GetGameTime
 
-local currentWarriorPlatform
-local currentEngineerPlatform
 --Do not reset coreUnits since they don't get destroyed after each pull
 local coreUnits = {}
 local engineerUnits
@@ -201,9 +199,6 @@ function mod:OnBuffRemove(nId, nSpellId)
   end
 end
 
-function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
-end
-
 function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
   if DEBUFF_ELECTROSHOCK_VULNERABILITY == nSpellId then
     local target = GetUnitById(nId)
@@ -221,27 +216,6 @@ function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
 
     mod:AddMsg(sMessageId, sElectroshockOnX, 5, sSound, "Red")
   end
-  --[=====[
-  if DEBUFF_ION_CLASH == nSpellId then
-    mod:AddMsg("DISCHARGED_PLASMA_MSG", "KITE THE FIRE ORB", 5, "RunAway")
-    core:AddPicture(nId, nId, "Crosshair", 20)
-  end
-  if DEBUFF_UNSTABLE_VOLTAGE == nSpellId then
-    mod:AddMsg("UNSTABLE_VOLTAGE_MSG", "GET AWAY FROM THE CENTER", 5, "RunAway")
-  end
-  --]=====]
-end
-
-function mod:OnDebuffRemove(nId, nSpellId, nStack, fTimeRemaining)
-  --[=====[
-  if nSpellId == DEBUFF_ION_CLASH then
-    core:RemovePicture(nId)
-  end
-  --]=====]
-end
-
-function mod:OnUnitDestroyed(nId, tUnit, sName)
-
 end
 
 function mod:IsPlayerClose(unit)
@@ -283,7 +257,6 @@ mod:RegisterUnitEvents({
 mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
-        --Stack
         if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
           mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, mod:GetSetting("Liquidate") == true and "Info")
         end
@@ -360,28 +333,3 @@ function mod:RegisterOrbTarget()
     end
   end
 end
-
---function mod:OnBuffUpdate(nId, nSpellId, nOldStack, nStack, fTimeRemaining)
---  if nSpellId == 87214 and nStack > 7 then
---    local orbUnit = orbUnits[nId]
---    if not orbUnit.popMessageSent then
---      orbUnit.popMessageSent = true
---      local target = orbUnit.unit:GetTarget()
---      local isOnMyself = target == playerUnit
---      if isOnMyself then
---        mod:AddMsg("DISCHARGED_PLASMA_MSG_POP", "POP THE FIRE ORB", 5, mod:GetSetting("FireOrbPop") == true and "Inferno")
---      end
---    end
---  end
---end
-
--- mod:RegisterUnitEvents({"Friendly Invisible Unit for Fields"},{
--- ["OnUnitCreated"] = function (self, nId, tUnit, sName)
--- core:AddPixie(nId, 2, tUnit, nil, "Green", 10, 50, 0)
--- core:AddPixie(nId, 2, tUnit, nil, "Green", 10, 20, 180)
--- end,
--- ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
--- core:DropPixie(nId)
--- end,
--- }
--- )

From cf91ce6696fe4e688bcda8f87381e2154bdbe06d Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Mon, 5 Sep 2016 02:36:42 +0200
Subject: [PATCH 42/62] Removed Liquidate after jump.

---
 Encounters/RMT/Engineers.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 3c36317..91674d4 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -61,7 +61,6 @@ local FIRE_ORB_SAFE_TIMER = 14
 
 local FIRST_LIQUIDATE_TIMER = 12
 local LIQUIDATE_TIMER = 22
-local JUMP_LIQUIDATE_TIMER = 17
 
 local FUSION_CORE = 1
 local COOLING_TURBINE = 2
@@ -265,7 +264,6 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
-        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", JUMP_LIQUIDATE_TIMER)
       end
       if self.L["Liquidate"] == sCastName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")

From 87ec8f306202168a505aa7f65e64312b7cec35ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 03:21:03 +0200
Subject: [PATCH 43/62] Add check for Electroshock target and localization

---
 Encounters/RMT/Engineers.lua | 63 +++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 91674d4..548399a 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -39,9 +39,15 @@ mod:RegisterEnglishLocale({
     -- Datachron
     ["([^%s]+%s[^%s]+) suffers from Electroshock"] = "([^%s]+%s[^%s]+) suffers from Electroshock",
     -- Messages
+    ["Next Electroshock in"] = "Next Electroshock in",
+    ["Next Liquidate in"] = "Next Liquidate in",
+    ["Stack"] = "Stack",
     ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
     ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
     ["Next Fire Orb in"] = "Next Fire Orb in",
+    ["FIRE ORB ON YOU"] = "FIRE ORB ON YOU",
+    ["Fire Orb spawned"] = "Fire Orb spawned",
+    ["Fire Orb is safe to pop in"] = "Fire Orb is safe to pop in",
   })
 ----------------------------------------------------------------------------------------------------
 -- Constants.
@@ -51,6 +57,8 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local DEBUFF_ELECTROSHOCK_VULNERABILITY = 83798
 local DEBUFF_DIMINISHING_FUSION_REACTION = 87214
 local BUFF_INSULATION = 83987
+local ELECTROSHOCK_X_TOLERANCE = 0.01
+local ELECTROSHOCK_Z_TOLERANCE = 0.011
 
 -- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
@@ -114,7 +122,7 @@ mod:RegisterDefaultSetting("Electroshock")
 mod:RegisterDefaultSetting("ElectroshockSwap")
 mod:RegisterDefaultSetting("ElectroshockSwapYou")
 mod:RegisterDefaultSetting("FireOrb")
-
+mod:RegisterDefaultSetting("FireOrbAlt")
 ----------------------------------------------------------------------------------------------------
 -- Raw event handlers.
 ----------------------------------------------------------------------------------------------------
@@ -136,8 +144,8 @@ function mod:OnBossEnable()
     ENGINEER_NAMES[self.L[name]] = id
   end
 
-  mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", FIRST_ELECTROSHOCK_TIMER)
-  mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", FIRST_LIQUIDATE_TIMER)
+  mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], FIRST_ELECTROSHOCK_TIMER)
+  mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["Next Liquidate in"], FIRST_LIQUIDATE_TIMER)
 end
 
 function mod:OnBossDisable()
@@ -257,7 +265,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Liquidate"] == sCastName then
         if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
-          mod:AddMsg("LIQUIDATE_MSG", "Stack", 5, mod:GetSetting("Liquidate") == true and "Info")
+          mod:AddMsg("LIQUIDATE_MSG", self.L["Stack"], 5, mod:GetSetting("Liquidate") == true and "Info")
         end
       end
     end,
@@ -267,40 +275,73 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
       end
       if self.L["Liquidate"] == sCastName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
-        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", "Next Liquidate in", LIQUIDATE_TIMER)
+        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["Next Liquidate in"], LIQUIDATE_TIMER)
       end
     end,
   }
 )
 
+function mod:IsUnitFacingOtherUnit(unit, otherUnit)
+  local unitVector = Vector3.New(unit:GetPosition())
+  local otherUnitVector = Vector3.New(otherUnit:GetPosition())
+  local difference = otherUnitVector - unitVector
+  local normalized = difference:Normal()
+  normalized.y = 0
+  local facing = Vector3.New(unit:GetFacing())
+  local facingDifference = normalized - facing
+  Print(tostring(facingDifference))
+
+  return math.abs(facingDifference.x) < ELECTROSHOCK_X_TOLERANCE and math.abs(facingDifference.z) < ELECTROSHOCK_Z_TOLERANCE
+  --local unitCoords = unit:GetPosition()
+  --local unitHeading = unit:GetHeading()
+  --local otherUnitCoords = otherUnit:GetPosition()
+
+  --local deltaX = otherUnitCoords['x'] - unitCoords['x']
+  --local deltaZ = otherUnitCoords['z'] - unitCoords['z']
+
+  --local vectorDirection = math.atan(deltaX / deltaZ)
+
+  --local isFacing = math.abs(vectorDirection - unitHeading) < 0.01
+  --Print("vector direction: "..vectorDirection.." unitHeading: "..unitHeading)
+  --return isFacing
+end
+
 -- Engineer
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Electroshock"] == sCastName then
         if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
-          mod:AddMsg("ELECTROSHOCK_CAST_MSG", "Electroshock", 5, mod:GetSetting("Electroshock") == true and "Beware")
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
         end
+        local timer = ApolloTimer.Create(0.5, false, "CheckEngineerTarget", mod)
+        timer:Start()
       end
     end,
     ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
       if self.L["Rocket Jump"] == sCastName then
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
-        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", JUMP_ELECTROSHOCK_TIMER)
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], JUMP_ELECTROSHOCK_TIMER)
       end
       if self.L["Electroshock"] == sCastName then
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
-        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", "Next Electroshock in", ELECTROSHOCK_TIMER)
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], ELECTROSHOCK_TIMER)
       end
     end,
   }
 )
 
+function mod:CheckEngineerTarget()
+  if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
+    Print("HE IS FACING ME!")
+  end
+end
+
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, nId, tUnit, sName)
       core:WatchUnit(tUnit)
       mod:RemoveTimerBar("NEXT_FIRE_ORB_TIMER")
       mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["Next Fire Orb in"], NEXT_FIRE_ORB_TIMER)
-      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId), "Fire Orb is safe to pop in", FIRE_ORB_SAFE_TIMER)
+      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId), self.L["Fire Orb is safe to pop in"], FIRE_ORB_SAFE_TIMER)
       local testTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
       testTimer:Start()
       orbUnits[nId] = {
@@ -324,9 +365,9 @@ function mod:RegisterOrbTarget()
       local target = orbUnit.unit:GetTarget()
       local isOnMyself = target == playerUnit
       if isOnMyself then
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", "FIRE ORB ON YOU", 5, mod:GetSetting("FireOrb") == true and "RunAway")
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["FIRE ORB ON YOU"], 5, mod:GetSetting("FireOrb") == true and "RunAway")
       else
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", "Fire Orb spawned", 2, mod:GetSetting("FireOrbAlt") == true and "Info")
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["Fire Orb spawned"], 2, mod:GetSetting("FireOrbAlt") == true and "Info")
       end
     end
   end

From 0206c325e998b8b0b54fc7658f911b92039367c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 20:23:52 +0200
Subject: [PATCH 44/62] Change RoboMazeLine setting description

---
 RaidCore.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RaidCore.xml b/RaidCore.xml
index 42076e6..12c592d 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1633,7 +1633,7 @@
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_LineRoboMaze" TooltipColor="" Text="Draw line to robo after kill arms in maze" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Robomination_LineRoboMaze" TooltipColor="" Text="Line to robo after arms die in maze" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>

From f3e99612a1890c3460b90c4c7e45a59d0a064a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 20:27:06 +0200
Subject: [PATCH 45/62] Move local functions to their own section

---
 Encounters/RMT/Engineers.lua | 6 ++++--
 Encounters/RMT/Shredder.lua  | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 548399a..dced2af 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -103,11 +103,13 @@ local ENGINEER_NICKNAMES = {
   [ENGINEER] = "Engineer",
 }
 ----------------------------------------------------------------------------------------------------
--- Locals.
+-- Functions.
 ----------------------------------------------------------------------------------------------------
 local GetUnitById = GameLib.GetUnitById
 local GetGameTime = GameLib.GetGameTime
-
+----------------------------------------------------------------------------------------------------
+-- Locals.
+----------------------------------------------------------------------------------------------------
 --Do not reset coreUnits since they don't get destroyed after each pull
 local coreUnits = {}
 local engineerUnits
diff --git a/Encounters/RMT/Shredder.lua b/Encounters/RMT/Shredder.lua
index 3328e54..7c4b407 100644
--- a/Encounters/RMT/Shredder.lua
+++ b/Encounters/RMT/Shredder.lua
@@ -136,11 +136,14 @@ local SAW_SAFESPOT = {
   [6] = "RIGHT", --SAW_MID + SAW_EAST
 }
 ----------------------------------------------------------------------------------------------------
--- Locals.
+-- Functions.
 ----------------------------------------------------------------------------------------------------
 local GetUnitById = GameLib.GetUnitById
 local GetPlayerUnit = GameLib.GetPlayerUnit
 local GetGameTime = GameLib.GetGameTime
+----------------------------------------------------------------------------------------------------
+-- Locals.
+----------------------------------------------------------------------------------------------------
 local phase
 local addPhase
 local previousAddPhase

From 0d9c11162f8b6c79e6e934ae34643a658ccf394a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 21:16:01 +0200
Subject: [PATCH 46/62] Standardize variable names

---
 Encounters/RMT/Engineers.lua        |  85 ++++++++++----------
 Encounters/RMT/Mordechai.lua        |  16 ++--
 Encounters/RMT/Robomination.lua     | 116 ++++++++++++++--------------
 Encounters/RMT/Shredder.lua         | 112 +++++++++++++--------------
 Encounters/RMT/miniboss/Lockjaw.lua |  18 ++---
 Encounters/RMT/miniboss/Skooty.lua  |  24 +++---
 Encounters/RMT/miniboss/Thrag.lua   |  24 +++---
 7 files changed, 198 insertions(+), 197 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index dced2af..39c76a1 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -201,29 +201,30 @@ end
 function mod:OnEngiChangeLocation(engineerId, oldCoreId, newCoreId)
 end
 
-function mod:OnBuffRemove(nId, nSpellId)
-  if nSpellId == BUFF_INSULATION then
+function mod:OnBuffRemove(id, spellId)
+  if spellId == BUFF_INSULATION then
     mod:CheckBossLocation(ENGINEER)
     mod:CheckBossLocation(WARRIOR)
   end
 end
 
-function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
-  if DEBUFF_ELECTROSHOCK_VULNERABILITY == nSpellId then
-    local target = GetUnitById(nId)
+function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
+  if DEBUFF_ELECTROSHOCK_VULNERABILITY == spellId then
+    local target = GetUnitById(id)
     local targetName = target:GetName()
     local isOnMyself = targetName == playerUnit:GetName()
-    local sElectroshockOnX = ""
-    local sMessageId = string.format("ELECTROSHOCK_MSG_%s", targetName)
+    local electroshockOnX = ""
+    local messageId = string.format("ELECTROSHOCK_MSG_%s", targetName)
+    local sound
     if bIsOnMyself then
-      sElectroshockOnX = self.L["YOU SWAP TO WARRIOR"]
-      sSound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
+      electroshockOnX = self.L["YOU SWAP TO WARRIOR"]
+      sound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
     else
-      sElectroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(targetName)
-      sSound = mod:GetSetting("ElectroshockSwap") == true and "Info"
+      electroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(targetName)
+      sound = mod:GetSetting("ElectroshockSwap") == true and "Info"
     end
 
-    mod:AddMsg(sMessageId, sElectroshockOnX, 5, sSound, "Red")
+    mod:AddMsg(messageId, electroshockOnX, 5, sound, "Red")
   end
 end
 
@@ -231,10 +232,10 @@ function mod:IsPlayerClose(unit)
   return mod:GetDistanceBetweenUnits(playerUnit, unit) < 75
 end
 
-function mod:OnUnitDestroyedRaw(tUnit)
-  local sName = tUnit:GetName()
-  if CORE_NAMES[sName] ~= nil then
-    coreUnits[CORE_NAMES[sName]] = nil
+function mod:OnUnitDestroyedRaw(unit)
+  local name = unit:GetName()
+  if CORE_NAMES[name] ~= nil then
+    coreUnits[CORE_NAMES[name]] = nil
   end
 end
 
@@ -245,14 +246,14 @@ mod:RegisterUnitEvents({
     "Spark Plug",
     "Lubricant Nozzle"
     },{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      if CORE_NAMES[sName] ~= nil then
-        coreUnits[CORE_NAMES[sName]] = tUnit
-      elseif ENGINEER_NAMES[sName] ~= nil then
-        local id = ENGINEER_NAMES[sName]
-        engineerUnits[id] = {
-          unit = tUnit,
-          location = ENGINEER_START_LOCATION[id],
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      if CORE_NAMES[name] ~= nil then
+        coreUnits[CORE_NAMES[name]] = unit
+      elseif ENGINEER_NAMES[name] ~= nil then
+        local engineerId = ENGINEER_NAMES[name]
+        engineerUnits[engineerId] = {
+          unit = unit,
+          location = ENGINEER_START_LOCATION[engineerId],
         }
       end
       if #coreUnits == 4 and #engineerUnits == 2 then
@@ -264,18 +265,18 @@ mod:RegisterUnitEvents({
 
 -- Warrior
 mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Liquidate"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Liquidate"] == castName then
         if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
           mod:AddMsg("LIQUIDATE_MSG", self.L["Stack"], 5, mod:GetSetting("Liquidate") == true and "Info")
         end
       end
     end,
-    ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Rocket Jump"] == sCastName then
+    ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
+      if self.L["Rocket Jump"] == castName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
       end
-      if self.L["Liquidate"] == sCastName then
+      if self.L["Liquidate"] == castName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
         mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["Next Liquidate in"], LIQUIDATE_TIMER)
       end
@@ -310,8 +311,8 @@ end
 
 -- Engineer
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Electroshock"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Electroshock"] == castName then
         if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
         end
@@ -319,12 +320,12 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         timer:Start()
       end
     end,
-    ["OnCastEnd"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Rocket Jump"] == sCastName then
+    ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
+      if self.L["Rocket Jump"] == castName then
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
         mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], JUMP_ELECTROSHOCK_TIMER)
       end
-      if self.L["Electroshock"] == sCastName then
+      if self.L["Electroshock"] == castName then
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
         mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], ELECTROSHOCK_TIMER)
       end
@@ -339,23 +340,23 @@ function mod:CheckEngineerTarget()
 end
 
 mod:RegisterUnitEvents("Discharged Plasma",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:WatchUnit(unit)
       mod:RemoveTimerBar("NEXT_FIRE_ORB_TIMER")
       mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["Next Fire Orb in"], NEXT_FIRE_ORB_TIMER)
-      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId), self.L["Fire Orb is safe to pop in"], FIRE_ORB_SAFE_TIMER)
+      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id), self.L["Fire Orb is safe to pop in"], FIRE_ORB_SAFE_TIMER)
       local testTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
       testTimer:Start()
-      orbUnits[nId] = {
-        unit = tUnit,
+      orbUnits[id] = {
+        unit = unit,
         checkedTarget = false,
         popMessageSent = false,
         timer = testTimer
       }
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      orbUnits[nId] = nil
-      mod:RemoveTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", nId))
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      orbUnits[id] = nil
+      mod:RemoveTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id))
     end,
   }
 )
diff --git a/Encounters/RMT/Mordechai.lua b/Encounters/RMT/Mordechai.lua
index 6fa3b85..2d8aad2 100644
--- a/Encounters/RMT/Mordechai.lua
+++ b/Encounters/RMT/Mordechai.lua
@@ -36,28 +36,28 @@ function mod:OnBossEnable()
 
 end
 
-function mod:OnBuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+function mod:OnBuffAdd(id, spellId, stack, timeRemaining)
 end
 
-function mod:OnCastStart(nId, sCastName, nCastEndTime, sName)
+function mod:OnCastStart(id, castName, castEndTime, name)
 end
 
-function mod:OnDebuffAdd(nId, nSpellId, nStack, fTimeRemaining)
+function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
 
 end
 
-function mod:OnUnitDestroyed(nId, tUnit, sName)
+function mod:OnUnitDestroyed(id, tUnit, name)
 
 end
 
-function mod:OnUnitCreated(nId, unit, sName)
+function mod:OnUnitCreated(id, unit, name)
 
 end
 
 mod:RegisterUnitEvents("Mordechai Redmoon",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
+      core:WatchUnit(unit)
     end,
   }
 )
diff --git a/Encounters/RMT/Robomination.lua b/Encounters/RMT/Robomination.lua
index fad0eb1..8a1270e 100644
--- a/Encounters/RMT/Robomination.lua
+++ b/Encounters/RMT/Robomination.lua
@@ -125,40 +125,40 @@ function mod:OnBossEnable()
   mod:DrawCompactorGrid()
 end
 
-mod:RegisterDatachronEvent("Robomination tries to crush", "FIND", function (self, sMessage)
-    local sSnakeTarget = GetPlayerUnitByName(string.match(sMessage, self.L["Robomination tries to crush"].." ".."([^%s]+%s[^!]+)!$"))
-    local bIsOnMyself = sSnakeTarget == playerUnit
-    local bSnakeNearYou = not bIsOnMyself and mod:GetDistanceBetweenUnits(playerUnit, sSnakeTarget) < 10
-    local sSound = nil
-    local sSnakeOnX = ""
-    if bIsOnMyself then
-      sSound = mod:GetSetting("SoundSnake") == true and "RunAway"
-      sSnakeOnX = self.L["SNAKE ON YOU"]
-    elseif bSnakeNearYou then
+mod:RegisterDatachronEvent("Robomination tries to crush", "FIND", function (self, message)
+    local snakeTarget = GetPlayerUnitByName(string.match(message, self.L["Robomination tries to crush"].." ".."([^%s]+%s[^!]+)!$"))
+    local isOnMyself = snakeTarget == playerUnit
+    local isSnakeNearYou = not isOnMyself and mod:GetDistanceBetweenUnits(playerUnit, snakeTarget) < 10
+    local sound = nil
+    local snakeOnX = ""
+    if isOnMyself then
+      sound = mod:GetSetting("SoundSnake") == true and "RunAway"
+      snakeOnX = self.L["SNAKE ON YOU"]
+    elseif isSnakeNearYou then
       if mod:GetSetting("SoundSnakeNear") then
         if mod:GetSetting("SoundSnakeNearAlt") then
-          sSound = "Destruction"
+          sound = "Destruction"
         else
-          sSound = "RunAway"
+          sound = "RunAway"
         end
       end
-      sSnakeOnX = self.L["SNAKE NEAR ON %s"]:format(sSnakeTarget:GetName())
+      snakeOnX = self.L["SNAKE NEAR ON %s"]:format(snakeTarget:GetName())
     else
-      sSnakeOnX = self.L["SNAKE ON %s"]:format(sSnakeTarget:GetName())
+      snakeOnX = self.L["SNAKE ON %s"]:format(snakeTarget:GetName())
     end
 
     if mod:GetSetting("CrosshairSnake") then
-      core:AddPicture("SNAKE_CROSSHAIR", sSnakeTarget:GetId(), "Crosshair", 20)
+      core:AddPicture("SNAKE_CROSSHAIR", snakeTarget:GetId(), "Crosshair", 20)
     end
 
     mod:RemoveTimerBar("NEXT_SNAKE_TIMER")
     core:AddTimerBar("NEXT_SNAKE_TIMER", self.L["Next snake in"], SNAKE_TIMER, nil, { sColor = "xkcdBrown" })
 
-    mod:AddMsg("SNAKE_MSG", sSnakeOnX, 5, sSound, "Blue")
+    mod:AddMsg("SNAKE_MSG", snakeOnX, 5, sound, "Blue")
   end
 )
 
-mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "EQUAL", function (self, sMessage)
+mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "EQUAL", function (self, message)
     phase = MAZE_PHASE
     core:RemoveMsg("ROBO_MAZE")
     mod:RemoveTimerBar("NEXT_SNAKE_TIMER")
@@ -173,7 +173,7 @@ mod:RegisterDatachronEvent("The Robomination sinks down into the trash.", "EQUAL
   end
 )
 
-mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "EQUAL", function (self, sMessage)
+mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "EQUAL", function (self, message)
     phase = DPS_PHASE
     core:RemoveLineBetweenUnits("ROBO_MAZE_LINE")
     core:AddTimerBar("NEXT_SNAKE_TIMER", self.L["Next snake in"], FIRST_SNAKE_TIMER, nil, { sColor = "xkcdBrown" })
@@ -184,24 +184,24 @@ mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "EQUA
   end
 )
 
-mod:RegisterDatachronEvent("Robomination tries to incinerate", "FIND", function (self, sMessage)
-    local tLaserTarget = GetPlayerUnitByName(string.match(sMessage, self.L["Robomination tries to incinerate"].." ".."([^%s]+%s.+)$"))
-    local bIsOnMyself = tLaserTarget == playerUnit
-    local sSound = mod:GetSetting("SoundLaser") == true and "Burn"
-    local sLaserOnX = ""
-    if bIsOnMyself then
-      sLaserOnX = self.L["LASER ON YOU"]
+mod:RegisterDatachronEvent("Robomination tries to incinerate", "FIND", function (self, message)
+    local laserTarget = GetPlayerUnitByName(string.match(message, self.L["Robomination tries to incinerate"].." ".."([^%s]+%s.+)$"))
+    local isOnMyself = laserTarget == playerUnit
+    local sound = mod:GetSetting("SoundLaser") == true and "Burn"
+    local laserOnX = ""
+    if isOnMyself then
+      laserOnX = self.L["LASER ON YOU"]
     else
-      sLaserOnX = self.L["LASER ON %s"]:format(tLaserTarget:GetName())
+      laserOnX = self.L["LASER ON %s"]:format(laserTarget:GetName())
     end
 
     if mod:GetSetting("CrosshairLaser") then
-      core:AddPicture("LASER_CROSSHAIR", tLaserTarget:GetId(), "Crosshair", 30, 0, 0, nil, "Red")
+      core:AddPicture("LASER_CROSSHAIR", laserTarget:GetId(), "Crosshair", 30, 0, 0, nil, "Red")
     end
 
     mod:RemoveTimerBar("NEXT_INCINERATE_TIMER")
     core:AddTimerBar("NEXT_INCINERATE_TIMER", self.L["Next incinerate in"], INCINERATE_TIMER, nil, { sColor = "red", bEmphasize = mod:GetSetting("SoundLaser") })
-    mod:AddMsg("LASER_MSG", sLaserOnX, 5, sSound, "Red")
+    mod:AddMsg("LASER_MSG", laserOnX, 5, sound, "Red")
   end
 )
 
@@ -232,8 +232,8 @@ function mod:HelperCompactorGrid(compactors, isCorner, isAdding)
   end
 end
 
-function mod:OnDebuffRemove(nId, nSpellId, nStack, fTimeRemaining)
-  if nSpellId == DEBUFF_SNAKE then
+function mod:OnDebuffRemove(id, spellId, stack, timeRemaining)
+  if spellId == DEBUFF_SNAKE then
     core:RemovePicture("SNAKE_CROSSHAIR")
   end
 end
@@ -244,26 +244,26 @@ mod:RegisterUnitEvents({
     "Robomination",
     "Scanning Eye",
     },{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
     end,
   }
 )
 
 mod:RegisterUnitEvents("Scanning Eye",{
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
       phase = MID_MAZE_PHASE
     end,
   }
 )
 
 mod:RegisterUnitEvents({"Cannon Arm", "Flailing Arm"},{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if phase == MID_MAZE_PHASE then
         mazeArmCount = mazeArmCount + 1
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
       if phase == MID_MAZE_PHASE then
         mazeArmCount = mazeArmCount - 1
         if mazeArmCount == 0 then
@@ -279,65 +279,65 @@ mod:RegisterUnitEvents({"Cannon Arm", "Flailing Arm"},{
 
 function mod:RedrawCannonArmLines()
   if mod:GetSetting("LineCannonArm") then
-    for nId, tUnit in pairs(cannonArms) do
-      core:AddLineBetweenUnits(string.format("CANNON_ARM_LINE %d", nId), playerUnit:GetId(), nId, 5)
+    for id, tUnit in pairs(cannonArms) do
+      core:AddLineBetweenUnits(string.format("CANNON_ARM_LINE %d", id), playerUnit:GetId(), id, 5)
     end
   end
 end
 
 function mod:RemoveCannonArmLines()
   if mod:GetSetting("LineCannonArm") then
-    for nId, tUnit in pairs(cannonArms) do
-      core:RemoveLineBetweenUnits(string.format("CANNON_ARM_LINE %d", nId))
+    for id, tUnit in pairs(cannonArms) do
+      core:RemoveLineBetweenUnits(string.format("CANNON_ARM_LINE %d", id))
     end
   end
 end
 
 mod:RegisterUnitEvents("Cannon Arm",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      cannonArms[nId] = tUnit
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      cannonArms[id] = unit
+      core:WatchUnit(unit)
       if mod:GetSetting("LineCannonArm") then
-        core:AddLineBetweenUnits(string.format("CANNON_ARM_LINE %d", nId), playerUnit:GetId(), nId, 5)
+        core:AddLineBetweenUnits(string.format("CANNON_ARM_LINE %d", id), playerUnit:GetId(), id, 5)
       end
       if phase == DPS_PHASE then
         mod:AddTimerBar("NEXT_ARMS_TIMER", self.L["Arms spawning in"], ARMS_TIMER)
       end
       mod:AddMsg("ARMS_MSG", self.L["Cannon arm spawned"], 5, mod:GetSetting("SoundArmSpawn") == true and "Info", "Red")
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Cannon Fire"] == sCastName then
-        if mod:GetDistanceBetweenUnits(playerUnit, GetUnitById(nId)) < 45 then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Cannon Fire"] == castName then
+        if mod:GetDistanceBetweenUnits(playerUnit, GetUnitById(id)) < 45 then
           mod:AddMsg("ARMS_MSG", self.L["INTERRUPT CANNON!"], 2, mod:GetSetting("SoundCannonInterrupt") == true and "Inferno")
         end
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      cannonArms[nId] = nil
-      core:RemoveLineBetweenUnits(string.format("CANNON_ARM_LINE %d", nId))
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      cannonArms[id] = nil
+      core:RemoveLineBetweenUnits(string.format("CANNON_ARM_LINE %d", id))
     end,
   }
 )
 
 mod:RegisterUnitEvents("Robomination",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:WatchUnit(tUnit)
-      roboUnit = tUnit
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:WatchUnit(unit)
+      roboUnit = unit
     end,
-    ["OnHealthChanged"] = function (self, nId, nPourcent, sName)
-      if nPourcent >= 75.5 and nPourcent <= 76.5 then
+    ["OnHealthChanged"] = function (self, id, percent, name)
+      if percent >= 75.5 and percent <= 76.5 then
         mod:AddMsg("ROBO_MAZE", self.L["MAZE SOON!"], 5, mod:GetSetting("SoundPhaseChangeClose") and "Info")
       end
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Noxious Belch"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Noxious Belch"] == castName then
         mod:RemoveTimerBar("NEXT_SPEW_TIMER")
         core:AddTimerBar("NEXT_SPEW_TIMER", self.L["Next spew in"], SPEW_TIMER, nil, { sColor = "green" })
         mod:AddMsg("SPEW_MSG", self.L["Spew!"], 4, mod:GetSetting("SoundSpew") == true and "Beware")
       end
     end,
-    ["OnCastEnd"] = function (self, nId, sCastName, isInterrupted, nCastEndTime, sName)
-      if self.L["Incineration Laser"] == sCastName then
+    ["OnCastEnd"] = function (self, id, castName, isInterrupted, castEndTime, name)
+      if self.L["Incineration Laser"] == castName then
         core:RemovePicture("LASER_CROSSHAIR")
       end
     end,
diff --git a/Encounters/RMT/Shredder.lua b/Encounters/RMT/Shredder.lua
index 7c4b407..6c28e42 100644
--- a/Encounters/RMT/Shredder.lua
+++ b/Encounters/RMT/Shredder.lua
@@ -161,10 +161,10 @@ function mod:OnBossEnable()
   secondShredderSaw = nil
 end
 
-function mod:OnDebuffUpdate(nId, nSpellId, nStack, fTimeRemaining)
-  if DEBUFF_OOZING_BILE == nSpellId then
-    if GameLib.GetPlayerUnit():GetId() == nId and nStack >= 8 then
-      mod:AddMsg("OOZE_MSG", string.format(self.L["%d BILE STACKS!"], nStack), 5, nStack == 8 and mod:GetSetting("SoundOozeStacksWarning") and "Beware")
+function mod:OnDebuffUpdate(id, spellId, stack, timeRemaining)
+  if DEBUFF_OOZING_BILE == spellId then
+    if GameLib.GetPlayerUnit():GetId() == id and stack >= 8 then
+      mod:AddMsg("OOZE_MSG", string.format(self.L["%d BILE STACKS!"], stack), 5, stack == 8 and mod:GetSetting("SoundOozeStacksWarning") and "Beware")
     end
   end
 end
@@ -202,25 +202,25 @@ function mod:NextAddWave()
 end
 
 function mod:PhaseChange()
-  local sText = "Walking "
+  local text = "Walking "
   if phase == SHREDDER then
     phase = WALKING
-    sText = sText.." North"
+    text = text.." North"
     mod:NextAddWave()
   else
-    sText = sText.." South"
+    text = text.." South"
     phase = SHREDDER
     firstShredderSaw = nil
     secondShredderSaw = nil
   end
-  mod:AddProgressBar("WALKING_PROGRESS", sText, mod.GetWalkingProgress, mod, mod.PhaseChange)
+  mod:AddProgressBar("WALKING_PROGRESS", text, mod.GetWalkingProgress, mod, mod.PhaseChange)
 end
 
 function mod:StartProgressBar()
   mod:AddProgressBar("WALKING_PROGRESS", "Walking North", mod.GetWalkingProgress, mod, mod.PhaseChange)
   mod:NextAddWave()
-  _tStartProgressBar:Stop()
-  _tStartProgressBar = nil
+  startProgressBarTimer:Stop()
+  startProgressBarTimer = nil
 end
 
 mod:RegisterUnitEvents({
@@ -233,56 +233,56 @@ mod:RegisterUnitEvents({
     "Risen Redmoon Plunderer",
     "Risen Redmoon Cadet"
     },{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:WatchUnit(unit)
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:RemovePicture(nId)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:RemovePicture(id)
     end,
-    ["OnHealthChanged"] = function (self, nId, nPourcent, sName)
-      if nPourcent <= 1 and mod:GetSetting("CrosshairAdds") then
-        core:AddPicture(nId, nId, "Crosshair", 20)
+    ["OnHealthChanged"] = function (self, id, percent, name)
+      if percent <= 1 and mod:GetSetting("CrosshairAdds") then
+        core:AddPicture(id, id, "Crosshair", 20)
       end
     end,
   }
 )
 
 mod:RegisterUnitEvents({ "Bilious Brute", "Noxious Nabber" },{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if mod:GetSetting("CrosshairPriority") then
-        core:AddPicture(nId, nId, "Crosshair", 30, 0, 0, nil, "red")
+        core:AddPicture(id, id, "Crosshair", 30, 0, 0, nil, "red")
       end
     end,
   }
 )
 
 mod:RegisterUnitEvents("Swabbie Ski'Li",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-      core:WatchUnit(tUnit)
-      self.swabbieUnit = tUnit
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
+      core:WatchUnit(unit)
+      self.swabbieUnit = unit
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:RemoveUnit(tUnit)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:RemoveUnit(unit)
       self:RemoveProgressBar("WALKING_PROGRESS")
       self:RemoveProgressBar("ADDS_PROGRESS")
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Risen Repellent"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Risen Repellent"] == castName then
         mod:AddMsg("KNOCKBACK", "KNOCKBACK", 2)
       end
     end,
-    ["OnCastEnd"] = function (self, nId, sCastName, isInterrupted, nCastEndTime, sName)
-      if self.L["Swabbie Swoop"] == sCastName then
-        _tStartProgressBar = ApolloTimer.Create(1, true, "StartProgressBar", mod)
-        _tStartProgressBar:Start()
+    ["OnCastEnd"] = function (self, id, castName, isInterrupted, castEndTime, name)
+      if self.L["Swabbie Swoop"] == castName then
+        startProgressBarTimer = ApolloTimer.Create(1, true, "StartProgressBar", mod)
+        startProgressBarTimer:Start()
       end
     end,
   }
 )
 
-function mod:DetermineSawLocation(tUnit)
-  local x = tUnit:GetPosition().x
+function mod:DetermineSawLocation(unit)
+  local x = unit:GetPosition().x
   if WEST_POSITION < x and x < MIDDLE_WEST_POSITION then
     return SAW_WEST
   elseif MIDDLE_WEST_POSITION < x and x < MIDDLE_EAST_POSITION then
@@ -309,11 +309,11 @@ function mod:HandleShredderSaw(sawLocation)
 end
 
 mod:RegisterUnitEvents("Sawblade",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if mod:GetSetting("LineSawblade") then
-        core:AddPixie(nId, 2, tUnit, nil, "Red", 10, 60, 0)
+        core:AddPixie(id, 2, unit, nil, "Red", 10, 60, 0)
       end
-      local sawLocation = mod:DetermineSawLocation(tUnit)
+      local sawLocation = mod:DetermineSawLocation(unit)
       if phase == WALKING and sawLocation == SAW_MID then
         mod:AddMsg("SAW_MSG", self.L["SAW IN MIDDLE"], 5,
           mod:GetSetting("SoundMidSawWarning") == true and "Beware"
@@ -322,21 +322,21 @@ mod:RegisterUnitEvents("Sawblade",{
         mod:HandleShredderSaw(sawLocation)
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:DropPixie(nId)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:DropPixie(id)
     end,
   }
 )
 
 mod:RegisterUnitEvents("Noxious Nabber",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       core:RemoveMsg("ADDS_MSG")
       mod:AddMsg("ADDS_MSG", "NOXIOUS NABBER SPAWNED", 5, mod:GetSetting("SoundAdds") and "Info")
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Necrotic Lash"] == sCastName then
-        local tUnit = GetUnitById(nId)
-        if mod:GetDistanceBetweenUnits(playerUnit, tUnit) < 45 and sSpellName == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Necrotic Lash"] == castName then
+        local unit = GetUnitById(id)
+        if mod:GetDistanceBetweenUnits(playerUnit, unit) < 45 and sSpellName == castName then
           mod:AddMsg("NABBER", "INTERRUPT NECROTIC LASH!", 5, mod:GetSetting("SoundNecroticLash") == true and "Inferno")
         end
       end
@@ -345,13 +345,13 @@ mod:RegisterUnitEvents("Noxious Nabber",{
 )
 
 mod:RegisterUnitEvents({"Regor the Rancid", "Braugh the Bloated"},{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       mod:AddMsg("MINIBOSS", "MINIBOSS SPAWNED", 5, mod:GetSetting("SoundMiniboss") and "Info")
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Gravedigger"] == sCastName or
-      self.L["Deathwail"] == sCastName or
-      self.L["Crush"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Gravedigger"] == castName or
+      self.L["Deathwail"] == castName or
+      self.L["Crush"] == castName then
         core:RemoveMsg("MINIBOSS")
         mod:AddMsg("MINIBOSS", "INTERRUPT MINIBOSS!", 5, mod:GetSetting("SoundMinibossCast") and "Inferno")
       end
@@ -360,25 +360,25 @@ mod:RegisterUnitEvents({"Regor the Rancid", "Braugh the Bloated"},{
 )
 
 mod:RegisterUnitEvents("Tether Anchor",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if mod:GetSetting("CrosshairTether") then
-        core:AddPicture(nId, nId, "Crosshair", 25, 0, 0, nil, "FFFFF569")
+        core:AddPicture(id, id, "Crosshair", 25, 0, 0, nil, "FFFFF569")
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:RemovePicture(nId)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:RemovePicture(id)
     end,
   }
 )
 
 mod:RegisterUnitEvents("Junk Trap",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if mod:GetSetting("SquareTethers") then
-        core:AddPolygon(nId, nId, 5, 45, 6, nil, 4)
+        core:AddPolygon(id, id, 5, 45, 6, nil, 4)
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:RemovePolygon(nId)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:RemovePolygon(id)
     end,
   }
 )
diff --git a/Encounters/RMT/miniboss/Lockjaw.lua b/Encounters/RMT/miniboss/Lockjaw.lua
index 49a3689..d9fcfba 100644
--- a/Encounters/RMT/miniboss/Lockjaw.lua
+++ b/Encounters/RMT/miniboss/Lockjaw.lua
@@ -41,12 +41,12 @@ function mod:OnBossEnable()
 end
 
 mod:RegisterUnitEvents("Chief Warden Lockjaw",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
+      core:WatchUnit(unit)
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Blaze Shackles"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Blaze Shackles"] == castName then
         mod:AddMsg("CIRCLES", "DODGE CIRCLES", 5, "Info")
       end
     end,
@@ -54,13 +54,13 @@ mod:RegisterUnitEvents("Chief Warden Lockjaw",{
 )
 
 mod:RegisterUnitEvents("Blaze Shackle",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
+    ["OnUnitCreated"] = function (self, id, unit, name)
       if mod:GetSetting("CrosshairTethers") then
-        core:AddPicture(nId, nId, "Crosshair", 25)
+        core:AddPicture(id, id, "Crosshair", 25)
       end
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      core:RemovePicture(nId)
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      core:RemovePicture(id)
     end,
   }
 )
diff --git a/Encounters/RMT/miniboss/Skooty.lua b/Encounters/RMT/miniboss/Skooty.lua
index b22cde6..507a2e1 100644
--- a/Encounters/RMT/miniboss/Skooty.lua
+++ b/Encounters/RMT/miniboss/Skooty.lua
@@ -42,12 +42,12 @@ function mod:OnBossEnable()
 end
 
 mod:RegisterUnitEvents("Assistant Technician Skooty",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
+      core:WatchUnit(unit)
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Pulse Cannon"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Pulse Cannon"] == castName then
         mod:AddMsg("PULSECANNON", "GET OUT", 5, "RunAway")
       end
     end,
@@ -55,14 +55,14 @@ mod:RegisterUnitEvents("Assistant Technician Skooty",{
 )
 
 mod:RegisterUnitEvents("Jumpstart Charge",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      jumpStarts[nId] = tUnit
-      --core:WatchUnit(tUnit)
-      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", nId), playerUnit:GetId(), nId, 5)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      jumpStarts[id] = unit
+      --core:WatchUnit(unit)
+      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      jumpStarts[nId] = nil
-      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      jumpStarts[id] = nil
+      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
     end,
   }
 )
diff --git a/Encounters/RMT/miniboss/Thrag.lua b/Encounters/RMT/miniboss/Thrag.lua
index 30d5a32..a55c079 100644
--- a/Encounters/RMT/miniboss/Thrag.lua
+++ b/Encounters/RMT/miniboss/Thrag.lua
@@ -42,12 +42,12 @@ function mod:OnBossEnable()
 end
 
 mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      core:AddUnit(tUnit)
-      core:WatchUnit(tUnit)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      core:AddUnit(unit)
+      core:WatchUnit(unit)
     end,
-    ["OnCastStart"] = function (self, nId, sCastName, nCastEndTime, sName)
-      if self.L["Gigavolt"] == sCastName then
+    ["OnCastStart"] = function (self, id, castName, castEndTime, name)
+      if self.L["Gigavolt"] == castName then
         mod:AddMsg("GIGAVOLT", "GET OUT", 5, "RunAway")
       end
     end,
@@ -55,14 +55,14 @@ mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
 )
 
 mod:RegisterUnitEvents("Jumpstart Charge",{
-    ["OnUnitCreated"] = function (self, nId, tUnit, sName)
-      jumpStarts[nId] = tUnit
-      --core:WatchUnit(tUnit)
-      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", nId), playerUnit:GetId(), nId, 5)
+    ["OnUnitCreated"] = function (self, id, unit, name)
+      jumpStarts[id] = unit
+      --core:WatchUnit(unit)
+      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
     end,
-    ["OnUnitDestroyed"] = function (self, nId, tUnit, sName)
-      jumpStarts[nId] = nil
-      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", nId))
+    ["OnUnitDestroyed"] = function (self, id, unit, name)
+      jumpStarts[id] = nil
+      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
     end,
   }
 )

From 4f98810fad04b13d9b3cf4e850c22a0e27e54880 Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Mon, 5 Sep 2016 21:42:33 +0200
Subject: [PATCH 47/62] Added settings for minibosses

---
 RaidCore.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/RaidCore.xml b/RaidCore.xml
index 12c592d..caaafdb 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1544,6 +1544,30 @@
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
         </Control>
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="70" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="140" RelativeToClient="1" Font="Nameplates" Text="Assistant Technician Skooty" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Assistant Technician Skooty" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Skooty_PulseCannon" TooltipColor="" Text="Sound for Pulse Cannon" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Skooty_BombLines" TooltipColor="" Text="Show lines to every bomb" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+        </Control>
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="140" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="210" RelativeToClient="1" Font="Nameplates" Text="Chief Engine Scrubber Thrag" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Chief Engine Scrubber Thrag" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Thrag_Gigavolt" TooltipColor="" Text="Sound for Gigavolt" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Thrag_BombLines" TooltipColor="" Text="Show lines to every bomb" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+        </Control>
     </Form>
     <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="0" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Shredder" Border="0" Picture="0" SwallowMouseClicks="1" Moveable="0" Escapable="0" Overlapped="0" TooltipColor="" TextId="" Visible="0" Tooltip="" NotRelative="1" AutoHideScroll="1" VScroll="1">
         <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="129" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">

From 9bf8c0e2d56ed34a5d0f9816a4dfc6c1cefcd11a Mon Sep 17 00:00:00 2001
From: Jeffroiscool <jeffroiscool@gmail.com>
Date: Mon, 5 Sep 2016 21:43:08 +0200
Subject: [PATCH 48/62] Bomb Lines, Pulse Cannon and Gigavolt

---
 Encounters/RMT/miniboss/Skooty.lua | 19 ++++++++++++-------
 Encounters/RMT/miniboss/Thrag.lua  | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Encounters/RMT/miniboss/Skooty.lua b/Encounters/RMT/miniboss/Skooty.lua
index 507a2e1..cd0f87e 100644
--- a/Encounters/RMT/miniboss/Skooty.lua
+++ b/Encounters/RMT/miniboss/Skooty.lua
@@ -24,7 +24,8 @@ mod:RegisterEnglishLocale({
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
-
+mod:RegisterDefaultSetting("PulseCannon")
+mod:RegisterDefaultSetting("BombLines")
 ----------------------------------------------------------------------------------------------------
 -- Constants.
 ----------------------------------------------------------------------------------------------------
@@ -33,12 +34,12 @@ mod:RegisterEnglishLocale({
 -- Locals.
 ----------------------------------------------------------------------------------------------------
 local jumpStarts
-
+local playerUnit
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
-
+  playerUnit = GameLib.GetPlayerUnit()
 end
 
 mod:RegisterUnitEvents("Assistant Technician Skooty",{
@@ -48,7 +49,7 @@ mod:RegisterUnitEvents("Assistant Technician Skooty",{
     end,
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Pulse Cannon"] == castName then
-        mod:AddMsg("PULSECANNON", "GET OUT", 5, "RunAway")
+        mod:AddMsg("PULSECANNON", "GET OUT", 5, mod:GetSetting("PulseCannon") == true and "RunAway")
       end
     end,
   }
@@ -57,12 +58,16 @@ mod:RegisterUnitEvents("Assistant Technician Skooty",{
 mod:RegisterUnitEvents("Jumpstart Charge",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       jumpStarts[id] = unit
-      --core:WatchUnit(unit)
-      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
+      core:WatchUnit(unit)
+      if mod:GetSetting("BombLines") then
+        core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
+      end
     end,
     ["OnUnitDestroyed"] = function (self, id, unit, name)
       jumpStarts[id] = nil
-      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
+      if mod:GetSetting("BombLines") then
+        core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
+      end
     end,
   }
 )
diff --git a/Encounters/RMT/miniboss/Thrag.lua b/Encounters/RMT/miniboss/Thrag.lua
index a55c079..64d51d1 100644
--- a/Encounters/RMT/miniboss/Thrag.lua
+++ b/Encounters/RMT/miniboss/Thrag.lua
@@ -24,7 +24,8 @@ mod:RegisterEnglishLocale({
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
-
+mod:RegisterDefaultSetting("Gigavolt")
+mod:RegisterDefaultSetting("BombLines")
 ----------------------------------------------------------------------------------------------------
 -- Constants.
 ----------------------------------------------------------------------------------------------------
@@ -33,12 +34,12 @@ mod:RegisterEnglishLocale({
 -- Locals.
 ----------------------------------------------------------------------------------------------------
 local jumpStarts
-
+local playerUnit
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
-
+  playerUnit = GameLib.GetPlayerUnit()
 end
 
 mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
@@ -48,7 +49,7 @@ mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
     end,
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Gigavolt"] == castName then
-        mod:AddMsg("GIGAVOLT", "GET OUT", 5, "RunAway")
+        mod:AddMsg("GIGAVOLT", "GET OUT", 5, mod:GetSetting("Gigavolt") == true and "RunAway")
       end
     end,
   }
@@ -57,12 +58,16 @@ mod:RegisterUnitEvents("Chief Engine Scrubber Thrag",{
 mod:RegisterUnitEvents("Jumpstart Charge",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       jumpStarts[id] = unit
-      --core:WatchUnit(unit)
-      core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
+      core:WatchUnit(unit)
+      if mod:GetSetting("BombLines") then
+        core:AddLineBetweenUnits(string.format("JUMP_START_LINE %d", id), playerUnit:GetId(), id, 5)
+      end
     end,
     ["OnUnitDestroyed"] = function (self, id, unit, name)
       jumpStarts[id] = nil
-      core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
+      if mod:GetSetting("BombLines") then
+        core:RemoveLineBetweenUnits(string.format("JUMP_START_LINE %d", id))
+      end
     end,
   }
 )

From 61629f7c0f76fffb7e039fed6395c66b4f1f584f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 21:40:16 +0200
Subject: [PATCH 49/62] Cleanup comments and unused code

---
 Encounters/RMT/Engineers.lua        | 10 +++++---
 Encounters/RMT/Mordechai.lua        |  1 +
 Encounters/RMT/Robomination.lua     | 19 ++++++++++----
 Encounters/RMT/Shredder.lua         | 39 ++++++++---------------------
 Encounters/RMT/miniboss/Lockjaw.lua | 14 ++---------
 Encounters/RMT/miniboss/Skooty.lua  |  4 ++-
 Encounters/RMT/miniboss/Thrag.lua   |  4 ++-
 7 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 39c76a1..90fc9f8 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -33,12 +33,12 @@ mod:RegisterEnglishLocale({
     ["Friendly Invisible Unit for Fields"] = "Friendly Invisible Unit for Fields",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
     ["Discharged Plasma"] = "Discharged Plasma", -- Fire Orb
-    -- Cast names
+    -- Cast names.
     ["Liquidate"] = "Liquidate",
     ["Electroshock"] = "Electroshock",
-    -- Datachron
+    -- Datachron.
     ["([^%s]+%s[^%s]+) suffers from Electroshock"] = "([^%s]+%s[^%s]+) suffers from Electroshock",
-    -- Messages
+    -- Messages.
     ["Next Electroshock in"] = "Next Electroshock in",
     ["Next Liquidate in"] = "Next Liquidate in",
     ["Stack"] = "Stack",
@@ -60,7 +60,7 @@ local BUFF_INSULATION = 83987
 local ELECTROSHOCK_X_TOLERANCE = 0.01
 local ELECTROSHOCK_Z_TOLERANCE = 0.011
 
--- Timers
+-- Timers.
 local FIRST_ELECTROSHOCK_TIMER = 11
 local ELECTROSHOCK_TIMER = 18
 local JUMP_ELECTROSHOCK_TIMER = 12
@@ -70,6 +70,7 @@ local FIRE_ORB_SAFE_TIMER = 14
 local FIRST_LIQUIDATE_TIMER = 12
 local LIQUIDATE_TIMER = 22
 
+-- Cores.
 local FUSION_CORE = 1
 local COOLING_TURBINE = 2
 local SPARK_PLUG = 3
@@ -88,6 +89,7 @@ local CORE_NICKNAMES = {
   [LUBRICANT_NOZZLE] = "Lubricant Nozzle"
 }
 
+-- Engineers.
 local WARRIOR = 1
 local ENGINEER = 2
 local ENGINEER_NAMES = {
diff --git a/Encounters/RMT/Mordechai.lua b/Encounters/RMT/Mordechai.lua
index 2d8aad2..51a3b36 100644
--- a/Encounters/RMT/Mordechai.lua
+++ b/Encounters/RMT/Mordechai.lua
@@ -16,6 +16,7 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ALL", { "Mordechai Redmoon" })
 mod:RegisterEnglishLocale({
+    -- Unit names.
     ["Mordechai Redmoon"] = "Mordechai Redmoon"
   })
 ----------------------------------------------------------------------------------------------------
diff --git a/Encounters/RMT/Robomination.lua b/Encounters/RMT/Robomination.lua
index 8a1270e..cdb707a 100644
--- a/Encounters/RMT/Robomination.lua
+++ b/Encounters/RMT/Robomination.lua
@@ -16,22 +16,22 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ANY", { "Robomination" })
 mod:RegisterEnglishLocale({
-    --Unit names.
+    -- Unit names.
     ["Robomination"] = "Robomination",
     ["Trash Compactor"] = "Trash Compactor",
     ["Cannon Arm"] = "Cannon Arm",
     ["Flailing Arm"] = "Flailing Arm",
     ["Scanning Eye"] = "Scanning Eye",
-    --Casts
+    -- Cast names.
     ["Cannon Fire"] = "Cannon Fire",
     ["Incineration Laser"] = "Incineration Laser",
     ["Noxious Belch"] = "Noxious Belch",
-    --Datachron
+    -- Datachron.
     ["Robomination tries to crush"] = "Robomination tries to crush",
     ["The Robomination tries to incinerate"] = "The Robomination tries to incinerate",
     ["The Robomination sinks down into the trash."] = "The Robomination sinks down into the trash.",
     ["The Robomination erupts back into the fight!"] = "The Robomination erupts back into the fight!",
-    --Message bars
+    -- Messages.
     ["SNAKE ON %s"] = "SNAKE ON %s",
     ["SNAKE ON YOU"] = "SNAKE ON YOU",
     ["SNAKE NEAR ON %s"] = "SNAKE NEAR ON %s",
@@ -50,19 +50,28 @@ mod:RegisterEnglishLocale({
 ----------------------------------------------------------------------------------------------------
 -- Constants.
 ----------------------------------------------------------------------------------------------------
-local NO_BREAK_SPACE = string.char(194, 160)
+-- Spell ids.
 local DEBUFF_SNAKE = 75126
+
+-- Phases.
 local DPS_PHASE = 1
 local MAZE_PHASE = 2
 local MID_MAZE_PHASE = 3
+
+-- Timers.
 local FIRST_SNAKE_TIMER = 7.5
 local SNAKE_TIMER = 17.5
+
 local FIRST_INCINERATE_TIMER = 18.5
 local INCINERATE_TIMER = 42.5
+
 local FIRST_SPEW_TIMER = 15.6
 local SPEW_TIMER = 31.75
 local MAZE_SPEW_TIMER = 10
+
 local ARMS_TIMER = 45
+
+-- Compactors.
 local COMPACTORS_EDGE = {
   { y = -203.4208984375, x = 0.71257400512695, z = -1349.8697509766 },
   { y = -203.4208984375, x = 10.955376625061, z = -1339.6927490234 },
diff --git a/Encounters/RMT/Shredder.lua b/Encounters/RMT/Shredder.lua
index 6c28e42..e491a4d 100644
--- a/Encounters/RMT/Shredder.lua
+++ b/Encounters/RMT/Shredder.lua
@@ -22,7 +22,7 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ALL", { "Swabbie Ski'Li" })
 mod:RegisterEnglishLocale({
-    --Unit names
+    -- Unit names.
     ["Swabbie Ski'Li"] = "Swabbie Ski'Li",
     ["Sawblade"] = "Sawblade", -- big saw
     ["Saw"] = "Saw", -- little saw
@@ -38,7 +38,7 @@ mod:RegisterEnglishLocale({
     ["Junk Trap"] = "Junk Trap",
     -- Datachron messages.
     ["WARNING: THE SHREDDER IS STARTING!"] = "WARNING: THE SHREDDER IS STARTING!",
-    --Cast names
+    -- Cast names.
     ["Swabbie Swoop"] = "Swabbie Swoop",
     ["Risen Repellent"] = "Risen Repellent",
     ["Crush"] = "Crush",
@@ -46,7 +46,7 @@ mod:RegisterEnglishLocale({
     ["Deathwail"] = "Deathwail",
     ["Necrotic Lash"] = "Necrotic Lash",
     ["Swabbie Swoop"] = "Swabbie Swoop",
-    --Messages
+    -- Messages.
     ["%d BILE STACKS!"] = "%d BILE STACKS!",
     ["SAW IN MIDDLE"] = "SAW IN MIDDLE",
     ["SAFE SPOT %s"] = "SAFE SPOT %s",
@@ -54,31 +54,6 @@ mod:RegisterEnglishLocale({
     ["MIDDLE"] = "MIDDLE",
     ["RIGHT"] = "RIGHT",
   })
-
-mod:RegisterFrenchLocale({
-    -- --Unit names
-    -- ["Swabbie Ski'Li"] = "Swabbie Ski'Li",
-    -- ["Sawblade"] = "Sawblade", -- big saw
-    -- ["Saw"] = "Saw", -- little saw
-    -- ["Noxious Nabber"] = "Noxious Nabber",
-    -- ["Risen Redmoon Grunt"] = "Risen Redmoon Grunt",
-    -- ["Regor the Rancid"] = "Regor the Rancid",
-    -- ["Braugh the Bloated"] = "Braugh the Bloated",
-    -- ["Bilious Brute"] = "Bilious Brute",
-    -- ["Putrid Pouncer"] = "Putrid Pouncer",
-    -- ["Risen Redmoon Plunderer"] = "Risen Redmoon Plunderer",
-    -- ["Risen Redmoon Cadet"] = "Risen Redmoon Cadet",
-    -- -- Datachron messages.
-    -- ["WARNING: THE SHREDDER IS STARTING!"] = "WARNING: THE SHREDDER IS STARTING!",
-    -- --Cast names
-    -- ["Swabbie Swoop"] = "Swabbie Swoop",
-    -- ["Risen Repellent"] = "Risen Repellent",
-    -- ["Crush"] = "Crush",
-    -- ["Gravedigger"] = "Gravedigger",
-    -- ["Deathwail"] = "Deathwail",
-    -- ["Necrotic Lash"] = "Necrotic Lash",
-    -- ["Swabbie Swoop"] = "Swabbie Swoop",
-  })
 ----------------------------------------------------------------------------------------------------
 -- Settings
 ----------------------------------------------------------------------------------------------------
@@ -115,14 +90,20 @@ function circular(t)
   return setmetatable(t, lmt)
 end
 
+-- Coordinates
 local START_POSITION = Vector3.New({x = -20.054916381836,y = 597.66021728516,z = -809.42694091797})
 local END_POSITION = Vector3.New({x = -20.499969482422,y = 597.88836669922,z = -973.21472167969})
 local WALKING_DISTANCE = (END_POSITION-START_POSITION):Length()
-local NO_BREAK_SPACE = string.char(194, 160)
+
+-- Phases.
 local WALKING = 0
 local SHREDDER = 1
 local ADD_PHASES = circular{ 11, 45, 66, 0 }
+
+-- Spell ids.
 local DEBUFF_OOZING_BILE = 84321
+
+-- Saw stuff.
 local WEST_POSITION = -42
 local MIDDLE_WEST_POSITION = -28
 local MIDDLE_EAST_POSITION = -14
diff --git a/Encounters/RMT/miniboss/Lockjaw.lua b/Encounters/RMT/miniboss/Lockjaw.lua
index d9fcfba..cdf42e3 100644
--- a/Encounters/RMT/miniboss/Lockjaw.lua
+++ b/Encounters/RMT/miniboss/Lockjaw.lua
@@ -16,30 +16,20 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ALL", { "Chief Warden Lockjaw" })
 mod:RegisterEnglishLocale({
+    -- Unit names.
     ["Chief Warden Lockjaw"] = "Chief Warden Lockjaw",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
     ["Blaze Shackle"] = "Blaze Shackle",
+    -- Cast names.
     ["Blaze Shackles"] = "Blaze Shackles",
   })
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
 mod:RegisterDefaultSetting("CrosshairTethers")
-----------------------------------------------------------------------------------------------------
--- Constants.
-----------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------
--- Locals.
-----------------------------------------------------------------------------------------------------
-
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
-function mod:OnBossEnable()
-
-end
-
 mod:RegisterUnitEvents("Chief Warden Lockjaw",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:AddUnit(unit)
diff --git a/Encounters/RMT/miniboss/Skooty.lua b/Encounters/RMT/miniboss/Skooty.lua
index cd0f87e..86c7309 100644
--- a/Encounters/RMT/miniboss/Skooty.lua
+++ b/Encounters/RMT/miniboss/Skooty.lua
@@ -16,10 +16,12 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ALL", { "Assistant Technician Skooty" })
 mod:RegisterEnglishLocale({
+    -- Unit names.
     ["Assistant Technician Skooty"] = "Assistant Technician Skooty",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
-    ["Pulse Cannon"] = "Pulse Cannon",
     ["Jumpstart Charge"] = "Jumpstart Charge",
+    -- Cast names.
+    ["Pulse Cannon"] = "Pulse Cannon",
   })
 ----------------------------------------------------------------------------------------------------
 -- Settings.
diff --git a/Encounters/RMT/miniboss/Thrag.lua b/Encounters/RMT/miniboss/Thrag.lua
index 64d51d1..f0bd6a3 100644
--- a/Encounters/RMT/miniboss/Thrag.lua
+++ b/Encounters/RMT/miniboss/Thrag.lua
@@ -16,10 +16,12 @@ if not mod then return end
 ----------------------------------------------------------------------------------------------------
 mod:RegisterTrigMob("ALL", { "Chief Engine Scrubber Thrag" })
 mod:RegisterEnglishLocale({
+    -- Unit names.
     ["Chief Engine Scrubber Thrag"] = "Chief Engine Scrubber Thrag",
     ["Hostile Invisible Unit for Fields (0 hit radius)"] = "Hostile Invisible Unit for Fields (0 hit radius)",
-    ["Gigavolt"] = "Gigavolt",
     ["Jumpstart Charge"] = "Jumpstart Charge",
+    -- Cast names.
+    ["Gigavolt"] = "Gigavolt",
   })
 ----------------------------------------------------------------------------------------------------
 -- Settings.

From 67efdeb7f5a980c69a1de588fd0ca9efde7530f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Mon, 5 Sep 2016 21:54:27 +0200
Subject: [PATCH 50/62] Refactor datachron events to MATCH format

---
 Encounters/RMT/Robomination.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Encounters/RMT/Robomination.lua b/Encounters/RMT/Robomination.lua
index cdb707a..a00f0c1 100644
--- a/Encounters/RMT/Robomination.lua
+++ b/Encounters/RMT/Robomination.lua
@@ -27,8 +27,8 @@ mod:RegisterEnglishLocale({
     ["Incineration Laser"] = "Incineration Laser",
     ["Noxious Belch"] = "Noxious Belch",
     -- Datachron.
-    ["Robomination tries to crush"] = "Robomination tries to crush",
-    ["The Robomination tries to incinerate"] = "The Robomination tries to incinerate",
+    ["Robomination tries to crush ([^%s]+%s[^!]+)!$"] = "Robomination tries to crush ([^%s]+%s[^!]+)!$",
+    ["Robomination tries to incinerate ([^%s]+%s.+)$"] = "Robomination tries to incinerate ([^%s]+%s.+)$",
     ["The Robomination sinks down into the trash."] = "The Robomination sinks down into the trash.",
     ["The Robomination erupts back into the fight!"] = "The Robomination erupts back into the fight!",
     -- Messages.
@@ -134,8 +134,8 @@ function mod:OnBossEnable()
   mod:DrawCompactorGrid()
 end
 
-mod:RegisterDatachronEvent("Robomination tries to crush", "FIND", function (self, message)
-    local snakeTarget = GetPlayerUnitByName(string.match(message, self.L["Robomination tries to crush"].." ".."([^%s]+%s[^!]+)!$"))
+mod:RegisterDatachronEvent("Robomination tries to crush ([^%s]+%s[^!]+)!$", "MATCH", function (self, message, snakeTargetName)
+    local snakeTarget = GetPlayerUnitByName(snakeTargetName)
     local isOnMyself = snakeTarget == playerUnit
     local isSnakeNearYou = not isOnMyself and mod:GetDistanceBetweenUnits(playerUnit, snakeTarget) < 10
     local sound = nil
@@ -193,8 +193,8 @@ mod:RegisterDatachronEvent("The Robomination erupts back into the fight!", "EQUA
   end
 )
 
-mod:RegisterDatachronEvent("Robomination tries to incinerate", "FIND", function (self, message)
-    local laserTarget = GetPlayerUnitByName(string.match(message, self.L["Robomination tries to incinerate"].." ".."([^%s]+%s.+)$"))
+mod:RegisterDatachronEvent("Robomination tries to incinerate ([^%s]+%s.+)$", "MATCH", function (self, message, laserTargetName)
+    local laserTarget = GetPlayerUnitByName(laserTargetName)
     local isOnMyself = laserTarget == playerUnit
     local sound = mod:GetSetting("SoundLaser") == true and "Burn"
     local laserOnX = ""

From 39a3c5544968d0c99f92ac4bc0ce7a6d0ecbab9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 22:01:51 +0200
Subject: [PATCH 51/62] Remove timer

---
 Encounters/RMT/Engineers.lua | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 90fc9f8..d6ae697 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -297,18 +297,6 @@ function mod:IsUnitFacingOtherUnit(unit, otherUnit)
   Print(tostring(facingDifference))
 
   return math.abs(facingDifference.x) < ELECTROSHOCK_X_TOLERANCE and math.abs(facingDifference.z) < ELECTROSHOCK_Z_TOLERANCE
-  --local unitCoords = unit:GetPosition()
-  --local unitHeading = unit:GetHeading()
-  --local otherUnitCoords = otherUnit:GetPosition()
-
-  --local deltaX = otherUnitCoords['x'] - unitCoords['x']
-  --local deltaZ = otherUnitCoords['z'] - unitCoords['z']
-
-  --local vectorDirection = math.atan(deltaX / deltaZ)
-
-  --local isFacing = math.abs(vectorDirection - unitHeading) < 0.01
-  --Print("vector direction: "..vectorDirection.." unitHeading: "..unitHeading)
-  --return isFacing
 end
 
 -- Engineer
@@ -318,8 +306,9 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
         end
-        local timer = ApolloTimer.Create(0.5, false, "CheckEngineerTarget", mod)
-        timer:Start()
+        if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
+          Print("HE IS FACING ME!")
+        end
       end
     end,
     ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
@@ -335,12 +324,6 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
   }
 )
 
-function mod:CheckEngineerTarget()
-  if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
-    Print("HE IS FACING ME!")
-  end
-end
-
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:WatchUnit(unit)

From 2140d3b36be2d89398eb44faa09cde0b92b33b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 22:24:10 +0200
Subject: [PATCH 52/62] Try fixing the targeting

---
 Encounters/RMT/Engineers.lua | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index d6ae697..f446e3a 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -57,10 +57,10 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local DEBUFF_ELECTROSHOCK_VULNERABILITY = 83798
 local DEBUFF_DIMINISHING_FUSION_REACTION = 87214
 local BUFF_INSULATION = 83987
-local ELECTROSHOCK_X_TOLERANCE = 0.01
-local ELECTROSHOCK_Z_TOLERANCE = 0.011
+local ELECTROSHOCK_X_TOLERANCE = 0.05
+local ELECTROSHOCK_Z_TOLERANCE = 0.05
 
--- Timers.
+-- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
 local ELECTROSHOCK_TIMER = 18
 local JUMP_ELECTROSHOCK_TIMER = 12
@@ -70,7 +70,6 @@ local FIRE_ORB_SAFE_TIMER = 14
 local FIRST_LIQUIDATE_TIMER = 12
 local LIQUIDATE_TIMER = 22
 
--- Cores.
 local FUSION_CORE = 1
 local COOLING_TURBINE = 2
 local SPARK_PLUG = 3
@@ -89,7 +88,6 @@ local CORE_NICKNAMES = {
   [LUBRICANT_NOZZLE] = "Lubricant Nozzle"
 }
 
--- Engineers.
 local WARRIOR = 1
 local ENGINEER = 2
 local ENGINEER_NAMES = {
@@ -303,12 +301,8 @@ end
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Electroshock"] == castName then
-        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
-          mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
-        end
-        if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
-          Print("HE IS FACING ME!")
-        end
+        local timer = ApolloTimer.Create(0.4, false, "CheckEngineerTarget", mod)
+        timer:Start()
       end
     end,
     ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
@@ -324,6 +318,16 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
   }
 )
 
+function mod:CheckEngineerTarget()
+  if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
+    if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
+      mod:AddMsg("ELECTROSHOCK_CAST_MSG", "RUN AWAY MOTHERFUCKER", 5, "Inferno")
+    else
+      mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
+    end
+  end
+end
+
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:WatchUnit(unit)

From c19da997738f883c61b93ba391f2e47bbde9d868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Mon, 5 Sep 2016 22:46:28 +0200
Subject: [PATCH 53/62] Remove electroshock target guessing

---
 Encounters/RMT/Engineers.lua | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index f446e3a..6e0a8de 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -57,8 +57,6 @@ local DEBUFF_UNSTABLE_VOLTAGE = 84045
 local DEBUFF_ELECTROSHOCK_VULNERABILITY = 83798
 local DEBUFF_DIMINISHING_FUSION_REACTION = 87214
 local BUFF_INSULATION = 83987
-local ELECTROSHOCK_X_TOLERANCE = 0.05
-local ELECTROSHOCK_Z_TOLERANCE = 0.05
 
 -- Timers
 local FIRST_ELECTROSHOCK_TIMER = 11
@@ -292,17 +290,18 @@ function mod:IsUnitFacingOtherUnit(unit, otherUnit)
   normalized.y = 0
   local facing = Vector3.New(unit:GetFacing())
   local facingDifference = normalized - facing
-  Print(tostring(facingDifference))
 
-  return math.abs(facingDifference.x) < ELECTROSHOCK_X_TOLERANCE and math.abs(facingDifference.z) < ELECTROSHOCK_Z_TOLERANCE
+  return math.abs(facingDifference.x) < 0.01 and math.abs(facingDifference.z) < 0.01
 end
 
 -- Engineer
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Electroshock"] == castName then
-        local timer = ApolloTimer.Create(0.4, false, "CheckEngineerTarget", mod)
-        timer:Start()
+        core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 60, 0)
+        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
+        end
       end
     end,
     ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
@@ -311,6 +310,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], JUMP_ELECTROSHOCK_TIMER)
       end
       if self.L["Electroshock"] == castName then
+        core:DropPixie("ELECTROSHOCK_PIXIE")
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
         mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], ELECTROSHOCK_TIMER)
       end
@@ -318,16 +318,6 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
   }
 )
 
-function mod:CheckEngineerTarget()
-  if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
-    if mod:IsUnitFacingOtherUnit(engineerUnits[ENGINEER].unit, playerUnit) then
-      mod:AddMsg("ELECTROSHOCK_CAST_MSG", "RUN AWAY MOTHERFUCKER", 5, "Inferno")
-    else
-      mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
-    end
-  end
-end
-
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:WatchUnit(unit)

From ffcfa8f58aeb10829d28ac105b4eafe2ef910290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Tue, 6 Sep 2016 00:07:09 +0200
Subject: [PATCH 54/62] Refactored i18n and Settings. Added Health warnings

---
 Encounters/RMT/Engineers.lua | 117 +++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 40 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 6e0a8de..c5a4921 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -39,15 +39,17 @@ mod:RegisterEnglishLocale({
     -- Datachron.
     ["([^%s]+%s[^%s]+) suffers from Electroshock"] = "([^%s]+%s[^%s]+) suffers from Electroshock",
     -- Messages.
-    ["Next Electroshock in"] = "Next Electroshock in",
-    ["Next Liquidate in"] = "Next Liquidate in",
-    ["Stack"] = "Stack",
-    ["%s SWAP TO WARRIOR"] = "%s SWAP TO WARRIOR",
-    ["YOU SWAP TO WARRIOR"] = "YOU SWAP TO WARRIOR",
-    ["Next Fire Orb in"] = "Next Fire Orb in",
-    ["FIRE ORB ON YOU"] = "FIRE ORB ON YOU",
-    ["Fire Orb spawned"] = "Fire Orb spawned",
-    ["Fire Orb is safe to pop in"] = "Fire Orb is safe to pop in",
+    ["electroshock.next"] = "Next Electroshock in",
+    ["liquidate.next"] = "Next Liquidate in",
+    ["liquidate.stack"] = "Stack",
+    ["electroshock.swap.other"] = "%s SWAP TO WARRIOR",
+    ["electroshock.swap.you"] = "YOU SWAP TO WARRIOR",
+    ["fire_orb.next"] = "Next Fire Orb in",
+    ["fire_orb.you"] = "FIRE ORB ON YOU",
+    ["fire_orb.spawned"] = "Fire Orb spawned",
+    ["fire_orb.pop"] = "Fire Orb is safe to pop in",
+    ["core.health.high.warning"] = "%s pillar at 85%%!",
+    ["core.health.low.warning"] = "%s pillar at 15%%!"
   })
 ----------------------------------------------------------------------------------------------------
 -- Constants.
@@ -116,13 +118,15 @@ local orbUnits
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
-mod:RegisterDefaultSetting("CoreHealth", false)
-mod:RegisterDefaultSetting("Liquidate")
-mod:RegisterDefaultSetting("Electroshock")
-mod:RegisterDefaultSetting("ElectroshockSwap")
-mod:RegisterDefaultSetting("ElectroshockSwapYou")
-mod:RegisterDefaultSetting("FireOrb")
-mod:RegisterDefaultSetting("FireOrbAlt")
+mod:RegisterDefaultSetting("BarsCoreHealth", false)
+mod:RegisterDefaultSetting("LineElectroshock")
+mod:RegisterDefaultSetting("SoundLiquidate")
+mod:RegisterDefaultSetting("SoundElectroshock")
+mod:RegisterDefaultSetting("SoundElectroshockSwap")
+mod:RegisterDefaultSetting("SoundElectroshockSwapYou")
+mod:RegisterDefaultSetting("SoundFireOrb")
+mod:RegisterDefaultSetting("SoundFireOrbAlt")
+mod:RegisterDefaultSetting("SoundCoreHealthWarning")
 ----------------------------------------------------------------------------------------------------
 -- Raw event handlers.
 ----------------------------------------------------------------------------------------------------
@@ -144,8 +148,12 @@ function mod:OnBossEnable()
     ENGINEER_NAMES[self.L[name]] = id
   end
 
-  mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], FIRST_ELECTROSHOCK_TIMER)
-  mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["Next Liquidate in"], FIRST_LIQUIDATE_TIMER)
+  for id, coreUnit in pairs(coreUnits) do
+    coreUnit.healthWarning = false
+  end
+
+  mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["electroshock.next"], FIRST_ELECTROSHOCK_TIMER)
+  mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["liquidate.next"], FIRST_LIQUIDATE_TIMER)
 end
 
 function mod:OnBossDisable()
@@ -158,9 +166,9 @@ function mod:AddUnits()
     core:AddUnit(engineer.unit)
   end
   for coreId, coreUnit in pairs(coreUnits) do
-    core:WatchUnit(coreUnit)
-    if mod:GetSetting("CoreHealth") then
-      core:AddUnit(coreUnit)
+    core:WatchUnit(coreUnit.unit)
+    if mod:GetSetting("BarsCoreHealth") then
+      core:AddUnit(coreUnit.unit)
     end
   end
 end
@@ -170,8 +178,8 @@ function mod:RemoveUnits()
     core:RemoveUnit(engineer.unit)
   end
   for coreId, coreUnit in pairs(coreUnits) do
-    if mod:GetSetting("CoreHealth") then
-      core:RemoveUnit(coreUnit)
+    if mod:GetSetting("BarsCoreHealth") then
+      core:RemoveUnit(coreUnit.unit)
     end
   end
 end
@@ -183,7 +191,7 @@ function mod:CheckBossLocation(engineerId)
   local newLocation = oldLocation
   for coreId, coreUnit in pairs(coreUnits) do
     currentDistance = mod:GetDistanceBetweenUnits(
-      engineerUnits[engineerId].unit, coreUnit
+      engineerUnits[engineerId].unit, coreUnit.unit
     )
     if shortestDistance > currentDistance then
       shortestDistance = currentDistance
@@ -215,11 +223,11 @@ function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
     local messageId = string.format("ELECTROSHOCK_MSG_%s", targetName)
     local sound
     if bIsOnMyself then
-      electroshockOnX = self.L["YOU SWAP TO WARRIOR"]
-      sound = mod:GetSetting("ElectroshockSwapYou") == true and "RunAway"
+      electroshockOnX = self.L["electroshock.swap.you"]
+      sound = mod:GetSetting("SoundElectroshockSwapYou") == true and "RunAway"
     else
-      electroshockOnX = self.L["%s SWAP TO WARRIOR"]:format(targetName)
-      sound = mod:GetSetting("ElectroshockSwap") == true and "Info"
+      electroshockOnX = self.L["electroshock.swap.other"]:format(targetName)
+      sound = mod:GetSetting("SoundElectroshockSwap") == true and "Info"
     end
 
     mod:AddMsg(messageId, electroshockOnX, 5, sound, "Red")
@@ -246,7 +254,10 @@ mod:RegisterUnitEvents({
     },{
     ["OnUnitCreated"] = function (self, id, unit, name)
       if CORE_NAMES[name] ~= nil then
-        coreUnits[CORE_NAMES[name]] = unit
+        coreUnits[CORE_NAMES[name]] = {
+          unit = unit,
+          healthWarning = false,
+        }
       elseif ENGINEER_NAMES[name] ~= nil then
         local engineerId = ENGINEER_NAMES[name]
         engineerUnits[engineerId] = {
@@ -261,12 +272,34 @@ mod:RegisterUnitEvents({
   }
 )
 
+-- Cores
+mod:RegisterUnitEvents({
+    "Fusion Core",
+    "Cooling Turbine",
+    "Spark Plug",
+    "Lubricant Nozzle"
+    },{
+    ["OnHealthChanged"] = function (self, id, percent, name)
+      local coreUnit = coreUnits[CORE_NAMES[name]]
+      if percent > 15 and percent < 85 then
+        coreUnit.healthWarning = false
+      elseif percent >= 85 and not coreUnit.healthWarning then
+        coreUnit.healthWarning = true
+        mod:AddMsg("CORE_HEALTH_HIGH_WARN", self.L["core.health.high.warning"]:format(name), 5, mod:GetSetting("SoundCoreHealthWarning") and "Info")
+      elseif percent <= 15 and not coreUnit.healthWarning then
+        coreUnit.healthWarning = true
+        mod:AddMsg("CORE_HEALTH_LOW_WARN", self.L["core.health.low.warning"]:format(name), 5, mod:GetSetting("SoundCoreHealthWarning") and "Info")
+      end
+    end
+  }
+)
+
 -- Warrior
 mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Liquidate"] == castName then
         if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
-          mod:AddMsg("LIQUIDATE_MSG", self.L["Stack"], 5, mod:GetSetting("Liquidate") == true and "Info")
+          mod:AddMsg("LIQUIDATE_MSG", self.L["liquidate.stack"], 5, mod:GetSetting("SoundLiquidate") == true and "Info")
         end
       end
     end,
@@ -276,7 +309,7 @@ mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
       end
       if self.L["Liquidate"] == castName then
         mod:RemoveTimerBar("NEXT_LIQUIDATE_TIMER")
-        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["Next Liquidate in"], LIQUIDATE_TIMER)
+        mod:AddTimerBar("NEXT_LIQUIDATE_TIMER", self.L["liquidate.next"], LIQUIDATE_TIMER)
       end
     end,
   }
@@ -298,21 +331,25 @@ end
 mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Electroshock"] == castName then
-        core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 60, 0)
+        if mod:GetSetting("LineElectroshock") then
+          core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 60, 0)
+        end
         if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
-          mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("Electroshock") == true and "Beware")
+          mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("SoundElectroshock") == true and "Beware")
         end
       end
     end,
     ["OnCastEnd"] = function (self, id, castName, castEndTime, name)
       if self.L["Rocket Jump"] == castName then
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
-        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], JUMP_ELECTROSHOCK_TIMER)
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["electroshock.next"], JUMP_ELECTROSHOCK_TIMER)
       end
       if self.L["Electroshock"] == castName then
-        core:DropPixie("ELECTROSHOCK_PIXIE")
+        if mod:GetSetting("LineElectroshock") then
+          core:DropPixie("ELECTROSHOCK_PIXIE")
+        end
         mod:RemoveTimerBar("NEXT_ELEKTROSHOCK_TIMER")
-        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["Next Electroshock in"], ELECTROSHOCK_TIMER)
+        mod:AddTimerBar("NEXT_ELEKTROSHOCK_TIMER", self.L["electroshock.next"], ELECTROSHOCK_TIMER)
       end
     end,
   }
@@ -322,8 +359,8 @@ mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:WatchUnit(unit)
       mod:RemoveTimerBar("NEXT_FIRE_ORB_TIMER")
-      mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["Next Fire Orb in"], NEXT_FIRE_ORB_TIMER)
-      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id), self.L["Fire Orb is safe to pop in"], FIRE_ORB_SAFE_TIMER)
+      mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["fire_orb.next"], NEXT_FIRE_ORB_TIMER)
+      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id), self.L["fire_orb.pop"], FIRE_ORB_SAFE_TIMER)
       local testTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
       testTimer:Start()
       orbUnits[id] = {
@@ -347,9 +384,9 @@ function mod:RegisterOrbTarget()
       local target = orbUnit.unit:GetTarget()
       local isOnMyself = target == playerUnit
       if isOnMyself then
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["FIRE ORB ON YOU"], 5, mod:GetSetting("FireOrb") == true and "RunAway")
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["fire_orb.you"], 5, mod:GetSetting("SoundFireOrb") == true and "RunAway")
       else
-        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["Fire Orb spawned"], 2, mod:GetSetting("FireOrbAlt") == true and "Info")
+        mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["fire_orb.spawned"], 2, mod:GetSetting("SoundFireOrbAlt") == true and "Info")
       end
     end
   end

From 55d1cb78ba54bd8af4386de80981db68a11f86fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Tue, 6 Sep 2016 00:10:12 +0200
Subject: [PATCH 55/62] Forgot to actually add settings changes

---
 RaidCore.xml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/RaidCore.xml b/RaidCore.xml
index caaafdb..902b190 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1727,34 +1727,49 @@
     <TemplateFile Name="RaidCore_Templates.xml"/>
     <Form Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="1" BAnchorOffset="0" RelativeToClient="1" Font="Default" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_Scrolllist_Options" TooltipType="OnCursor" Name="ConfigForm_Engineers" Border="1" Picture="1" SwallowMouseClicks="1" Moveable="1" Escapable="1" Overlapped="1" TooltipColor="" Visible="0">
         <Control Class="Window" LAnchorPoint="0" LAnchorOffset="0" TAnchorPoint="0" TAnchorOffset="0" RAnchorPoint="1" RAnchorOffset="0" BAnchorPoint="0" BAnchorOffset="65" RelativeToClient="1" Font="Nameplates" Text="Visual Settings" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Visual Settings" TooltipColor="" TextId="" Border="1" IgnoreMouse="1" Tooltip="" UseTemplateBG="1">
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="29" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="51" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_CoreHealth" TooltipColor="" Text="Add cores as health bars" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="29" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="51" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_BarsCoreHealth" TooltipColor="" Text="Add cores as health bars" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_LineElectroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock line" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
         </Control>
-        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="1" TAnchorPoint="0" TAnchorOffset="63" RAnchorPoint="1" RAnchorOffset="1" BAnchorPoint="0" BAnchorOffset="182" RelativeToClient="1" Font="Nameplates" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" UseTemplateBG="1">
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_Electroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+        <Control Class="Window" LAnchorPoint="0" LAnchorOffset="1" TAnchorPoint="0" TAnchorOffset="63" RAnchorPoint="1" RAnchorOffset="1" BAnchorPoint="0" BAnchorOffset="200" RelativeToClient="1" Font="Nameplates" Text="" BGColor="UI_WindowBGDefault" TextColor="UI_WindowTextDefault" Template="Holo_with_Margin" TooltipType="OnCursor" Name="Sound Settings" TooltipColor="" TextId="Options_SoundTitle" Border="1" IgnoreMouse="1" UseTemplateBG="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundElectroshock" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundElectroshockSwapYou" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap on YOU" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundLiquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_ElectroshockSwapYou" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap on YOU" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundFireOrb" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb chasing you" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_Liquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundElectroshockSwap" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap message" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="55" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="77" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_FireOrb" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundFireOrbAlt" TooltipColor="" FocusedTextColor="ffffffff" Text="Fire Orb spawned" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_ElectroshockSwap" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap message" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="105" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="127" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundCoreHealthWarning" TooltipColor="" FocusedTextColor="ffffffff" Text="Core Health Warning" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>

From 25a2abfd5011875a78d391f9dc686c8d13421d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Tue, 6 Sep 2016 00:17:32 +0200
Subject: [PATCH 56/62] Changed Settings Layout

---
 RaidCore.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RaidCore.xml b/RaidCore.xml
index 902b190..8c95246 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1749,7 +1749,7 @@
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundLiquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundLiquidate" TooltipColor="" FocusedTextColor="ffffffff" Text="Liquidate cast" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
@@ -1759,7 +1759,7 @@
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
-            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="30" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="52" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundElectroshockSwap" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap message" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0" LAnchorOffset="10" TAnchorPoint="0" TAnchorOffset="80" RAnchorPoint="0.5" RAnchorOffset="-5" BAnchorPoint="0" BAnchorOffset="102" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundElectroshockSwap" TooltipColor="" FocusedTextColor="ffffffff" Text="Electroshock swap on others" TextId="" Template="HologramControl1" DrawAsCheckbox="1" DT_SINGLELINE="1">
                 <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>

From 7e9e87c9baedcb1f8957be9dfa734d8769d84280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Tue, 6 Sep 2016 00:24:55 +0200
Subject: [PATCH 57/62] Bump Pixie range slightly for Electroshock

---
 Encounters/RMT/Engineers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index c5a4921..562c87f 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -332,7 +332,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Electroshock"] == castName then
         if mod:GetSetting("LineElectroshock") then
-          core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 60, 0)
+          core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 80, 0)
         end
         if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("SoundElectroshock") == true and "Beware")

From 723431e6adc880a915542057d2d7c0e9ddadaf65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Tue, 6 Sep 2016 01:02:18 +0200
Subject: [PATCH 58/62] Squeeze in color parameter for timer bars

---
 Encounters/BossPrototype.lua    | 7 ++++++-
 Encounters/TEST/GalerasTest.lua | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Encounters/BossPrototype.lua b/Encounters/BossPrototype.lua
index 88f6f1e..6893442 100644
--- a/Encounters/BossPrototype.lua
+++ b/Encounters/BossPrototype.lua
@@ -131,12 +131,13 @@ end
 -- @param sEnglishText English text to search in language dictionnary.
 -- @param nDuration Timer duration.
 -- @param bEmphasize Timer count down requested (nil take the default one).
+-- @param sColor Color for the timer bar (nil take the default one)..
 -- @param fHandler function to call on timeout
 -- @param tClass Class used by callback action on timeout
 -- @param tData Data forwarded by callback action on timeout
 --
 -- Note: If the English translation is not found, the current string will be used like that.
-function EncounterPrototype:AddTimerBar(sKey, sEnglishText, nDuration, bEmphasize, fHandler, tClass, tData)
+function EncounterPrototype:AddTimerBar(sKey, sEnglishText, nDuration, bEmphasize, sColor, fHandler, tClass, tData)
   local tOptions = nil
   local sLocalText = self.L[sEnglishText]
   if self.tDefaultTimerBarsOptions[sKey] then
@@ -147,6 +148,10 @@ function EncounterPrototype:AddTimerBar(sKey, sEnglishText, nDuration, bEmphasiz
   if bEmphasize ~= nil then
     tOptions["bEmphasize"] = bEmphasize and true
   end
+  if sColor ~= nil then
+    assert(type(sColor) == "string")
+    tOptions["sColor"] = sColor
+  end
   local tCallback = nil
   if type(fHandler) == "function" then
     tCallback = {
diff --git a/Encounters/TEST/GalerasTest.lua b/Encounters/TEST/GalerasTest.lua
index 5aa07b2..a81b735 100644
--- a/Encounters/TEST/GalerasTest.lua
+++ b/Encounters/TEST/GalerasTest.lua
@@ -46,20 +46,20 @@ mod:RegisterDefaultTimerBarConfigs({
 -- Locals.
 ----------------------------------------------------------------------------------------------------
 local function InfiniteTimer2()
-  mod:AddTimerBar("INFINITE2", "Loop Timer outside", 10, nil, InfiniteTimer2)
+  mod:AddTimerBar("INFINITE2", "Loop Timer outside", 10, nil, nil, InfiniteTimer2)
 end
 
 ----------------------------------------------------------------------------------------------------
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
-  mod:AddTimerBar("INFINITE", "Timer in class", 12, false, mod.InfiniteTimer, mod)
-  mod:AddTimerBar("INFINITE2", "Timer outside", 12, nil, InfiniteTimer2)
+  mod:AddTimerBar("INFINITE", "Timer in class", 12, false, nil, mod.InfiniteTimer, mod)
+  mod:AddTimerBar("INFINITE2", "Timer outside", 12, nil, nil, InfiniteTimer2)
   mod:AddTimerBar("LONG", "Long long timer...", 1000)
 end
 
 function mod:InfiniteTimer()
-  mod:AddTimerBar("INFINITE", "Loop Timer in class", 10, false, mod.InfiniteTimer, mod)
+  mod:AddTimerBar("INFINITE", "Loop Timer in class", 10, false, nil, mod.InfiniteTimer, mod)
 end
 
 function mod:OnUnitCreated(nId, unit, sName)

From 7aecf2263655f4aae3db2817d611cf8ba70b49b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Tue, 6 Sep 2016 01:14:35 +0200
Subject: [PATCH 59/62] Refactor platform check for generic unit use

---
 Encounters/RMT/Engineers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 562c87f..d8f2d0a 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -184,24 +184,18 @@ function mod:RemoveUnits()
   end
 end
 
-function mod:CheckBossLocation(engineerId)
+function mod:GetUnitPlatform(unit)
   local shortestDistance = 100000
   local currentDistance
-  local oldLocation = engineerUnits[engineerId].location
-  local newLocation = oldLocation
+  local location = 0
   for coreId, coreUnit in pairs(coreUnits) do
-    currentDistance = mod:GetDistanceBetweenUnits(
-      engineerUnits[engineerId].unit, coreUnit.unit
-    )
+    currentDistance = mod:GetDistanceBetweenUnits(unit, coreUnit.unit)
     if shortestDistance > currentDistance then
       shortestDistance = currentDistance
-      newLocation = coreId
+      location = coreId
     end
   end
-  if newLocation ~= oldLocation then
-    engineerUnits[engineerId].location = newLocation
-    mod:OnEngiChangeLocation(engineerId, oldLocation, newLocation)
-  end
+  return location
 end
 
 function mod:OnEngiChangeLocation(engineerId, oldCoreId, newCoreId)
@@ -209,8 +203,14 @@ end
 
 function mod:OnBuffRemove(id, spellId)
   if spellId == BUFF_INSULATION then
-    mod:CheckBossLocation(ENGINEER)
-    mod:CheckBossLocation(WARRIOR)
+    for engineerId, engineer in pairs(engineerUnits) do
+      local oldLocation = engineerUnits[engineerId].location
+      local newLocation = mod:GetUnitPlatform(engineer.unit)
+      if newLocation ~= oldLocation then
+        engineerUnits[engineerId].location = newLocation
+        mod:OnEngiChangeLocation(engineerId, oldLocation, newLocation)
+      end
+    end
   end
 end
 

From cfc86a866d49ad4fd70d8f93b93abc6047cbcb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Tue, 6 Sep 2016 01:28:49 +0200
Subject: [PATCH 60/62] Refactor playerUnit into player table For upcoming
 changes

---
 Encounters/RMT/Engineers.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index d8f2d0a..449c916 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -113,7 +113,7 @@ local GetGameTime = GameLib.GetGameTime
 --Do not reset coreUnits since they don't get destroyed after each pull
 local coreUnits = {}
 local engineerUnits
-local playerUnit
+local player
 local orbUnits
 ----------------------------------------------------------------------------------------------------
 -- Settings.
@@ -135,7 +135,8 @@ Apollo.RegisterEventHandler("UnitDestroyed", "OnUnitDestroyedRaw", mod)
 -- Encounter description.
 ----------------------------------------------------------------------------------------------------
 function mod:OnBossEnable()
-  playerUnit = GameLib.GetPlayerUnit()
+  player = {}
+  player.unit = GameLib.GetPlayerUnit()
   engineerUnits = {}
   orbUnits = {}
   --locales
@@ -218,7 +219,7 @@ function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
   if DEBUFF_ELECTROSHOCK_VULNERABILITY == spellId then
     local target = GetUnitById(id)
     local targetName = target:GetName()
-    local isOnMyself = targetName == playerUnit:GetName()
+    local isOnMyself = targetName == player.unit:GetName()
     local electroshockOnX = ""
     local messageId = string.format("ELECTROSHOCK_MSG_%s", targetName)
     local sound
@@ -235,7 +236,7 @@ function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
 end
 
 function mod:IsPlayerClose(unit)
-  return mod:GetDistanceBetweenUnits(playerUnit, unit) < 75
+  return mod:GetDistanceBetweenUnits(player.unit, unit) < 75
 end
 
 function mod:OnUnitDestroyedRaw(unit)
@@ -382,7 +383,7 @@ function mod:RegisterOrbTarget()
     if not orbUnit.checkedTarget then
       orbUnit.checkedTarget = true
       local target = orbUnit.unit:GetTarget()
-      local isOnMyself = target == playerUnit
+      local isOnMyself = target == player.unit
       if isOnMyself then
         mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["fire_orb.you"], 5, mod:GetSetting("SoundFireOrb") == true and "RunAway")
       else

From bef1157dbd45fa6299ae3e86f906f3a79728b688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Tue, 6 Sep 2016 01:34:15 +0200
Subject: [PATCH 61/62] Refactor IsPlayerClose to a platform based check

---
 Encounters/RMT/Engineers.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 449c916..170af4e 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -137,6 +137,7 @@ Apollo.RegisterEventHandler("UnitDestroyed", "OnUnitDestroyedRaw", mod)
 function mod:OnBossEnable()
   player = {}
   player.unit = GameLib.GetPlayerUnit()
+  player.location = 0
   engineerUnits = {}
   orbUnits = {}
   --locales
@@ -235,8 +236,9 @@ function mod:OnDebuffAdd(id, spellId, stack, timeRemaining)
   end
 end
 
-function mod:IsPlayerClose(unit)
-  return mod:GetDistanceBetweenUnits(player.unit, unit) < 75
+function mod:IsPlayerOnPlatform(coreId)
+  player.location = mod:GetUnitPlatform(player.unit)
+  return player.location == coreId
 end
 
 function mod:OnUnitDestroyedRaw(unit)
@@ -299,7 +301,7 @@ mod:RegisterUnitEvents({
 mod:RegisterUnitEvents("Chief Engineer Wilbargh",{
     ["OnCastStart"] = function (self, id, castName, castEndTime, name)
       if self.L["Liquidate"] == castName then
-        if mod:IsPlayerClose(engineerUnits[WARRIOR].unit) then
+        if mod:IsPlayerOnPlatform(engineerUnits[WARRIOR].location) then
           mod:AddMsg("LIQUIDATE_MSG", self.L["liquidate.stack"], 5, mod:GetSetting("SoundLiquidate") == true and "Info")
         end
       end
@@ -335,7 +337,7 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
         if mod:GetSetting("LineElectroshock") then
           core:AddPixie("ELECTROSHOCK_PIXIE", 2, engineerUnits[ENGINEER].unit, nil, "Red", 10, 80, 0)
         end
-        if mod:IsPlayerClose(engineerUnits[ENGINEER].unit) then
+        if mod:IsPlayerOnPlatform(engineerUnits[ENGINEER].location) then
           mod:AddMsg("ELECTROSHOCK_CAST_MSG", self.L["Electroshock"], 5, mod:GetSetting("SoundElectroshock") == true and "Beware")
         end
       end

From a9ad8b38522c44bb78151793d4e430a5c73b38da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarke=20Hesthaven=20S=C3=B8ndergaard?= <bhsgaard@gmail.com>
Date: Tue, 6 Sep 2016 01:41:52 +0200
Subject: [PATCH 62/62] Add Fire Orb pop message

---
 Encounters/RMT/Engineers.lua | 19 ++++++++++++++-----
 RaidCore.xml                 |  5 +++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Encounters/RMT/Engineers.lua b/Encounters/RMT/Engineers.lua
index 170af4e..fb10812 100644
--- a/Encounters/RMT/Engineers.lua
+++ b/Encounters/RMT/Engineers.lua
@@ -47,7 +47,8 @@ mod:RegisterEnglishLocale({
     ["fire_orb.next"] = "Next Fire Orb in",
     ["fire_orb.you"] = "FIRE ORB ON YOU",
     ["fire_orb.spawned"] = "Fire Orb spawned",
-    ["fire_orb.pop"] = "Fire Orb is safe to pop in",
+    ["fire_orb.pop.timer"] = "Fire Orb is safe to pop in",
+    ["fire_orb.pop.msg"] = "Pop the Fire Orb!",
     ["core.health.high.warning"] = "%s pillar at 85%%!",
     ["core.health.low.warning"] = "%s pillar at 15%%!"
   })
@@ -115,6 +116,8 @@ local coreUnits = {}
 local engineerUnits
 local player
 local orbUnits
+
+local fireOrbTargetTestTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
 ----------------------------------------------------------------------------------------------------
 -- Settings.
 ----------------------------------------------------------------------------------------------------
@@ -126,6 +129,7 @@ mod:RegisterDefaultSetting("SoundElectroshockSwap")
 mod:RegisterDefaultSetting("SoundElectroshockSwapYou")
 mod:RegisterDefaultSetting("SoundFireOrb")
 mod:RegisterDefaultSetting("SoundFireOrbAlt")
+mod:RegisterDefaultSetting("SoundFireOrbPop")
 mod:RegisterDefaultSetting("SoundCoreHealthWarning")
 ----------------------------------------------------------------------------------------------------
 -- Raw event handlers.
@@ -358,14 +362,19 @@ mod:RegisterUnitEvents("Head Engineer Orvulgh",{
   }
 )
 
+function mod:PopFireOrb()
+  if mod:IsPlayerOnPlatform(FUSION_CORE) then
+    mod:AddMsg("FIRE_ORB_POP_MSG", self.L["fire_orb.pop.msg"], 5, mod:GetSetting("SoundFireOrbPop") == true and "Alarm")
+  end
+end
+
 mod:RegisterUnitEvents("Discharged Plasma",{
     ["OnUnitCreated"] = function (self, id, unit, name)
       core:WatchUnit(unit)
       mod:RemoveTimerBar("NEXT_FIRE_ORB_TIMER")
       mod:AddTimerBar("NEXT_FIRE_ORB_TIMER", self.L["fire_orb.next"], NEXT_FIRE_ORB_TIMER)
-      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id), self.L["fire_orb.pop"], FIRE_ORB_SAFE_TIMER)
-      local testTimer = ApolloTimer.Create(1, false, "RegisterOrbTarget", mod)
-      testTimer:Start()
+      mod:AddTimerBar(string.format("FIRE_ORB_SAFE_TIMER %d", id), self.L["fire_orb.pop.timer"], FIRE_ORB_SAFE_TIMER, false, "Red", mod.PopFireOrb, mod)
+      fireOrbTargetTestTimer:Start()
       orbUnits[id] = {
         unit = unit,
         checkedTarget = false,
@@ -388,7 +397,7 @@ function mod:RegisterOrbTarget()
       local isOnMyself = target == player.unit
       if isOnMyself then
         mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["fire_orb.you"], 5, mod:GetSetting("SoundFireOrb") == true and "RunAway")
-      else
+      elseif mod:IsPlayerOnPlatform(FUSION_CORE) then
         mod:AddMsg("DISCHARGED_PLASMA_MSG", self.L["fire_orb.spawned"], 2, mod:GetSetting("SoundFireOrbAlt") == true and "Info")
       end
     end
diff --git a/RaidCore.xml b/RaidCore.xml
index 8c95246..24c7e94 100644
--- a/RaidCore.xml
+++ b/RaidCore.xml
@@ -1774,6 +1774,11 @@
                 <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
                 <Event Name="WindowLoad" Function="OnWindowLoad"/>
             </Control>
+            <Control Class="Button" Base="HologramSprites:HoloCheckBoxBtn" Font="Nameplates" ButtonType="Check" RadioGroup="" LAnchorPoint="0.5" LAnchorOffset="5" TAnchorPoint="0" TAnchorOffset="105" RAnchorPoint="1" RAnchorOffset="-10" BAnchorPoint="0" BAnchorOffset="127" DT_VCENTER="1" DT_CENTER="0" BGColor="UI_BtnBGDefault" TextColor="gray" NormalTextColor="UI_BtnTextDefault" PressedTextColor="UI_BtnTextDefault" FlybyTextColor="UI_BtnTextDefault" PressedFlybyTextColor="UI_BtnTextDefault" DisabledTextColor="UI_BtnTextDefault" TooltipType="OnCursor" Name="Encounters_Engineers_SoundFireOrbPop" TooltipColor="" Text="Fire Orb ready to pop" TextId="" DT_SINGLELINE="1" Tooltip="" TooltipId="" Template="HologramControl1" NoClip="0" DoNotBlockTooltip="0" NotRelative="0" UseTemplateBG="0" DrawAsCheckbox="1" FocusedTextColor="ffffffff">
+                <Event Name="ButtonCheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="ButtonUncheck" Function="OnButtonCheckBoxSwitched"/>
+                <Event Name="WindowLoad" Function="OnWindowLoad"/>
+            </Control>
         </Control>
     </Form>
 </Forms>