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

Merge branch 'main' into onload-improvements

Browse Source
This commit is contained in:
Chr1Z93 2024-03-25 17:36:08 +01:00
commit 771f3f07fa
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
objects/AllPlayerCards.15bb07/SoulSanctification3.52f6d6.gmnotes
View File

@ -2,6 +2,7 @@
"id": "09123", "id": "09123",
"type": "Asset", "type": "Asset",
"class": "Neutral", "class": "Neutral",
"startsInPlay": true,
"level": 3, "level": 3,
"traits": "Ritual.", "traits": "Ritual.",
"permanent": true, "permanent": true,

4
objects/EncounterSets.304ffc.ttslua
View File

@ -2,6 +2,6 @@ function onLoad()
self.addContextMenuItem("Download", download) self.addContextMenuItem("Download", download)
end end
function download() function download(_, playerColor)
Global.call('placeholder_download', { url = self.getGMNotes(), replace = self.guid }) Global.call('placeholder_download', { url = self.getGMNotes(), player = Player[playerColor], replace = self.guid })
end end

2
src/core/DownloadBox.ttslua
View File

@ -37,5 +37,5 @@ function onLoad()
end end
function buttonClick_download(_, playerColor) function buttonClick_download(_, playerColor)
Global.call('placeholder_download', { url = self.getGMNotes(), player = Player[playerColor], replace = self.guid }) Global.call('placeholder_download', { url = self.getGMNotes(), player = playerColor and Player[playerColor] or nil, replace = self.guid })
end end

4
src/core/Global.ttslua
View File

@ -40,7 +40,7 @@ local bagSearchers = {}
local hideTitleSplashWaitFunctionId = nil local hideTitleSplashWaitFunctionId = nil
-- online functionality related variables -- online functionality related variables
local MOD_VERSION = "3.6.0" local MOD_VERSION = "3.7.0"
local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/main' local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/main'
local library, requestObj, modMeta local library, requestObj, modMeta
local acknowledgedUpgradeVersions = {} local acknowledgedUpgradeVersions = {}
@ -783,7 +783,9 @@ function placeholder_download(params)
UI.setAttribute('download_progress', 'active', false) UI.setAttribute('download_progress', 'active', false)
-- hide download window -- hide download window
if params.player then
changeWindowVisibilityForColor(params.player.color, "downloadWindow", false) changeWindowVisibilityForColor(params.player.color, "downloadWindow", false)
end
return 1 return 1
end end