From ea7a119c22d0c51307dcdff2891890a8a6239df3 Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Tue, 6 Feb 2024 22:36:30 +0100
Subject: [PATCH] deck id fixes, import fix

---
 objects/AllPlayerCards.15bb07/Bewitching3.db335c.gmnotes | 1 +
 objects/AllPlayerCards.15bb07/DrainEssence.9965aa.json   | 4 ++--
 objects/AllPlayerCards.15bb07/KateWinthrop.ce2322.json   | 4 ++--
 src/arkhamdb/ArkhamDb.ttslua                             | 7 +++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/objects/AllPlayerCards.15bb07/Bewitching3.db335c.gmnotes b/objects/AllPlayerCards.15bb07/Bewitching3.db335c.gmnotes
index f39a7cf7..93e1fc17 100644
--- a/objects/AllPlayerCards.15bb07/Bewitching3.db335c.gmnotes
+++ b/objects/AllPlayerCards.15bb07/Bewitching3.db335c.gmnotes
@@ -2,6 +2,7 @@
   "id": "10079",
   "type": "Asset",
   "class": "Rogue",
+  "startsInPlay": true,
   "level": 3,
   "traits": "Talent. Trick.",
   "permanent": true,
diff --git a/objects/AllPlayerCards.15bb07/DrainEssence.9965aa.json b/objects/AllPlayerCards.15bb07/DrainEssence.9965aa.json
index 2dede668..6d904d9a 100644
--- a/objects/AllPlayerCards.15bb07/DrainEssence.9965aa.json
+++ b/objects/AllPlayerCards.15bb07/DrainEssence.9965aa.json
@@ -5,14 +5,14 @@
     "z": 0
   },
   "Autoraise": true,
-  "CardID": 12100,
+  "CardID": 125100,
   "ColorDiffuse": {
     "b": 0.71324,
     "g": 0.71324,
     "r": 0.71324
   },
   "CustomDeck": {
-    "121": {
+    "1251": {
       "BackIsHidden": true,
       "BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
       "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2279448008872128231/B3D4EF69ABE3736988B015629C5862F69EB42BDC/",
diff --git a/objects/AllPlayerCards.15bb07/KateWinthrop.ce2322.json b/objects/AllPlayerCards.15bb07/KateWinthrop.ce2322.json
index edeab958..38022a6f 100644
--- a/objects/AllPlayerCards.15bb07/KateWinthrop.ce2322.json
+++ b/objects/AllPlayerCards.15bb07/KateWinthrop.ce2322.json
@@ -5,14 +5,14 @@
     "z": 0
   },
   "Autoraise": true,
-  "CardID": 12100,
+  "CardID": 127100,
   "ColorDiffuse": {
     "b": 0.71324,
     "g": 0.71324,
     "r": 0.71324
   },
   "CustomDeck": {
-    "121": {
+    "1271": {
       "BackIsHidden": true,
       "BackURL": "http://cloud-3.steamusercontent.com/ugc/2279448008875867646/87E93B4F71674659B01C9ED280E573D7BD929882/",
       "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2279448008875867768/A54D29440DD5A9DA4E059B861C7AC22F5ACD9BE4/",
diff --git a/src/arkhamdb/ArkhamDb.ttslua b/src/arkhamdb/ArkhamDb.ttslua
index 841822fe..2194f486 100644
--- a/src/arkhamdb/ArkhamDb.ttslua
+++ b/src/arkhamdb/ArkhamDb.ttslua
@@ -312,19 +312,22 @@ do
         break
       end
 
-      if instructor == "" or (instructor ~= "add:" and instructor ~= "remove:") then return end
+      if instructor == "" or (instructor ~= "add:" and instructor ~= "remove:") then break end
 
       -- remove instructor from line
       line = line:gsub(instructor, "")
 
       -- evaluate instructions
-      local cardIds = {}
       for str in line:gmatch("([^,]+)") do
         if instructor == "add:" then
           slots[str] = (slots[str] or 0) + 1
         elseif instructor == "remove:" then
           if slots[str] == nil then break end
           slots[str] = math.max(slots[str] - 1, 0)
+
+          if slots[str] == 0 then
+            slots[str] = nil
+          end
         end
       end
     end