Add configurable padding around the multi-cube area

This should help with the (smooth) camera keeping up with the multiple cubes are
moving.

Author: veger

locale/en/locale.cfg

@@ -40,6 +40,7 @@ label-top-right=Top/Right:
 label-type=Type:
 label-until-build=Follow until build
 label-zoom=Zoom:
+label-cube-padding=Cube padding:
 label-transitionperiod=Transition period:
 label-cityblock-size=Block size:
 label-cityblock-offset=Offset:
@@ -92,6 +93,7 @@ tracker-cityblock-blockScale=How many city blocks to zoom out, centered on the c
 tracker-cityblock-blockScale-value=A zoom of 3 will capture the current block and all of the neighbors. <enter> to set.
 tracker-cityblock-player=Use player coordinates to select the current city block.
 tracker-cube-not-available=This tracker is not available because Ultracube mod is not loaded.
+tracker-cube-padding=Padding (in tiles) applied around the cube area when multiple cubes are present.
 
 [controls]
 tlbe-main-window-toggle=Open/Close camera settings

scripts/gui.lua

@@ -635,6 +635,17 @@ function GUI.onTextChanged(event)
             selectedTracker.maxPos.x = value
             Tracker.areaUpdateCenterAndSize(selectedTracker)
 
+            GUI.updateTrackerConfig(playerSettings.gui.trackerInfo, selectedTracker)
+            GUI.updateTrackerInfo(playerSettings.gui.trackerInfo, selectedTracker)
+        end
+    elseif event.element.name == "tlbe-tracker-cube-padding" and event.element.text ~= nil then
+        local value = tonumber(event.element.text)
+        if value ~= nil then
+            if value < 0 then
+                value = 0
+            end
+            selectedTracker.cubePadding = value
+
             GUI.updateTrackerConfig(playerSettings.gui.trackerInfo, selectedTracker)
             GUI.updateTrackerInfo(playerSettings.gui.trackerInfo, selectedTracker)
         end
@@ -1594,6 +1605,20 @@ function GUI.createTrackerConfigAndInfo(trackerInfo, tracker)
                 tooltip = { "tooltip.tracker-until-build" },
                 state = tracker.untilBuild
             }
+        elseif tracker.type == "cube" then
+            trackerInfo.add {
+                type = "label",
+                caption = { "gui.label-cube-padding" },
+                tooltip = { "tooltip.tracker-cube-padding" },
+                style = "bold_label"
+            }
+            trackerInfo.add {
+                type = "textfield",
+                name = "tlbe-tracker-cube-padding",
+                style = "tlbe_config_half_width_textfield",
+                numeric = true,
+                allow_negative = false
+            }
         elseif tracker.type == "cityblock" then
             trackerInfo.add {
                 type = "label",
@@ -1762,6 +1787,8 @@ function GUI.updateTrackerConfig(trackerInfo, tracker)
             blFlow["tlbe-tracker-left"].style = style
         elseif tracker.type == "player" then
             trackerInfo["tracker-untilbuild"].state = tracker.untilBuild
+        elseif tracker.type == "cube" then
+            trackerInfo["tlbe-tracker-cube-padding"].text = string.format("%d", tracker.cubePadding)
         elseif tracker.type == "cityblock" then
             local cityBlock = tracker.cityBlock
             if cityBlock == nil then

scripts/tracker.lua

@@ -13,6 +13,7 @@ local Tracker = {}
 --- @field userCanEnable boolean When true, the user can enabled/disable the tracker, otherwise the tracker is controlled by TLBE
 --- @field moveToNextTracker boolean|nil Disables the tracker after the cameras are processed (end of game tick)
 --- @field changeId integer Incremented on each position/size change of the tracker
+--- @field cubePadding number Padding (in tiles) applied around the cube area when multiple cubes are present
 --- @field centerPos MapPosition.0|nil Center position of the tracker area (Calculated from minPos and maxPos)
 --- @field size MapPosition.0|nil Size of the tracker area (Calculated from minPos and maxPos)
 --- @field minPos MapPosition.0 Bottom/Left of tracker area
@@ -61,9 +62,10 @@ function Tracker.newTracker(player, trackerType, trackerList)
         smooth = true,
         untilBuild = false,
         changeId = 0,
+        cubePadding = 0,
         -- Set some sensible defaults but will be most likely overwritten by the tracker specific implementations
         minPos = { x = -5, y = -5 },
-        maxPos = { x = 5, y = 5 }
+        maxPos = { x = 5, y = 5 },
     }
 
     -- Add tracker specific details
@@ -178,23 +180,23 @@ function Tracker.tick(tracker, player)
             local size
 
             if minPos ~= nil and maxPos ~= nil then
-                local sizeX = maxPos.x - minPos.x
-                local sizeY = maxPos.y - minPos.y
+                local baseSizeX = maxPos.x - minPos.x
+                local baseSizeY = maxPos.y - minPos.y
 
-                if sizeX == 0 then
-                    sizeX = 1
+                if baseSizeX == 0 then
+                    baseSizeX = 1
                 end
-                if sizeY == 0 then
-                    sizeY = 1
+                if baseSizeY == 0 then
+                    baseSizeY = 1
                 end
 
                 size = {
-                    x = sizeX,
-                    y = sizeY
+                    x = baseSizeX + 2 * tracker.cubePadding,
+                    y = baseSizeY + 2 * tracker.cubePadding
                 }
                 centerPos = {
-                    x = minPos.x + size.x / 2,
-                    y = minPos.y + size.y / 2
+                    x = minPos.x + baseSizeX / 2,
+                    y = minPos.y + baseSizeY / 2
                 }
             elseif info.position ~= nil then
                 centerPos = {