From 6af1831d480f16e9a86a4aa24c58d6b072b1894d Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Thu, 21 Nov 2024 09:32:31 +0100
Subject: [PATCH] Removed token moving from TTS events

---
 src/core/GameKeyHandler.ttslua |  2 +-
 src/core/Global.ttslua         | 38 +---------------------------------
 src/core/GlobalApi.ttslua      |  7 -------
 src/playermat/Playermat.ttslua |  2 +-
 src/util/Trashcan.ttslua       | 14 -------------
 5 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/src/core/GameKeyHandler.ttslua b/src/core/GameKeyHandler.ttslua
index 373357e9..8b57ce0b 100644
--- a/src/core/GameKeyHandler.ttslua
+++ b/src/core/GameKeyHandler.ttslua
@@ -264,7 +264,7 @@ function removeOneUse(playerColor, hoveredObject)
     local indexByMemo = {}
     local distanceByMemo = {}
     for _, obj in ipairs(searchResult) do
-      if obj.memo or not obj.locked then
+      if not obj.locked then
         local objPos = obj.getPosition()
         local distance = Vector.between(cardPos, objPos):magnitude()
         local memo = obj.memo or "NO_MEMO"
diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index d6fa4c84..23f62ad2 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -180,18 +180,6 @@ function getRandomSeed()
   return math.random(999)
 end
 
-function onObjectDrop(_, object)
-  if object.type == "Card" or object.type == "Deck" then
-    moveCardWithTokens({ card = object })
-  end
-end
-
-function onObjectRotate(object, _, flip, _, _, oldFlip)
-  if flip ~= oldFlip then
-    stopTokenTransformUpdating(object)
-  end
-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.
@@ -312,12 +300,6 @@ function onPlayerAction(player, action, targets)
       trash.putObject(target)
     end
     return false
-  elseif action == Player.Action.PickUp then
-    for _, target in ipairs(targets) do
-      if target.type == "Card" or target.type == "Deck" then
-        storeTokenTransform(target)
-      end
-    end
   end
 end
 
@@ -2897,7 +2879,7 @@ function storeTokenTransform(card)
   cardTokens[card] = {}
   local cardRot = card.getRotation()
   for _, token in ipairs(searchLib.onObject(card, "isTileOrToken", 0.95)) do
-    if token.memo or not token.locked then
+    if not token.locked then
       -- offset to stop the token from colliding with the card
       local tokenPos = token.getPosition() + Vector(0, 0.05, 0)
       token.setPosition(tokenPos)
@@ -2933,24 +2915,6 @@ function stopTokenTransformUpdating(card)
   card.use_hands = true
 end
 
-function unregisterCard(card)
-  cardTokens[card] = nil
-end
-
-function unregisterTokenFromCard(params)
-  local card = params.card
-  local token = params.token
-
-  if cardTokens[card] == nil then return end
-
-  for i, tokenData in ipairs(cardTokens[card] or {}) do
-    if tokenData.token == token then
-      table.remove(cardTokens[card], i)
-      break
-    end
-  end
-end
-
 -- removes tokens from the provided card/deck
 function removeTokensFromObject(params)
   local object = params.object
diff --git a/src/core/GlobalApi.ttslua b/src/core/GlobalApi.ttslua
index 229a31e7..e39a64d9 100644
--- a/src/core/GlobalApi.ttslua
+++ b/src/core/GlobalApi.ttslua
@@ -68,13 +68,6 @@ do
     Global.call("moveCardWithTokens", { card = card, position = position, rotation = rotation })
   end
 
-  -- unregisters a token from a card
-  ---@param card tts__Object Card that might have this token added
-  ---@param token tts__Object Token that should get unregistered
-  function GlobalApi.unregisterTokenFromCard(card, token)
-    Global.call("unregisterTokenFromCard", { card = card, token = token })
-  end
-
   -- loads saved options
   ---@param options table Set a new state for the option table
   function GlobalApi.loadOptionPanelSettings(options)
diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua
index 10993dd6..5612ed00 100644
--- a/src/playermat/Playermat.ttslua
+++ b/src/playermat/Playermat.ttslua
@@ -297,7 +297,7 @@ function discardListOfObjects(objList)
     elseif tokenChecker.isChaosToken(obj) then
       -- put chaos tokens back into bag (e.g. Unrelenting)
       chaosBagApi.returnChaosTokenToBag(obj, false)
-    elseif (obj.memo or not obj.getLock()) and not obj.hasTag("DontDiscard") then
+    elseif not obj.getLock() and not obj.hasTag("DontDiscard") then
       -- don't touch locked objects (like the table etc.) or specific objects (like key tokens)
       ownedObjects.Trash.putObject(obj)
     end
diff --git a/src/util/Trashcan.ttslua b/src/util/Trashcan.ttslua
index a98ea78b..6a5a6625 100644
--- a/src/util/Trashcan.ttslua
+++ b/src/util/Trashcan.ttslua
@@ -9,17 +9,3 @@ function emptyTrash()
     self.takeObject().destruct()
   end
 end
-
-function onObjectLeaveContainer(container, object)
-  if container == self then
-    object.locked = false
-
-    if object.type == "Card" then
-      object.use_hands = true
-    end
-
-    if object.type == "Card" or object.type == "Deck" then
-      Global.call("unregisterCard", object)
-    end
-  end
-end