From d7dd8b3223b090dfda3fd5f2e634d6da0ee2e4ef Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Thu, 4 Jul 2024 21:50:00 +0200
Subject: [PATCH] added player color initializing

---
 src/core/Global.ttslua         | 18 +++++++++---------
 src/playermat/Playermat.ttslua |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index 2132b7c9..54640ce2 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -228,15 +228,6 @@ function onObjectNumberTyped(hoveredObject, playerColor, number)
   -- only continue for decks or cards
   if hoveredObject.type ~= "Deck" and hoveredObject.type ~= "Card" then return end
 
-  -- check whether the hovered object is part of a players draw objects
-  for _, color in ipairs(playermatApi.getUsedMatColors()) do
-    local deckAreaObjects = playermatApi.getDeckAreaObjects(color)
-    if deckAreaObjects.topCard == hoveredObject or deckAreaObjects.draw == hoveredObject then
-      playermatApi.drawCardsWithReshuffle(color, number)
-      return true
-    end
-  end
-
   -- check if this is a card with states (and then change state instead of drawing it)
   local states = hoveredObject.getStates()
   if states ~= nil and #states > 0 then
@@ -246,6 +237,15 @@ function onObjectNumberTyped(hoveredObject, playerColor, number)
       return true
     end
   end
+
+  -- check whether the hovered object is part of a players draw objects
+  for _, color in ipairs(playermatApi.getUsedMatColors()) do
+    local deckAreaObjects = playermatApi.getDeckAreaObjects(color)
+    if deckAreaObjects.topCard == hoveredObject or deckAreaObjects.draw == hoveredObject then
+      playermatApi.drawCardsWithReshuffle(color, number)
+      return true
+    end
+  end
 end
 
 -- TTS event, used to redraw the playermat slot symbols after a small delay to account for the custom font loading
diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua
index 62388c58..81dd612d 100644
--- a/src/playermat/Playermat.ttslua
+++ b/src/playermat/Playermat.ttslua
@@ -128,6 +128,8 @@ function onLoad(savedData)
     slotData                = loadedData.slotData
   end
 
+  updateMessageColor(playerColor)
+
   self.interactable = false
 
   -- get object references to owned objects