Merge branch 'RMT-Encounters'

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
@@ -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 = {