diff --git a/config.json b/config.json index c2b621ac..7b9f83e2 100644 --- a/config.json +++ b/config.json @@ -199,9 +199,9 @@ "CampaignImporterExporter.334ee3", "TokenArranger.022907", "ChaosBagManager.023240", - "ArkhamSCE330-1092023-Page1.964222", "PlaceholderBoxDummy.a93466", - "SoulsofDarkness.a94e6b" + "BaldursGateIII.695abd", + "ArkhamSCE340-2023-11-04-Page1.964222" ], "PlayArea": 1, "PlayerCounts": [ @@ -212,7 +212,7 @@ 0, 0 ], - "SaveName": "Arkham SCE - 3.3.0", + "SaveName": "Arkham SCE - 3.4.0", "Sky": "Sky_Museum", "SkyURL": "https://i.imgur.com/GkQqaOF.jpg", "SnapPoints_path": "SnapPoints.json", @@ -222,4 +222,4 @@ "Turns_path": "Turns.json", "VersionNumber": "v13.2.2", "XmlUI": "\u003cInclude src=\"Global/Global.xml\"/\u003e" -} \ No newline at end of file +} diff --git a/objects/3DText.d628cc.json b/objects/3DText.d628cc.json index ce448aff..d3f68dbf 100644 --- a/objects/3DText.d628cc.json +++ b/objects/3DText.d628cc.json @@ -41,7 +41,7 @@ "Transform": { "posX": -19.5, "posY": 1.697, - "posZ": -84, + "posZ": -87, "rotX": 90, "rotY": 90, "rotZ": 0, diff --git a/objects/AllPlayerCards.15bb07/EmergencyCache3.408cb5.gmnotes b/objects/AllPlayerCards.15bb07/EmergencyCache3.408cb5.gmnotes index 9762ab4e..c683420f 100644 --- a/objects/AllPlayerCards.15bb07/EmergencyCache3.408cb5.gmnotes +++ b/objects/AllPlayerCards.15bb07/EmergencyCache3.408cb5.gmnotes @@ -5,5 +5,12 @@ "cost": 0, "level": 3, "traits": "Supply.", + "uses": [ + { + "count": 4, + "type": "Supply", + "token": "resource" + } + ], "cycle": "The Path to Carcosa" } diff --git a/objects/AllPlayerCards.15bb07/HospitalDebts.47d6c9.gmnotes b/objects/AllPlayerCards.15bb07/HospitalDebts.47d6c9.gmnotes index 161d44da..ae7925bc 100644 --- a/objects/AllPlayerCards.15bb07/HospitalDebts.47d6c9.gmnotes +++ b/objects/AllPlayerCards.15bb07/HospitalDebts.47d6c9.gmnotes @@ -7,5 +7,12 @@ "class": "Neutral", "traits": "Task.", "weakness": true, + "uses": [ + { + "count": 0, + "type": "Resource", + "token": "resource" + } + ], "cycle": "Core" } diff --git a/objects/AllPlayerCards.15bb07/HospitalDebts.bd323d.gmnotes b/objects/AllPlayerCards.15bb07/HospitalDebts.bd323d.gmnotes index 2a4759c7..1db5d363 100644 --- a/objects/AllPlayerCards.15bb07/HospitalDebts.bd323d.gmnotes +++ b/objects/AllPlayerCards.15bb07/HospitalDebts.bd323d.gmnotes @@ -4,5 +4,12 @@ "class": "Neutral", "traits": "Task.", "weakness": true, + "uses": [ + { + "count": 0, + "type": "Resource", + "token": "resource" + } + ], "cycle": "Standalone" } diff --git a/objects/ArkhamSCE330-1092023-Page1.964222.json b/objects/ArkhamSCE330-1092023-Page1.964222.json deleted file mode 100644 index c7f95c1f..00000000 --- a/objects/ArkhamSCE330-1092023-Page1.964222.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "AltLookAngle": { - "x": 0, - "y": 0, - "z": 0 - }, - "Autoraise": true, - "ColorDiffuse": { - "b": 1, - "g": 1, - "r": 1 - }, - "Description": "Thanks for downloading Arkham SCE 3.3.0!\n\n- Added 2023-08-30 taboo list. Note that the prior 2022-08-26 taboo list is no longer supported.\n- Added some of the previewed player cards from Feast of Hemlock Vale.\n- Removed broken content from and cleaned up the community player card/investigator box.", - "DragSelectable": true, - "GMNotes": "", - "GUID": "964222", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Notecard", - "Nickname": "Arkham SCE 3.3.0 - 10/9/2023 - Page 1", - "Snap": true, - "States": { - "2": { - "AltLookAngle": { - "x": 0, - "y": 0, - "z": 0 - }, - "Autoraise": true, - "ColorDiffuse": { - "b": 1, - "g": 1, - "r": 1 - }, - "Description": "- Added the following community contributions:\n Buffy the Vampire Slayer by AtomicZ!\n City of Secrets by Exhaled Innards!\n Circus Ex Mortis Investigator Expansion by The\n Beard!\n Heart of Darkness by Vinn Quest!\n The Red Coterie Investigators by\n Mattastrophic!\n (continued)", - "DragSelectable": true, - "GMNotes": "", - "GUID": "d7faf7", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Notecard", - "Nickname": "Arkham SCE 3.3.0 - 10/9/2023 - Page 2", - "Snap": true, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -26.88849, - "posY": 1.551499, - "posZ": -60.2882576, - "rotX": 0, - "rotY": 90, - "rotZ": 0, - "scaleX": 3, - "scaleY": 1, - "scaleZ": 3 - }, - "Value": 0, - "XmlUI": "" - }, - "3": { - "AltLookAngle": { - "x": 0, - "y": 0, - "z": 0 - }, - "Autoraise": true, - "ColorDiffuse": { - "b": 1, - "g": 1, - "r": 1 - }, - "Description": " The Sands of Memphis by Myriad!\n Souls of Darkness by JackOfHearts!\n- The options panel has a new option to spawn clickable counters only on \"0 uses\" cards. Try the \"Chef's Selection\" option for the best of both worlds!\n- Increased readability of master Clue Counter's text.", - "DragSelectable": true, - "GMNotes": "", - "GUID": "50d85e", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Notecard", - "Nickname": "Arkham SCE 3.3.0 - 10/9/2023 - Page 3", - "Snap": true, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -26.88849, - "posY": 1.551499, - "posZ": -60.2882576, - "rotX": 0, - "rotY": 90, - "rotZ": 0, - "scaleX": 3, - "scaleY": 1, - "scaleZ": 3 - }, - "Value": 0, - "XmlUI": "" - }, - "4": { - "AltLookAngle": { - "x": 0, - "y": 0, - "z": 0 - }, - "Autoraise": true, - "ColorDiffuse": { - "b": 1, - "g": 1, - "r": 1 - }, - "Description": "- General refactoring of code involving encounter card drawing, metadata, and the deck importer.\n- Added context menu option to Well-Connected to auto-calculate its skill bonus.\n- Fixed clues not spawning properly at very high clue counts.\n- Underworld Market helper no longer breaks when saving and loading.", - "DragSelectable": true, - "GMNotes": "", - "GUID": "e4e509", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Notecard", - "Nickname": "Arkham SCE 3.3.0 - 10/9/2023 - Page 4", - "Snap": true, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -26.88849, - "posY": 1.551499, - "posZ": -60.2882576, - "rotX": 0, - "rotY": 90, - "rotZ": 0, - "scaleX": 3, - "scaleY": 1, - "scaleZ": 3 - }, - "Value": 0, - "XmlUI": "" - }, - "5": { - "AltLookAngle": { - "x": 0, - "y": 0, - "z": 0 - }, - "Autoraise": true, - "ColorDiffuse": { - "b": 1, - "g": 1, - "r": 1 - }, - "Description": "- Fixed Token Arranger to be much less likely to \"explode\".\n- Resource spawning via hotkey on a card now auto-detects the right type of resource to spawn.\n- Various bits of community content have been updated to their most recent Workshop versions.\n\n- Thank you everyone for continuing to report bugs and create content for the mod!", - "DragSelectable": true, - "GMNotes": "", - "GUID": "c0ef49", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Notecard", - "Nickname": "Arkham SCE 3.3.0 - 10/9/2023 - Page 5", - "Snap": true, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -25.7359982, - "posY": 1.70084918, - "posZ": -59.9714432, - "rotX": 0, - "rotY": 90, - "rotZ": 0, - "scaleX": 3, - "scaleY": 1, - "scaleZ": 3 - }, - "Value": 0, - "XmlUI": "" - } - }, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -26.978, - "posY": 1.551, - "posZ": -56.165, - "rotX": 0, - "rotY": 90, - "rotZ": 0, - "scaleX": 3, - "scaleY": 1, - "scaleZ": 3 - }, - "Value": 0, - "XmlUI": "" -} diff --git a/objects/ArkhamSCE340-2023-11-04-Page1.964222.json b/objects/ArkhamSCE340-2023-11-04-Page1.964222.json new file mode 100644 index 00000000..c35ae155 --- /dev/null +++ b/objects/ArkhamSCE340-2023-11-04-Page1.964222.json @@ -0,0 +1,92 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "Description": "Thanks for downloading Arkham SCE 3.4.0!\n\n- added an image gallery for playarea images\r\n- revamped the download menu \t- this is now the primary way to access custom content instead of the container with placeholder boxes\r\n- added a helper for Subject 5U-21\r\n- added a tool to hide unused playermats\n- added a discard gamekey", + "DragSelectable": true, + "GMNotes": "", + "GUID": "964222", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Notecard", + "Nickname": "Arkham SCE 3.4.0 - 2023-11-04 - Page 1", + "Snap": true, + "States": { + "2": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "Description": "- added Parallel Jim and Parallel Zoey\n- added QoL features for Norman Withers\r\n- added default camera states (Shift + 1/2)\r\n- increased readability of master clue counter\r\n- cleaned up the option panel\n- bugfix for discarding cards from hand\r\n- bugfixes for the token arranger\r\n- fixed width of taboo cards\r\n- misc. metadata fixes", + "DragSelectable": true, + "GMNotes": "", + "GUID": "d7faf7", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Notecard", + "Nickname": "Arkham SCE 3.4.0 - 2023-11-04 - Page 2", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": -27, + "posY": 1.55149889, + "posZ": -56.165, + "rotX": 8.524158e-9, + "rotY": 90.00001, + "rotZ": -6.162494e-8, + "scaleX": 3, + "scaleY": 1, + "scaleZ": 3 + }, + "Value": 0, + "XmlUI": "" + } + }, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": -27, + "posY": 1.551, + "posZ": -56.165, + "rotX": 0, + "rotY": 90, + "rotZ": 0, + "scaleX": 3, + "scaleY": 1, + "scaleZ": 3 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/BaldursGateIII.695abd.json b/objects/BaldursGateIII.695abd.json new file mode 100644 index 00000000..22c5c6cb --- /dev/null +++ b/objects/BaldursGateIII.695abd.json @@ -0,0 +1,56 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "a": 0.27843, + "b": 1, + "g": 1, + "r": 1 + }, + "CustomMesh": { + "CastShadows": true, + "ColliderURL": "", + "Convex": true, + "DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/2117314083163063648/B404BC484394C1B241A97479C3A1FDC8D33ADE2F/", + "MaterialIndex": 3, + "MeshURL": "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/tuckbox_h_MSH.obj", + "NormalURL": "", + "TypeIndex": 0 + }, + "Description": "by Mint Tea Fan", + "DragSelectable": true, + "GMNotes": "fancreations/investigators_baldurs_gate_3.json", + "GUID": "695abd", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "require(\"core/DownloadBox\")", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Model", + "Nickname": " Baldur's Gate III", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": -26, + "posY": 1.481, + "posZ": -87, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 2.21, + "scaleY": 0.46, + "scaleZ": 2.42 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/PlaymatImageSwapper.b7b45b.json b/objects/PlaymatImageSwapper.b7b45b.json index d0085ec8..9cf1a047 100644 --- a/objects/PlaymatImageSwapper.b7b45b.json +++ b/objects/PlaymatImageSwapper.b7b45b.json @@ -34,7 +34,7 @@ "LayoutGroupSortIndex": 0, "Locked": true, "LuaScript": "require(\"core/PlayAreaSelector\")", - "LuaScriptState": "", + "LuaScriptState": "{\"selectionIndex\":1,\"typeIndex\":1}", "MeasureMovement": false, "Name": "Custom_Token", "Nickname": "Playmat Image Swapper", diff --git a/objects/SoulsofDarkness.a94e6b.json b/objects/SoulsofDarkness.a94e6b.json deleted file mode 100644 index 23b4e922..00000000 --- a/objects/SoulsofDarkness.a94e6b.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "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.0021877822, - "posY": -0.08963572, - "posZ": -0.00288731651, - "rotX": 270, - "rotY": 359.869568, - "rotZ": 0, - "scaleX": 2.00000215, - "scaleY": 2.00000238, - "scaleZ": 2.00000262 - } - } - ], - "Autoraise": true, - "ColorDiffuse": { - "b": 0.40592, - "g": 0.40592, - "r": 0.40592 - }, - "CustomMesh": { - "CastShadows": true, - "ColliderURL": "", - "Convex": true, - "CustomShader": { - "FresnelStrength": 0, - "SpecularColor": { - "b": 1, - "g": 1, - "r": 1 - }, - "SpecularIntensity": 0, - "SpecularSharpness": 2 - }, - "DiffuseURL": "https://i.ibb.co/SrtzMNN/souls-of-darkness.png", - "MaterialIndex": 3, - "MeshURL": "https://raw.githubusercontent.com/RobMayer/TTSLibrary/master/advboxes/tuckbox_h_MSH.obj", - "NormalURL": "", - "TypeIndex": 0 - }, - "Description": "", - "DragSelectable": true, - "GMNotes": "fancreations/campaign_souls_of_darkness.json", - "GUID": "a94e6b", - "Grid": true, - "GridProjection": false, - "Hands": false, - "HideWhenFaceDown": false, - "IgnoreFoW": false, - "LayoutGroupSortIndex": 0, - "Locked": false, - "LuaScript": "require(\"core/DownloadBox\")", - "LuaScriptState": "", - "MeasureMovement": false, - "Name": "Custom_Model", - "Nickname": "Souls of Darkness", - "Snap": true, - "Sticky": true, - "Tooltip": true, - "Transform": { - "posX": -26.956, - "posY": 1.481, - "posZ": -84.507, - "rotX": 0, - "rotY": 270, - "rotZ": 0, - "scaleX": 2.21, - "scaleY": 0.46, - "scaleZ": 2.42 - }, - "Value": 0, - "XmlUI": "" -} diff --git a/objects/TokenDiscardZone.457de3.json b/objects/TokenDiscardZone.457de3.json index 9062944f..53357582 100644 --- a/objects/TokenDiscardZone.457de3.json +++ b/objects/TokenDiscardZone.457de3.json @@ -43,4 +43,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/TokenDiscardZone.457de4.json b/objects/TokenDiscardZone.457de4.json index 991c9200..b862bb2a 100644 --- a/objects/TokenDiscardZone.457de4.json +++ b/objects/TokenDiscardZone.457de4.json @@ -43,4 +43,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/TokenDiscardZone.457de5.json b/objects/TokenDiscardZone.457de5.json index 2a85afc9..99c92cb5 100644 --- a/objects/TokenDiscardZone.457de5.json +++ b/objects/TokenDiscardZone.457de5.json @@ -43,4 +43,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/TokenDiscardZone.457de6.json b/objects/TokenDiscardZone.457de6.json index 5100327c..732d6d7e 100644 --- a/objects/TokenDiscardZone.457de6.json +++ b/objects/TokenDiscardZone.457de6.json @@ -43,4 +43,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 34d471e3..c1e8acab 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -39,7 +39,7 @@ local MAT_COLORS = { "White", "Orange", "Green", "Red" } local hideTitleSplashWaitFunctionId = nil -- online functionality related variables -local MOD_VERSION = "3.3.0" +local MOD_VERSION = "3.4.0" local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/main' local library, requestObj, modMeta local acknowledgedUpgradeVersions = {}