Make tier parsing optional

Options/Import/Window.lua

@@ -176,6 +176,7 @@ function Window:TimerToString(timer_data, type)
     text = text.."counter_start~="..tostring(timer_data.counter_start)..";\n"
     text = text.."increment~="..tostring(timer_data.increment)..";\n"
     text = text.."use_target_entity~="..tostring(timer_data.use_target_entity)..";\n"
+    text = text.."parse_tiers~="..tostring(timer_data.parse_tiers)..";\n"
     text = text.."show_grey~="..tostring(timer_data.show_grey)..";\n"
     text = text.."flashing_animation~="..tostring(timer_data.flashing_animation)..";\n"
 
@@ -624,6 +625,9 @@ function Window:ConvertTimer(text, window_index, old)
             if timer_info_list["use_target_entity"] ~= nil then
                 savedata[window_index][timer_info_list.type][timer_index].use_target_entity = timer_info_list["use_target_entity"]
             end
+            if timer_info_list["parse_tiers"] ~= nil then
+                savedata[window_index][timer_info_list.type][timer_index].parse_tiers = timer_info_list["parse_tiers"]
+            end
             if timer_info_list["flashing_animation"] ~= nil then
                 savedata[window_index][timer_info_list.type][timer_index].flashing_animation = timer_info_list["flashing_animation"]
             end
@@ -736,6 +740,10 @@ function Window:InterpreteTimer(text, old)
         list["use_target_entity"] = Utils.StringToBool(list["use_target_entity"])
     end
 
+    if list["parse_tiers"] ~= nil then
+        list["parse_tiers"] = Utils.StringToBool(list["parse_tiers"])
+    end
+
     if list["show_grey"] ~= nil then
         list["show_grey"] = Utils.StringToBool(list["show_grey"])
     end

Options/OptionsWindow/TimerEdit/TimerSettings.lua

@@ -178,6 +178,7 @@ function TimerSettings:SaveChanges()
     data.increment = self.increment_cb:IsChecked()
     data.show_grey = self.grey_cb:IsChecked()
     data.use_target_entity = self.use_target_entity_cb:IsChecked()
+    data.parse_tiers = self.parse_tiers_cb:IsChecked()
 
     data.target_list = Utils.TargetStringToList( self.target_list_tb:GetText() )
 
@@ -215,6 +216,7 @@ function TimerSettings:ResetColors()
     self.hide_timer_lb:SetForeColor(Turbine.UI.Color.White)
     self.target_list_lb:SetForeColor(Turbine.UI.Color.White)
     self.use_target_entity_lb:SetForeColor(Turbine.UI.Color.White)
+    self.parse_tiers_lb:SetForeColor(Turbine.UI.Color.White)
     self.increment_lb:SetForeColor(Turbine.UI.Color.White)
     self.grey_lb:SetForeColor(Turbine.UI.Color.White)
 
@@ -246,6 +248,7 @@ function TimerSettings:Empty()
     self.removable_cb:SetChecked(false)
     self.hide_timer_cb:SetChecked(false)
     self.use_target_entity_cb:SetChecked(false)
+    self.parse_tiers_cb:SetChecked(false)
     self.increment_cb:SetChecked(false)
     self.grey_cb:SetChecked(false)
     self.hide_timer_cb:SetChecked(false)
@@ -296,6 +299,7 @@ function TimerSettings:FillInformation()
     self.increment_cb:SetChecked(data.increment)
     self.grey_cb:SetChecked(data.show_grey)
     self.use_target_entity_cb:SetChecked(data.use_target_entity)
+    self.parse_tiers_cb:SetChecked(data.parse_tiers)
 
     self.target_list_tb:SetText( Utils.TargetListToString( data.target_list ) )
 
@@ -643,8 +647,30 @@ function TimerSettings:Build()
         self.use_target_entity_lb:SetForeColor(Turbine.UI.Color.Orange)
     end
 
+    row = row + 1
+
+    self.parse_tiers_lb = Turbine.UI.Label()
+    self.parse_tiers_lb:SetParent(self.background)
+    self.parse_tiers_lb:SetFont(OPTIONS_FONT)
+    self.parse_tiers_lb:SetSize(150, row_height)
+    self.parse_tiers_lb:SetPosition(SPACER, row * row_height)
+    self.parse_tiers_lb:SetTextAlignment(Turbine.UI.ContentAlignment.MiddleLeft)
+    self.parse_tiers_lb:SetFontStyle(Turbine.UI.FontStyle.Outline)
+    self.parse_tiers_lb:SetText(L.parse_tiers)
+
+    self.parse_tiers_cb = Turbine.UI.Lotro.CheckBox()
+    self.parse_tiers_cb:SetParent(self.background)
+    self.parse_tiers_cb:SetSize(20, 20)
+    self.parse_tiers_cb:SetFont(OPTIONS_FONT)
+    self.parse_tiers_cb:SetText("")
+    self.parse_tiers_cb:SetPosition(200 - 20, row * row_height)
+    self.parse_tiers_cb:SetChecked()
+    self.parse_tiers_cb.CheckedChanged = function()
+        self.parse_tiers_lb:SetForeColor(Turbine.UI.Color.Orange)
+    end
+
     local collumn2 = 210
-    row = row - 3
+    row = row - 4
 
     self.use_regex_lb = Turbine.UI.Label()
     self.use_regex_lb:SetParent(self.background)

Utils/Format.lua

@@ -350,9 +350,10 @@ end
 
 function ParseWindowTimerText(name, timer_data, window_data, target)
     local text_modifier = timer_data.text_modifier
+    local parse_tiers = timer_data.parse_tiers
     local tier = nil
     local text = ""
-    if text_modifier == TEXTMODIFIER.Let_the_plugin_decide or text_modifier == TEXTMODIFIER.Custom_Text then
+    if parse_tiers and (text_modifier == TEXTMODIFIER.Let_the_plugin_decide or text_modifier == TEXTMODIFIER.Custom_Text) then
         local start_tier, end_tier = string.find(name, "%d+") -- check if name has some sort of number / tier
         if start_tier ~= nil then
             tier = string.sub(name, start_tier, end_tier)

Utils/Localisation/de.lua

@@ -159,6 +159,7 @@ L.loop = "Wiederholen"
 L.use_regex = "Regex benutzen"
 L.removable = "Entfernbar"
 L.hide_timer = "Timer verstecken"
+L.parse_tiers = "Ebenen analysieren"
 L.close = "Schließen"
 L.resetChanges  = "Änderungen Zurücksetzten"
 L.timerHeader  = "- Timer -"

Utils/Localisation/en.lua

@@ -159,6 +159,7 @@ L.loop = "Loop"
 L.use_regex = "Use Regex"
 L.removable = "Removable"
 L.hide_timer = "Hide Timer"
+L.parse_tiers = "Parse Tiers"
 L.close = "Close"
 L.resetChanges  = "Reset Changes"
 L.timerHeader  = "- Timer -"

Utils/Localisation/fr.lua

@@ -160,6 +160,7 @@ L.loop = "Loop"
 L.use_regex = "Use Regex"
 L.removable = "Removable"
 L.hide_timer = "Hide Timer"
+L.parse_tiers = "Parse Tiers"
 L.close = "Close"
 L.resetChanges  = "Reset Changes"
 L.timerHeader  = "- Timer -"