Merge pull request #3 from Entrox-Licher/main

Update to main

config.json

@@ -73,7 +73,7 @@
     "Trash.70b9f6",
     "Resourcetokens.0168ae",
     "Horrortokens.ae1a4e",
-    "DamageTokens.b0ef6c",
+    "Damagetokens.b0ef6c",
     "Trash.4b8594",
     "Trash.5f896a",
     "Trash.147e80",
@@ -84,12 +84,12 @@
     "Cluetokens.3b2550",
     "Horrortokens.7bd2a0",
     "Doomtokens.16fcd6",
-    "DamageTokens.93f4a0",
+    "Damagetokens.93f4a0",
     "Resourcetokens.fd617a",
     "Cluetokens.31fa39",
     "Horrortokens.c3ecf4",
     "Doomtokens.47ffc3",
-    "DamageTokens.480bda",
+    "Damagetokens.480bda",
     "Resourcetokens.9fadf9",
     "Connectionmarkers.170f10",
     "FogOfWarTrigger.3aab97",
@@ -140,22 +140,22 @@
     "OtherDoominPlay.652ff3",
     "Playermat1White.8b081b",
     "Playermat2Orange.bd0ff4",
-    "Neutral.637e17",
+    "Neutral.2691e1",
-    "Neutral.e003fe",
+    "Neutral.748245",
-    "Neutral.8a496e",
+    "Neutral.271b17",
-    "Neutral.e1ab8d",
+    "Neutral.5bafdf",
-    "Neutral.9312d8",
+    "Neutral.012577",
-    "Neutral.bfcaf4",
+    "Neutral.04765b",
-    "Neutral.a1e2a3",
+    "Neutral.b71036",
-    "Neutral.460250",
+    "Neutral.1cb302",
-    "Neutral.7ffb43",
+    "Neutral.bbc5d4",
-    "Neutral.d7910b",
+    "Neutral.429bb3",
-    "Neutral.b8409d",
+    "Neutral.183dbe",
-    "Neutral.719ff4",
+    "Neutral.b80db6",
-    "Neutral.49bf4b",
+    "Neutral.af1927",
-    "Neutral.26a0a0",
+    "Neutral.0329cc",
-    "Neutral.a7c0f0",
+    "Neutral.5bec40",
-    "Neutral.bf7cc9",
+    "Neutral.5825ca",
     "LeadInvestigator.acaa93",
     "ArkhamDBDeckImporter.a28140",
     "Configuration.03804b",

objects/Damagetokens.480bda.json

@@ -13,7 +13,7 @@
   "ContainedObjects_order": [
     "Custom_Token.cd2a02"
   ],
