Merge pull request #42 from LauritsS/barrier

Added barrier to compact list

Author: m00nyONE

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## 2025.11.21 - @m00nyONE
 - fix the dialogs crashing GamePadUI. Thanks to @m0r for fixing this :-)
 
+## 2025.11.27 - @m00nyONE
+- adding barrier to the compact List. Thanks to @LauritsS for the PullRequest :-)
+
 ## 2025.11.20 - @m00nyONE
 - HOTFIX: removing LibCheck dialog for ALL Platforms until a reliable solution for displaying Dialogs without crashing console & gamepad UI is found
 

lang/de.lua

@@ -97,6 +97,8 @@ local strings = {
     HR_MODULES_HIDEME_HIDEATRO_DESCRIPTION = "Verberge deinen Atronach von den Listen.",
     HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL = "Verberge Saxhleel",
     HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION = "Verberge dein Saxhleel von den Listen.",
+    HR_MODULES_HIDEME_HIDEBARRIER_LABEL = "Verberge Barriere",
+    HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION = "Verberge deine Barriere von den Listen.",
     HR_MODULES_HIDEME_MENU_HEADER = "Hide Me Einstellungen",
     -- PULL
     HR_MODULES_PULL_FRIENDLYNAME = "Pull Countdown",

lang/en.lua

@@ -97,6 +97,8 @@ local strings = {
     HR_MODULES_HIDEME_HIDEATRO_DESCRIPTION = "Hide your atronach from the lists.",
     HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL = "Hide Saxhleel",
     HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION = "Hide your saxhleel from the lists.",
+    HR_MODULES_HIDEME_HIDEBARRIER_LABEL = "Hide Barrier",
+    HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION = "Hide your barrier from the lists.",
     HR_MODULES_HIDEME_MENU_HEADER = "Hide Me Options",
     -- PULL
     HR_MODULES_PULL_FRIENDLYNAME = "Pull Countdown",

lang/fr.lua

@@ -97,6 +97,8 @@ local strings = {
     --HR_MODULES_HIDEME_HIDEATRO_DESCRIPTION = "Hide your atronach from the lists.",
     --HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL = "Hide Saxhleel",
     --HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION = "Hide your saxhleel from the lists.",
+    --HR_MODULES_HIDEME_HIDEBARRIER_LABEL = "Hide Barrier",
+    --HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION = "Hide your barrier from the lists.",
     --HR_MODULES_HIDEME_MENU_HEADER = "Hide Me Options",
     -- PULL
     HR_MODULES_PULL_FRIENDLYNAME = "Compte à rebours avant de commencer le combat",

lang/ru.lua

@@ -97,6 +97,8 @@ local strings = {
     HR_MODULES_HIDEME_HIDEATRO_DESCRIPTION = "Скрыть вашего атронаха из списков.",
     HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL = "Скрыть саксхлил (Saxhleel)",
     HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION = "Скрыть вашего саксхлил из списков.",
+    --HR_MODULES_HIDEME_HIDEBARRIER_LABEL = "Hide Barrier",
+    --HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION = "Hide your barrier from the lists.",
     HR_MODULES_HIDEME_MENU_HEADER = "Параметры",
     -- PULL
     HR_MODULES_PULL_FRIENDLYNAME = "Pull Countdown",

lang/zh.lua

@@ -97,6 +97,8 @@ local strings = {
     HR_MODULES_HIDEME_HIDEATRO_DESCRIPTION = "从列表中隐藏你的石头人。",
     HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL = "隐藏Sax",
     HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION = "从列表中隐藏你的Sax。",
+    --HR_MODULES_HIDEME_HIDEBARRIER_LABEL = "Hide Barrier",
+    --HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION = "Hide your barrier from the lists.",
     HR_MODULES_HIDEME_MENU_HEADER = "将我隐藏选项",
     -- PULL
     HR_MODULES_PULL_FRIENDLYNAME = "开战倒计时",

modules/hideme/main.lua

@@ -56,6 +56,11 @@ local moduleDefinition = {
             label = GetString(HR_MODULES_HIDEME_HIDESAXHLEEL_LABEL),
             description = GetString(HR_MODULES_HIDEME_HIDESAXHLEEL_DESCRIPTION),
         },
+        [6] = {
+            name = "hideBarrier",
+            label = GetString(HR_MODULES_HIDEME_HIDEBARRIER_LABEL),
+            description = GetString(HR_MODULES_HIDEME_HIDEBARRIER_DESCRIPTION),
+        },
     }
 }
 

modules/ult/Console/menu.lua

@@ -442,6 +442,17 @@ function module:GetSubMenuOptions()
                 self.compactList:Update()
             end,
         },
+        {
+            type = LHAS.ST_CHECKBOX,
+            name = "show Barrier",
+            tooltip = "shows Barrier in the list.",
+            default = self.compactList.svDefault.showBarrier,
+            getFunction = function() return self.compactList.sw.showBarrier end,
+            setFunction = function(value)
+                self.compactList.sw.showBarrier = value
+                self.compactList:Update()
+            end,
+        },
         {
             type = LHAS.ST_CHECKBOX,
             label = "show Slayer",

modules/ult/PC/menu.lua

@@ -392,6 +392,17 @@ function module:GetSubMenuOptions()
                 self.compactList:Update()
             end,
         },
+        {
+            type = "checkbox",
+            name = "show Barrier",
+            tooltip = "shows Barrier in the list.",
+            default = self.compactList.svDefault.showBarrier,
+            getFunc = function() return self.compactList.sw.showBarrier end,
+            setFunc = function(value)
+                self.compactList.sw.showBarrier = value
+                self.compactList:Update()
+            end,
+        },
         {
             type = "checkbox",
             name = "show Slayer",

modules/ult/list_compact.lua

@@ -44,6 +44,7 @@ local svDefault = {
     showHorn = true,
     showColos = true,
     showAtro = true,
+    showBarrier = true,
     showSlayer = true,
     showPillager = true,
     showCryptCannon = true,
@@ -65,6 +66,7 @@ local svDefault = {
     colorSlayerBG = {1, 0, 0}, -- red
     colorPillagerBG = {0, 1, 0}, -- green
     colorCryptCannonBG = {1, 0, 1}, -- purple
+    colorBarrierBG = {1, 0.5, 0}, -- orange
 
     markOnCooldown = true,
     markOnCooldownColor = {1, 0, 0}, -- red
@@ -87,6 +89,7 @@ function module:CreateCompactList()
 
     list.HEADER_TYPE = list:GetNextDataTypeId() -- type id for header
     list.ROW_TYPE_HORN = list:GetNextDataTypeId() -- type id for horn rows
+    list.ROW_TYPE_BARRIER = list:GetNextDataTypeId() -- type id for barrier rows
     list.ROW_TYPE_COLOS = list:GetNextDataTypeId() -- type id for colos rows
     list.ROW_TYPE_ATRO = list:GetNextDataTypeId() -- type id for atro rows
     list.ROW_TYPE_SLAYER = list:GetNextDataTypeId() -- type id for slayer rows
@@ -159,6 +162,14 @@ function module:CreateCompactList()
             rowCreationWrapper(self.compactListCryptCannonRowCreationFunction)
     )
     list.logger:Debug("added cryptcannon player row type '%d' with template '%s'", list.ROW_TYPE_CRYPTCANNON, list.ROW_TEMPLATE)
+    ZO_ScrollList_AddDataType(
+        list.listControl,
+        list.ROW_TYPE_BARRIER,
+        list.ROW_TEMPLATE,
+        list.listRowHeight,
+        rowCreationWrapper(self.compactListBarrierRowCreationFunction)
+    )
+    list.logger:Debug("added barrier player row type '%d' with template '%s'", list.ROW_TYPE_BARRIER, list.ROW_TEMPLATE)
 
     -- register cooldown end time tracker for pillager cooldown
     local function setPillagerCooldownEndTime(_, duration)
@@ -396,6 +407,31 @@ function module:compactListSlayerRowCreationFunction(rowControl, data, scrollLis
     self:applyCompactListValues(rowControl, data, scrollList, slayerPercentage, gainSeconds, "s")
 end
 
+--- Barrier row creation function for compact ult list.
+--- @param rowControl Control
+--- @param data table
+--- @param scrollList ZO_ScrollList
+--- @return void
+function module:compactListBarrierRowCreationFunction(rowControl, data, scrollList)
+    local list = self.compactList
+    local sw = list.sw
+
+    list:ApplySupportRangeStyle(rowControl, data.tag)
+    list:ApplyUserNameToControl(rowControl:GetNamedChild('_Name'), data.userId)
+    list:ApplyUserIconToControl(rowControl:GetNamedChild('_Icon'), data.userId, data.classId)
+
+    rowControl:GetNamedChild('_BG'):SetColor(unpack(sw.colorBarrierBG))
+    rowControl:GetNamedChild('_BG'):SetAlpha(sw.backgroundAlpha)
+    rowControl:GetNamedChild("_UltIcon"):SetTexture(self.barrierIcon)
+
+    local barrierPercentage = 0
+    if self:isBarrier(data.ult1ID) then barrierPercentage = data.ult1Percentage end
+    if self:isBarrier(data.ult2ID) then barrierPercentage = data.ult2Percentage end
+
+    self:applyCompactListValues(rowControl, data, scrollList, barrierPercentage, nil, nil)
+end
+
+
 --- Slayer row creation function for compact ult list.
 --- @param rowControl Control
 --- @param data table
@@ -467,6 +503,7 @@ function module:UpdateCompactList()
     local slayerList = {}
     local pillagerList = {}
     local cryptCannonList = {}
+    local barrierList = {}
 
     local sw = compactList.sw
     for _, playerData in pairs(addon.playersData) do
@@ -488,6 +525,9 @@ function module:UpdateCompactList()
         if sw.showCryptCannon and playerData.hasCryptCannon then
             table.insert(cryptCannonList, playerData)
         end
+        if sw.showBarrier and not playerData.hideBarrier and playerData.hasBarrier then
+            table.insert(barrierList, playerData)
+        end
     end
     local sortByUltPercentage = self.sortByUltPercentage
     table.sort(hornList, sortByUltPercentage)
@@ -496,6 +536,7 @@ function module:UpdateCompactList()
     table.sort(slayerList, sortByUltPercentage)
     table.sort(pillagerList, sortByUltPercentage)
     table.sort(cryptCannonList, sortByUltPercentage)
+    table.sort(barrierList, sortByUltPercentage)
 
     --- fill dataList ---
     -- insert Header
@@ -519,6 +560,9 @@ function module:UpdateCompactList()
     for _, playerData in ipairs(cryptCannonList) do
         table.insert(dataList, ZO_ScrollList_CreateDataEntry(compactList.ROW_TYPE_CRYPTCANNON, playerData))
     end
+    for _, playerData in ipairs(barrierList) do
+        table.insert(dataList, ZO_ScrollList_CreateDataEntry(compactList.ROW_TYPE_BARRIER, playerData))
+    end
 
     ZO_ScrollList_Commit(listControl)
 end