Battle modules filtering buttons no longer scroll, fixed skill modules regeneration alert.

modules/game_battle/battle.otui

@@ -44,14 +44,13 @@ MiniWindow
   @onClose: modules.game_battle.onMiniWindowClose()
   &save: true
 
-  MiniWindowContents
   BattlePlayers
     id: hidePlayers
     !tooltip: tr('Hide players')
     anchors.top: parent.top
     anchors.right: next.left
     margin-right: 5
-      margin-top: 3
+    margin-top: 26
     @onCheckChange: modules.game_battle.checkCreatures()
 
   BattleNPCs
@@ -60,7 +59,7 @@ MiniWindow
     anchors.top: parent.top
     anchors.right: next.left
     margin-right: 5
-      margin-top: 3
+    margin-top: 26
     @onCheckChange: modules.game_battle.checkCreatures()
 
   BattleMonsters
@@ -68,7 +67,7 @@ MiniWindow
     !tooltip: tr('Hide monsters')
     anchors.top: parent.top
     anchors.horizontalCenter: parent.horizontalCenter
-      margin-top: 3
+    margin-top: 26
     @onCheckChange: modules.game_battle.checkCreatures()
 
   BattleSkulls
@@ -85,6 +84,7 @@ MiniWindow
     anchors.top: prev.top
     anchors.left: prev.right
     margin-left: 5
+    phantom: true
     @onCheckChange: modules.game_battle.checkCreatures()
 
   HorizontalSeparator
@@ -93,11 +93,15 @@ MiniWindow
     anchors.right: parent.right
     margin-top: 5
 
+  MiniWindowContents
+    anchors.top: parent.top
+    margin-top: 50
+
     Panel
       id: battlePanel
       anchors.left: parent.left
       anchors.right: parent.right
-      anchors.top: prev.bottom
+      anchors.top: parent.top
       margin-top: 5
       padding-right: 5
       layout:

modules/game_skills/skills.lua

@@ -115,12 +115,44 @@ function setSkillPercent(id, percent, tooltip)
   end
 end
 
-function checkAlert(id, value, maxValue, threshold)
-  if value > maxValue or maxValue < 1 then
+function checkAlert(id, value, maxValue, threshold, greaterThan)
+  if greaterThan == nil then greaterThan = false end
+  local alert = false
+
+  -- maxValue can be set to false to check value and threshold
+  -- used for regeneration checking
+  if type(maxValue) == 'boolean' then
+    if maxValue then
       return
     end
+
+    if greaterThan then
+      if value > threshold then
+        alert = true
+      end
+    else
+      if value < threshold then
+        alert = true
+      end
+    end
+  elseif type(maxValue) == 'number' then
+    if maxValue < 0 then
+      return
+    end
+
     local percent = math.floor((value / maxValue) * 100)
+    if greaterThan then
+      if percent > threshold then
+        alert = true
+      end
+    else
       if percent < threshold then
+        alert = true
+      end
+    end
+  end
+
+  if alert then
     setSkillColor(id, '#b22222') -- red
   else
     resetSkillColor(id)
@@ -267,7 +299,7 @@ function onRegenerationChange(localPlayer, regenerationTime)
   end
 
   setSkillValue('regenerationTime', hours .. ":" .. minutes)
-  checkAlert('regenerationTime', regenerationTime, 30, 20) -- what is max regeneration?
+  checkAlert('regenerationTime', regenerationTime, false, 300)
 end
 
 function onSpeedChange(localPlayer, speed)