-  "ContainedObjects_path": "DamageTokens.480bda",
+  "ContainedObjects_path": "Damagetokens.480bda",
   "CustomMesh": {
     "CastShadows": true,
     "ColliderURL": "",
@@ -51,7 +51,7 @@
   "MeasureMovement": false,
   "MeshIndex": -1,
   "Name": "Custom_Model_Infinite_Bag",
-  "Nickname": "Damage Tokens",
+  "Nickname": "Damage tokens",
   "Snap": true,
   "Sticky": true,
   "Tooltip": true,

objects/Damagetokens.93f4a0.json

@@ -13,7 +13,7 @@
   "ContainedObjects_order": [
     "Custom_Token.cd2a02"
   ],
-  "ContainedObjects_path": "DamageTokens.93f4a0",
+  "ContainedObjects_path": "Damagetokens.93f4a0",
   "CustomMesh": {
     "CastShadows": true,
     "ColliderURL": "",
@@ -51,7 +51,7 @@
   "MeasureMovement": false,
   "MeshIndex": -1,
   "Name": "Custom_Model_Infinite_Bag",
-  "Nickname": "Damage Tokens",
+  "Nickname": "Damage tokens",
   "Snap": true,
   "Sticky": true,
   "Tooltip": true,

objects/Damagetokens.b0ef6c.json

@@ -13,7 +13,7 @@
   "ContainedObjects_order": [
     "Custom_Token.cd2a02"
   ],
-  "ContainedObjects_path": "DamageTokens.b0ef6c",
+  "ContainedObjects_path": "Damagetokens.b0ef6c",
   "CustomMesh": {
     "CastShadows": true,
     "ColliderURL": "",
@@ -51,7 +51,7 @@
   "MeasureMovement": false,
   "MeshIndex": -1,
   "Name": "Custom_Model_Infinite_Bag",
-  "Nickname": "Damage Tokens",
+  "Nickname": "Damage tokens",
   "Snap": true,
   "Sticky": true,
   "Tooltip": true,

objects/RulebooksGuidesandTablets.fcfa7f.json

@@ -19,6 +19,7 @@
     "Rulepop-QuickRulesReferenceSite.b78dae",
     "OfficialLearntoPlayVideo.39ec3d",
     "In-depthArkhamHorrorTTStutorial.51cb8d",
+    "TheScarletKeys-InvestigatorExpansion.e331fc",
     "StarterDecklists.9cd82a",
     "OfficialFAQ.7fc24e",
     "LearntoPlay.49f237"

objects/RulebooksGuidesandTablets.fcfa7f/TheScarletKeys-InvestigatorExpansion.e331fc.json

@@ -0,0 +1,51 @@
+{
+  "AltLookAngle": {
+    "x": 0,
+    "y": 0,
+    "z": 0
+  },
+  "Autoraise": true,
+  "ColorDiffuse": {
+    "b": 1,
+    "g": 1,
+    "r": 1
+  },
+  "CustomPDF": {
+    "PDFPage": 0,
+    "PDFPageOffset": 0,
+    "PDFPassword": "",
+    "PDFUrl": "http://cloud-3.steamusercontent.com/ugc/2037355435564792746/B25EA6E0A5FCE0972F1F61F18948885923F4F137/"
+  },
+  "Description": "",
+  "DragSelectable": true,
+  "GMNotes": "",
+  "GUID": "e331fc",
+  "Grid": true,
+  "GridProjection": false,
+  "Hands": false,
+  "HideWhenFaceDown": false,
+  "IgnoreFoW": false,
+  "LayoutGroupSortIndex": 0,
+  "Locked": false,
+  "LuaScript": "",
+  "LuaScriptState": "",
+  "MeasureMovement": false,
+  "Name": "Custom_PDF",
+  "Nickname": "The Scarlet Keys - Investigator Expansion",
+  "Snap": true,
+  "Sticky": true,
+  "Tooltip": true,
+  "Transform": {
+    "posX": -33.924,
+    "posY": 3.42,
+    "posZ": 11.828,
+    "rotX": 0,
+    "rotY": 270,
+    "rotZ": 0,
+    "scaleX": 3.5,
+    "scaleY": 1,
+    "scaleZ": 3.5
+  },
+  "Value": 0,
+  "XmlUI": ""
+}

src/core/DataHelper.ttslua

@@ -526,10 +526,6 @@ function setSpawnedPlayerCardGuid(params)
   end
 end
 
--- deprecated, use metadata (GM Notes) instead (still used by custom data helpers)
--- Encounter Cards with "Hidden."
-HIDDEN_CARD_DATA = {}
-
 -- called by "Global" during encounter card drawing
 function checkHiddenCard(name)
   for _, n in ipairs(HIDDEN_CARD_DATA) do
@@ -550,28 +546,31 @@ function updateHiddenCards(args)
 end
 
 --------------------------------------------------------------------------
--- deprecated code (commented out)
+-- deprecated code, kept here for existing calls
 --------------------------------------------------------------------------
 
 -- deprecated, use metadata (GM Notes) instead
 -- Known locations and clues. We check this to determine if we should atttempt to spawn clues,
 -- first we look for <LOCATION_NAME>_<GUID> and if we find nothing we look for <LOCATION_NAME>
 -- format is [location_guid -> clueCount]
--- LOCATIONS_DATA = JSON.decode([[{
+
---   "XXXX": {"type": "fixed", "value": 2, "clueSide": "back"},
+-- Example 1: "Study" from Core Set (https://arkhamdb.com/card/01111)
---   "xxx": {"type": "perPlayer", "value": 2, "clueSide": "back"}
+-- ["Study"]= {type="perPlayer", value=2, clueSide= "back"}
--- }]])
+
+-- Example 2:  "Student Union" from Dunwich Legacy (https://arkhamdb.com/card/02051)
+-- ["Student Union"]= {type="fixed", value= 2, clueSide= "back"}
+LOCATIONS_DATA = {}
 
 -- deprecated, use metadata (GM Notes) instead
 -- Player cards with token counts and types
--- PLAYER_CARD_DATA = JSON.decode([[{
---   "xxx": {
---   "tokenType": "resource",
---   "tokenCount": 3
---   }
--- }]])
 
--- deprecated, included in TokenManager
+-- Example: "Flashlight" from Core Set (https://arkhamdb.com/card/01087)
--- PLAYER_CARD_TOKEN_OFFSETS = {
+-- ["Flashlight"]= {tokenType= "resource", tokenCount= 3}
---   [1] = {{ 0, 3, -0.2 }}
+PLAYER_CARD_DATA = {}
--- }
+
+-- deprecated, use metadata (GM Notes) instead (still used by custom data helpers)
+-- Encounter Cards with "Hidden." (List of names)
+
+-- Example: "Possession (Murderous)" from Path to Carcosa (https://arkhamdb.com/card/03342)
+-- ..., "Possession (Murderous)", ...
+HIDDEN_CARD_DATA = {}

src/playermat/Playmat.ttslua

@@ -500,9 +500,18 @@ function replenishTokens(card, count, replenish)
     end
   end
 
+  -- this is the theoretical new amount of uses (to be checked below)
   local newCount = foundTokens + replenish
-  if newCount > count then newCount = count end
+  
+  -- if there are already more uses than the replenish amount, keep them
+  if foundTokens > count then
+    newCount = foundTokens
+  -- only replenish up until the replenish amount
+  elseif newCount > count then
+    newCount = count
+  end
 
+  -- update the clickable counter or spawn a group of tokens
   if clickableResourceCounter then
     clickableResourceCounter.call("updateVal", newCount)
   else