From ed26af21248ceb5ab3e53e982eba9eea889553f0 Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Sun, 2 Jun 2024 20:12:39 +0200
Subject: [PATCH] updated context menu

---
 src/core/Global.ttslua                      |  4 ++
 src/core/UniversalActionAbilityToken.ttslua | 42 ++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index 22c055e8..eb989c55 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -155,6 +155,10 @@ function onLoad(savedData)
   end, 1)
 end
 
+function getRandomSeed()
+  return math.random(999)
+end
+
 -- Event hook for any object search.  When chaos tokens are manipulated while the chaos bag
 -- container is being searched, a TTS bug can cause tokens to duplicate or vanish.  We lock the
 -- chaos bag during search operations to avoid this.
diff --git a/src/core/UniversalActionAbilityToken.ttslua b/src/core/UniversalActionAbilityToken.ttslua
index 5bc3f3b1..2b692a15 100644
--- a/src/core/UniversalActionAbilityToken.ttslua
+++ b/src/core/UniversalActionAbilityToken.ttslua
@@ -52,7 +52,9 @@ function onLoad(savedData)
 
   updateDisplay()
   addContextMenu()
-  math.randomseed(os.time())
+
+  -- get random seed from Global so all are different
+  math.randomseed(Global.call("getRandomSeed"))
 end
 
 function updateDisplay()
@@ -72,7 +74,7 @@ function updateDisplay()
     {
       tag = "Image",
       attributes = {
-        image = "Bundle/Border",
+        image = "Bundle/Ring",
         height = "200",
         width = "200",
         position = "0 0 -10.2",
@@ -105,7 +107,7 @@ function updateDisplay()
     {
       tag = "Image",
       attributes = {
-        image = "Bundle/Border",
+        image = "Bundle/Ring",
         color = "#000000",
         height = "200",
         width = "200",
@@ -179,30 +181,42 @@ function updateDisplay()
   end
 end
 
+function getSymbolList()
+  local symbolList = {}
+  for str in string.gmatch(symbol, "([^/]+)") do
+    table.insert(symbolList, str)
+  end
+  return symbolList
+end
+
 function addContextMenu()
   self.addContextMenuItem("Change color", function(playerColor)
     Player[playerColor].showOptionsDialog("Choose color", listOfClasses, class, updateClass)
   end)
 
-  -- get display symbol from potential list
-  local symbols = {}
-  for str in string.gmatch(symbol, "([^/]+)") do
-    table.insert(symbols, str)
-  end
-
-  self.addContextMenuItem("Change symbol", function(playerColor)
-    Player[playerColor].showOptionsDialog("Choose symbol", listOfSymbols, symbols[1], updateSymbol)
+  self.addContextMenuItem("Change 1st symbol", function(playerColor)
+    local symbolList = getSymbolList()
+    Player[playerColor].showOptionsDialog("Choose symbol", listOfSymbols, symbolList[1], function(newSymbol)
+      if symbolList[2] then
+        symbol = newSymbol .. "/" .. symbolList[2]
+      else
+        symbol = newSymbol
+      end
+      updateDisplay()
+    end)
   end)
 
   self.addContextMenuItem("Change 2nd symbol", function(playerColor)
-    Player[playerColor].showOptionsDialog("Choose 2nd symbol", listOfSymbols, symbols[1], function(additionalSymbol)
-      symbol = symbols[1] .. "/" .. additionalSymbol
+    local symbolList = getSymbolList()
+    Player[playerColor].showOptionsDialog("Choose 2nd symbol", listOfSymbols, symbolList[2] or symbolList[1], function(newSymbol)
+      symbol = symbolList[1] .. "/" .. newSymbol
       updateDisplay()
     end)
   end)
 
   self.addContextMenuItem("Remove 2nd symbol", function()
-    symbol = symbols[1]
+    local symbolList = getSymbolList()
+    symbol = symbolList[1]
     updateDisplay()
   end)
 end