Merge pull request #169 from argonui/encounter-set-download-fixing

Removing "Extras" and "Investigators" from bottom menu
This commit is contained in:
Chr1Z 2023-01-09 06:59:03 +01:00 committed by GitHub
commit 23c8b12e1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 227 additions and 232 deletions

View File

@ -189,7 +189,10 @@
"TableDivider.75937e", "TableDivider.75937e",
"TableDivider.8646eb", "TableDivider.8646eb",
"Community-CreatedPlayerCardsInvestigators.ed4ca7", "Community-CreatedPlayerCardsInvestigators.ed4ca7",
"Fan-MadeScenariosCampaignsMiscellany.66e97c" "Fan-MadeScenariosCampaignsMiscellany.66e97c",
"Decoration-Ammo.0a3b03",
"Decoration-Ammo.b43845",
"Decoration-Ammo.d35ee9"
], ],
"PlayArea": 1, "PlayArea": 1,
"PlayerCounts": [ "PlayerCounts": [

View File

@ -44,7 +44,7 @@
"Transform": { "Transform": {
"posX": -17.5, "posX": -17.5,
"posY": 1.481, "posY": 1.481,
"posZ": 70, "posZ": 71,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,

View File

@ -0,0 +1,68 @@
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.14106,
"g": 0.14106,
"r": 0.14106
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "0a3b03",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": true,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Decoration - Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": false,
"Transform": {
"posX": -66.517,
"posY": 1.644,
"posZ": -83.303,
"rotX": 8,
"rotY": 176,
"rotZ": 267,
"scaleX": 0.2,
"scaleY": 0.3,
"scaleZ": 0.2
},
"Value": 0,
"XmlUI": ""
}

View File

@ -0,0 +1,68 @@
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.14106,
"g": 0.14106,
"r": 0.14106
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "b43845",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": true,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Decoration - Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": false,
"Transform": {
"posX": -65.826,
"posY": 1.571,
"posZ": -81.108,
"rotX": 290,
"rotY": 59,
"rotZ": 268,
"scaleX": 0.2,
"scaleY": 0.3,
"scaleZ": 0.2
},
"Value": 0,
"XmlUI": ""
}

View File

@ -0,0 +1,68 @@
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.14106,
"g": 0.14106,
"r": 0.14106
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "d35ee9",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": true,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Decoration - Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": false,
"Transform": {
"posX": -66.507,
"posY": 1.598,
"posZ": -88.119,
"rotX": 0,
"rotY": 161,
"rotZ": 90,
"scaleX": 0.2,
"scaleY": 0.3,
"scaleZ": 0.2
},
"Value": 0,
"XmlUI": ""
}

View File

@ -45,7 +45,7 @@
"Transform": { "Transform": {
"posX": -62, "posX": -62,
"posY": 1.495, "posY": 1.495,
"posZ": 72, "posZ": 71,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,

View File

@ -5,218 +5,9 @@
"z": 0 "z": 0
}, },
"Autoraise": true, "Autoraise": true,
"Bag": {
"Order": 0
},
"ChildObjects": [
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.141059875,
"g": 0.141059875,
"r": 0.141059875
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "0a3b03",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -0.8431477,
"posY": 0.0594902448,
"posZ": 0.08813342,
"rotX": -0.00000607416268,
"rotY": 0.000005999793,
"rotZ": 164.445618,
"scaleX": 0.06666666,
"scaleY": 0.099999994,
"scaleZ": 0.06666667
},
"Value": 0,
"XmlUI": ""
},
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.141059875,
"g": 0.141059875,
"r": 0.141059875
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "0c05e4",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -0.5932517,
"posY": -0.413039148,
"posZ": 0.088135004,
"rotX": 30.4455643,
"rotY": 270.000122,
"rotZ": 180.0001,
"scaleX": 0.06666667,
"scaleY": 0.09999998,
"scaleZ": 0.0666666552
},
"Value": 0,
"XmlUI": ""
},
{
"AltLookAngle": {
"x": 0,
"y": 0,
"z": 0
},
"Autoraise": true,
"ColorDiffuse": {
"b": 0.141059875,
"g": 0.141059875,
"r": 0.141059875
},
"CustomMesh": {
"CastShadows": true,
"ColliderURL": "",
"Convex": true,
"DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765629/74DEC33718157E37D77E0777715B452F9015A07F/",
"MaterialIndex": 2,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/780750188124765079/4F3634374EEC02E5D2DAED88F5D8F0956B6292B8/",
"NormalURL": "",
"TypeIndex": 0
},
"Description": "",
"DragSelectable": true,
"GMNotes": "",
"GUID": "b486bd",
"Grid": false,
"GridProjection": false,
"Hands": false,
"HideWhenFaceDown": false,
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Custom_Model",
"Nickname": "Ammo",
"PhysicsMaterial": {
"BounceCombine": 0,
"Bounciness": 0,
"DynamicFriction": 0,
"FrictionCombine": 0,
"StaticFriction": 0
},
"Rigidbody": {
"AngularDrag": 0,
"Drag": 0,
"Mass": 500,
"UseGravity": true
},
"Snap": false,
"Sticky": true,
"Tooltip": true,
"Transform": {
"posX": -0.0928746462,
"posY": 1.08934021,
"posZ": 0.08813286,
"rotX": 0.000100743171,
"rotY": 180.000122,
"rotZ": 96.55444,
"scaleX": 0.0666666552,
"scaleY": 0.09999998,
"scaleZ": 0.0666666552
},
"Value": 0,
"XmlUI": ""
}
],
"ColorDiffuse": { "ColorDiffuse": {
"b": 1, "b": 1,
"g": 0.99216, "g": 1,
"r": 1 "r": 1
}, },
"CustomMesh": { "CustomMesh": {
@ -237,11 +28,11 @@
"MaterialIndex": 1, "MaterialIndex": 1,
"MeshURL": "http://cloud-3.steamusercontent.com/ugc/863978359495064406/50966C05FB8C4D41BA069EB5E0E19E95BF3A9963/", "MeshURL": "http://cloud-3.steamusercontent.com/ugc/863978359495064406/50966C05FB8C4D41BA069EB5E0E19E95BF3A9963/",
"NormalURL": "", "NormalURL": "",
"TypeIndex": 6 "TypeIndex": 0
}, },
"Description": "Use the download menu at the bottom right to spawn encounter sets here.", "Description": "Use the context menu to download the encounter sets by cycle.",
"DragSelectable": true, "DragSelectable": true,
"GMNotes": "", "GMNotes": "extras/encounter_sets.json",
"GUID": "304ffc", "GUID": "304ffc",
"Grid": true, "Grid": true,
"GridProjection": false, "GridProjection": false,
@ -250,14 +41,11 @@
"IgnoreFoW": false, "IgnoreFoW": false,
"LayoutGroupSortIndex": 0, "LayoutGroupSortIndex": 0,
"Locked": true, "Locked": true,
"LuaScript": "",
"LuaScriptState": "", "LuaScriptState": "",
"MaterialIndex": -1, "LuaScript_path": "EncounterSets.304ffc.ttslua",
"MeasureMovement": false, "MeasureMovement": false,
"MeshIndex": -1, "Name": "Custom_Model",
"Name": "Custom_Model_Bag",
"Nickname": "Encounter Sets", "Nickname": "Encounter Sets",
"Number": 0,
"Snap": true, "Snap": true,
"Sticky": false, "Sticky": false,
"Tooltip": true, "Tooltip": true,

