adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity

Merge branch 'main' into navigationoverlay-update

Browse Source
This commit is contained in:
Chr1Z93 2023-04-13 01:12:09 +02:00
commit f2e95b81b3
29 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.json
View File

@ -190,7 +190,7 @@
"ArkhamSCE300-1272023-Page1.f873a8",
"VictoryDisplay.6ccd6d",
"CampaignOverview.e03c01",
"OptionPanelSource.830bd0"
"OptionPanelSource.830bd0"
],
"PlayArea": 1,
"PlayerCounts": [

2
objects/AllPlayerCards.15bb07/LivingInkUpgradeSheet.19a05b.json
View File

@ -58,4 +58,4 @@
},
"Value": 0,
"XmlUI": ""
}
}

2
objects/Cluetokens.31fa39.json
View File

@ -46,7 +46,7 @@
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -55.458,
"posX": -55.48,
"posY": 1.65,
"posZ": -1.12,
"rotX": 0,

2
objects/Damagetokens.480bda.json
View File

@ -56,7 +56,7 @@
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -53.235,
"posX": -53.24,
"posY": 1.65,
"posZ": 1.12,
"rotX": 0,

2
objects/Doomtokens.47ffc3.json
View File

@ -46,7 +46,7 @@
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -55.458,
"posX": -55.48,
"posY": 1.65,
"posZ": 1.12,
"rotX": 0,

2
objects/Fan-MadeAccessories.aa8b38/GenericDifficultySelector.8112ff.json
View File

@ -54,4 +54,4 @@
},
"Value": 0,
"XmlUI": ""
}
}

2
objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e.json
View File

@ -41,7 +41,7 @@
"CloseEncountersoftheLV-426Kind.4f5421",
"CelticRising.4d305a",
"CallofthePlaguebearer.613b64",
"BetrayalattheMountainsofMadness084.ef939a",
"BetrayalattheMountainsofMadness.ef939a",
"TheApproachingStorm.ab6b9a",
"AliceinWonderland.39916d",
"AgesUnwound.f7e5eb",

0
objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness084.ef939a.json → objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/BetrayalattheMountainsofMadness.ef939a.json
View File

2
objects/Fan-MadeScenariosCampaignsMiscellany.66e97c/Fan-MadeCampaigns.89c32e/TheColorOutofOz.be7d21.json
View File

@ -82,4 +82,4 @@
},
"Value": 0,
"XmlUI": ""
}
}

18
objects/Horrortokens.7bd2a0/Horror.36be72.json
View File

@ -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,

18
objects/Horrortokens.ae1a4e/Horror.36be72.json
View File

@ -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,

2
objects/Horrortokens.c3ecf4.json
View File

@ -46,7 +46,7 @@
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -53.235,
"posX": -53.24,
"posY": 1.65,
"posZ": -1.12,
"rotX": 0,

18
objects/Horrortokens.c3ecf4/Horror.36be72.json
View File

@ -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,

8
objects/LeadInvestigator.acaa93.json
View File

@ -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

1
objects/OptionPanelSource.830bd0.json
View File

@ -44,7 +44,6 @@
"MeshIndex": -1,
"Name": "Bag",
"Nickname": "OptionPanel Source",
"Number": 0,
"Snap": true,
"Sticky": true,
"Tooltip": true,

2
objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json
View File

@ -86,4 +86,4 @@
},
"Value": 0,
"XmlUI": ""
}
}

2
objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json
View File

@ -74,4 +74,4 @@
},
"Value": 0,
"XmlUI_path": "OptionPanelSource.830bd0/CleanUpHelper.26cf4b.xml"
}
}

2
objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json
View File

@ -54,4 +54,4 @@
},
"Value": 0,
"XmlUI": ""
}
}

24
objects/PhaseTracker.d0c8fa.json
View File

@ -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,

28
objects/Playermat1White.8b081b.json
View File

@ -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": "",

28
objects/Playermat2Orange.bd0ff4.json
View File

@ -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": "",

28
objects/Playermat3Green.383d8b.json
View File

@ -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": "",

28
objects/Playermat4Red.0840d5.json
View File

@ -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": "",

4
objects/ScriptingTrigger.a2f932.json
View File

@ -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": ""

12
objects/TokenRemover.0a5a29.json
View File

@ -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": ""

4
src/chaosbag/BlessCurseManagerApi.ttslua
View File

@ -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

5
src/core/Global.ttslua
View File

@ -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
@ -935,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, 2)
end
return spawnObjectData(spawnTable)
end
end

25
src/playermat/Playmat.ttslua
View File

@ -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
@ -689,11 +686,13 @@ 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
if obj.getGUID() ~= "4ee1f2" and -- table
obj ~= self and
obj.type ~= "Deck" and
obj.type ~= "Card" and
obj.getLock() == false and
obj.getDescription() ~= "Action Token" and
not tokenChecker.isChaosToken(obj) then
TRASHCAN.putObject(obj)
end

5
src/playermat/Zones.ttslua
View File

@ -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 }