diff --git a/objects/CampaignImporterExporter.334ee3.json b/objects/CampaignImporterExporter.334ee3.json index 2e8f41ad..1dfc1b60 100644 --- 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 index c7acb1ac..adc6ef2d 100644 --- 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/Clues.3f22e5.json b/objects/Clues.3f22e5.json index 3514b2cd..0d24493e 100644 --- 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 index 1631e8db..871a6189 100644 --- 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 index 19892121..39b4638c 100644 --- 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 index a7e0d6ae..9f29d087 100644 --- 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 index 2ec2e7fc..acabd942 100644 --- 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 index 2efd3ffe..7fcef772 100644 --- 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 index eaa4b84b..6cc44671 100644 --- 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 index ad333bb3..56118957 100644 --- 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 index 8ade7463..13ae3edd 100644 --- 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 index 8ade7463..13ae3edd 100644 --- 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 index 8ade7463..13ae3edd 100644 --- 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 index 835e3941..b3f17ba0 100644 --- 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 index 4c688911..92f3c697 100644 --- 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 index 9d55ef18..ffe69d63 100644 --- 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 index 1952ca6b..3fc4dd09 100644 --- 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 index 3a374739..51f8a102 100644 --- 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 index 0edec1bc..28bba65b 100644 --- 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 index 4f08f8dd..cb4dbefe 100644 --- 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 index e048a206..2fd90fda 100644 --- 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 index e048a206..2fd90fda 100644 --- 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 index e048a206..2fd90fda 100644 --- 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 index 6c679970..0b04d82b 100644 --- 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 index 576ba7eb..59841401 100644 --- 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 index bb89c305..bb3a278c 100644 --- 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 index c00a905d..2791eeb1 100644 --- 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 index b14f99cc..78c6eba3 100644 --- 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 index ec116e6d..6947f720 100644 --- 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 index a579bb75..53d741ef 100644 --- 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 index 9dc4f6d2..cbb7d303 100644 --- 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 index 80983eb5..bd913c7b 100644 --- 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 index 4528b5c2..1cf0e919 100644 --- 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 index 742c6f85..db6fd5f0 100644 --- 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 index 8f83c249..21fc9de4 100644 --- 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 index c3bf30b2..758420ff 100644 --- 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 index c9a5beb8..fd3a59fd 100644 --- 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 index 8190ea8a..abf1c906 100644 --- 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 index bfe037d1..cb77472e 100644 --- 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 index d463fffc..3d90b999 100644 --- 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", diff --git a/objects/PhaseTracker.d0c8fa.json b/objects/PhaseTracker.d0c8fa.json index d7c21241..9703ac4e 100644 --- a/objects/PhaseTracker.d0c8fa.json +++ b/objects/PhaseTracker.d0c8fa.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"accessories/PhaseTracker\")", + "LuaScript": "require(\"playarea/PhaseTracker\")", "LuaScriptState": "{\"broadcastChange\":false,\"phaseId\":1}", "MeasureMovement": false, "Name": "Custom_Tile", diff --git a/objects/PlayArea.721ba2.json b/objects/PlayArea.721ba2.json index 7a4e0967..2b4a9a8d 100644 --- a/objects/PlayArea.721ba2.json +++ b/objects/PlayArea.721ba2.json @@ -977,7 +977,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/PlayArea\")", + "LuaScript": "require(\"playarea/PlayArea\")", "LuaScriptState_path": "PlayArea.721ba2.luascriptstate", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/PlayAreaImageSwapper.b7b45b.json b/objects/PlayAreaImageSwapper.b7b45b.json index f259acef..bff8a7e2 100644 --- a/objects/PlayAreaImageSwapper.b7b45b.json +++ b/objects/PlayAreaImageSwapper.b7b45b.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/PlayAreaSelector\")", + "LuaScript": "require(\"playarea/PlayAreaSelector\")", "LuaScriptState": "{\"selectionIndex\":1,\"typeIndex\":1}", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/Resources.4406f0.json b/objects/Resources.4406f0.json index 8e30d2db..44679d5a 100644 --- a/objects/Resources.4406f0.json +++ b/objects/Resources.4406f0.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/GenericCounter\")", + "LuaScript": "require(\"tokens/GenericCounter\")", "LuaScriptState": "5", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/Resources.816d84.json b/objects/Resources.816d84.json index 93b38cad..efa7dd4e 100644 --- a/objects/Resources.816d84.json +++ b/objects/Resources.816d84.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/GenericCounter\")", + "LuaScript": "require(\"tokens/GenericCounter\")", "LuaScriptState": "5", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/Resources.a4b60d.json b/objects/Resources.a4b60d.json index 8bff4bd8..b8d506c1 100644 --- a/objects/Resources.a4b60d.json +++ b/objects/Resources.a4b60d.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/GenericCounter\")", + "LuaScript": "require(\"tokens/GenericCounter\")", "LuaScriptState": "5", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/Resources.cd15ac.json b/objects/Resources.cd15ac.json index 4336b206..222248d8 100644 --- a/objects/Resources.cd15ac.json +++ b/objects/Resources.cd15ac.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/GenericCounter\")", + "LuaScript": "require(\"tokens/GenericCounter\")", "LuaScriptState": "5", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/TokenArranger.022907.json b/objects/TokenArranger.022907.json index 12178e9b..078d0410 100644 --- a/objects/TokenArranger.022907.json +++ b/objects/TokenArranger.022907.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"accessories/TokenArranger\")", + "LuaScript": "require(\"tokens/TokenArranger\")", "LuaScriptState_path": "TokenArranger.022907.luascriptstate", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/objects/TokenRemover.0a5a29.json b/objects/TokenRemover.0a5a29.json index 8ec6ba98..1242fe21 100644 --- a/objects/TokenRemover.0a5a29.json +++ b/objects/TokenRemover.0a5a29.json @@ -33,8 +33,8 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"util/TokenRemover\")", - "LuaScriptState": "null", + "LuaScript": "require(\"tokens/TokenRemover\")", + "LuaScriptState": "", "MeasureMovement": false, "Name": "Custom_Tile", "Nickname": "Token Remover", diff --git a/objects/TokenRemover.2ba7a5.json b/objects/TokenRemover.2ba7a5.json index 296df651..af19b9ce 100644 --- a/objects/TokenRemover.2ba7a5.json +++ b/objects/TokenRemover.2ba7a5.json @@ -33,8 +33,8 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"util/TokenRemover\")", - "LuaScriptState": "null", + "LuaScript": "require(\"tokens/TokenRemover\")", + "LuaScriptState": "", "MeasureMovement": false, "Name": "Custom_Tile", "Nickname": "Token Remover", diff --git a/objects/TokenRemover.39b175.json b/objects/TokenRemover.39b175.json index 56775830..dffce7f3 100644 --- a/objects/TokenRemover.39b175.json +++ b/objects/TokenRemover.39b175.json @@ -33,8 +33,8 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"util/TokenRemover\")", - "LuaScriptState": "null", + "LuaScript": "require(\"tokens/TokenRemover\")", + "LuaScriptState": "", "MeasureMovement": false, "Name": "Custom_Tile", "Nickname": "Token Remover", diff --git a/objects/TokenSource.124381/Damage.cd2a02.json b/objects/TokenSource.124381/Damage.cd2a02.json index 8ade7463..13ae3edd 100644 --- a/objects/TokenSource.124381/Damage.cd2a02.json +++ b/objects/TokenSource.124381/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/TokenSource.124381/Horror.36be72.json b/objects/TokenSource.124381/Horror.36be72.json index e048a206..2fd90fda 100644 --- a/objects/TokenSource.124381/Horror.36be72.json +++ b/objects/TokenSource.124381/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/TokenSource.124381/ResourceCounter.498ec0.json b/objects/TokenSource.124381/ResourceCounter.498ec0.json index 0dd6811e..f482bfce 100644 --- a/objects/TokenSource.124381/ResourceCounter.498ec0.json +++ b/objects/TokenSource.124381/ResourceCounter.498ec0.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": false, - "LuaScript": "require(\"core/GenericCounter\")", + "LuaScript": "require(\"tokens/GenericCounter\")", "LuaScriptState": "0", "MeasureMovement": false, "Memo": "resourceCounter", diff --git a/objects/TokenSource.124381/UniversalActionAbilityToken.834ad5.json b/objects/TokenSource.124381/UniversalActionAbilityToken.834ad5.json index 8ddd3673..e9b0fe26 100644 --- a/objects/TokenSource.124381/UniversalActionAbilityToken.834ad5.json +++ b/objects/TokenSource.124381/UniversalActionAbilityToken.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/TokenSpawnTool.36b4ee.json b/objects/TokenSpawnTool.36b4ee.json index ce86d7c3..226eafa6 100644 --- a/objects/TokenSpawnTool.36b4ee.json +++ b/objects/TokenSpawnTool.36b4ee.json @@ -21,7 +21,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"util/TokenSpawnTool\")", + "LuaScript": "require(\"tokens/TokenSpawnTool\")", "LuaScriptState": "", "MeasureMovement": false, "Name": "Checker_white", diff --git a/objects/TokenSpawnTracker.e3ffc9.json b/objects/TokenSpawnTracker.e3ffc9.json index 0c4e1527..b3cef1cf 100644 --- a/objects/TokenSpawnTracker.e3ffc9.json +++ b/objects/TokenSpawnTracker.e3ffc9.json @@ -21,7 +21,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/token/TokenSpawnTracker\")", + "LuaScript": "require(\"tokens/TokenSpawnTracker\")", "LuaScriptState": "{\"cards\":[]}", "MeasureMovement": false, "Name": "Checker_white", diff --git a/objects/UseCacheDamage.ucached.json b/objects/UseCacheDamage.ucached.json index 93f04d53..502ee991 100644 --- a/objects/UseCacheDamage.ucached.json +++ b/objects/UseCacheDamage.ucached.json @@ -40,7 +40,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/DamageHorrorCounter\")", + "LuaScript": "require(\"tokens/DamageHorrorCounter\")", "LuaScriptState": "1", "MeasureMovement": false, "Memo": "damage", diff --git a/objects/UseCacheHorror.ucacheh.json b/objects/UseCacheHorror.ucacheh.json index 1686ac27..c737167f 100644 --- a/objects/UseCacheHorror.ucacheh.json +++ b/objects/UseCacheHorror.ucacheh.json @@ -40,7 +40,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/DamageHorrorCounter\")", + "LuaScript": "require(\"tokens/DamageHorrorCounter\")", "LuaScriptState": "1", "MeasureMovement": false, "Memo": "horror", diff --git a/objects/VictoryDisplay.6ccd6d.json b/objects/VictoryDisplay.6ccd6d.json index ac5a0409..0e57c99b 100644 --- a/objects/VictoryDisplay.6ccd6d.json +++ b/objects/VictoryDisplay.6ccd6d.json @@ -155,7 +155,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "require(\"core/VictoryDisplay\")", + "LuaScript": "require(\"mythos/VictoryDisplay\")", "LuaScriptState": "", "MeasureMovement": false, "Name": "Custom_Token", diff --git a/src/accessories/CleanUpHelper.ttslua b/src/accessories/CleanUpHelper.ttslua index b4620aa4..07555dd4 100644 --- a/src/accessories/CleanUpHelper.ttslua +++ b/src/accessories/CleanUpHelper.ttslua @@ -6,12 +6,12 @@ local blessCurseManagerApi = require("chaosbag/BlessCurseManagerApi") local chaosBagApi = require("chaosbag/ChaosBagApi") local guidReferenceApi = require("core/GUIDReferenceApi") -local mythosAreaApi = require("core/MythosAreaApi") -local playAreaApi = require("core/PlayAreaApi") +local mythosAreaApi = require("mythos/MythosAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") local soundCubeApi = require("core/SoundCubeApi") -local tokenSpawnTrackerApi = require("core/token/TokenSpawnTrackerApi") +local tokenSpawnTrackerApi = require("tokens/TokenSpawnTrackerApi") -- objects with this tag will be ignored local IGNORE_TAG = "CleanUpHelper_ignore" diff --git a/src/accessories/DisplacementTool.ttslua b/src/accessories/DisplacementTool.ttslua index b2989cb1..9ec3d194 100644 --- a/src/accessories/DisplacementTool.ttslua +++ b/src/accessories/DisplacementTool.ttslua @@ -1,4 +1,4 @@ -local playAreaApi = require("core/PlayAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local UI_offset = 1.15 diff --git a/src/arkhamdb/ArkhamDb.ttslua b/src/arkhamdb/ArkhamDb.ttslua index 91a82bef..45003707 100644 --- a/src/arkhamdb/ArkhamDb.ttslua +++ b/src/arkhamdb/ArkhamDb.ttslua @@ -1,6 +1,6 @@ do local allCardsBagApi = require("playercards/AllCardsBagApi") - local playAreaApi = require("core/PlayAreaApi") + local playAreaApi = require("playarea/PlayAreaApi") local ArkhamDb = {} local internal = {} diff --git a/src/chaosbag/BlessCurseManager.ttslua b/src/chaosbag/BlessCurseManager.ttslua index 8c925cad..7da2b99c 100644 --- a/src/chaosbag/BlessCurseManager.ttslua +++ b/src/chaosbag/BlessCurseManager.ttslua @@ -1,5 +1,5 @@ local chaosBagApi = require("chaosbag/ChaosBagApi") -local tokenArrangerApi = require("accessories/TokenArrangerApi") +local tokenArrangerApi = require("tokens/TokenArrangerApi") -- common button parameters local buttonParamaters = {} diff --git a/src/core/ActiveInvestigatorCounter.ttslua b/src/core/ActiveInvestigatorCounter.ttslua deleted file mode 100644 index e075d01e..00000000 --- a/src/core/ActiveInvestigatorCounter.ttslua +++ /dev/null @@ -1,3 +0,0 @@ -require("core/GenericCounter") -MIN_VALUE = 1 -MAX_VALUE = 4 diff --git a/src/accessories/CampaignImporterExporter.ttslua b/src/core/CampaignImporterExporter.ttslua similarity index 99% rename from src/accessories/CampaignImporterExporter.ttslua rename to src/core/CampaignImporterExporter.ttslua index 656bbd48..fb2b2873 100644 --- a/src/accessories/CampaignImporterExporter.ttslua +++ b/src/core/CampaignImporterExporter.ttslua @@ -5,7 +5,7 @@ local guidReferenceApi = require("core/GUIDReferenceApi") local navigationOverlayApi = require("core/NavigationOverlayApi") local playAreaApi = require("core/PlayAreaApi") local playermatApi = require("playermat/PlayermatApi") -local tokenArrangerApi = require("accessories/TokenArrangerApi") +local tokenArrangerApi = require("tokens/TokenArrangerApi") -- base data for token creation local saveTokenData = { diff --git a/src/accessories/CardBackEnhancer.ttslua b/src/core/CardBackEnhancer.ttslua similarity index 100% rename from src/accessories/CardBackEnhancer.ttslua rename to src/core/CardBackEnhancer.ttslua diff --git a/src/core/GameKeyHandler.ttslua b/src/core/GameKeyHandler.ttslua index 8b57ce0b..5a1ff71d 100644 --- a/src/core/GameKeyHandler.ttslua +++ b/src/core/GameKeyHandler.ttslua @@ -1,13 +1,13 @@ local blessCurseManagerApi = require("chaosbag/BlessCurseManagerApi") local GlobalApi = require("core/GlobalApi") local guidReferenceApi = require("core/GUIDReferenceApi") -local mythosAreaApi = require("core/MythosAreaApi") +local mythosAreaApi = require("mythos/MythosAreaApi") local navigationOverlayApi = require("core/NavigationOverlayApi") -local playAreaApi = require("core/PlayAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenChecker = require("core/token/TokenChecker") -local victoryDisplayApi = require("core/VictoryDisplayApi") +local tokenChecker = require("tokens/TokenChecker") +local victoryDisplayApi = require("mythos/VictoryDisplayApi") local sentMessage = false diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 23f62ad2..141c0ebb 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -1,15 +1,15 @@ require("core/Constants") local blessCurseManagerApi = require("chaosbag/BlessCurseManagerApi") local guidReferenceApi = require("core/GUIDReferenceApi") -local mythosAreaApi = require("core/MythosAreaApi") +local mythosAreaApi = require("mythos/MythosAreaApi") local navigationOverlayApi = require("core/NavigationOverlayApi") -local playAreaApi = require("core/PlayAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") local soundCubeApi = require("core/SoundCubeApi") -local tokenArrangerApi = require("accessories/TokenArrangerApi") -local tokenChecker = require("core/token/TokenChecker") -local tokenSpawnTrackerApi = require("core/token/TokenSpawnTrackerApi") +local tokenArrangerApi = require("tokens/TokenArrangerApi") +local tokenChecker = require("tokens/TokenChecker") +local tokenSpawnTrackerApi = require("tokens/TokenSpawnTrackerApi") --------------------------------------------------------- -- general setup diff --git a/src/accessories/TokenArranger.ttslua b/src/core/TokenArranger.ttslua similarity index 99% rename from src/accessories/TokenArranger.ttslua rename to src/core/TokenArranger.ttslua index 0719a4bc..7d0c0543 100644 --- a/src/accessories/TokenArranger.ttslua +++ b/src/core/TokenArranger.ttslua @@ -1,5 +1,5 @@ local chaosBagApi = require("chaosbag/ChaosBagApi") -local mythosAreaApi = require("core/MythosAreaApi") +local mythosAreaApi = require("mythos/MythosAreaApi") -- common parameters local buttonParameters = {} diff --git a/src/accessories/TokenArrangerApi.ttslua b/src/core/TokenArrangerApi.ttslua similarity index 100% rename from src/accessories/TokenArrangerApi.ttslua rename to src/core/TokenArrangerApi.ttslua diff --git a/src/accessories/AdditionalVictoryPointsCard.ttslua b/src/mythos/AdditionalVictoryPointsCard.ttslua similarity index 96% rename from src/accessories/AdditionalVictoryPointsCard.ttslua rename to src/mythos/AdditionalVictoryPointsCard.ttslua index b0bc990a..c0f2bf1a 100644 --- a/src/accessories/AdditionalVictoryPointsCard.ttslua +++ b/src/mythos/AdditionalVictoryPointsCard.ttslua @@ -1,4 +1,4 @@ -local victoryDisplayApi = require("core/VictoryDisplayApi") +local victoryDisplayApi = require("mythos/VictoryDisplayApi") local MIN_VALUE = -10 local MAX_VALUE = 99 diff --git a/src/core/DoomCounter.ttslua b/src/mythos/DoomCounter.ttslua similarity index 95% rename from src/core/DoomCounter.ttslua rename to src/mythos/DoomCounter.ttslua index 07dc1c01..06624be5 100644 --- a/src/core/DoomCounter.ttslua +++ b/src/mythos/DoomCounter.ttslua @@ -1,16 +1,16 @@ local guidReferenceApi = require("core/GUIDReferenceApi") -local playAreaApi = require("core/PlayAreaApi") -local searchLib = require("util/SearchLib") +local playAreaApi = require("playarea/PlayAreaApi") +local searchLib = require("util/SearchLib") -local optionsVisible = false -local options = { +local optionsVisible = false +local options = { Agenda = true, Playarea = true, Playermats = true } -val = 0 -self.max_typed_number = 99 +val = 0 +self.max_typed_number = 99 -- save current value and options function onSave() return JSON.encode({ val, options }) end @@ -85,7 +85,8 @@ function broadcastDoom(val) end -- sum the doom thresholds and modifiers - local doomThreshold = (md.doomThreshold or 0) + mod + (md.doomThresholdPerInvestigator or 0) * invCount + soloDoomThreshold + local doomThreshold = (md.doomThreshold or 0) + mod + (md.doomThresholdPerInvestigator or 0) * invCount + + soloDoomThreshold local doomInPlayCounter = guidReferenceApi.getObjectByOwnerAndType("Mythos", "DoomInPlayCounter") if doomInPlayCounter and md.subtractDoomInPlay then diff --git a/src/core/DoomInPlayCounter.ttslua b/src/mythos/DoomInPlayCounter.ttslua similarity index 100% rename from src/core/DoomInPlayCounter.ttslua rename to src/mythos/DoomInPlayCounter.ttslua diff --git a/src/core/MasterClueCounter.ttslua b/src/mythos/MasterClueCounter.ttslua similarity index 100% rename from src/core/MasterClueCounter.ttslua rename to src/mythos/MasterClueCounter.ttslua diff --git a/src/core/MythosArea.ttslua b/src/mythos/MythosArea.ttslua similarity index 97% rename from src/core/MythosArea.ttslua rename to src/mythos/MythosArea.ttslua index 654e0b8c..b52998ab 100644 --- a/src/core/MythosArea.ttslua +++ b/src/mythos/MythosArea.ttslua @@ -2,12 +2,11 @@ require("core/Constants") local deckLib = require("util/DeckLib") local GlobalApi = require("core/GlobalApi") local guidReferenceApi = require("core/GUIDReferenceApi") -local playAreaApi = require("core/PlayAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenArrangerApi = require("accessories/TokenArrangerApi") -local tokenChecker = require("core/token/TokenChecker") -local tokenSpawnTrackerApi = require("core/token/TokenSpawnTrackerApi") +local tokenArrangerApi = require("tokens/TokenArrangerApi") +local tokenSpawnTrackerApi = require("tokens/TokenSpawnTrackerApi") local ENCOUNTER_DECK_AREA = { upperLeft = { x = 1.05, z = 0.15 }, diff --git a/src/core/MythosAreaApi.ttslua b/src/mythos/MythosAreaApi.ttslua similarity index 100% rename from src/core/MythosAreaApi.ttslua rename to src/mythos/MythosAreaApi.ttslua diff --git a/src/core/VictoryDisplay.ttslua b/src/mythos/VictoryDisplay.ttslua similarity index 98% rename from src/core/VictoryDisplay.ttslua rename to src/mythos/VictoryDisplay.ttslua index c5405c44..d5ebe31b 100644 --- a/src/core/VictoryDisplay.ttslua +++ b/src/mythos/VictoryDisplay.ttslua @@ -1,9 +1,9 @@ local chaosBagApi = require("chaosbag/ChaosBagApi") local deckLib = require("util/DeckLib") local guidReferenceApi = require("core/GUIDReferenceApi") -local playAreaApi = require("core/PlayAreaApi") +local playAreaApi = require("playarea/PlayAreaApi") local searchLib = require("util/SearchLib") -local tokenChecker = require("core/token/TokenChecker") +local tokenChecker = require("tokens/TokenChecker") local pendingCall = false local missingData = {} diff --git a/src/core/VictoryDisplayApi.ttslua b/src/mythos/VictoryDisplayApi.ttslua similarity index 100% rename from src/core/VictoryDisplayApi.ttslua rename to src/mythos/VictoryDisplayApi.ttslua diff --git a/src/playarea/ActiveInvestigatorCounter.ttslua b/src/playarea/ActiveInvestigatorCounter.ttslua new file mode 100644 index 00000000..b5728a96 --- /dev/null +++ b/src/playarea/ActiveInvestigatorCounter.ttslua @@ -0,0 +1,3 @@ +require("tokens/GenericCounter") +MIN_VALUE = 1 +MAX_VALUE = 4 diff --git a/src/accessories/PhaseTracker.ttslua b/src/playarea/PhaseTracker.ttslua similarity index 100% rename from src/accessories/PhaseTracker.ttslua rename to src/playarea/PhaseTracker.ttslua diff --git a/src/core/PlayArea.ttslua b/src/playarea/PlayArea.ttslua similarity index 99% rename from src/core/PlayArea.ttslua rename to src/playarea/PlayArea.ttslua index 999a4ae4..2522adbf 100644 --- a/src/core/PlayArea.ttslua +++ b/src/playarea/PlayArea.ttslua @@ -1,6 +1,6 @@ local guidReferenceApi = require("core/GUIDReferenceApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- Location connection directional options local BIDIRECTIONAL = 0 diff --git a/src/core/PlayAreaApi.ttslua b/src/playarea/PlayAreaApi.ttslua similarity index 100% rename from src/core/PlayAreaApi.ttslua rename to src/playarea/PlayAreaApi.ttslua diff --git a/src/core/PlayAreaImageData.ttslua b/src/playarea/PlayAreaImageData.ttslua similarity index 100% rename from src/core/PlayAreaImageData.ttslua rename to src/playarea/PlayAreaImageData.ttslua diff --git a/src/core/PlayAreaSelector.ttslua b/src/playarea/PlayAreaSelector.ttslua similarity index 96% rename from src/core/PlayAreaSelector.ttslua rename to src/playarea/PlayAreaSelector.ttslua index 4d9e7bef..02520da5 100644 --- a/src/core/PlayAreaSelector.ttslua +++ b/src/playarea/PlayAreaSelector.ttslua @@ -1,6 +1,6 @@ -require("core/PlayAreaImageData") -- this fills the variable "PLAYAREA_IMAGE_DATA" -local GlobalApi = require("core/GlobalApi") -local playAreaApi = require("core/PlayAreaApi") +require("playarea/PlayAreaImageData") -- this fills the variable "PLAYAREA_IMAGE_DATA" +local GlobalApi = require("core/GlobalApi") +local playAreaApi = require("playarea/PlayAreaApi") local typeIndex, selectionIndex, plainNameCache function updateSave() @@ -21,7 +21,7 @@ function onLoad(savedData) function_owner = self, click_function = "onClick_toggleGallery", tooltip = "Show Image Gallery", - position = {0, 0.06, 0}, + position = { 0, 0.06, 0 }, height = 1500, width = 1500, color = { 1, 1, 1, 0 } diff --git a/src/playercards/CardsThatSealTokens.ttslua b/src/playercards/CardsThatSealTokens.ttslua index 48fccf0a..0160c0ef 100644 --- a/src/playercards/CardsThatSealTokens.ttslua +++ b/src/playercards/CardsThatSealTokens.ttslua @@ -25,7 +25,7 @@ SHOW_MULTI_RELEASE --@type: number (maximum amount of tokens to release at once - enables an entry in the context menu - this entry allows releasing of multiple tokens at once, to the maximum number - does not fail if there are fewer than the maximum sealed - - example usage: "Nephthys" (to release up to 3 bless tokens at once) + - example usage: "Nephthys" (to release up to 3 bless tokens at once) SHOW_MULTI_RETURN --@type: number (amount of tokens to return to pool at once) - enables an entry in the context menu @@ -86,27 +86,27 @@ Thus it should be implemented like this: ----------------------------------------------------------]] local blessCurseManagerApi = require("chaosbag/BlessCurseManagerApi") -local chaosBagApi = require("chaosbag/ChaosBagApi") -local guidReferenceApi = require("core/GUIDReferenceApi") -local playermatApi = require("playermat/PlayermatApi") -local tokenArrangerApi = require("accessories/TokenArrangerApi") +local chaosBagApi = require("chaosbag/ChaosBagApi") +local guidReferenceApi = require("core/GUIDReferenceApi") +local playermatApi = require("playermat/PlayermatApi") +local tokenArrangerApi = require("tokens/TokenArrangerApi") -local sealedTokens = {} -local ID_URL_MAP = {} -local tokensInBag = {} +local sealedTokens = {} +local ID_URL_MAP = {} +local tokensInBag = {} -- XML background color for each token for label when stacked -local tokenColor = { - ["Skull"] = "#4A0400E6", - ["Cultist"] = "#173B0BE6", - ["Tablet"] = "#1D2238E6", +local tokenColor = { + ["Skull"] = "#4A0400E6", + ["Cultist"] = "#173B0BE6", + ["Tablet"] = "#1D2238E6", ["Elder Thing"] = "#4D2331E6", - ["Auto-fail"] = "#9B0004E6", - ["Bless"] = "#9D702CE6", - ["Curse"] = "#633A84E6", - ["Frost"] = "#404450E6", - ["Elder Sign"] = "#50A8CEE6", - [""] = "#77674DE6" + ["Auto-fail"] = "#9B0004E6", + ["Bless"] = "#9D702CE6", + ["Curse"] = "#633A84E6", + ["Frost"] = "#404450E6", + ["Elder Sign"] = "#50A8CEE6", + [""] = "#77674DE6" } function updateSave() diff --git a/src/playercards/cards/ElleRubash2.ttslua b/src/playercards/cards/ElleRubash2.ttslua index cd0bfbc2..badac3dc 100644 --- a/src/playercards/cards/ElleRubash2.ttslua +++ b/src/playercards/cards/ElleRubash2.ttslua @@ -1,5 +1,5 @@ require("playercards/CardsWithHelper") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- intentionally global hasXML = true diff --git a/src/playercards/cards/FamilyInheritance.ttslua b/src/playercards/cards/FamilyInheritance.ttslua index cc65f877..19bb49f4 100644 --- a/src/playercards/cards/FamilyInheritance.ttslua +++ b/src/playercards/cards/FamilyInheritance.ttslua @@ -1,7 +1,7 @@ require("playercards/CardsWithHelper") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- intentionally global hasXML = true diff --git a/src/playercards/cards/KohakuNarukami.ttslua b/src/playercards/cards/KohakuNarukami.ttslua index 2f8ee661..3a22908a 100644 --- a/src/playercards/cards/KohakuNarukami.ttslua +++ b/src/playercards/cards/KohakuNarukami.ttslua @@ -3,7 +3,7 @@ local blessCurseManagerApi = require("chaosbag/BlessCurseManagerApi") local guidReferenceApi = require("core/GUIDReferenceApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- intentionally global hasXML = true diff --git a/src/playercards/cards/ScrollofSecrets.ttslua b/src/playercards/cards/ScrollofSecrets.ttslua index 544ef2c8..9416f70d 100644 --- a/src/playercards/cards/ScrollofSecrets.ttslua +++ b/src/playercards/cards/ScrollofSecrets.ttslua @@ -1,5 +1,5 @@ -local mythosAreaApi = require("core/MythosAreaApi") -local playermatApi = require("playermat/PlayermatApi") +local mythosAreaApi = require("mythos/MythosAreaApi") +local playermatApi = require("playermat/PlayermatApi") function onLoad() -- get class via metadata and proceed menu accordingly: diff --git a/src/playercards/cards/StellaClark.ttslua b/src/playercards/cards/StellaClark.ttslua index c57ab611..2803aa75 100644 --- a/src/playercards/cards/StellaClark.ttslua +++ b/src/playercards/cards/StellaClark.ttslua @@ -2,7 +2,7 @@ require("playercards/CardsWithHelper") local guidReferenceApi = require("core/GUIDReferenceApi") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- intentionally global hasXML = true diff --git a/src/playercards/cards/TheRedClock.ttslua b/src/playercards/cards/TheRedClock.ttslua index c3a29ad4..8e63b178 100644 --- a/src/playercards/cards/TheRedClock.ttslua +++ b/src/playercards/cards/TheRedClock.ttslua @@ -1,7 +1,7 @@ require("playercards/CardsWithHelper") local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") -- intentionally global hasXML = true diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua index 5612ed00..76f04bae 100644 --- a/src/playermat/Playermat.ttslua +++ b/src/playermat/Playermat.ttslua @@ -3,12 +3,12 @@ local chaosBagApi = require("chaosbag/ChaosBagApi") local deckLib = require("util/DeckLib") local GlobalApi = require("core/GlobalApi") local guidReferenceApi = require("core/GUIDReferenceApi") -local mythosAreaApi = require("core/MythosAreaApi") +local mythosAreaApi = require("mythos/MythosAreaApi") local navigationOverlayApi = require("core/NavigationOverlayApi") local searchLib = require("util/SearchLib") -local tokenChecker = require("core/token/TokenChecker") -local tokenManagerApi = require("core/token/TokenManagerApi") -local tokenSpawnTrackerApi = require("core/token/TokenSpawnTrackerApi") +local tokenChecker = require("tokens/TokenChecker") +local tokenManagerApi = require("tokens/TokenManagerApi") +local tokenSpawnTrackerApi = require("tokens/TokenSpawnTrackerApi") local zones = require("playermat/Zones") -- option panel data diff --git a/src/core/DamageHorrorCounter.ttslua b/src/tokens/DamageHorrorCounter.ttslua similarity index 100% rename from src/core/DamageHorrorCounter.ttslua rename to src/tokens/DamageHorrorCounter.ttslua diff --git a/src/core/GenericCounter.ttslua b/src/tokens/GenericCounter.ttslua similarity index 100% rename from src/core/GenericCounter.ttslua rename to src/tokens/GenericCounter.ttslua diff --git a/src/core/token/TokenChecker.ttslua b/src/tokens/TokenChecker.ttslua similarity index 100% rename from src/core/token/TokenChecker.ttslua rename to src/tokens/TokenChecker.ttslua diff --git a/src/core/token/TokenManagerApi.ttslua b/src/tokens/TokenManagerApi.ttslua similarity index 100% rename from src/core/token/TokenManagerApi.ttslua rename to src/tokens/TokenManagerApi.ttslua diff --git a/src/util/TokenRemover.ttslua b/src/tokens/TokenRemover.ttslua similarity index 100% rename from src/util/TokenRemover.ttslua rename to src/tokens/TokenRemover.ttslua diff --git a/src/util/TokenSpawnTool.ttslua b/src/tokens/TokenSpawnTool.ttslua similarity index 98% rename from src/util/TokenSpawnTool.ttslua rename to src/tokens/TokenSpawnTool.ttslua index 3a6f19ad..a8961595 100644 --- a/src/util/TokenSpawnTool.ttslua +++ b/src/tokens/TokenSpawnTool.ttslua @@ -1,6 +1,6 @@ local playermatApi = require("playermat/PlayermatApi") local searchLib = require("util/SearchLib") -local tokenManagerApi = require("core/token/TokenManagerApi") +local tokenManagerApi = require("tokens/TokenManagerApi") local TOKEN_INDEX = {} TOKEN_INDEX[1] = "universalActionAbility" diff --git a/src/core/token/TokenSpawnTracker.ttslua b/src/tokens/TokenSpawnTracker.ttslua similarity index 100% rename from src/core/token/TokenSpawnTracker.ttslua rename to src/tokens/TokenSpawnTracker.ttslua diff --git a/src/core/token/TokenSpawnTrackerApi.ttslua b/src/tokens/TokenSpawnTrackerApi.ttslua similarity index 100% rename from src/core/token/TokenSpawnTrackerApi.ttslua rename to src/tokens/TokenSpawnTrackerApi.ttslua diff --git a/src/core/UniversalActionAbilityToken.ttslua b/src/tokens/UniversalActionAbilityToken.ttslua similarity index 100% rename from src/core/UniversalActionAbilityToken.ttslua rename to src/tokens/UniversalActionAbilityToken.ttslua