Merge branch 'main' into action-tracker

argonui · Nov 21, 2024 · b180b78 · b180b78
2 parents 5cbaa37 + 1a2866d
commit b180b78
Show file tree

Hide file tree

Showing 115 changed files with 421 additions and 163 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+# add language detection for custom file extension
+*.ttslua linguist-language=Lua
+*.gmnotes linguist-language=json
+*.luascriptstate linguist-language=json
diff --git a/config.json b/config.json
@@ -187,6 +187,10 @@
     "ChaosBagManager.023240",
     "PlaceholderBoxDummy.a93466",
     "PopestsBorderlessVol1.fecccd",
+    "TokenDrawDummy.dummy1",
+    "TokenDrawDummy.dummy2",
+    "TokenDrawDummy.dummy3",
+    "TokenDrawDummy.dummy4",
     "Tokencache_1.a15273",
     "Tokencache_0.0a8592",
     "Tokencache_-1.b644d2",
@@ -241,7 +245,7 @@
     0,
     0
   ],
-  "SaveName": "Arkham SCE - 4.0.1",
+  "SaveName": "Arkham SCE - 4.0.2",
   "Sky": "Sky_Museum",
   "SkyURL": "https://i.imgur.com/GkQqaOF.jpg",
   "SnapPoints_path": "SnapPoints.json",

diff --git a/objects/CampaignImporterExporter.334ee3.json b/objects/CampaignImporterExporter.334ee3.json
@@ -42,7 +42,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"accessories/CampaignImporterExporter\")",
+  "LuaScript": "require(\"core/CampaignImporterExporter\")",
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Tile",

diff --git a/objects/CardBackEnhancer.87450c.json b/objects/CardBackEnhancer.87450c.json
@@ -42,7 +42,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"accessories/CardBackEnhancer\")",
+  "LuaScript": "require(\"core/CardBackEnhancer\")",
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Tile",

diff --git a/objects/ChaosBagManager.023240.json b/objects/ChaosBagManager.023240.json
@@ -6,9 +6,9 @@
   },
   "Autoraise": true,
   "ColorDiffuse": {
-    "b": 1,
-    "g": 1,
-    "r": 1
+    "b": 0,
+    "g": 0,
+    "r": 0
   },
   "CustomImage": {
     "CustomTile": {

diff --git a/objects/Clues.3f22e5.json b/objects/Clues.3f22e5.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/Clues.4111de.json b/objects/Clues.4111de.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/Clues.891403.json b/objects/Clues.891403.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/Clues.db85d6.json b/objects/Clues.db85d6.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/Damage.1f5a0a.json b/objects/Damage.1f5a0a.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damage.591a45.json b/objects/Damage.591a45.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damage.e64eec.json b/objects/Damage.e64eec.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damage.eb08d6.json b/objects/Damage.eb08d6.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damagetokens.480bda/Damage.cd2a02.json b/objects/Damagetokens.480bda/Damage.cd2a02.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damagetokens.93f4a0/Damage.cd2a02.json b/objects/Damagetokens.93f4a0/Damage.cd2a02.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/Damagetokens.b0ef6c/Damage.cd2a02.json b/objects/Damagetokens.b0ef6c/Damage.cd2a02.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "damage",

diff --git a/objects/DoomCounter.85c4c6.json b/objects/DoomCounter.85c4c6.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/DoomCounter\")",
+  "LuaScript": "require(\"mythos/DoomCounter\")",
   "LuaScriptState": "[0,{\"Agenda\":true,\"Playarea\":true,\"Playermats\":true}]",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json b/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "AutofailCounter",

diff --git a/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json b/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "ElderSignCounter",

diff --git a/objects/Horror.0257d9.json b/objects/Horror.0257d9.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horror.468e88.json b/objects/Horror.468e88.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horror.7b5729.json b/objects/Horror.7b5729.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horror.beb964.json b/objects/Horror.beb964.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/GenericCounter\")",
+  "LuaScript": "require(\"tokens/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horrortokens.7bd2a0/Horror.36be72.json b/objects/Horrortokens.7bd2a0/Horror.36be72.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horrortokens.ae1a4e/Horror.36be72.json b/objects/Horrortokens.ae1a4e/Horror.36be72.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/Horrortokens.c3ecf4/Horror.36be72.json b/objects/Horrortokens.c3ecf4/Horror.36be72.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/DamageHorrorCounter\")",
+  "LuaScript": "require(\"tokens/DamageHorrorCounter\")",
   "LuaScriptState": "1",
   "MeasureMovement": false,
   "Memo": "horror",

diff --git a/objects/InvestigatorCount.f182ee.json b/objects/InvestigatorCount.f182ee.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/ActiveInvestigatorCounter\")",
+  "LuaScript": "require(\"playarea/ActiveInvestigatorCounter\")",
   "LuaScriptState": "2",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/MasterClueCounter.4a3aa4.json b/objects/MasterClueCounter.4a3aa4.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/MasterClueCounter\")",
+  "LuaScript": "require(\"mythos/MasterClueCounter\")",
   "LuaScriptState": "false",
   "MeasureMovement": false,
   "Name": "Custom_Token",

diff --git a/objects/MythosArea.9f334f.json b/objects/MythosArea.9f334f.json
@@ -66,7 +66,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/MythosArea\")",
+  "LuaScript": "require(\"mythos/MythosArea\")",
   "LuaScriptState": "{\"currentScenario\":\"\",\"tokenData\":[],\"useFrontData\":true}",
   "MeasureMovement": false,
   "Name": "Custom_Tile",

diff --git a/objects/Neutral.06ee01.json b/objects/Neutral.06ee01.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.42ec66.json b/objects/Neutral.42ec66.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.589c7d.json b/objects/Neutral.589c7d.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.642585.json b/objects/Neutral.642585.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.6441b3.json b/objects/Neutral.6441b3.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.762df8.json b/objects/Neutral.762df8.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.834ad5.json b/objects/Neutral.834ad5.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.88d9ff.json b/objects/Neutral.88d9ff.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.a5476b.json b/objects/Neutral.a5476b.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.a84ae4.json b/objects/Neutral.a84ae4.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.f2d25a.json b/objects/Neutral.f2d25a.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/Neutral.f94579.json b/objects/Neutral.f94579.json
@@ -40,7 +40,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"core/UniversalActionAbilityToken\")",
+  "LuaScript": "require(\"tokens/UniversalActionAbilityToken\")",
   "LuaScriptState": "{\"class\":\"Neutral\",\"symbol\":\"Neutral\"}",
   "MeasureMovement": false,
   "Memo": "universalActionAbility",

diff --git a/objects/ObjectSourceBag.830bd0/AdditionalVictoryPoints.958bc0.json b/objects/ObjectSourceBag.830bd0/AdditionalVictoryPoints.958bc0.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScript": "require(\"accessories/AdditionalVictoryPointsCard\")",
+  "LuaScript": "require(\"mythos/AdditionalVictoryPointsCard\")",
   "LuaScriptState": "{\"notes\":\"Click to type\",\"vp\":1}",
   "MeasureMovement": false,
   "Name": "CardCustom",

diff --git a/objects/OtherDoominPlay.652ff3.json b/objects/OtherDoominPlay.652ff3.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"core/DoomInPlayCounter\")",
+  "LuaScript": "require(\"mythos/DoomInPlayCounter\")",
   "LuaScriptState": "false",
   "MeasureMovement": false,
   "Name": "Custom_Token",