Merge pull request #258 from argonui/layout

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

View File

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

View File

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

View File

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

View File

@ -41,7 +41,7 @@
"CloseEncountersoftheLV-426Kind.4f5421",
"CelticRising.4d305a",
"CallofthePlaguebearer.613b64",
"BetrayalattheMountainsofMadness084.ef939a",
"BetrayalattheMountainsofMadness.ef939a",
"TheApproachingStorm.ab6b9a",
"AliceinWonderland.39916d",
"AgesUnwound.f7e5eb",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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