Merge pull request #405 from argonui/suzi-helper

Suzi Helper: moved script and added handling for empty bags

objects/Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.json

@@ -49,8 +49,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
+  "LuaScript": "require(\"accessories/Subject5U-21Helper\")",
   "LuaScriptState": "",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/Subject5U-21Helper.1335e8.ttslua",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
   "Nickname": "Subject 5U-21 Helper",

objects/Fan-MadeAccessories.aa8b38/UnderworldMarketHelper.3650ea.json

@@ -34,8 +34,8 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": false,
+  "LuaScript": "require(\"accessories/UnderworldMarketHelper\")",
   "LuaScriptState": "",
-  "LuaScript_path": "Fan-MadeAccessories.aa8b38/UnderworldMarketHelper.3650ea.ttslua",
   "MaterialIndex": -1,
   "MeasureMovement": false,
   "MeshIndex": -1,

src/accessories/Subject5U-21Helper.ttslua

@@ -91,10 +91,14 @@ function getNotesFromCardsAndContainers()
       notes = JSON.decode(obj.getGMNotes()) or {}
       table.insert(notesList, notes)
     elseif obj.type == "Bag" or obj.type == "Deck" then
-      for _, deepObj in ipairs(obj.getData().ContainedObjects) do
-        if deepObj.Name == "Card" or deepObj.Name == "CardCustom" then
-          notes = JSON.decode(deepObj.GMNotes) or {}
-          table.insert(notesList, notes)
+      -- check if there are actually objects contained and loop through them
+      local containedObjects = obj.getData().ContainedObjects
+      if containedObjects then
+        for _, deepObj in ipairs(containedObjects) do
+          if deepObj.Name == "Card" or deepObj.Name == "CardCustom" then
+            notes = JSON.decode(deepObj.GMNotes) or {}
+            table.insert(notesList, notes)
+          end
         end
       end
     end