Merge branch 'main' into api-additions

objects/AllPlayerCards.15bb07/Ajax.f8a7c6.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10642",
   "type": "Asset",
+  "slot": "Ally",
   "class": "Neutral",
   "cost": 2,
   "traits": "Ally. Creature.",

objects/AllPlayerCards.15bb07/CornHuskDoll.3602f5.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10714",
   "type": "Asset",
+  "slot": "Accessory",
   "class": "Neutral",
   "cost": 1,
   "willpowerIcons": 1,

objects/AllPlayerCards.15bb07/DrRosaMarquez.62d5a6.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10702",
   "type": "Asset",
+  "slot": "Ally",
   "class": "Neutral",
   "cost": 4,
   "traits": "Ally. Miskatonic. Wayfarer.",

objects/AllPlayerCards.15bb07/HelenPeters.33bfa1.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10703",
   "type": "Asset",
+  "slot": "Ally",
   "class": "Neutral",
   "cost": 3,
   "traits": "Ally. Hunter.",

objects/AllPlayerCards.15bb07/LittleSylvie.153a42.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10548",
   "type": "Asset",
+  "slot": "Accessory",
   "class": "Neutral",
   "cost": 1,
   "traits": "Item. Charm. Cursed.",

objects/AllPlayerCards.15bb07/PrismaticShard.27fe24.gmnotes

@@ -4,5 +4,12 @@
   "class": "Neutral",
   "cost": 2,
   "traits": "Item. Relic. Colour.",
+  "uses": [
+    {
+      "count": 4,
+      "type": "Brilliance",
+      "token": "resource"
+    }
+  ],
   "cycle": "The Feast of Hemlock Vale"
 }

objects/AllPlayerCards.15bb07/ThePearlDiary.34a7b5.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10715",
   "type": "Asset",
+  "slot": "Hand",
   "class": "Neutral",
   "cost": 1,
   "traits": "Item. Tome.",

objects/AllPlayerCards.15bb07/WorryRock.5e5dc6.gmnotes

@@ -1,6 +1,7 @@
 {
   "id": "10713",
   "type": "Asset",
+  "slot": "Accessory",
   "class": "Neutral",
   "cost": 1,
   "traits": "Item. Charm. Blessed.",

objects/TokenSpawningReference.f8b3a7.json

@@ -19,7 +19,7 @@
     },
     "ImageScalar": 1,
     "ImageSecondaryURL": "",
-    "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2172484009093238162/ACF3BBD93CB517B0BD0952E9BB78A2D35A62F377/",
+    "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2467486908540932616/8370C75D2789E1332836D8C2A31D32542153DE85/",
     "WidthScale": 0
   },
   "Description": "Press a numpad key to spawn the indicated token.",

src/playercards/cards/Nephthys4.ttslua

@@ -2,6 +2,7 @@ VALID_TOKENS = {
   ["Bless"] = true
 }
 
+SHOW_SINGLE_RELEASE = true
 SHOW_MULTI_RELEASE = 3
 SHOW_MULTI_RETURN = 3
 

src/playercards/cards/RiteofSanctification.ttslua

@@ -2,6 +2,7 @@ VALID_TOKENS = {
   ["Bless"] = true
 }
 
+KEEP_OPEN = true
 SHOW_SINGLE_RELEASE = true
 
 require("playercards/CardsThatSealTokens")

src/playercards/cards/ShieldofFaith2.ttslua

@@ -2,7 +2,7 @@ VALID_TOKENS = {
   ["Bless"] = true
 }
 
-SHOW_SINGLE_RELEASE = true
 KEEP_OPEN = true
+SHOW_SINGLE_RELEASE = true
 
 require("playercards/CardsThatSealTokens")

src/playermat/Playmat.ttslua

@@ -952,7 +952,7 @@ function drawChaosTokenButton(_, _, isRightClick)
 end
 
 function drawEncounterCard(_, _, isRightClick)
-  local drawPos = getEncounterCardDrawPosition(isRightClick)
+  local drawPos = getEncounterCardDrawPosition(not isRightClick)
   mythosAreaApi.drawEncounterCard(matColor, drawPos)
 end