Merge branch 'argonui:main' into parallel-jim

objects/AllPlayerCards.15bb07/DeckofPossibilities.fefdfa.json

@@ -15,7 +15,7 @@
     "2664": {
       "BackIsHidden": true,
       "BackURL": "http://cloud-3.steamusercontent.com/ugc/1874087305860121579/39578AC78E34DAA169AB4DE4246BB1E002528B8C/",
-      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1874087305860119704/FCC908E5C313759E9E478D5952C74179DF80ADA8/",
+      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021605474902965618/1DA915D6106D951592457701CBA262B73CBEDE6B/",
       "NumHeight": 5,
       "NumWidth": 7,
       "Type": 0,

objects/AllPlayerCards.15bb07/ScrollofSecrets3Taboo.84a7df.gmnotes

@@ -1,15 +1,14 @@
 {
-  "id": "05189-t",
+  "id": "05188-t",
   "type": "Asset",
-  "class": "Mystic",
+  "class": "Seeker",
   "cost": 1,
   "level": 3,
   "traits": "Item. Tome.",
-  "willpowerIcons": 1,
+  "intellectIcons": 2,
-  "intellectIcons": 1,
   "uses": [
     {
-      "count": 4,
+      "count": 3,
       "type": "Secret",
       "token": "resource"
     }

objects/Community-CreatedPlayerCardsInvestigators.ed4ca7.json

@@ -18,6 +18,7 @@
     "TouhouProjectInvestigators.c5c294",
     "StreetsofNewCapenna.48b4ca",
     "StrangeAeonsCustomInvestigators.d78bd2",
+    "SixofCrowsInvestigatorExpansion.ac6335",
     "SignatureReplacements.b06fd9",
     "TheSandsOfMemphisInvestigatorExpansion.073201",
     "TheShadowsofArkhamPlayerCards.2e5eef",

objects/Community-CreatedPlayerCardsInvestigators.ed4ca7/SixofCrowsInvestigatorExpansion.ac6335.json

@@ -0,0 +1,85 @@
+{
+  "AltLookAngle": {
+    "x": 0,
+    "y": 0,
+    "z": 0
+  },
+  "AttachedDecals": [
+    {
+      "CustomDecal": {
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/959719855119695911/931B9829687A20F4DEADB36DA57B7E6D76792231/",
+        "Name": "dunwich_back",
+        "Size": 7.4
+      },
+      "Transform": {
+        "posX": 0,
+        "posY": 0,
+        "posZ": 0,
+        "rotX": 270,
+        "rotY": 0,
+        "rotZ": 0,
+        "scaleX": 2,
+        "scaleY": 2,
+        "scaleZ": 2
+      }
+    }
+  ],
+  "Autoraise": true,
+  "ColorDiffuse": {
+    "b": 0.34902,
+    "g": 0.34902,
+    "r": 0.35294
+  },
+  "CustomMesh": {
+    "CastShadows": true,
+    "ColliderURL": "",
+    "Convex": true,
+    "CustomShader": {
+      "FresnelStrength": 0,
+      "SpecularColor": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "SpecularIntensity": 0,
+      "SpecularSharpness": 2
+    },
+    "DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/2040738499780847997/8EB48569F817CB9566D4FB0911C3D0B543B2EA75/",
+    "MaterialIndex": 3,
+    "MeshURL": "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/tuckbox_h_MSH.obj",
+    "NormalURL": "",
+    "TypeIndex": 0
+  },
+  "Description": "By Mint Tea Fan",
+  "DragSelectable": true,
+  "GMNotes": "fancreations/investigators_six_of_crows.json",
+  "GUID": "ac6335",
+  "Grid": true,
+  "GridProjection": false,
+  "Hands": true,
+  "HideWhenFaceDown": false,
+  "IgnoreFoW": false,
+  "LayoutGroupSortIndex": 0,
+  "Locked": false,
+  "LuaScript": "require(\"core/DownloadBox\")",
+  "LuaScriptState": "",
+  "MeasureMovement": false,
+  "Name": "Custom_Model",
+  "Nickname": "Six of Crows Investigator Expansion",
+  "Snap": true,
+  "Sticky": true,
+  "Tooltip": true,
+  "Transform": {
+    "posX": 0,
+    "posY": 1.5,
+    "posZ": 0,
+    "rotX": 0,
+    "rotY": 270,
+    "rotZ": 0,
+    "scaleX": 2.21,
+    "scaleY": 0.46,
+    "scaleZ": 2.42
+  },
+  "Value": 0,
+  "XmlUI": ""
+}

objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json

@@ -49,8 +49,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
+  "LuaScript": "require(\"accessories/Subject5U-21Helper\")",
   "LuaScriptState": "",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.ttslua",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
   "Nickname": "Subject 5U-21 Helper",

objects/Fan-MadeAccessories.aa8b38/UnderworldMarketHelper.3650ea.json

@@ -34,8 +34,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
+  "LuaScript": "require(\"accessories/UnderworldMarketHelper\")",
   "LuaScriptState": "",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/UnderworldMarketHelper.3650ea.ttslua",
   "MaterialIndex": -1,
   "MeasureMovement": false,
   "MeshIndex": -1,

src/accessories/Subject5U-21Helper.ttslua

@@ -91,10 +91,14 @@ function getNotesFromCardsAndContainers()
       notes = JSON.decode(obj.getGMNotes()) or {}
       table.insert(notesList, notes)
     elseif obj.type == "Bag" or obj.type == "Deck" then
-      for _, deepObj in ipairs(obj.getData().ContainedObjects) do
+      -- check if there are actually objects contained and loop through them
-        if deepObj.Name == "Card" or deepObj.Name == "CardCustom" then
+      local containedObjects = obj.getData().ContainedObjects
-          notes = JSON.decode(deepObj.GMNotes) or {}
+      if containedObjects then
-          table.insert(notesList, notes)
+        for _, deepObj in ipairs(containedObjects) do
+          if deepObj.Name == "Card" or deepObj.Name == "CardCustom" then
+            notes = JSON.decode(deepObj.GMNotes) or {}
+            table.insert(notesList, notes)
+          end
         end
       end
     end

src/accessories/TokenArranger.ttslua

@@ -233,7 +233,7 @@ end
 
 -- creates buttons as labels as display for percentage values
 function createPercentageButton(tokenCount, valueCount, tokenName)
-  local startPos = Vector(2.3, -0.05, 0.875 * valueCount)
+  local startPos = Vector(2.3, -0.04, 0.875 * valueCount)
 
   if percentage == "cumulative" then
     percentageLabel.scale = { 1.5, 1.5, 1.5 }

src/playercards/PlayerCardPanel.ttslua

@@ -50,7 +50,7 @@ local START_POSITIONS = {
   randomWeakness = Vector(0, 2, 1.4),
   -- Because the card spread is handled by the SpawnBag, we don't know (programatically) where this
   -- should be placed.  If more customizable cards are added it will need to be moved.
-  summonedServitor = Vector(CARD_WIDTH * -6.5, 2, 1.7),
+  summonedServitor = Vector(CARD_WIDTH * -7.5, 2, 1.7),
 }
 
 -- Shifts to move rows of cards, and groups of rows, as different groupings are laid out