From 2556c0d83d8f10e090f5e5c27b27115f2230bdd4 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 17 Oct 2023 10:50:15 +0200 Subject: [PATCH 01/14] more bugfixing --- src/accessories/TokenArranger.ttslua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/accessories/TokenArranger.ttslua b/src/accessories/TokenArranger.ttslua index fb836480..2be2c7cd 100644 --- a/src/accessories/TokenArranger.ttslua +++ b/src/accessories/TokenArranger.ttslua @@ -312,6 +312,10 @@ function layout(_, _, isRightClick) local value = tonumber(objData.Nickname) local precedence = tokenPrecedence[objData.Nickname] + -- remove GUID to avoid issues for high latency clients + objData["GUID"] = nil + + -- store data with value / precendence data[i] = { token = objData, value = value or precedence[1] From 1c6984c9c6431e582c5570be344df078aafce8d9 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 17 Oct 2023 22:58:59 +0200 Subject: [PATCH 02/14] spawn correct amount of bonded cards --- src/arkhamdb/ArkhamDb.ttslua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/arkhamdb/ArkhamDb.ttslua b/src/arkhamdb/ArkhamDb.ttslua index d41da134..eb3dcf41 100644 --- a/src/arkhamdb/ArkhamDb.ttslua +++ b/src/arkhamdb/ArkhamDb.ttslua @@ -295,7 +295,12 @@ do local card = allCardsBagApi.getCardById(cardId) if (card ~= nil and card.metadata.bonded ~= nil) then for _, bond in ipairs(card.metadata.bonded) do - bondedCards[bond.id] = bond.count + -- add a bonded card for each copy of the parent card (except for Pendant of the Queen) + if bond.id == "06022" then + bondedCards[bond.id] = bond.count + else + bondedCards[bond.id] = bond.count * cardCount + end -- We need to know which cards are bonded to determine their position, remember them bondedList[bond.id] = true -- Also adding taboo versions of bonded cards to the list From d4cb0eb2f0daaaf26e13a810c5985f9080411664 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 18 Oct 2023 22:51:23 +0200 Subject: [PATCH 03/14] added laid to rest --- .../ChallengeScenarios.9f6801.json | 1 + .../LaidtoRest.e2dd57.json | 86 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json index db2728ef..32939093 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json @@ -17,6 +17,7 @@ "BadBlood.451eaa", "RedTideRising.5302f2", "AllorNothing.72ab92", + "LaidtoRest.e2dd57", "ReadorDie.9e73fa", "BytheBook.cc7eb3" ], diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json new file mode 100644 index 00000000..a4921ec9 --- /dev/null +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json @@ -0,0 +1,86 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "AttachedDecals": [ + { + "CustomDecal": { + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/959719855119695911/931B9829687A20F4DEADB36DA57B7E6D76792231/", + "Name": "dunwich_back", + "Size": 7.4 + }, + "Transform": { + "posX": 0, + "posY": 0, + "posZ": 0, + "rotX": 270, + "rotY": 0, + "rotZ": 0, + "scaleX": 2, + "scaleY": 2, + "scaleZ": 2 + } + } + ], + "Autoraise": true, + "ColorDiffuse": { + "a": 0.27451, + "b": 1, + "g": 1, + "r": 1 + }, + "CustomMesh": { + "CastShadows": true, + "ColliderURL": "", + "Convex": true, + "CustomShader": { + "FresnelStrength": 0, + "SpecularColor": { + "b": 1, + "g": 1, + "r": 1 + }, + "SpecularIntensity": 0, + "SpecularSharpness": 2 + }, + "DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/2115061845788468343/B7611EC7DCD2008B87D6518EBEFF0AD36EFE5B54/", + "MaterialIndex": 3, + "MeshURL": "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/tuckbox_h_MSH.obj", + "NormalURL": "", + "TypeIndex": 0 + }, + "Description": "Challenge Scenario", + "DragSelectable": true, + "GMNotes": "scenarios/challenge_laid_to_rest.json", + "GUID": "e2dd57", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "require(\"core/DownloadBox\")", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Model", + "Nickname": "Laid to Rest", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 12.25, + "posY": 1.5, + "posZ": -12, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 2.21, + "scaleY": 0.46, + "scaleZ": 2.42 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file From 7f826bc973d39bd27b8e81a2b0bcdcd3d23985e0 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 18 Oct 2023 22:52:12 +0200 Subject: [PATCH 04/14] updated memory bag --- .../ChallengeScenarios.9f6801.json | 8 ++++---- .../ChallengeScenarios.9f6801.luascriptstate | 2 +- .../ChallengeScenarios.9f6801/AllorNothing.72ab92.json | 6 +++--- .../ChallengeScenarios.9f6801/BadBlood.451eaa.json | 6 +++--- .../ChallengeScenarios.9f6801/BytheBook.cc7eb3.json | 4 ++-- .../ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json | 6 +++--- .../ChallengeScenarios.9f6801/ReadorDie.9e73fa.json | 2 +- .../ChallengeScenarios.9f6801/RedTideRising.5302f2.json | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json index 32939093..920cb3c3 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.json @@ -14,12 +14,12 @@ "r": 1 }, "ContainedObjects_order": [ - "BadBlood.451eaa", - "RedTideRising.5302f2", "AllorNothing.72ab92", + "BadBlood.451eaa", + "BytheBook.cc7eb3", "LaidtoRest.e2dd57", "ReadorDie.9e73fa", - "BytheBook.cc7eb3" + "RedTideRising.5302f2" ], "ContainedObjects_path": "ChallengeScenarios.9f6801", "CustomMesh": { @@ -65,7 +65,7 @@ "Tooltip": true, "Transform": { "posX": -9, - "posY": 1.481, + "posY": 1.482, "posZ": -76, "rotX": 0, "rotY": 270, diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.luascriptstate b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.luascriptstate index 609f01d1..eacd2ea5 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.luascriptstate +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801.luascriptstate @@ -1 +1 @@ -{"ml":{"451eaa":{"lock":false,"pos":{"x":12.2499580383301,"y":1.46560525894165,"z":3.98636198043823},"rot":{"x":359.920135498047,"y":269.999908447266,"z":0.016873624175787}},"5302f2":{"lock":false,"pos":{"x":12.2504663467407,"y":1.45853757858276,"z":-20.013650894165},"rot":{"x":359.920135498047,"y":270.00146484375,"z":0.0168716721236706}},"72ab92":{"lock":false,"pos":{"x":12.2520532608032,"y":1.4679582118988,"z":11.9863719940186},"rot":{"x":359.920135498047,"y":270,"z":0.0168737415224314}},"9e73fa":{"lock":false,"pos":{"x":12.2500581741333,"y":1.46089386940002,"z":-12.0136384963989},"rot":{"x":359.920135498047,"y":269.999847412109,"z":0.0168744903057814}},"cc7eb3":{"lock":false,"pos":{"x":12.2495565414429,"y":1.46325027942657,"z":-4.01364088058472},"rot":{"x":359.920135498047,"y":269.999908447266,"z":0.0168744102120399}}}} +{"ml":{"451eaa":{"lock":false,"pos":{"x":12.252,"y":1.4815,"z":11.986},"rot":{"x":0,"y":269.9999,"z":0}},"5302f2":{"lock":false,"pos":{"x":12.2505,"y":1.4815,"z":-20.0137},"rot":{"x":0,"y":270.0014,"z":0}},"72ab92":{"lock":false,"pos":{"x":12.25,"y":1.4815,"z":19.986},"rot":{"x":0,"y":269.9999,"z":0}},"9e73fa":{"lock":false,"pos":{"x":12.2501,"y":1.4815,"z":-12.0137},"rot":{"x":0,"y":269.9998,"z":0}},"cc7eb3":{"lock":false,"pos":{"x":12.25,"y":1.4815,"z":3.986},"rot":{"x":0,"y":269.9999,"z":0}},"e2dd57":{"lock":false,"pos":{"x":12.25,"y":1.4815,"z":-4.014},"rot":{"x":0,"y":270,"z":0}}}} diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/AllorNothing.72ab92.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/AllorNothing.72ab92.json index 0ed9d952..b150356e 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/AllorNothing.72ab92.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/AllorNothing.72ab92.json @@ -71,9 +71,9 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": 12.252, - "posY": 1.468, - "posZ": 11.986, + "posX": 12.25, + "posY": 1.481, + "posZ": 19.986, "rotX": 0, "rotY": 270, "rotZ": 0, diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BadBlood.451eaa.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BadBlood.451eaa.json index 7d1189e1..a8fe9cf7 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BadBlood.451eaa.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BadBlood.451eaa.json @@ -71,9 +71,9 @@ "Sticky": true, "Tooltip": true, "Transform": { - "posX": 12.25, - "posY": 1.466, - "posZ": 3.986, + "posX": 12.252, + "posY": 1.481, + "posZ": 11.986, "rotX": 0, "rotY": 270, "rotZ": 0, diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BytheBook.cc7eb3.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BytheBook.cc7eb3.json index 00b94b1b..ba1c69ad 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BytheBook.cc7eb3.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/BytheBook.cc7eb3.json @@ -72,8 +72,8 @@ "Tooltip": true, "Transform": { "posX": 12.25, - "posY": 1.463, - "posZ": -4.014, + "posY": 1.481, + "posZ": 3.986, "rotX": 0, "rotY": 270, "rotZ": 0, diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json index a4921ec9..6750e563 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/LaidtoRest.e2dd57.json @@ -72,8 +72,8 @@ "Tooltip": true, "Transform": { "posX": 12.25, - "posY": 1.5, - "posZ": -12, + "posY": 1.481, + "posZ": -4.014, "rotX": 0, "rotY": 270, "rotZ": 0, @@ -83,4 +83,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/ReadorDie.9e73fa.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/ReadorDie.9e73fa.json index becd0521..2acce7c1 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/ReadorDie.9e73fa.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/ReadorDie.9e73fa.json @@ -72,7 +72,7 @@ "Tooltip": true, "Transform": { "posX": 12.25, - "posY": 1.461, + "posY": 1.481, "posZ": -12.014, "rotX": 0, "rotY": 270, diff --git a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/RedTideRising.5302f2.json b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/RedTideRising.5302f2.json index b794a5df..85fdb993 100644 --- a/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/RedTideRising.5302f2.json +++ b/objects/OfficialStandaloneChallengeScenarios.0ef5c8/ChallengeScenarios.9f6801/RedTideRising.5302f2.json @@ -72,7 +72,7 @@ "Tooltip": true, "Transform": { "posX": 12.25, - "posY": 1.459, + "posY": 1.481, "posZ": -20.014, "rotX": 0, "rotY": 270, From 88ca1a66f61748ddec37311fdcc1d5746bfbda27 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 00:05:21 +0200 Subject: [PATCH 05/14] fixed shiftdown vector --- src/core/token/TokenManager.ttslua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua index cee5204d..fc4608b7 100644 --- a/src/core/token/TokenManager.ttslua +++ b/src/core/token/TokenManager.ttslua @@ -225,9 +225,11 @@ do -- Copy the offsets to make sure we don't change the static values local baseOffsets = offsets offsets = { } + + -- get a vector for the shifting (downwards local to the card) + local shiftDownVector = Vector(0, 0, shiftDown):rotateOver("y", card.getRotation().y) for i, baseOffset in ipairs(baseOffsets) do - offsets[i] = baseOffset - offsets[i][3] = offsets[i][3] + shiftDown + offsets[i] = baseOffset + shiftDownVector end end From ce38acca4f22eba8c9560b3e2435e473a6fda476 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 17:47:59 +0200 Subject: [PATCH 06/14] ui changes --- src/core/Global.ttslua | 10 ++++++++++ xml/Global/DownloadWindow.xml | 35 ++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 9ebbbdf7..6cbea48a 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -717,6 +717,16 @@ function downloadCoroutine() return 1 end +-- spawns a bag that contains every object from the library +function onClick_downloadAll() + +end + +-- spawns a placeholder box for the selected object +function onClick_spawnPlaceholder() + +end + -- toggles the visibility of the respective UI ---@param player LuaPlayer Player that triggered this ---@param title String Name of the UI to toggle diff --git a/xml/Global/DownloadWindow.xml b/xml/Global/DownloadWindow.xml index 8b11460b..49583b87 100644 --- a/xml/Global/DownloadWindow.xml +++ b/xml/Global/DownloadWindow.xml @@ -12,6 +12,12 @@ color="white"/> + + + fontSize="28">Download Date: Thu, 19 Oct 2023 18:20:16 +0200 Subject: [PATCH 07/14] spawn placeholder function completed --- config.json | 2 +- objects/PlaceholderBoxDummy.a93466.json | 45 ++++++++++++++ src/core/GUIDReferenceHandler.ttslua | 1 + src/core/Global.ttslua | 79 ++++++++++++++++++++----- 4 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 objects/PlaceholderBoxDummy.a93466.json diff --git a/config.json b/config.json index 1b0ebb1b..741b5115 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,6 @@ "ComponentTags_path": "ComponentTags.json", "CustomUIAssets_path": "CustomUIAssets.json", "DecalPallet_path": "DecalPallet.json", - "Decals": [], "GameComplexity": "", "GameMode": "Arkham Horror LCG - Super Complete Edition", "GameType": "", @@ -200,6 +199,7 @@ "TokenArranger.022907", "ChaosBagManager.023240", "ArkhamSCE330-1092023-Page1.964222", + "PlaceholderBoxDummy.a93466", "SoulsofDarkness.a94e6b" ], "PlayArea": 1, diff --git a/objects/PlaceholderBoxDummy.a93466.json b/objects/PlaceholderBoxDummy.a93466.json new file mode 100644 index 00000000..f20cff4f --- /dev/null +++ b/objects/PlaceholderBoxDummy.a93466.json @@ -0,0 +1,45 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 0.82353, + "g": 0.20157, + "r": 0 + }, + "Description": "This dummy is there to hold the up-to-date script file for placeholder boxes to be available for placeholder box spawning.", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a93466", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "require(\"core/DownloadBox\")", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "BlockRectangle", + "Nickname": "Placeholder Box Dummy", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.645, + "posZ": -33, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/src/core/GUIDReferenceHandler.ttslua b/src/core/GUIDReferenceHandler.ttslua index b770c057..53b3c7d9 100644 --- a/src/core/GUIDReferenceHandler.ttslua +++ b/src/core/GUIDReferenceHandler.ttslua @@ -56,6 +56,7 @@ local GuidReferences = { MythosArea = "9f334f", NavigationOverlayHandler = "797ede", OptionPanelSource = "830bd0", + PlaceholderBoxDummy = "a93466", PlayArea = "721ba2", PlayAreaZone = "a2f932", PlayerCardPanel = "2d30ee", diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 6cbea48a..b7ba459b 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -724,7 +724,56 @@ end -- spawns a placeholder box for the selected object function onClick_spawnPlaceholder() + -- get object references + local item = library[contentToShow][currentListItem] + local dummy = guidReferenceApi.getObjectByOwnerAndType("Mythos", "PlaceholderBoxDummy") + + -- error handling + if not item.boxsize or item.boxsize == "" or not item.boxart or item.boxart == "" then + print("Error loading object.") + return + end + -- get data for placeholder + local spawnPos = {-39.5, 2, -87} + + local meshTable = { + big = "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/core_h_MSH.obj", + small = "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/tuckbox_h_MSH.obj", + wide = "http://pastebin.com/raw.php?i=uWAmuNZ2" + } + + local scaleTable = { + big = {1.00, 0.14, 1.00}, + small = {2.21, 0.46, 2.42}, + wide = {2.00, 0.11, 1.69} + } + + local placeholder = spawnObject({ + type = "Custom_Model", + position = spawnPos, + rotation = {0, 270, 0}, + scale = scaleTable[item.boxsize], + }) + + placeholder.setCustomObject({ + mesh = meshTable[item.boxsize], + diffuse = item.boxart, + material = 3 + }) + + placeholder.setColorTint({1, 1, 1, 71/255}) + placeholder.setName(item.name) + placeholder.setDescription("by " .. (item.author or "Unknown")) + placeholder.setGMNotes(item.url) + placeholder.setLuaScript(dummy.getLuaScript()) + Player.getPlayers()[1].pingTable(spawnPos) + + -- hide download window + if xmlVisibility.downloadWindow then + xmlVisibility.downloadWindow = false + UI.hide('downloadWindow') + end end -- toggles the visibility of the respective UI @@ -764,25 +813,25 @@ function updatePreviewWindow() local maskData = {} if item.boxsize == "big" then maskData = { - image = "box-cover-mask-big", - width = "870", - height = "435", - offsetXY = "154 60" - } + image = "box-cover-mask-big", + width = "870", + height = "435", + offsetXY = "154 60" + } elseif item.boxsize == "small" then maskData = { - image = "box-cover-mask-small", - width = "792", - height = "594", - offsetXY = "135 13" - } + image = "box-cover-mask-small", + width = "792", + height = "594", + offsetXY = "135 13" + } elseif item.boxsize == "wide" then maskData = { - image = "box-cover-mask-wide", - width = "756", - height = "630", - offsetXY = "-190 -70" - } + image = "box-cover-mask-wide", + width = "756", + height = "630", + offsetXY = "-190 -70" + } end -- loading empty image as placeholder until real image is loaded From 2189cf83af785f9facf426e580ce1c6cfb43c6e6 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 18:47:19 +0200 Subject: [PATCH 08/14] download everything WIP --- src/core/Global.ttslua | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index b7ba459b..0236fc55 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -719,7 +719,43 @@ end -- spawns a bag that contains every object from the library function onClick_downloadAll() + startLuaCoroutine(Global, "multiDownload") +end +function multiDownload() + local data = { + Name = "Bag", + Nickname = "All Downloadable Content", + Transform = { + posX = -39.5, + posY = 2, + posZ = -87, + rotX = 0, + rotY = 270, + rotZ = 0, + scaleX = 1, + scaleY = 1, + scaleZ = 1 + }, + ContainedObjects = {} + } + + -- loop through the library to add content + --for contentType, objectList in pairs(library) do + --for _, params in ipairs(objectList) do + local params = library[contentToShow][currentListItem] + WebRequest.get(SOURCE_REPO .. '/' .. params.url, function (request) + table.insert(data.ContainedObjects, request.text) + spawnObjectData({data = data}) -- need spawnObjectJson + end) + --end + --end + + -- hide download window + if xmlVisibility.downloadWindow then + xmlVisibility.downloadWindow = false + UI.hide('downloadWindow') + end end -- spawns a placeholder box for the selected object From d4d63097782479873c9ffedb484461387cb2ec39 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 23:20:46 +0200 Subject: [PATCH 09/14] added download all function --- src/core/Global.ttslua | 89 +++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 31 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 0236fc55..92e088bf 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -719,43 +719,70 @@ end -- spawns a bag that contains every object from the library function onClick_downloadAll() - startLuaCoroutine(Global, "multiDownload") -end - -function multiDownload() - local data = { - Name = "Bag", - Nickname = "All Downloadable Content", - Transform = { - posX = -39.5, - posY = 2, - posZ = -87, - rotX = 0, - rotY = 270, - rotZ = 0, - scaleX = 1, - scaleY = 1, - scaleZ = 1 - }, - ContainedObjects = {} - } - - -- loop through the library to add content - --for contentType, objectList in pairs(library) do - --for _, params in ipairs(objectList) do - local params = library[contentToShow][currentListItem] - WebRequest.get(SOURCE_REPO .. '/' .. params.url, function (request) - table.insert(data.ContainedObjects, request.text) - spawnObjectData({data = data}) -- need spawnObjectJson - end) - --end - --end + broadcastToAll("Download initiated - this will take a few minutes!") -- hide download window if xmlVisibility.downloadWindow then xmlVisibility.downloadWindow = false UI.hide('downloadWindow') end + + startLuaCoroutine(Global, "coroutineDownloadAll") +end + +function coroutineDownloadAll() + local JSON = [[ + { + "Name": "Bag", + "Transform": { + "posX": -39.5, + "posY": 2, + "posZ": -87, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1.0, + "scaleY": 1.0, + "scaleZ": 1.0 + }, + "Nickname": "All Downloadable Content", + "Bag": { + "Order": 0 + }, + "ContainedObjects": [ + ]] + + local contained = "" + local downloadedItems = 0 + local skippedItems = 0 + + -- loop through the library to add content + for contentType, objectList in pairs(library) do + broadcastToAll("Downloading " .. contentType .. "...") + for _, params in ipairs(objectList) do + local request = WebRequest.get(SOURCE_REPO .. '/' .. params.url) + local start = os.time() + while true do + if request.is_done then + contained = contained .. request.text .. "," + downloadedItems = downloadedItems + 1 + break + -- time-out if item can't be loaded in 5s + elseif request.is_error or (os.time() - start) > 5 then + skippedItems = skippedItems + 1 + break + end + coroutine.yield(0) + end + end + end + + JSON = JSON .. contained .. "]}" + spawnObjectJSON({json = JSON}) + + broadcastToAll(downloadedItems .. " objects downloaded.", "Green") + broadcastToAll(skippedItems .. " objects had a time-out / error.", "Orange") + return 1 end -- spawns a placeholder box for the selected object From 31c3ebde79b928835c6188cf8712656151d032b2 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 23:31:04 +0200 Subject: [PATCH 10/14] fixed inputfield row --- .../customizable/FriendsinLowPlacesUpgradeSheet.ttslua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/playercards/customizable/FriendsinLowPlacesUpgradeSheet.ttslua b/src/playercards/customizable/FriendsinLowPlacesUpgradeSheet.ttslua index 7862666f..f0870600 100644 --- a/src/playercards/customizable/FriendsinLowPlacesUpgradeSheet.ttslua +++ b/src/playercards/customizable/FriendsinLowPlacesUpgradeSheet.ttslua @@ -25,16 +25,16 @@ customizations = { checkboxes = { posZ = -0.44, count = 2, + }, + textField = { + position = { 0.6295, 0.25, -0.44 }, + width = 290 } }, [4] = { checkboxes = { posZ = -0.05, count = 2, - }, - textField = { - position = { 0.6295, 0.25, -0.44 }, - width = 290 } }, [5] = { From bf9ba59648f71a069c70851551f0212c09d3d136 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 19 Oct 2023 23:46:12 +0200 Subject: [PATCH 11/14] updated rules reference --- objects/RulesReference.d99993.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/RulesReference.d99993.json b/objects/RulesReference.d99993.json index 4de14917..efc620d1 100644 --- a/objects/RulesReference.d99993.json +++ b/objects/RulesReference.d99993.json @@ -14,7 +14,7 @@ "PDFPage": 0, "PDFPageOffset": 0, "PDFPassword": "", - "PDFUrl": "https://images-cdn.fantasyflightgames.com/filer_public/c4/b0/c4b0d66c-d79e-411b-bdb5-b5d8c457d4bc/ahc01_rules_reference_web.pdf" + "PDFUrl": "http://cloud-3.steamusercontent.com/ugc/2115061845793806189/6FC67F9AF9224452E2D8F25E63B88D702B21B0DC/" }, "Description": "", "DragSelectable": true, From 5a51752a247b47d7779cf52a36bcad06383ab342 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 20 Oct 2023 09:33:57 +0200 Subject: [PATCH 12/14] removed files --- objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json | 2 +- objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json | 2 +- objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json | 2 +- .../AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes | 8 -------- objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json | 2 +- objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json | 2 +- objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json | 2 +- objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes | 7 ------- objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json | 2 +- 18 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes delete mode 100644 objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes diff --git a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes deleted file mode 100644 index ff4a7b6d..00000000 --- a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "01004-m", - "alternate_ids": [ - "01504-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json index cb81169c..809b312b 100644 --- a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json +++ b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes", + "GMNotes": "{\n \"id\": \"01004-m\",\n \"alternate_ids\": [\n \"01504-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "e53693", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes deleted file mode 100644 index 165f5f1e..00000000 --- a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "05001-m", - "alternate_ids": [ - "98010-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes deleted file mode 100644 index 7fca2d70..00000000 --- a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "01002-m", - "alternate_ids": [ - "01502-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes deleted file mode 100644 index f3e88481..00000000 --- a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "07004-m", - "alternate_ids": [ - "98016-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes deleted file mode 100644 index 11dd50a8..00000000 --- a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "02003-m", - "alternate_ids": [ - "98001-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json index 221ef1cf..9e77cd62 100644 --- a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json +++ b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes", + "GMNotes": "{\n \"id\": \"02003-m\",\n \"alternate_ids\": [\n \"98001-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "48b174", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes deleted file mode 100644 index c4d99400..00000000 --- a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "05006-m", - "alternate_ids": [ - "99001-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json index b53f0a2b..0b1a8fb4 100644 --- a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json +++ b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes", + "GMNotes": "{\n \"id\": \"05006-m\",\n \"alternate_ids\": [\n \"99001-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "b05c03", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes deleted file mode 100644 index ef45d791..00000000 --- a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "08004-m", - "alternate_ids": [ - "98007-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes deleted file mode 100644 index 9618b615..00000000 --- a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "01001-m", - "alternate_ids": [ - "98004-m", - "01501-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json index 142d258a..727af51b 100644 --- a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json +++ b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes", + "GMNotes": "{\n \"id\": \"01001-m\",\n \"alternate_ids\": [\n \"98004-m\",\n \"01501-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "5bde90", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes deleted file mode 100644 index f7c8fb25..00000000 --- a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "07005-m", - "alternate_ids": [ - "98013-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json index db19a9f6..36a280c2 100644 --- a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json +++ b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes", + "GMNotes": "{\n \"id\": \"07005-m\",\n \"alternate_ids\": [\n \"98013-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "574b59", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes deleted file mode 100644 index a835d694..00000000 --- a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "01003-m", - "alternate_ids": [ - "01503-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json index e27ecc72..d6590e3e 100644 --- a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json +++ b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes", + "GMNotes": "{\n \"id\": \"01003-m\",\n \"alternate_ids\": [\n \"01503-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "6b00ec", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes deleted file mode 100644 index 125ebf29..00000000 --- a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "01005-m", - "alternate_ids": [ - "01505-m" - ], - "type": "Minicard" -} diff --git a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json index eaada6de..47aa1b7a 100644 --- a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json +++ b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes", + "GMNotes": "{\n \"id\": \"01005-m\",\n \"alternate_ids\": [\n \"01505-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "15e40d", "Grid": true, "GridProjection": false, From ad787073f47d241241321b32f3036bc31c1c68ac Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 20 Oct 2023 09:36:55 +0200 Subject: [PATCH 13/14] more fixes --- objects/AllPlayerCards.15bb07/CarolynFern.30614e.json | 2 +- objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json | 2 +- objects/AllPlayerCards.15bb07/DexterDrake.57668a.json | 2 +- objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json index 70eab16c..7c2bfcb9 100644 --- a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json +++ b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes", + "GMNotes": "{\n \"id\": \"05001-m\",\n \"alternate_ids\": [\n \"98010-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "30614e", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json index 729d5d23..a7b0b2d4 100644 --- a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json +++ b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes", + "GMNotes": "{\n \"id\": \"01002-m\",\n \"alternate_ids\": [\n \"01502-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "bce6a5", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json index 957524e9..c6f8826f 100644 --- a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json +++ b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes", + "GMNotes": "{\n \"id\": \"07004-m\",\n \"alternate_ids\": [\n \"98016-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "57668a", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json index d01ddd38..ed8fc985 100644 --- a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json +++ b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes", + "GMNotes": "{\n \"id\": \"08004-m\",\n \"alternate_ids\": [\n \"98007-m\"\n ],\n \"type\": \"Minicard\"\n}", "GUID": "a5d9bb", "Grid": true, "GridProjection": false, From c9cbff0adf3dba2539895e55f66d696807c023a1 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 20 Oct 2023 09:42:57 +0200 Subject: [PATCH 14/14] clean decompose --- modsettings/ComponentTags.json | 4 ---- objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json | 2 +- objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/CarolynFern.30614e.json | 2 +- objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json | 2 +- objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/DexterDrake.57668a.json | 2 +- objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json | 2 +- objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json | 2 +- .../AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json | 2 +- objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes | 8 ++++++++ objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json | 2 +- objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json | 2 +- objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json | 2 +- objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes | 7 +++++++ objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json | 2 +- objects/ArkhamDeckCutter.445115.json | 3 --- .../Auto-failCounter.a9a321.json | 2 +- .../ElderSignCounter.e62cb5.json | 2 +- .../Subject5U-21Helper.1335e8.json | 2 +- objects/GUIDReferenceHandler.123456.json | 2 +- objects/Playermat4Red.0840d5.json | 4 ---- 29 files changed, 93 insertions(+), 26 deletions(-) create mode 100644 objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes diff --git a/modsettings/ComponentTags.json b/modsettings/ComponentTags.json index 3e61c8d2..df092f6f 100644 --- a/modsettings/ComponentTags.json +++ b/modsettings/ComponentTags.json @@ -56,10 +56,6 @@ "displayed": "chaosBag", "normalized": "chaosbag" }, - { - "displayed": "arkham_setup_memory_object", - "normalized": "arkham_setup_memory_object" - }, { "displayed": "ActionToken", "normalized": "actiontoken" diff --git a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes new file mode 100644 index 00000000..ff4a7b6d --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "01004-m", + "alternate_ids": [ + "01504-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json index 809b312b..cb81169c 100644 --- a/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json +++ b/objects/AllPlayerCards.15bb07/AgnesBaker.e53693.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"01004-m\",\n \"alternate_ids\": [\n \"01504-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/AgnesBaker.e53693.gmnotes", "GUID": "e53693", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes new file mode 100644 index 00000000..165f5f1e --- /dev/null +++ b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "05001-m", + "alternate_ids": [ + "98010-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json index 7c2bfcb9..70eab16c 100644 --- a/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json +++ b/objects/AllPlayerCards.15bb07/CarolynFern.30614e.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"05001-m\",\n \"alternate_ids\": [\n \"98010-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/CarolynFern.30614e.gmnotes", "GUID": "30614e", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes new file mode 100644 index 00000000..7fca2d70 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "01002-m", + "alternate_ids": [ + "01502-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json index a7b0b2d4..729d5d23 100644 --- a/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json +++ b/objects/AllPlayerCards.15bb07/DaisyWalker.bce6a5.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"01002-m\",\n \"alternate_ids\": [\n \"01502-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/DaisyWalker.bce6a5.gmnotes", "GUID": "bce6a5", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes new file mode 100644 index 00000000..f3e88481 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "07004-m", + "alternate_ids": [ + "98016-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json index c6f8826f..957524e9 100644 --- a/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json +++ b/objects/AllPlayerCards.15bb07/DexterDrake.57668a.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"07004-m\",\n \"alternate_ids\": [\n \"98016-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/DexterDrake.57668a.gmnotes", "GUID": "57668a", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes new file mode 100644 index 00000000..11dd50a8 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "02003-m", + "alternate_ids": [ + "98001-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json index 9e77cd62..221ef1cf 100644 --- a/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json +++ b/objects/AllPlayerCards.15bb07/JennyBarnes.48b174.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"02003-m\",\n \"alternate_ids\": [\n \"98001-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/JennyBarnes.48b174.gmnotes", "GUID": "48b174", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes new file mode 100644 index 00000000..c4d99400 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "05006-m", + "alternate_ids": [ + "99001-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json index 0b1a8fb4..b53f0a2b 100644 --- a/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json +++ b/objects/AllPlayerCards.15bb07/MarieLambeau.b05c03.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"05006-m\",\n \"alternate_ids\": [\n \"99001-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/MarieLambeau.b05c03.gmnotes", "GUID": "b05c03", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes new file mode 100644 index 00000000..ef45d791 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "08004-m", + "alternate_ids": [ + "98007-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json index ed8fc985..d01ddd38 100644 --- a/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json +++ b/objects/AllPlayerCards.15bb07/NormanWithers.a5d9bb.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"08004-m\",\n \"alternate_ids\": [\n \"98007-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/NormanWithers.a5d9bb.gmnotes", "GUID": "a5d9bb", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes new file mode 100644 index 00000000..9618b615 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes @@ -0,0 +1,8 @@ +{ + "id": "01001-m", + "alternate_ids": [ + "98004-m", + "01501-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json index 727af51b..142d258a 100644 --- a/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json +++ b/objects/AllPlayerCards.15bb07/RolandBanks.5bde90.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"01001-m\",\n \"alternate_ids\": [\n \"98004-m\",\n \"01501-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/RolandBanks.5bde90.gmnotes", "GUID": "5bde90", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes new file mode 100644 index 00000000..f7c8fb25 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "07005-m", + "alternate_ids": [ + "98013-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json index 36a280c2..db19a9f6 100644 --- a/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json +++ b/objects/AllPlayerCards.15bb07/SilasMarsh.574b59.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"07005-m\",\n \"alternate_ids\": [\n \"98013-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/SilasMarsh.574b59.gmnotes", "GUID": "574b59", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes new file mode 100644 index 00000000..a835d694 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "01003-m", + "alternate_ids": [ + "01503-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json index d6590e3e..e27ecc72 100644 --- a/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json +++ b/objects/AllPlayerCards.15bb07/SkidsOToole.6b00ec.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"01003-m\",\n \"alternate_ids\": [\n \"01503-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/SkidsOToole.6b00ec.gmnotes", "GUID": "6b00ec", "Grid": true, "GridProjection": false, diff --git a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes new file mode 100644 index 00000000..125ebf29 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "01005-m", + "alternate_ids": [ + "01505-m" + ], + "type": "Minicard" +} diff --git a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json index 47aa1b7a..eaada6de 100644 --- a/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json +++ b/objects/AllPlayerCards.15bb07/WendyAdams.15e40d.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "{\n \"id\": \"01005-m\",\n \"alternate_ids\": [\n \"01505-m\"\n ],\n \"type\": \"Minicard\"\n}", + "GMNotes_path": "AllPlayerCards.15bb07/WendyAdams.15e40d.gmnotes", "GUID": "15e40d", "Grid": true, "GridProjection": false, diff --git a/objects/ArkhamDeckCutter.445115.json b/objects/ArkhamDeckCutter.445115.json index 33d0eb4f..a34b4112 100644 --- a/objects/ArkhamDeckCutter.445115.json +++ b/objects/ArkhamDeckCutter.445115.json @@ -28,9 +28,6 @@ "Nickname": "Arkham Deck Cutter", "Snap": true, "Sticky": true, - "Tags": [ - "arkham_setup_memory_object" - ], "Tooltip": true, "Transform": { "posX": 78, diff --git a/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json b/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json index c7b63814..2c2bae63 100644 --- a/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json +++ b/objects/Fan-MadeAccessories.aa8b38/Auto-failCounter.a9a321.json @@ -54,4 +54,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json b/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json index bfd05186..c2460aa5 100644 --- a/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json +++ b/objects/Fan-MadeAccessories.aa8b38/ElderSignCounter.e62cb5.json @@ -54,4 +54,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json b/objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json index a273d326..b3b58a32 100644 --- a/objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json +++ b/objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json @@ -73,4 +73,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/GUIDReferenceHandler.123456.json b/objects/GUIDReferenceHandler.123456.json index 096e5e49..bd13b2f4 100644 --- a/objects/GUIDReferenceHandler.123456.json +++ b/objects/GUIDReferenceHandler.123456.json @@ -42,4 +42,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/Playermat4Red.0840d5.json b/objects/Playermat4Red.0840d5.json index 68a96ac7..96edae24 100644 --- a/objects/Playermat4Red.0840d5.json +++ b/objects/Playermat4Red.0840d5.json @@ -351,10 +351,6 @@ "Nickname": "Playermat 4: Red", "Snap": true, "Sticky": true, - "Tags": [ - "Red", - "Playermat" - ], "Tooltip": false, "Transform": { "posX": -30.35,