Try triggering release action on publish, instead of create

Lower hand zones to prevent weird card interactions
Allow swapping ArkhamDB importer to use AdamDB
2024-08-03 20:10:23 -04:00 · 2024-08-03 20:10:23 -04:00 · 2024-08-03 20:10:23 -04:00 · 2024-08-03 20:10:23 -04:00 · 2024-08-03 20:10:23 -04:00 · 2024-08-03 20:10:22 -04:00
27 changed files with 50 additions and 97 deletions
--- a/.github/workflows/build-mod.yml
+++ b/.github/workflows/build-mod.yml
@ -2,7 +2,7 @@ name: build-mod
 on:
  workflow_dispatch:
  release:
-    types: [created]
+    types: [published]
  pull_request:

 permissions: read-all
--- a/config.json
+++ b/config.json
@ -156,7 +156,6 @@
    "PhaseTrackerCache.645841",
    "TokenSource.124381",
    "GameData.3dbe47",
-    "SCEDTour.0e5aa8",
    "InstructionGenerator.240522",
    "PlayerCards.2d30ee",
    "TokenRemover.39b175",
--- a/objects/Cluetokens.3b2550.json
+++ b/objects/Cluetokens.3b2550.json
@ -50,7 +50,7 @@
    "posY": 1.561,
    "posZ": -26.426,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 0.8,
--- a/objects/Cluetokens.fae2f6.json
+++ b/objects/Cluetokens.fae2f6.json
@ -50,7 +50,7 @@
    "posY": 1.561,
    "posZ": 25.864,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 0.8,
--- a/objects/Configuration.03804b.json
+++ b/objects/Configuration.03804b.json
@ -20,7 +20,7 @@
  "HideWhenFaceDown": false,
  "IgnoreFoW": false,
  "LayoutGroupSortIndex": 0,
-  "Locked": true,
+  "Locked": false,
  "LuaScript": "require(\"arkhamdb/Configuration\")",
  "LuaScriptState": "",
  "MeasureMovement": false,
