wip: start fixing cooldowns bar..

mehah · Jul 3, 2024 · c4286de · c4286de
1 parent 803500f
commit c4286de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
@@ -251,7 +251,9 @@ function onSpellGroupCooldown(groupId, duration)
         return
     end
 
+    print('onSpellGroupCooldown: ' .. groupId)
     local icon = contentsPanel:getChildById('groupIcon' .. SpellGroups[groupId])
+    print("Progress Rect: " .. 'progressRect' .. SpellGroups[groupId])
     local progressRect = contentsPanel:getChildById('progressRect' .. SpellGroups[groupId])
     if icon then
         icon:setOn(true)

diff --git a/modules/game_cooldown/cooldown.otui b/modules/game_cooldown/cooldown.otui
@@ -117,7 +117,7 @@ Panel
       !tooltip: tr('Focus')
 
     SpellGroupIcon
-      id: groupIconUltimateStrike
+      id: groupIconUltimateStrikes
       image-clip: 120 0 20 20
       anchors.top: parent.top
       anchors.left: groupIconFocus.right
@@ -126,15 +126,15 @@ Panel
         image-clip: 120 20 20 20
 
     SpellProgressRect
-      id: progressRectUltimateStrike
-      anchors.fill: groupIconUltimateStrike
+      id: progressRectUltimateStrikes
+      anchors.fill: groupIconUltimateStrikes
       !tooltip: tr('Ultimate Strike')
 
     SpellGroupIcon
       id: groupIconGreatBeams
       image-clip: 140 0 20 20
       anchors.top: parent.top
-      anchors.left: groupIconUltimateStrike.right
+      anchors.left: groupIconUltimateStrikes.right
       margin-left: 3
       $on:
         image-clip: 140 20 20 20

diff --git a/modules/gamelib/spells.lua b/modules/gamelib/spells.lua
@@ -2893,9 +2893,9 @@ SpellGroups = {
     [4] = 'Special',
     [5] = 'Crippling',
     [6] = 'Focus',
-    [7] = 'Ultimate Strikes',
-    [8] = 'Great Beams',
-    [9] = 'Bursts of Nature'
+    [7] = 'UltimateStrikes',
+    [8] = 'GreatBeams',
+    [9] = 'BurstsOfNature'
 }
 
 Spells = {}