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

Merge pull request #258 from argonui/layout

Browse Source 
Adding token remover for white/orange, moving Phase Tracker
This commit is contained in:
BootleggerFinn 2023-04-12 18:07:27 -05:00 committed by GitHub
commit d298913db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/Cluetokens.31fa39.json
View File

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

2
objects/Damagetokens.480bda.json
View File

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

2
objects/Doomtokens.47ffc3.json
View File

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

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

@ -41,7 +41,7 @@
"CloseEncountersoftheLV-426Kind.4f5421", "CloseEncountersoftheLV-426Kind.4f5421",
"CelticRising.4d305a", "CelticRising.4d305a",
"CallofthePlaguebearer.613b64", "CallofthePlaguebearer.613b64",
"BetrayalattheMountainsofMadness084.ef939a", "BetrayalattheMountainsofMadness.ef939a",
"TheApproachingStorm.ab6b9a", "TheApproachingStorm.ab6b9a",
"AliceinWonderland.39916d", "AliceinWonderland.39916d",
"AgesUnwound.f7e5eb", "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/Horrortokens.c3ecf4.json
View File

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

8
objects/LeadInvestigator.acaa93.json
View File

@ -45,12 +45,12 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -61.051, "posX": -45,
"posY": 1.581, "posY": 1.62,
"posZ": -0.008, "posZ": 0,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 180, "rotZ": 0,
"scaleX": 0.61, "scaleX": 0.61,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.61 "scaleZ": 0.61

1
objects/OptionPanelSource.830bd0.json
View File

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

24
objects/PhaseTracker.d0c8fa.json
View File

@ -87,9 +87,9 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -58.148, "posX": -11.3,
"posY": 1.565, "posY": 1.52,
"posZ": 0, "posZ": -16,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,
@ -147,9 +147,9 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -58.148, "posX": -11.3,
"posY": 1.565, "posY": 1.52,
"posZ": 0, "posZ": -16,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,
@ -207,9 +207,9 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -58.148, "posX": -11.3,
"posY": 1.565, "posY": 1.52,
"posZ": 0, "posZ": -16,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,
@ -227,9 +227,9 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -58.148, "posX": -11.3,
"posY": 1.565, "posY": 1.52,
"posZ": 0, "posZ": -16,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,

4
objects/ScriptingTrigger.a2f932.json
View File

@ -35,11 +35,11 @@
"posY": 3.5, "posY": 3.5,
"posZ": 0, "posZ": 0,
"rotX": 0, "rotX": 0,
"rotY": 90, "rotY": 0,
"rotZ": 0, "rotZ": 0,
"scaleX": 37, "scaleX": 37,
"scaleY": 4, "scaleY": 4,
"scaleZ": 36.5 "scaleZ": 37
}, },
"Value": 0, "Value": 0,
"XmlUI": "" "XmlUI": ""

12
objects/TokenRemover.0a5a29.json
View File

@ -45,15 +45,15 @@
], ],
"Tooltip": true, "Tooltip": true,
"Transform": { "Transform": {
"posX": -6.755, "posX": -57.72,
"posY": 1.583, "posY": 1.481,
"posZ": -16.526, "posZ": 0,
"rotX": 0, "rotX": 0,
"rotY": 90, "rotY": 270,
"rotZ": 0, "rotZ": 0,
"scaleX": 0.8, "scaleX": 1,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.8 "scaleZ": 1
}, },
"Value": 0, "Value": 0,
"XmlUI": "" "XmlUI": ""

5
src/core/Global.ttslua
View File

@ -878,7 +878,7 @@ function applyOptionPanelChange(id, state)
-- option: Show attachment helper -- option: Show attachment helper
elseif id == "showAttachmentHelper" then 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 -- option: Show navigation overlay
elseif id == "showNavigationOverlay" then elseif id == "showNavigationOverlay" then
@ -935,6 +935,9 @@ function spawnHelperObject(name, position, rotation)
for _, obj in ipairs(sourceBag.getData().ContainedObjects) do for _, obj in ipairs(sourceBag.getData().ContainedObjects) do
if obj["Nickname"] == name then if obj["Nickname"] == name then
spawnTable.data = obj spawnTable.data = obj
spawnTable.callback_function = function(spawnedObj)
Wait.time(function() spawnedObj.setLock(true) end, 2)
end
return spawnObjectData(spawnTable) return spawnObjectData(spawnTable)
end end
end end