From 40854e43e234ad3c986efb4eeff0c4c3d63bd373 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Sun, 8 Jan 2023 16:07:38 +0100 Subject: [PATCH 1/2] object renaming --- config.json | 24 +++++++++---------- ...6ae.json => Decoration-Candle.5706ae.json} | 4 ++-- ...tom_Tile.463022.json => Panel.463022.json} | 4 ++-- ...5fd.json => TableBorderBottom.9f95fd.json} | 6 ++--- ...5b95f.json => TableBorderLeft.35b95f.json} | 6 ++--- ...38a2.json => TableBorderRight.f938a2.json} | 6 ++--- ...5af8f2.json => TableBorderTop.5af8f2.json} | 6 ++--- ...ca.json => TableLegBottomLeft.c8edca.json} | 6 ++--- ...3.json => TableLegBottomRight.afc863.json} | 6 ++--- ...93bf7.json => TableLegTopLeft.393bf7.json} | 6 ++--- ...c65e.json => TableLegTopRight.12c65e.json} | 4 ++-- ...l.4ee1f2.json => TableSurface.4ee1f2.json} | 6 ++--- ....7bff34.json => TentacleStand.7bff34.json} | 4 ++-- src/core/Global.ttslua | 16 +++++-------- 14 files changed, 50 insertions(+), 54 deletions(-) rename objects/{Decortion-Candle.5706ae.json => Decoration-Candle.5706ae.json} (96%) rename objects/{Custom_Tile.463022.json => Panel.463022.json} (96%) rename objects/{Custom_Assetbundle.9f95fd.json => TableBorderBottom.9f95fd.json} (94%) rename objects/{Custom_Assetbundle.35b95f.json => TableBorderLeft.35b95f.json} (94%) rename objects/{Custom_Assetbundle.f938a2.json => TableBorderRight.f938a2.json} (94%) rename objects/{Custom_Assetbundle.5af8f2.json => TableBorderTop.5af8f2.json} (94%) rename objects/{Custom_Assetbundle.c8edca.json => TableLegBottomLeft.c8edca.json} (94%) rename objects/{Custom_Assetbundle.afc863.json => TableLegBottomRight.afc863.json} (94%) rename objects/{Custom_Assetbundle.393bf7.json => TableLegTopLeft.393bf7.json} (94%) rename objects/{Custom_Assetbundle.12c65e.json => TableLegTopRight.12c65e.json} (94%) rename objects/{Custom_Model.4ee1f2.json => TableSurface.4ee1f2.json} (96%) rename objects/{Custom_Token.7bff34.json => TentacleStand.7bff34.json} (97%) diff --git a/config.json b/config.json index 0c579342..5204aa0f 100644 --- a/config.json +++ b/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", diff --git a/objects/Decortion-Candle.5706ae.json b/objects/Decoration-Candle.5706ae.json similarity index 96% rename from objects/Decortion-Candle.5706ae.json rename to objects/Decoration-Candle.5706ae.json index a5184df9..37c96557 100644 --- a/objects/Decortion-Candle.5706ae.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Tile.463022.json b/objects/Panel.463022.json similarity index 96% rename from objects/Custom_Tile.463022.json rename to objects/Panel.463022.json index 115f30c2..496c1601 100644 --- a/objects/Custom_Tile.463022.json +++ b/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, diff --git a/objects/Custom_Assetbundle.9f95fd.json b/objects/TableBorderBottom.9f95fd.json similarity index 94% rename from objects/Custom_Assetbundle.9f95fd.json rename to objects/TableBorderBottom.9f95fd.json index 5e6fe09f..f7709b91 100644 --- a/objects/Custom_Assetbundle.9f95fd.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.35b95f.json b/objects/TableBorderLeft.35b95f.json similarity index 94% rename from objects/Custom_Assetbundle.35b95f.json rename to objects/TableBorderLeft.35b95f.json index 009518de..b74acfa5 100644 --- a/objects/Custom_Assetbundle.35b95f.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.f938a2.json b/objects/TableBorderRight.f938a2.json similarity index 94% rename from objects/Custom_Assetbundle.f938a2.json rename to objects/TableBorderRight.f938a2.json index abc39b24..88c1f8e3 100644 --- a/objects/Custom_Assetbundle.f938a2.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.5af8f2.json b/objects/TableBorderTop.5af8f2.json similarity index 94% rename from objects/Custom_Assetbundle.5af8f2.json rename to objects/TableBorderTop.5af8f2.json index b85763ed..ea6cc9dc 100644 --- a/objects/Custom_Assetbundle.5af8f2.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.c8edca.json b/objects/TableLegBottomLeft.c8edca.json similarity index 94% rename from objects/Custom_Assetbundle.c8edca.json rename to objects/TableLegBottomLeft.c8edca.json index b09ad4a8..cd02b02f 100644 --- a/objects/Custom_Assetbundle.c8edca.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.afc863.json b/objects/TableLegBottomRight.afc863.json similarity index 94% rename from objects/Custom_Assetbundle.afc863.json rename to objects/TableLegBottomRight.afc863.json index 82bff108..852adee7 100644 --- a/objects/Custom_Assetbundle.afc863.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.393bf7.json b/objects/TableLegTopLeft.393bf7.json similarity index 94% rename from objects/Custom_Assetbundle.393bf7.json rename to objects/TableLegTopLeft.393bf7.json index 8cd9995e..c2bfbeb4 100644 --- a/objects/Custom_Assetbundle.393bf7.json +++ b/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, @@ -49,4 +49,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Assetbundle.12c65e.json b/objects/TableLegTopRight.12c65e.json similarity index 94% rename from objects/Custom_Assetbundle.12c65e.json rename to objects/TableLegTopRight.12c65e.json index f3e08c80..74059946 100644 --- a/objects/Custom_Assetbundle.12c65e.json +++ b/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, diff --git a/objects/Custom_Model.4ee1f2.json b/objects/TableSurface.4ee1f2.json similarity index 96% rename from objects/Custom_Model.4ee1f2.json rename to objects/TableSurface.4ee1f2.json index 1379e580..f76ba1fa 100644 --- a/objects/Custom_Model.4ee1f2.json +++ b/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, @@ -62,4 +62,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/objects/Custom_Token.7bff34.json b/objects/TentacleStand.7bff34.json similarity index 97% rename from objects/Custom_Token.7bff34.json rename to objects/TentacleStand.7bff34.json index d180998b..ec47c293 100644 --- a/objects/Custom_Token.7bff34.json +++ b/objects/TentacleStand.7bff34.json @@ -37,7 +37,7 @@ "LuaScriptState": "", "MeasureMovement": false, "Name": "Custom_Token", - "Nickname": "", + "Nickname": "TentacleStand", "PhysicsMaterial": { "BounceCombine": 0, "Bounciness": 0, @@ -67,4 +67,4 @@ }, "Value": 0, "XmlUI": "" -} +} \ No newline at end of file diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index c2003d65..2a694c0c 100644 --- a/src/core/Global.ttslua +++ b/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 From 6551470e9457cb0ecc19e1ff36317a1d345b3305 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Sun, 8 Jan 2023 22:48:34 +0100 Subject: [PATCH 2/2] correct value because table is no longer nameless --- src/playermat/ClueCounter.ttslua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playermat/ClueCounter.ttslua b/src/playermat/ClueCounter.ttslua index ede426e9..3dcaa490 100644 --- a/src/playermat/ClueCounter.ttslua +++ b/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())