View File

@ -0,0 +1,7 @@
function onLoad()
self.addContextMenuItem("Download", download)
end
function download()
Global.call('placeholder_download', { url = self.getGMNotes(), replace = self.guid })
end

View File

@ -44,7 +44,7 @@
"Transform": { "Transform": {
"posX": 60, "posX": 60,
"posY": 1.481, "posY": 1.481,
"posZ": 70, "posZ": 71,
"rotX": 0, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 0, "rotZ": 0,

View File

@ -22,35 +22,28 @@
font="font_teutonic-arkham"/> font="font_teutonic-arkham"/>
</Defaults> </Defaults>
<!-- Buttons in the bottom right of the screen --> <!-- Buttons at the bottom right (height: n * 35 + (n-1) * 2) -->
<VerticalLayout visibility="Admin" <VerticalLayout visibility="Admin"
color="#000000" color="#000000"
outlineSize="1 1" outlineSize="1 1"
outline="#303030" outline="#303030"
rectAlignment="LowerRight" rectAlignment="LowerRight"
width="35" width="35"
height="215" height="146"
offsetXY="-1 60" offsetXY="-1 60"
spacing="1"> spacing="2">
<Button icon="cthulhu" <Button icon="cthulhu"
tooltip="Campaigns" tooltip="Campaigns"
onClick="onClick_toggleUi(Campaigns)"/> onClick="onClick_toggleUi(Campaigns)"/>
<Button icon="dark-cult" <Button icon="dark-cult"
tooltip="Standalone Scenarios" tooltip="Standalone Scenarios"
onClick="onClick_toggleUi(Standalone Scenarios)"/> onClick="onClick_toggleUi(Standalone Scenarios)"/>
<Button icon="yog-sothoth"
tooltip="Extras"
onClick="onClick_toggleUi(Extras)"/>
<Button icon="elder-sign"
tooltip="Investigators"
onClick="onClick_toggleUi(Investigators)"/>
<Button icon="devourer" <Button icon="devourer"
tooltip="Community Content" tooltip="Community Content"
onClick="onClick_toggleUi(Community Content)"/> onClick="onClick_toggleUi(Community Content)"/>
<Button icon="option-gear" <Button icon="option-gear"
tooltip="Options" tooltip="Options"
onClick="onClick_toggleUi(Options)"/> onClick="onClick_toggleUi(Options)"/>
<!--<Button icon="download" tooltip="ArkhamDB Deck Importer" onClick="onClick_toggleUi(Deck Importer)"/> -->
</VerticalLayout> </VerticalLayout>
<!-- Basic UI that will be replaced based on title --> <!-- Basic UI that will be replaced based on title -->