@ -33,9 +33,9 @@
  ],
  "Tooltip": true,
  "Transform": {
-    "posX": 78,
-    "posY": 1.395,
-    "posZ": 4.352,
+    "posX": -8.44,
+    "posY": 2,
+    "posZ": 77,
    "rotX": 0,
    "rotY": 270,
    "rotZ": 180,
--- a/objects/Damagetokens.93f4a0.json
+++ b/objects/Damagetokens.93f4a0.json
@ -60,7 +60,7 @@
    "posY": 1.581,
    "posZ": -22.555,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/Damagetokens.b0ef6c.json
+++ b/objects/Damagetokens.b0ef6c.json
@ -60,7 +60,7 @@
    "posY": 1.581,
    "posZ": 21.992,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/Doomtokens.16724b.json
+++ b/objects/Doomtokens.16724b.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": 27.799,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/Doomtokens.16fcd6.json
+++ b/objects/Doomtokens.16fcd6.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": -28.362,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/HandTrigger.0285cc.json
+++ b/objects/HandTrigger.0285cc.json
@ -33,7 +33,7 @@
  "Tooltip": true,
  "Transform": {
    "posX": -37.75,
-    "posY": 6,
+    "posY": 5.08,
    "posZ": 30,
    "rotX": 0,
    "rotY": 90,
--- a/objects/HandTrigger.5fe087.json
+++ b/objects/HandTrigger.5fe087.json
@ -33,7 +33,7 @@
  "Tooltip": true,
  "Transform": {
    "posX": -65,
-    "posY": 6,
+    "posY": 5.08,
    "posZ": -16.1,
    "rotX": 0,
    "rotY": 90,
--- a/objects/HandTrigger.a70eee.json
+++ b/objects/HandTrigger.a70eee.json
@ -33,7 +33,7 @@
  "Tooltip": true,
  "Transform": {
    "posX": -65,
-    "posY": 6,
+    "posY": 5.08,
    "posZ": 16.1,
    "rotX": 0,
    "rotY": 90,
--- a/objects/HandTrigger.be2f17.json
+++ b/objects/HandTrigger.be2f17.json
@ -33,7 +33,7 @@
  "Tooltip": true,
  "Transform": {
    "posX": -37.75,
-    "posY": 6,
+    "posY": 5.08,
    "posZ": -30,
    "rotX": 0,
    "rotY": 90,
--- a/objects/Horrortokens.7bd2a0.json
+++ b/objects/Horrortokens.7bd2a0.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": -24.491,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/Horrortokens.ae1a4e.json
+++ b/objects/Horrortokens.ae1a4e.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": 23.928,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/LuaScriptState.luascriptstate
+++ b/objects/LuaScriptState.luascriptstate
@ -23,7 +23,7 @@
    "showTitleSplash": true,
    "useClassTexture": true,
    "useClueClickers": false,
-    "useResourceCounters": "disabled",
+    "useResourceCounters": "enabled",
    "useSnapTags": true
  }
 }
--- a/objects/Resourcetokens.0168ae.json
+++ b/objects/Resourcetokens.0168ae.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": 20.057,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/Resourcetokens.fd617a.json
+++ b/objects/Resourcetokens.fd617a.json
@ -50,7 +50,7 @@
    "posY": 1.581,
    "posZ": -20.619,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/SCEDTour.0e5aa8.json
+++ b/objects/SCEDTour.0e5aa8.json
@ -1,57 +0,0 @@
-{
-  "AltLookAngle": {
-    "x": 0,
-    "y": 0,
-    "z": 0
-  },
-  "Autoraise": true,
-  "ColorDiffuse": {
-    "b": 1,
-    "g": 1,
-    "r": 1
-  },
-  "CustomImage": {
-    "CustomToken": {
-      "MergeDistancePixels": 5,
-      "Stackable": false,
-      "StandUp": false,
-      "Thickness": 0.1
-    },
-    "ImageScalar": 1,
-    "ImageSecondaryURL": "",
-    "ImageURL": "https://i.imgur.com/Q1J2Dgl.png",
-    "WidthScale": 0
-  },
-  "Description": "",
-  "DragSelectable": true,
-  "GMNotes": "",
-  "GUID": "0e5aa8",
-  "Grid": true,
-  "GridProjection": false,
-  "Hands": false,
-  "HideWhenFaceDown": false,
-  "IgnoreFoW": false,
-  "LayoutGroupSortIndex": 0,
-  "Locked": false,
-  "LuaScript": "require(\"core/tour/TourStarter\")",
-  "LuaScriptState": "",
-  "MeasureMovement": false,
-  "Name": "Custom_Token",
-  "Nickname": "SCED Tour",
-  "Snap": true,
-  "Sticky": true,
-  "Tooltip": false,
-  "Transform": {
-    "posX": -24.5,
-    "posY": 1.57,
-    "posZ": 0,
-    "rotX": 0,
-    "rotY": 270,
-    "rotZ": 0,
-    "scaleX": 4,
-    "scaleY": 1,
-    "scaleZ": 4
-  },
-  "Value": 0,
-  "XmlUI": ""
-}
--- a/objects/TokenRemover.2ba7a5.json
+++ b/objects/TokenRemover.2ba7a5.json
@ -49,7 +49,7 @@
    "posY": 1.481,
    "posZ": 29.735,
    "rotX": 0,
-    "rotY": 0,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/objects/TokenRemover.39b175.json
+++ b/objects/TokenRemover.39b175.json
@ -49,7 +49,7 @@
    "posY": 1.481,
    "posZ": -30.309,
    "rotX": 0,
-    "rotY": 180,
+    "rotY": 270,
    "rotZ": 0,
    "scaleX": 0.8,
    "scaleY": 1,
--- a/src/arkhamdb/Configuration.ttslua
+++ b/src/arkhamdb/Configuration.ttslua
@ -7,3 +7,20 @@ configuration = {
    cards = "card",
    taboo = "taboos"
 }
+
+
+function onRotate(spin, flip, player_color, old_spin, old_flip)
+   local builder = getObjectFromGUID("a28140")
+
+    if flip == 0 then
+        configuration.api_uri = "https://arkhamdb.adamgoldsmith.name/api/public"
+        builder.UI.setXml('<Text fontSize="25" color="orange" position="17 -74 -11" rotation="0 0 180">Adam</Text>')
+    else
+        configuration.api_uri = "https://arkhamdb.com/api/public"
+        builder.UI.setXml('')
+    end
+
+    builder.call("arkhamdb_reinit", {})
+
+    print("Set URL to " .. configuration.api_uri)
+end
--- a/src/arkhamdb/DeckImporter.ttslua
+++ b/src/arkhamdb/DeckImporter.ttslua
@ -40,6 +40,10 @@ function onLoad(script_state)
  arkhamDb.initialize()
 end

+function arkhamdb_reinit()
+   arkhamDb.initialize()
+end
+
 function onSave() return JSON.encode(getUiState()) end

 -- Returns a table with the full state of the UI, including options and deck IDs.
--- a/src/core/DoomInPlayCounter.ttslua
+++ b/src/core/DoomInPlayCounter.ttslua
@ -7,11 +7,11 @@ local IGNORE_TAG       = "DoomCounter_ignore"
 local TOTAL_PLAY_AREA  = {
  upperLeft = {
    x = -9,
-    z = -35
+    z = -46
  },
  lowerRight = {
    x = -60,
-    z = 35
+    z = 46
  }
 }

--- a/src/core/MythosArea.ttslua
+++ b/src/core/MythosArea.ttslua
@ -180,17 +180,7 @@ end

 -- draw the provided card to the requesting playermat
 function actualEncounterCardDraw(card, params)
-  local metadata = JSON.decode(card.getGMNotes()) or {}
-  local DATA_HELPER = guidReferenceApi.getObjectByOwnerAndType("Mythos", "DataHelper")
-
-  -- draw hidden cards facedown
-  local faceUpRotation = 0
-  if metadata.hidden or DATA_HELPER.call('checkHiddenCard', card.getName()) then
-    faceUpRotation = 180
-  end
-
-  local rot = playermatApi.returnRotation(params.matColor):setAt("z", faceUpRotation)
-  deckLib.placeOrMergeIntoDeck(card, params.position, rot)
+  card.deal(1, params.mat.matColor)
 end

 -- gets the discard pile and shuffles it into the encounter deck
--- a/src/core/token/TokenManager.ttslua
+++ b/src/core/token/TokenManager.ttslua
@ -473,11 +473,11 @@ do
      local localIndex = (i - 1) % 16

      -- get row and column for this clue
-      local row = math.floor(localIndex / 4) + 1
-      local column = localIndex % 4
+      local column = math.floor(localIndex / 4)
+      local row = (localIndex) % 4

      -- calculate local position
-      local localPos = Vector((-0.825 + 0.55 * column) * modifier, 0, -1.5 + 0.55 * row)
+      local localPos = Vector((1.4 + 0.55 * column) * modifier, 0, -1 + 0.55 * row)

      -- get the global clue position (higher y-position for each set)
      local cluePos = card.positionToWorld(localPos) + Vector(0, 0.03 + 0.103 * (set - 1), 0)
--- a/src/playermat/Playermat.ttslua
+++ b/src/playermat/Playermat.ttslua
@ -285,7 +285,7 @@ function makeDiscardButton(id)
    label = "Discard",
    click_function = handlerName,
    function_owner = self,
-    position = position,
+    position = {position[1], position[2], position[3] + 0.6},
    scale = { 0.12, 0.12, 0.12 },
    width = 900,
    height = 350,
Author	SHA1	Message	Date
Adam Goldsmith	f1f41ca641	Try triggering release action on publish, instead of create All checks were successful build-mod / build-the-mod (release) Successful in 36s Details	2024-08-03 20:10:23 -04:00
Adam Goldsmith	b9510c6fba	Lower hand zones to prevent weird card interactions	2024-08-03 20:10:23 -04:00
Adam Goldsmith	f1214fea40	Allow swapping ArkhamDB importer to use AdamDB	2024-08-03 20:10:23 -04:00
Adam Goldsmith	6cd795ef24	Remove SCED Tour	2024-08-03 20:10:23 -04:00
Adam Goldsmith	e74cb37e7f	Move encounter discard buttons to bottom of card	2024-08-03 20:10:23 -04:00
Adam Goldsmith	0fe4510005	Spawn clues next to cards, instead of on them	2024-08-03 20:10:22 -04:00
Adam Goldsmith	65701768db	Deal encounter cards to players' hands	2024-08-03 20:07:01 -04:00
Adam Goldsmith	03bf4dbb6c	Enable useResourceCounters option	2024-08-03 20:06:59 -04:00
Adam Goldsmith	5b724f5135	Rotate all of the side token spawners/removers to normal orientation	2024-08-03 20:06:22 -04:00
Adam Goldsmith	e98a5d546f	Expand play area for "doom in play" counter	2024-08-03 20:06:22 -04:00