Merge pull request #168 from argonui/renaming-table-objects

Table object renaming

config.json

@@ -24,22 +24,22 @@
     "HandTrigger.be2f17",
     "HandTrigger.0285cc",
     "HandTrigger.a70eee",
-    "Custom_Assetbundle.afc863",
-    "Custom_Assetbundle.c8edca",
-    "Custom_Assetbundle.393bf7",
-    "Custom_Assetbundle.12c65e",
+    "TableLegBottomRight.afc863",
+    "TableLegBottomLeft.c8edca",
+    "TableLegTopLeft.393bf7",
+    "TableLegTopRight.12c65e",
     "FlexTableControl.bd69bd",
-    "Custom_Assetbundle.f938a2",
-    "Custom_Assetbundle.9f95fd",
-    "Custom_Assetbundle.35b95f",
-    "Custom_Assetbundle.5af8f2",
+    "TableBorderRight.f938a2",
+    "TableBorderBottom.9f95fd",
+    "TableBorderLeft.35b95f",
+    "TableBorderTop.5af8f2",
     "MythosArea.9f334f",
-    "Decortion-Candle.5706ae",
+    "Decoration-Candle.5706ae",
     "Decoration-Coin.87ccfc",
     "Decoration-Coin.a90f21",
     "Decoration-Coin.180a23",
-    "Custom_Tile.463022",
-    "Custom_Token.7bff34",
+    "Panel.463022",
+    "TentacleStand.7bff34",
     "ScriptingTrigger.83ef06",
     "Cluetokens.11e0cf",
     "Doomtokens.b015d8",
@@ -65,7 +65,7 @@
     "Damage.1f5a0a",
     "Horror.7b5729",
     "Resources.cd15ac",
-    "Custom_Model.4ee1f2",
+    "TableSurface.4ee1f2",
     "EncounterSets.304ffc",
     "Decoration-Coin.f18c2d",
     "Decoration-Coin.4be4a3",

objects/Decoration-Candle.5706ae.json

@@ -32,7 +32,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "Decortion - Candle",
+  "Nickname": "Decoration - Candle",
   "Snap": true,
   "Sticky": true,
   "Tooltip": false,

objects/Panel.463022.json

@@ -37,10 +37,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
-  "Nickname": "",
+  "Nickname": "Panel",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 77.99,
     "posY": 0.65,

objects/TableBorderBottom.9f95fd.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableBorderBottom",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": -54,
     "posY": -9,

objects/TableBorderLeft.35b95f.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableBorderLeft",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 0,
     "posY": -9,

objects/TableBorderRight.f938a2.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableBorderRight",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 0,
     "posY": -9,

objects/TableBorderTop.5af8f2.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableBorderTop",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 54,
     "posY": -9,

objects/TableLegBottomLeft.c8edca.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableLegBottomLeft",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": -54,
     "posY": -9,

objects/TableLegBottomRight.afc863.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableLegBottomRight",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": -54,
     "posY": -9,

objects/TableLegTopLeft.393bf7.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableLegTopLeft",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 54,
     "posY": -9,

objects/TableLegTopRight.12c65e.json

@@ -32,10 +32,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Assetbundle",
-  "Nickname": "",
+  "Nickname": "TableLegTopRight",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 54,
     "posY": -9,

objects/TableSurface.4ee1f2.json

@@ -45,10 +45,10 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Model",
-  "Nickname": "",
+  "Nickname": "TableSurface",
   "Snap": true,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
     "posX": 0,
     "posY": -9,

objects/TentacleStand.7bff34.json

@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Token",
-  "Nickname": "",
+  "Nickname": "TentacleStand",
   "PhysicsMaterial": {
     "BounceCombine": 0,
     "Bounciness": 0,

src/core/Global.ttslua

@@ -16,16 +16,12 @@ BARREL_GUID = "aa8b38"
 
 -- GUIDs that will not be interactable (e.g. parts of the table)
 local NOT_INTERACTABLE = {
-  "6161b4",
-  "721ba2",
-  "9f334f",
-  "23a43c",
-  "5450cc",
-  "463022",
-  "9487a4",
-  "91dd9b",
-  "f182ee",
-  "7bff34",
+  "6161b4", -- Decoration-Map
+  "721ba2", -- PlayArea
+  "9f334f", -- MythosArea
+  "463022", -- Panel behind tentacle stand
+  "f182ee", -- InvestigatorCount
+  "7bff34", -- Tentacle stand
   "8646eb", -- horizontal border left
   "75937e", -- horizontal border right
   "612072", -- vertical border left

src/playermat/ClueCounter.ttslua

@@ -26,7 +26,7 @@ end
 
 -- Activated once per second, counts items in bowls
 function countItems()
-  local totalValue = -1
+  local totalValue = 0
   local countableItems = findValidItemsInSphere()
   for _, entry in ipairs(countableItems) do
     local descValue = tonumber(entry.hit_object.getDescription())