Merge branch 'main' into hotkeys

src/accessories/TokenArranger.ttslua

@@ -74,6 +74,8 @@ function onLoad(saveState)
       percentage = false
     else
       percentage = "basic"
+      broadcastToAll("Percentages are unreliable when using tokens that draw other tokens (bless or curse for example).",
+      "Yellow")
     end
     layout()
   end)
@@ -83,8 +85,9 @@ function onLoad(saveState)
       percentage = "basic"
     else
       percentage = "cumulative"
-      broadcastToAll("Cumulative percentages are unreliable when using tokens that draw other tokens (bless or curse for example).", Color.Yellow)
     end
+    broadcastToAll("Percentages are unreliable when using tokens that draw other tokens (bless or curse for example).",
+    "Yellow")
     layout()
   end)
 
@@ -209,16 +212,12 @@ end
 
 -- order function for data sorting
 function tokenValueComparator(left, right)
-  if left.value > right.value then
+  if (left.value ~= right.value) then
-    return true
+    return left.value > right.value
-  elseif right.value > left.value then
+  elseif left.order ~= right.order then
-    return false
+    return left.order < right.order
-  elseif left.order < right.order then
-    return true
-  elseif right.order < left.order then
-    return false
   else
-    return left.token.getGUID() > right.token.getGUID()
+    return false
   end
 end
 
@@ -358,6 +357,7 @@ function layout(_, _, isRightClick)
     tokenName  = item.token.getName()
 
     -- set tokenName to false if it does not contain letters
+    -- tokenName is used by `createPercentageButton()` to determine the textcolor for percentages
     if string.match(tokenName, "%a") == nil then
       tokenName = false
     end