From 705b96d7072aab7bb0528acf0069b35a51b8f2d6 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Sun, 8 Jan 2023 19:42:45 +0100 Subject: [PATCH] adding ammo as separate objects --- config.json | 5 +- objects/Decoration-Ammo.0a3b03.json | 68 +++++++++ objects/Decoration-Ammo.b43845.json | 68 +++++++++ objects/Decoration-Ammo.d35ee9.json | 68 +++++++++ objects/EncounterSets.304ffc.json | 224 +--------------------------- objects/EncounterSets.304ffc.ttslua | 7 + xml/Global.xml | 13 +- 7 files changed, 224 insertions(+), 229 deletions(-) create mode 100644 objects/Decoration-Ammo.0a3b03.json create mode 100644 objects/Decoration-Ammo.b43845.json create mode 100644 objects/Decoration-Ammo.d35ee9.json create mode 100644 objects/EncounterSets.304ffc.ttslua diff --git a/config.json b/config.json index 0c579342..69cf4c63 100644 --- a/config.json +++ b/config.json @@ -189,7 +189,10 @@ "TableDivider.75937e", "TableDivider.8646eb", "Community-CreatedPlayerCardsInvestigators.ed4ca7", - "Fan-MadeScenariosCampaignsMiscellany.66e97c" + "Fan-MadeScenariosCampaignsMiscellany.66e97c", + "Decoration-Ammo.0a3b03", + "Decoration-Ammo.b43845", + "Decoration-Ammo.d35ee9" ], "PlayArea": 1, "PlayerCounts": [ diff --git a/objects/Decoration-Ammo.0a3b03.json b/objects/Decoration-Ammo.0a3b03.json new file mode 100644 index 00000000..7c483bed --- /dev/null +++ b/objects/Decoration-Ammo.0a3b03.json @@ -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": "" +} diff --git a/objects/Decoration-Ammo.b43845.json b/objects/Decoration-Ammo.b43845.json new file mode 100644 index 00000000..8613afd2 --- /dev/null +++ b/objects/Decoration-Ammo.b43845.json @@ -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": "" +} diff --git a/objects/Decoration-Ammo.d35ee9.json b/objects/Decoration-Ammo.d35ee9.json new file mode 100644 index 00000000..c7c96721 --- /dev/null +++ b/objects/Decoration-Ammo.d35ee9.json @@ -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": "" +} diff --git a/objects/EncounterSets.304ffc.json b/objects/EncounterSets.304ffc.json index 799165a3..229c5fdf 100644 --- a/objects/EncounterSets.304ffc.json +++ b/objects/EncounterSets.304ffc.json @@ -5,218 +5,9 @@ "z": 0 }, "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": { "b": 1, - "g": 0.99216, + "g": 1, "r": 1 }, "CustomMesh": { @@ -237,11 +28,11 @@ "MaterialIndex": 1, "MeshURL": "http://cloud-3.steamusercontent.com/ugc/863978359495064406/50966C05FB8C4D41BA069EB5E0E19E95BF3A9963/", "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, - "GMNotes": "", + "GMNotes": "extras/encounter_sets.json", "GUID": "304ffc", "Grid": true, "GridProjection": false, @@ -250,14 +41,11 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": true, - "LuaScript": "", "LuaScriptState": "", - "MaterialIndex": -1, + "LuaScript_path": "EncounterSets.304ffc.ttslua", "MeasureMovement": false, - "MeshIndex": -1, - "Name": "Custom_Model_Bag", + "Name": "Custom_Model", "Nickname": "Encounter Sets", - "Number": 0, "Snap": true, "Sticky": false, "Tooltip": true, diff --git a/objects/EncounterSets.304ffc.ttslua b/objects/EncounterSets.304ffc.ttslua new file mode 100644 index 00000000..0bbfbf9a --- /dev/null +++ b/objects/EncounterSets.304ffc.ttslua @@ -0,0 +1,7 @@ +function onLoad() + self.addContextMenuItem("Download", download) +end + +function download() + Global.call('placeholder_download', { url = self.getGMNotes(), replace = self.guid }) +end diff --git a/xml/Global.xml b/xml/Global.xml index dc15bced..8e9dc4b1 100644 --- a/xml/Global.xml +++ b/xml/Global.xml @@ -22,35 +22,28 @@ font="font_teutonic-arkham"/> - + + spacing="2">