From c2e4fc8ca812c39a25af30642b5a4772ebe72fe2 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 11 Apr 2023 22:17:29 +0200 Subject: [PATCH 1/9] exclude playermat owned tokens --- src/playermat/Playmat.ttslua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 5a14b196..a684188f 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -689,11 +689,15 @@ end function removeTokensFromObject(object) for _, v in ipairs(searchArea(object.getPosition(), { 3, 1, 4 })) do local obj = v.hit_object - -- don't remove the table surface, self, any decks/cards or chaos tokens - if obj.getGUID() ~= "4ee1f2" and + local name = obj.getName() + + if obj.getGUID() ~= "4ee1f2" and -- table obj ~= self and obj.type ~= "Deck" and obj.type ~= "Card" and + name ~= "Horror" and + name ~= "Resources" and + obj.getDescription() ~= "Action Token" and not tokenChecker.isChaosToken(obj) then TRASHCAN.putObject(obj) end From 708efb32ce499c1f33bd31075ef5b9e98b858376 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 11 Apr 2023 22:22:40 +0200 Subject: [PATCH 2/9] fixed names in api --- src/chaosbag/BlessCurseManagerApi.ttslua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chaosbag/BlessCurseManagerApi.ttslua b/src/chaosbag/BlessCurseManagerApi.ttslua index 0e535b6d..71c9a2e4 100644 --- a/src/chaosbag/BlessCurseManagerApi.ttslua +++ b/src/chaosbag/BlessCurseManagerApi.ttslua @@ -5,8 +5,8 @@ do -- removes all taken tokens and resets the counts BlessCurseManagerApi.removeTakenTokensAndReset = function() local BlessCurseManager = getObjectFromGUID(MANAGER_GUID) - Wait.time(function() BlessCurseManager.call("removeType", "Bless") end, 0.05) - Wait.time(function() BlessCurseManager.call("removeType", "Curse") end, 0.10) + Wait.time(function() BlessCurseManager.call("removeTakenTokens", "Bless") end, 0.05) + Wait.time(function() BlessCurseManager.call("removeTakenTokens", "Curse") end, 0.10) Wait.time(function() BlessCurseManager.call("doReset", "White") end, 0.15) end From 9a8dd4aeb012793e04c6ec0df121f733fe4b1530 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 11 Apr 2023 22:37:55 +0200 Subject: [PATCH 3/9] fixed approach and updated horror token names --- objects/Horrortokens.7bd2a0/Horror.36be72.json | 18 +++++++++--------- objects/Horrortokens.ae1a4e/Horror.36be72.json | 18 +++++++++--------- objects/Horrortokens.c3ecf4/Horror.36be72.json | 18 +++++++++--------- src/playermat/Playmat.ttslua | 4 +--- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/objects/Horrortokens.7bd2a0/Horror.36be72.json b/objects/Horrortokens.7bd2a0/Horror.36be72.json index 2d35aafe..0839a4d4 100644 --- a/objects/Horrortokens.7bd2a0/Horror.36be72.json +++ b/objects/Horrortokens.7bd2a0/Horror.36be72.json @@ -38,7 +38,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "States": { "2": { @@ -81,7 +81,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -139,7 +139,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -197,7 +197,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -255,7 +255,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -313,7 +313,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -371,7 +371,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -429,7 +429,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -487,7 +487,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, diff --git a/objects/Horrortokens.ae1a4e/Horror.36be72.json b/objects/Horrortokens.ae1a4e/Horror.36be72.json index 2d35aafe..0839a4d4 100644 --- a/objects/Horrortokens.ae1a4e/Horror.36be72.json +++ b/objects/Horrortokens.ae1a4e/Horror.36be72.json @@ -38,7 +38,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "States": { "2": { @@ -81,7 +81,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -139,7 +139,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -197,7 +197,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -255,7 +255,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -313,7 +313,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -371,7 +371,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -429,7 +429,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -487,7 +487,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, diff --git a/objects/Horrortokens.c3ecf4/Horror.36be72.json b/objects/Horrortokens.c3ecf4/Horror.36be72.json index 2d35aafe..0839a4d4 100644 --- a/objects/Horrortokens.c3ecf4/Horror.36be72.json +++ b/objects/Horrortokens.c3ecf4/Horror.36be72.json @@ -38,7 +38,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "States": { "2": { @@ -81,7 +81,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -139,7 +139,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -197,7 +197,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -255,7 +255,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -313,7 +313,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -371,7 +371,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -429,7 +429,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, @@ -487,7 +487,7 @@ "MeasureMovement": false, "Memo": "horror", "Name": "Custom_Token", - "Nickname": "Horror", + "Nickname": "", "Snap": false, "Sticky": true, "Tooltip": true, diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index a684188f..bfebb400 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -689,14 +689,12 @@ end function removeTokensFromObject(object) for _, v in ipairs(searchArea(object.getPosition(), { 3, 1, 4 })) do local obj = v.hit_object - local name = obj.getName() if obj.getGUID() ~= "4ee1f2" and -- table obj ~= self and obj.type ~= "Deck" and obj.type ~= "Card" and - name ~= "Horror" and - name ~= "Resources" and + obj.getLock() == false and obj.getDescription() ~= "Action Token" and not tokenChecker.isChaosToken(obj) then TRASHCAN.putObject(obj) From a0e069c23339e31d9da167351ad94b6c8ed27210 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 10:25:50 +0200 Subject: [PATCH 4/9] moving threat area down --- objects/Playermat1White.8b081b.json | 28 ++++++++++++++-------------- objects/Playermat2Orange.bd0ff4.json | 28 ++++++++++++++-------------- objects/Playermat3Green.383d8b.json | 28 ++++++++++++++-------------- objects/Playermat4Red.0840d5.json | 28 ++++++++++++++-------------- src/playermat/Playmat.ttslua | 19 ++++++++----------- 5 files changed, 64 insertions(+), 67 deletions(-) diff --git a/objects/Playermat1White.8b081b.json b/objects/Playermat1White.8b081b.json index 9cb68266..0cd532bf 100644 --- a/objects/Playermat1White.8b081b.json +++ b/objects/Playermat1White.8b081b.json @@ -231,9 +231,9 @@ }, { "Position": { - "x": 1.38, + "x": 1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -243,9 +243,9 @@ }, { "Position": { - "x": 0.92, + "x": 0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -255,9 +255,9 @@ }, { "Position": { - "x": 0.46, + "x": 0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -269,7 +269,7 @@ "Position": { "x": 0, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -279,9 +279,9 @@ }, { "Position": { - "x": -0.46, + "x": -0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -291,9 +291,9 @@ }, { "Position": { - "x": -0.92, + "x": -0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -303,9 +303,9 @@ }, { "Position": { - "x": -1.38, + "x": -1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -329,7 +329,7 @@ }, "ImageScalar": 1, "ImageSecondaryURL": "", - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/", "WidthScale": 0 }, "Description": "", diff --git a/objects/Playermat2Orange.bd0ff4.json b/objects/Playermat2Orange.bd0ff4.json index 3a6e632e..ccc4720a 100644 --- a/objects/Playermat2Orange.bd0ff4.json +++ b/objects/Playermat2Orange.bd0ff4.json @@ -231,9 +231,9 @@ }, { "Position": { - "x": 1.38, + "x": 1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -243,9 +243,9 @@ }, { "Position": { - "x": 0.92, + "x": 0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -255,9 +255,9 @@ }, { "Position": { - "x": 0.46, + "x": 0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -269,7 +269,7 @@ "Position": { "x": 0, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -279,9 +279,9 @@ }, { "Position": { - "x": -0.46, + "x": -0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -291,9 +291,9 @@ }, { "Position": { - "x": -0.92, + "x": -0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -303,9 +303,9 @@ }, { "Position": { - "x": -1.38, + "x": -1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -329,7 +329,7 @@ }, "ImageScalar": 1, "ImageSecondaryURL": "", - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/", "WidthScale": 0 }, "Description": "", diff --git a/objects/Playermat3Green.383d8b.json b/objects/Playermat3Green.383d8b.json index 97962ae6..82f2760f 100644 --- a/objects/Playermat3Green.383d8b.json +++ b/objects/Playermat3Green.383d8b.json @@ -231,9 +231,9 @@ }, { "Position": { - "x": 1.38, + "x": 1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -243,9 +243,9 @@ }, { "Position": { - "x": 0.92, + "x": 0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -255,9 +255,9 @@ }, { "Position": { - "x": 0.46, + "x": 0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -269,7 +269,7 @@ "Position": { "x": 0, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -279,9 +279,9 @@ }, { "Position": { - "x": -0.46, + "x": -0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -291,9 +291,9 @@ }, { "Position": { - "x": -0.92, + "x": -0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -303,9 +303,9 @@ }, { "Position": { - "x": -1.38, + "x": -1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -329,7 +329,7 @@ }, "ImageScalar": 1, "ImageSecondaryURL": "", - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/", "WidthScale": 0 }, "Description": "", diff --git a/objects/Playermat4Red.0840d5.json b/objects/Playermat4Red.0840d5.json index 0daca64a..aeb7a709 100644 --- a/objects/Playermat4Red.0840d5.json +++ b/objects/Playermat4Red.0840d5.json @@ -231,9 +231,9 @@ }, { "Position": { - "x": 1.38, + "x": 1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -243,9 +243,9 @@ }, { "Position": { - "x": 0.92, + "x": 0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -255,9 +255,9 @@ }, { "Position": { - "x": 0.46, + "x": 0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -269,7 +269,7 @@ "Position": { "x": 0, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -279,9 +279,9 @@ }, { "Position": { - "x": -0.46, + "x": -0.455, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -291,9 +291,9 @@ }, { "Position": { - "x": -0.92, + "x": -0.91, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -303,9 +303,9 @@ }, { "Position": { - "x": -1.38, + "x": -1.365, "y": 0.1, - "z": -0.645 + "z": -0.625 }, "Rotation": { "x": 0, @@ -329,7 +329,7 @@ }, "ImageScalar": 1, "ImageSecondaryURL": "", - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/", "WidthScale": 0 }, "Description": "", diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 5a14b196..5e1225dc 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -8,17 +8,13 @@ local DEBUG = false local collisionEnabled = false -- position offsets relative to mat [x, y, z] -local DRAWN_ENCOUNTER_CARD_OFFSET = {1.365, 0.5, -0.635} -local DRAWN_CHAOS_TOKEN_OFFSET = {-1.55, 0.5, -0.58} -local DISCARD_BUTTON_OFFSETS = { - {-1.38, 0.1, -0.94}, - {-0.92, 0.1, -0.94}, - {-0.46, 0.1, -0.94}, - {0.00, 0.1, -0.94}, - {0.46, 0.1, -0.94}, - {0.92, 0.1, -0.94} -} +local DRAWN_ENCOUNTER_CARD_OFFSET = {1.365, 0.5, -0.625} +local DRAWN_CHAOS_TOKEN_OFFSET = {-1.55, 0.25, -0.58} +-- x-Values for discard buttons +local DISCARD_BUTTON_OFFSETS = {-1.365, -0.91, -0.455, 0, 0.455, 0.91} + +-- defined areas for the function "inArea()"" local MAIN_PLAY_AREA = { upperLeft = { x = 1.98, @@ -193,7 +189,8 @@ function makeDiscardHandlerFor(searchPosition, discardPosition) end -- build a discard button to discard from searchPosition to discardPosition (number must be unique) -function makeDiscardButton(position, discardPosition, number) +function makeDiscardButton(xValue, discardPosition, number) + local position = { xValue, 0.1, -0.94} local searchPosition = {-position[1], position[2], position[3] + 0.32} local handler = makeDiscardHandlerFor(searchPosition, discardPosition) local handlerName = 'handler' .. number From bf394e9e8290a08da93aa0ae25b6838a621c4033 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 17:52:31 +0200 Subject: [PATCH 5/9] misc. changes --- config.json | 4 ++-- .../LivingInkUpgradeSheet.19a05b.json | 2 +- objects/Cluetokens.31fa39.json | 2 +- objects/Damagetokens.480bda.json | 2 +- objects/Doomtokens.47ffc3.json | 2 +- .../GenericDifficultySelector.8112ff.json | 2 +- .../Fan-MadeCampaigns.89c32e.json | 2 +- ...trayalattheMountainsofMadness.ef939a.json} | 0 .../TheColorOutofOz.be7d21.json | 2 +- objects/Horrortokens.c3ecf4.json | 2 +- objects/LeadInvestigator.acaa93.json | 8 +++---- objects/OptionPanelSource.830bd0.json | 1 - .../CYOACampaignGuides.e87ea2.json | 2 +- .../CleanUpHelper.26cf4b.json | 2 +- .../CustomPlaymatImages.004fe7.json | 2 +- .../Custom_Assetbundle.cecc3e.json | 2 +- objects/PhaseTracker.d0c8fa.json | 24 +++++++++---------- objects/ScriptingTrigger.a2f932.json | 4 ++-- objects/TokenRemover.0a5a29.json | 12 +++++----- src/core/Global.ttslua | 6 +++-- 20 files changed, 42 insertions(+), 41 deletions(-) rename objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/{BetrayalattheMountainsofMadness084.ef939a.json => BetrayalattheMountainsofMadness.ef939a.json} (100%) diff --git a/config.json b/config.json index bb183a4e..f62cb2fe 100644 --- a/config.json +++ b/config.json @@ -168,7 +168,6 @@ "InvestigatorSkillTracker.e74881", "TheScarletKeys.300fcc", "Search-A-Card.24051a", - "PhaseTracker.d0c8fa", "TokenSpawnTracker.e3ffc9", "TokenSource.124381", "GameData.3dbe47", @@ -190,7 +189,8 @@ "ArkhamSCE300-1272023-Page1.f873a8", "VictoryDisplay.6ccd6d", "CampaignOverview.e03c01", - "OptionPanelSource.830bd0" + "OptionPanelSource.830bd0", + "PhaseTracker.d0c8fa" ], "PlayArea": 1, "PlayerCounts": [ diff --git a/objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json b/objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json index b3915296..1921697f 100644 --- a/objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json +++ b/objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Cluetokens.31fa39.json b/objects/Cluetokens.31fa39.json index 2c4ec387..d9e9347f 100644 --- a/objects/Cluetokens.31fa39.json +++ b/objects/Cluetokens.31fa39.json @@ -46,7 +46,7 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": -55.458, + "posX": -55.48, "posY": 1.65, "posZ": -1.12, "rotX": 0, diff --git a/objects/Damagetokens.480bda.json b/objects/Damagetokens.480bda.json index 68f752d9..e97ce0b5 100644 --- a/objects/Damagetokens.480bda.json +++ b/objects/Damagetokens.480bda.json @@ -56,7 +56,7 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": -53.235, + "posX": -53.24, "posY": 1.65, "posZ": 1.12, "rotX": 0, diff --git a/objects/Doomtokens.47ffc3.json b/objects/Doomtokens.47ffc3.json index fd8cffec..51c4fbc0 100644 --- a/objects/Doomtokens.47ffc3.json +++ b/objects/Doomtokens.47ffc3.json @@ -46,7 +46,7 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": -55.458, + "posX": -55.48, "posY": 1.65, "posZ": 1.12, "rotX": 0, diff --git a/objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json b/objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json index 72f701d1..9bfee944 100644 --- a/objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json +++ b/objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json @@ -54,4 +54,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json b/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json index 66632633..344c8423 100644 --- a/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json +++ b/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json @@ -41,7 +41,7 @@ "CloseEncountersoftheLV-426Kind.4f5421", "CelticRising.4d305a", "CallofthePlaguebearer.613b64", - "BetrayalattheMountainsofMadness084.ef939a", + "BetrayalattheMountainsofMadness.ef939a", "TheApproachingStorm.ab6b9a", "AliceinWonderland.39916d", "AgesUnwound.f7e5eb", diff --git a/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness084.ef939a.json b/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness.ef939a.json similarity index 100% rename from objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness084.ef939a.json rename to objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness.ef939a.json diff --git a/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json b/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json index 99ddf968..d773c221 100644 --- a/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json +++ b/objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json @@ -82,4 +82,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Horrortokens.c3ecf4.json b/objects/Horrortokens.c3ecf4.json index 96e60273..6681a0af 100644 --- a/objects/Horrortokens.c3ecf4.json +++ b/objects/Horrortokens.c3ecf4.json @@ -46,7 +46,7 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": -53.235, + "posX": -53.24, "posY": 1.65, "posZ": -1.12, "rotX": 0, diff --git a/objects/LeadInvestigator.acaa93.json b/objects/LeadInvestigator.acaa93.json index 897a4db5..2334bb0b 100644 --- a/objects/LeadInvestigator.acaa93.json +++ b/objects/LeadInvestigator.acaa93.json @@ -45,12 +45,12 @@ ], "Tooltip": true, "Transform": { - "posX": -61.051, - "posY": 1.581, - "posZ": -0.008, + "posX": -45, + "posY": 1.62, + "posZ": 0, "rotX": 0, "rotY": 270, - "rotZ": 180, + "rotZ": 0, "scaleX": 0.61, "scaleY": 1, "scaleZ": 0.61 diff --git a/objects/OptionPanelSource.830bd0.json b/objects/OptionPanelSource.830bd0.json index bfe27848..119dd01c 100644 --- a/objects/OptionPanelSource.830bd0.json +++ b/objects/OptionPanelSource.830bd0.json @@ -44,7 +44,6 @@ "MeshIndex": -1, "Name": "Bag", "Nickname": "OptionPanel Source", - "Number": 0, "Snap": true, "Sticky": true, "Tooltip": true, diff --git a/objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json b/objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json index a17a3364..7eb1937e 100644 --- a/objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json +++ b/objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json @@ -86,4 +86,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json b/objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json index f1c87564..17e60ad0 100644 --- a/objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json +++ b/objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json @@ -74,4 +74,4 @@ }, "Value": 0, "XmlUI_path": "OptionPanelSource.830bd0/CleanUpHelper.26cf4b.xml" -} \ No newline at end of file +} diff --git a/objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json b/objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json index 03ee89ba..bb696aea 100644 --- a/objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json +++ b/objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json @@ -54,4 +54,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json index b7601193..0fddc7f3 100644 --- a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json +++ b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/PhaseTracker.d0c8fa.json b/objects/PhaseTracker.d0c8fa.json index 17bfcdda..6406f387 100644 --- a/objects/PhaseTracker.d0c8fa.json +++ b/objects/PhaseTracker.d0c8fa.json @@ -87,9 +87,9 @@ ], "Tooltip": true, "Transform": { - "posX": -58.148, - "posY": 1.565, - "posZ": 0, + "posX": -11.3, + "posY": 1.52, + "posZ": -16, "rotX": 0, "rotY": 270, "rotZ": 0, @@ -147,9 +147,9 @@ ], "Tooltip": true, "Transform": { - "posX": -58.148, - "posY": 1.565, - "posZ": 0, + "posX": -11.3, + "posY": 1.52, + "posZ": -16, "rotX": 0, "rotY": 270, "rotZ": 0, @@ -207,9 +207,9 @@ ], "Tooltip": true, "Transform": { - "posX": -58.148, - "posY": 1.565, - "posZ": 0, + "posX": -11.3, + "posY": 1.52, + "posZ": -16, "rotX": 0, "rotY": 270, "rotZ": 0, @@ -227,9 +227,9 @@ ], "Tooltip": true, "Transform": { - "posX": -58.148, - "posY": 1.565, - "posZ": 0, + "posX": -11.3, + "posY": 1.52, + "posZ": -16, "rotX": 0, "rotY": 270, "rotZ": 0, diff --git a/objects/ScriptingTrigger.a2f932.json b/objects/ScriptingTrigger.a2f932.json index a35f7b5c..9db7b89a 100644 --- a/objects/ScriptingTrigger.a2f932.json +++ b/objects/ScriptingTrigger.a2f932.json @@ -35,11 +35,11 @@ "posY": 3.5, "posZ": 0, "rotX": 0, - "rotY": 90, + "rotY": 0, "rotZ": 0, "scaleX": 37, "scaleY": 4, - "scaleZ": 36.5 + "scaleZ": 37 }, "Value": 0, "XmlUI": "" diff --git a/objects/TokenRemover.0a5a29.json b/objects/TokenRemover.0a5a29.json index cb1b5c42..0956b06d 100644 --- a/objects/TokenRemover.0a5a29.json +++ b/objects/TokenRemover.0a5a29.json @@ -45,15 +45,15 @@ ], "Tooltip": true, "Transform": { - "posX": -6.755, - "posY": 1.583, - "posZ": -16.526, + "posX": -57.72, + "posY": 1.481, + "posZ": 0, "rotX": 0, - "rotY": 90, + "rotY": 270, "rotZ": 0, - "scaleX": 0.8, + "scaleX": 1, "scaleY": 1, - "scaleZ": 0.8 + "scaleZ": 1 }, "Value": 0, "XmlUI": "" diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 24c41cf2..d5d029e2 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -878,7 +878,7 @@ function applyOptionPanelChange(id, state) -- option: Show attachment helper elseif id == "showAttachmentHelper" then - optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-64, 1.4, 0}) + optionPanel[id] = spawnOrRemoveHelper(state, "Attachment Helper", {-61, 1.4, 0}) -- option: Show navigation overlay elseif id == "showNavigationOverlay" then @@ -907,7 +907,9 @@ end function spawnOrRemoveHelper(state, name, position, rotation) if state then Player.getPlayers()[1].pingTable(position) - return spawnHelperObject(name, position, rotation).getGUID() + local spawnedHelper = spawnHelperObject(name, position, rotation) + spawnedHelper.setLock(true) + return spawnedHelper.getGUID() else return removeHelperObject(name) end From 044b3a06e24f7f0cde8efd814e71028984558817 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 17:57:48 +0200 Subject: [PATCH 6/9] reverted order in config.json --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index f62cb2fe..e062bb1a 100644 --- a/config.json +++ b/config.json @@ -168,6 +168,7 @@ "InvestigatorSkillTracker.e74881", "TheScarletKeys.300fcc", "Search-A-Card.24051a", + "PhaseTracker.d0c8fa", "TokenSpawnTracker.e3ffc9", "TokenSource.124381", "GameData.3dbe47", @@ -189,8 +190,7 @@ "ArkhamSCE300-1272023-Page1.f873a8", "VictoryDisplay.6ccd6d", "CampaignOverview.e03c01", - "OptionPanelSource.830bd0", - "PhaseTracker.d0c8fa" + "OptionPanelSource.830bd0" ], "PlayArea": 1, "PlayerCounts": [ From dee13c5d2631b4b6e6595c4167c191dfdca43d82 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 18:07:40 +0200 Subject: [PATCH 7/9] added delay for locking helpers --- src/core/Global.ttslua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index d5d029e2..5db7670f 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -907,9 +907,7 @@ end function spawnOrRemoveHelper(state, name, position, rotation) if state then Player.getPlayers()[1].pingTable(position) - local spawnedHelper = spawnHelperObject(name, position, rotation) - spawnedHelper.setLock(true) - return spawnedHelper.getGUID() + return spawnHelperObject(name, position, rotation).getGUID() else return removeHelperObject(name) end @@ -937,6 +935,9 @@ function spawnHelperObject(name, position, rotation) for _, obj in ipairs(sourceBag.getData().ContainedObjects) do if obj["Nickname"] == name then spawnTable.data = obj + spawnTable.callback_function = function(spawnedObj) + Wait.time(function() spawnedObj.setLock(true) end, 1) + end return spawnObjectData(spawnTable) end end From 96ca2c66ce93e0bc7c0ca395470287937fa06a87 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 18:17:46 +0200 Subject: [PATCH 8/9] increased delay for locking --- src/core/Global.ttslua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 5db7670f..10701019 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -936,7 +936,7 @@ function spawnHelperObject(name, position, rotation) if obj["Nickname"] == name then spawnTable.data = obj spawnTable.callback_function = function(spawnedObj) - Wait.time(function() spawnedObj.setLock(true) end, 1) + Wait.time(function() spawnedObj.setLock(true) end, 2) end return spawnObjectData(spawnTable) end From a3858fc6ca125ca47731aea4c79336b958cb176f Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 23:34:27 +0200 Subject: [PATCH 9/9] corrected minicard spawn position --- src/playermat/Zones.ttslua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/playermat/Zones.ttslua b/src/playermat/Zones.ttslua index 6efb17aa..2cb978d9 100644 --- a/src/playermat/Zones.ttslua +++ b/src/playermat/Zones.ttslua @@ -30,7 +30,6 @@ do local commonZones = {} commonZones["Investigator"] = { -1.17702, 0, 0.00209 } - commonZones["Minicard"] = { -1.17702, 0, -1.45 } commonZones["Deck"] = { -1.822724, 0, -0.02940192 } commonZones["Discard"] = { -1.822451, 0, 0.6092291 } commonZones["Ally"] = { -0.6157398, 0, 0.02435675 } @@ -51,7 +50,6 @@ do local zoneData = {} zoneData["White"] = {} zoneData["White"]["Investigator"] = commonZones["Investigator"] - zoneData["White"]["Minicard"] = commonZones["Minicard"] zoneData["White"]["Deck"] = commonZones["Deck"] zoneData["White"]["Discard"] = commonZones["Discard"] zoneData["White"]["Ally"] = commonZones["Ally"] @@ -68,6 +66,7 @@ do zoneData["White"]["Threat2"] = commonZones["Threat2"] zoneData["White"]["Threat3"] = commonZones["Threat3"] zoneData["White"]["Threat4"] = commonZones["Threat4"] + zoneData["White"]["Minicard"] = { -1, 0, -1.45 } zoneData["White"]["SetAside1"] = { 2.345893, 0, -0.520315 } zoneData["White"]["SetAside2"] = { 2.345893, 0, 0.042552 } zoneData["White"]["SetAside3"] = { 2.345893, 0, 0.605419 } @@ -79,7 +78,6 @@ do zoneData["Orange"] = {} zoneData["Orange"]["Investigator"] = commonZones["Investigator"] - zoneData["Orange"]["Minicard"] = commonZones["Minicard"] zoneData["Orange"]["Deck"] = commonZones["Deck"] zoneData["Orange"]["Discard"] = commonZones["Discard"] zoneData["Orange"]["Ally"] = commonZones["Ally"] @@ -96,6 +94,7 @@ do zoneData["Orange"]["Threat2"] = commonZones["Threat2"] zoneData["Orange"]["Threat3"] = commonZones["Threat3"] zoneData["Orange"]["Threat4"] = commonZones["Threat4"] + zoneData["Orange"]["Minicard"] = { 1, 0, -1.45 } zoneData["Orange"]["SetAside1"] = { -2.350362, 0, -0.520315 } zoneData["Orange"]["SetAside2"] = { -2.350362, 0, 0.042552 } zoneData["Orange"]["SetAside3"] = { -2.350362, 0, 0.605419 }