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

Merge branch 'main' into wolf-mask

Browse Source
This commit is contained in:
Chr1Z93 2024-01-09 01:42:37 +01:00
commit fe544372f4
11 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/OfficialStandaloneChallengeScenarios.0ef5c8.json
View File

@ -34,7 +34,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/1758068588410895356/0B5F0CCD29DEC12514840D7B9CD2329B635A79A6/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 6
},

2
objects/ReturntoTheCircleUndone.757324.json
View File

@ -27,7 +27,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/1697277388086852852/6FD56D74FDDDA5626A3B72E788993EC651AD25E1/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 0
},

2
objects/ReturntoTheDunwichLegacy.ce9130.json
View File

@ -27,7 +27,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/762723517667592476/36D86649503A49A36AA97B7B72C6150E4C2BE333/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 0
},

2
objects/ReturntoTheForgottenAge.479ff3.json
View File

@ -27,7 +27,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/1474319121423613924/490D56D20C6AE0547D67D942513396E8D0584A4A/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 0
},

2
objects/ReturntoThePathtoCarcosa.e9889a.json
View File

@ -27,7 +27,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/762723517667556656/9638E8CE7F209B50634B202C9EF4B0BDB4993BBB/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 0
},

2
objects/ReturntotheNightoftheZealot.56270d.json
View File

@ -27,7 +27,7 @@
},
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/762723517667598054/18C06F0F20D9D4651E6736FB609E2D41F4D1964E/",
"MaterialIndex": 3,
"MeshURL": "http://pastebin.com/raw.php?i=uWAmuNZ2",
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/",
"NormalURL": "",
"TypeIndex": 0
},

3
src/accessories/CleanUpHelper.ttslua
View File

@ -245,6 +245,9 @@ function tidyPlayareaCoroutine()
local trash = guidReferenceApi.getObjectByOwnerAndType("Mythos", "Trash")
local playAreaZone = guidReferenceApi.getObjectByOwnerAndType("Mythos", "PlayAreaZone")
-- reset the playarea image by not providing an image
playAreaApi.updateSurface()
if playAreaZone == nil then
printToAll("Scripting zone for main play area could not be found!", "Red")
elseif trash == nil then

2
src/core/DoomInPlayCounter.ttslua
View File

@ -6,7 +6,7 @@ local doomURL = "https://i.imgur.com/EoL7yaZ.png"
local IGNORE_TAG = "DoomCounter_ignore"
local TOTAL_PLAY_AREA = {
upperLeft = {
x = -10,
x = -9,
z = -35
},
lowerRight = {

2
src/core/GameKeyHandler.ttslua
View File

@ -70,7 +70,7 @@ function discardObject(playerColor, hoveredObject)
-- discard tokens / tiles on cards / decks
if hoveredObject.type ~= "Tile" then
for _, obj in ipairs(searchLib.onObject(hoveredObject), "isTileOrToken") do
for _, obj in ipairs(searchLib.onObject(hoveredObject, "isTileOrToken")) do
table.insert(discardTheseObjects, obj)
end
end

3
src/core/Global.ttslua
View File

@ -20,7 +20,6 @@ ENCOUNTER_DECK_DISCARD_POSITION = { -3.85, 1, 10.38 }
-- GUIDs that will not be interactable (e.g. parts of the table)
local NOT_INTERACTABLE = {
"6161b4", -- Decoration-Map
"721ba2", -- PlayArea
"9f334f", -- MythosArea
"463022", -- Panel behind tentacle stand
"f182ee", -- InvestigatorCount
@ -834,7 +833,7 @@ function onClick_spawnPlaceholder()
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"
wide = "http://cloud-3.steamusercontent.com/ugc/2278324073260846176/33EFCAF30567F8756F665BE5A2A6502E9C61C7F7/"
}
local scaleTable = {

5
src/core/PlayArea.ttslua
View File

@ -61,6 +61,7 @@ function onSave()
end
function onLoad(savedData)
self.interactable = false -- this needs to be here since the playarea will be reloaded when the image changes
local loadedData = JSON.decode(savedData) or {}
locations = loadedData.trackedLocations or {}
currentScenario = loadedData.currentScenario
@ -84,10 +85,10 @@ function updateSurface(newURL)
if newURL ~= "" and newURL ~= nil and newURL ~= DEFAULT_URL then
customInfo.image = newURL
broadcastToAll("New Playmat Image Applied", { 0.2, 0.9, 0.2 })
broadcastToAll("New Playarea Image Applied", { 0.2, 0.9, 0.2 })
else
customInfo.image = DEFAULT_URL
broadcastToAll("Default Playmat Image Applied", { 0.2, 0.9, 0.2 })
broadcastToAll("Default Playarea Image Applied", { 0.2, 0.9, 0.2 })
end
self.setCustomObject(customInfo)