moving spawnable objects to the new bag

objects/Fan-MadeAccessories.aa8b38.json

@@ -14,22 +14,12 @@
     "r": 1
   },
   "ContainedObjects_order": [
-    "ChaosBagManager.023240",
-    "TokenArranger.022907",
-    "CYOACampaignGuides.e87ea2",
-    "AttachmentHelper.7f4976",
     "ArkhamFantasy-PixelArtMini-Cards.e17c9e",
-    "jaqenZannsNavigationOverlay.a8affa",
     "DrawTokenButtonTooltipRenamer.cc77a8",
     "WhimsicalsGenericDifficultySelector.05efb4",
-    "SearchAssistant.17aed0",
-    "HandHelper.450688",
-    "DisplacementTool.0f1374",
     "LuckyPenny.2ab443",
     "Double-SidedResource.bc81cb",
     "DescriptivePhaseTracker.b171c8",
-    "CleanUpHelper.26cf4b",
-    "CustomPlaymatImages.004fe7",
     "CustomDataHelper.2547b3"
   ],
   "ContainedObjects_path": "Fan-MadeAccessories.aa8b38",

objects/OptionPanelSource.830bd0.json

@@ -13,6 +13,19 @@
     "g": 0.36652,
     "r": 0.70588
   },
+  "ContainedObjects_order": [
+    "ChaosBagManager.023240",
+    "TokenArranger.022907",
+    "CYOACampaignGuides.e87ea2",
+    "AttachmentHelper.7f4976",
+    "jaqenZannsNavigationOverlay.a8affa",
+    "SearchAssistant.17aed0",
+    "HandHelper.450688",
+    "DisplacementTool.0f1374",
+    "CleanUpHelper.26cf4b",
+    "CustomPlaymatImages.004fe7"
+  ],
+  "ContainedObjects_path": "OptionPanelSource.830bd0",
   "Description": "Contains the objects that are spawnable via option panel",
   "DragSelectable": true,
   "GMNotes": "",

objects/OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.json

@@ -63,8 +63,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScriptState_path": "Fan-MadeAccessories.aa8b38/CYOACampaignGuides.e87ea2.luascriptstate",
+  "LuaScriptState_path": "OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.luascriptstate",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/CYOACampaignGuides.e87ea2.ttslua",
+  "LuaScript_path": "OptionPanelSource.830bd0/CYOACampaignGuides.e87ea2.ttslua",
   "MaterialIndex": -1,
   "MeasureMovement": false,
   "MeshIndex": -1,
@@ -86,4 +86,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/OptionPanelSource.830bd0/CleanUpHelper.26cf4b.json

@@ -73,5 +73,5 @@
     "scaleZ": 1.5
   },
   "Value": 0,
-  "XmlUI_path": "Fan-MadeAccessories.aa8b38/CleanUpHelper.26cf4b.xml"
+  "XmlUI_path": "OptionPanelSource.830bd0/CleanUpHelper.26cf4b.xml"
-}
+}

objects/OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.json

@@ -34,7 +34,7 @@
   "LayoutGroupSortIndex": 0,
   "Locked": false,
   "LuaScript": "require(\"accessories/CustomPlaymatImages\")",
-  "LuaScriptState_path": "Fan-MadeAccessories.aa8b38/CustomPlaymatImages.004fe7.luascriptstate",
+  "LuaScriptState_path": "OptionPanelSource.830bd0/CustomPlaymatImages.004fe7.luascriptstate",
   "MeasureMovement": false,
   "Name": "Custom_Token",
   "Nickname": "Custom Playmat Images",
@@ -54,4 +54,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.json

@@ -29,7 +29,7 @@
   "LayoutGroupSortIndex": 0,
   "Locked": false,
   "LuaScriptState": "{\"distance\":15,\"pitch\":75}",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.ttslua",
+  "LuaScript_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/Custom_Assetbundle.cecc3e.ttslua",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
   "Nickname": "",
@@ -49,4 +49,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.0ffbc5.json

@@ -33,8 +33,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
-  "LuaScriptState_path": "Fan-MadeAccessories.aa8b38/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.0ffbc5.luascriptstate",
+  "LuaScriptState_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.0ffbc5.luascriptstate",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.0ffbc5.ttslua",
+  "LuaScript_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.0ffbc5.ttslua",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
   "Nickname": "jaqenZann's Navigation Overlay Tile",
@@ -54,4 +54,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}

src/core/Global.ttslua

@@ -11,9 +11,6 @@ optionPanel = {}
 -- GUID of data helper
 DATA_HELPER_GUID = "708279"
 
--- GUID of fan-made accessories bag (also just called "barrel")
-BARREL_GUID = "aa8b38"
-
 -- GUIDs that will not be interactable (e.g. parts of the table)
 local NOT_INTERACTABLE = {
   "6161b4", -- Decoration-Map
@@ -906,15 +903,16 @@ function spawnOrRemoveHelper(state, name, position, rotation)
   end
 end
 
--- copies the specified tool (by name) from the barrel
+-- copies the specified tool (by name) from the option panel source bag
 ---@param name String Name of the object that should be copied
 ---@param position Table Desired position of the object
 function spawnHelperObject(name, position, rotation)
-  local barrel = getObjectFromGUID(BARREL_GUID)
 
-  -- error handling for missing barrel
+  local sourceBag = getObjectFromGUID("830bd0")
-  if not barrel then
+
-    broadcastToAll("'Barrel' with fan-made accessories could not be found!", "Red")
+  -- error handling for missing sourceBag
+  if not sourceBag then
+    broadcastToAll("Option panel source bag could not be found!", "Red")
     return
   end
 
@@ -925,7 +923,7 @@ function spawnHelperObject(name, position, rotation)
     spawnTable.rotation = rotation
   end
 
-  for _, obj in ipairs(barrel.getData().ContainedObjects) do
+  for _, obj in ipairs(sourceBag.getData().ContainedObjects) do
     if obj["Nickname"] == name then
       spawnTable.data = obj
       return spawnObjectData(spawnTable)