From c54afed3ffe51aa6f89feedf8dc57c2ac19eea97 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Sat, 19 Nov 2022 01:56:50 +0100 Subject: [PATCH] resolving comments --- objects/Custom_Model.032300.json | 2 +- objects/Custom_Model.1769ed.json | 2 +- objects/Custom_Model.37be78.json | 2 +- objects/Custom_Model.d86b7c.json | 2 +- objects/Damage.1f5a0a.json | 2 +- objects/Damage.591a45.json | 2 +- objects/Damage.e64eec.json | 2 +- objects/Damage.eb08d6.json | 2 +- objects/Horror.0257d9.json | 2 +- objects/Horror.468e88.json | 2 +- objects/Horror.7b5729.json | 2 +- objects/Horror.beb964.json | 2 +- objects/Resources.4406f0.json | 2 +- objects/Resources.816d84.json | 2 +- objects/Resources.a4b60d.json | 2 +- objects/Resources.cd15ac.json | 2 +- src/playermat/GenericCounter.ttslua | 13 ++++++++++++- 17 files changed, 28 insertions(+), 17 deletions(-) diff --git a/objects/Custom_Model.032300.json b/objects/Custom_Model.032300.json index 85809306..edcc06c5 100644 --- a/objects/Custom_Model.032300.json +++ b/objects/Custom_Model.032300.json @@ -52,7 +52,7 @@ "Tooltip": true, "Transform": { "posX": -31.911, - "posY": 1.65, + "posY": 1.57, "posZ": 30.97, "rotX": 0, "rotY": 0, diff --git a/objects/Custom_Model.1769ed.json b/objects/Custom_Model.1769ed.json index 4d270f1c..823113a1 100644 --- a/objects/Custom_Model.1769ed.json +++ b/objects/Custom_Model.1769ed.json @@ -52,7 +52,7 @@ "Tooltip": true, "Transform": { "posX": -59.449, - "posY": 1.65, + "posY": 1.57, "posZ": -22.628, "rotX": 0, "rotY": 270, diff --git a/objects/Custom_Model.37be78.json b/objects/Custom_Model.37be78.json index 13e73562..ff90db73 100644 --- a/objects/Custom_Model.37be78.json +++ b/objects/Custom_Model.37be78.json @@ -52,7 +52,7 @@ "Tooltip": true, "Transform": { "posX": -18.983, - "posY": 1.65, + "posY": 1.57, "posZ": -31.01, "rotX": 0, "rotY": 180, diff --git a/objects/Custom_Model.d86b7c.json b/objects/Custom_Model.d86b7c.json index 91dbf8ce..fceedaac 100644 --- a/objects/Custom_Model.d86b7c.json +++ b/objects/Custom_Model.d86b7c.json @@ -52,7 +52,7 @@ "Tooltip": true, "Transform": { "posX": -59.499, - "posY": 1.65, + "posY": 1.57, "posZ": 9.561, "rotX": 0, "rotY": 270, diff --git a/objects/Damage.1f5a0a.json b/objects/Damage.1f5a0a.json index 92522eca..43b01ca0 100644 --- a/objects/Damage.1f5a0a.json +++ b/objects/Damage.1f5a0a.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -32.31, - "posY": 1.55, + "posY": 1.52, "posZ": 29.006, "rotX": 0, "rotY": 11, diff --git a/objects/Damage.591a45.json b/objects/Damage.591a45.json index ab583f3d..de4a7ec4 100644 --- a/objects/Damage.591a45.json +++ b/objects/Damage.591a45.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -18.706, - "posY": 1.55, + "posY": 1.52, "posZ": -29.027, "rotX": 0, "rotY": 195, diff --git a/objects/Damage.e64eec.json b/objects/Damage.e64eec.json index 76ce2961..b139388e 100644 --- a/objects/Damage.e64eec.json +++ b/objects/Damage.e64eec.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -57.512, - "posY": 1.55, + "posY": 1.52, "posZ": -22.921, "rotX": 0, "rotY": 285, diff --git a/objects/Damage.eb08d6.json b/objects/Damage.eb08d6.json index 7697439f..a2cb8816 100644 --- a/objects/Damage.eb08d6.json +++ b/objects/Damage.eb08d6.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -57.488, - "posY": 1.55, + "posY": 1.52, "posZ": 9.184, "rotX": 0, "rotY": 282, diff --git a/objects/Horror.0257d9.json b/objects/Horror.0257d9.json index 14b58d93..e6657372 100644 --- a/objects/Horror.0257d9.json +++ b/objects/Horror.0257d9.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -57.882, - "posY": 1.55, + "posY": 1.52, "posZ": -24.902, "rotX": 0, "rotY": 285, diff --git a/objects/Horror.468e88.json b/objects/Horror.468e88.json index 03a00871..256b9c3a 100644 --- a/objects/Horror.468e88.json +++ b/objects/Horror.468e88.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -57.837, - "posY": 1.55, + "posY": 1.52, "posZ": 7.19, "rotX": 0, "rotY": 280, diff --git a/objects/Horror.7b5729.json b/objects/Horror.7b5729.json index 57c35d39..0b0509b0 100644 --- a/objects/Horror.7b5729.json +++ b/objects/Horror.7b5729.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -34.234, - "posY": 1.55, + "posY": 1.52, "posZ": 29.394, "rotX": 0, "rotY": 10, diff --git a/objects/Horror.beb964.json b/objects/Horror.beb964.json index 7e2d72d1..6c3e6c49 100644 --- a/objects/Horror.beb964.json +++ b/objects/Horror.beb964.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -16.653, - "posY": 1.55, + "posY": 1.52, "posZ": -29.429, "rotX": 0, "rotY": 195, diff --git a/objects/Resources.4406f0.json b/objects/Resources.4406f0.json index 0e2ec7c4..5329df96 100644 --- a/objects/Resources.4406f0.json +++ b/objects/Resources.4406f0.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -59.774, - "posY": 1.55, + "posY": 1.52, "posZ": 7.535, "rotX": 0, "rotY": 280, diff --git a/objects/Resources.816d84.json b/objects/Resources.816d84.json index 07d07b28..eadba42d 100644 --- a/objects/Resources.816d84.json +++ b/objects/Resources.816d84.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -59.793, - "posY": 1.55, + "posY": 1.52, "posZ": -24.544, "rotX": 0, "rotY": 285, diff --git a/objects/Resources.a4b60d.json b/objects/Resources.a4b60d.json index 4a4a7e3b..2acfa04c 100644 --- a/objects/Resources.a4b60d.json +++ b/objects/Resources.a4b60d.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -17.037, - "posY": 1.55, + "posY": 1.52, "posZ": -31.384, "rotX": 0, "rotY": 195, diff --git a/objects/Resources.cd15ac.json b/objects/Resources.cd15ac.json index 1adb34df..eeafff2b 100644 --- a/objects/Resources.cd15ac.json +++ b/objects/Resources.cd15ac.json @@ -43,7 +43,7 @@ "Tooltip": false, "Transform": { "posX": -33.889, - "posY": 1.55, + "posY": 1.52, "posZ": 31.335, "rotX": 0, "rotY": 10, diff --git a/src/playermat/GenericCounter.ttslua b/src/playermat/GenericCounter.ttslua index 9999a283..c3f9cce8 100644 --- a/src/playermat/GenericCounter.ttslua +++ b/src/playermat/GenericCounter.ttslua @@ -9,11 +9,22 @@ function onLoad(saved_data) val = JSON.decode(saved_data) end + local name = self.getName() + local position = {} + + if name == "Damage" or name == "Resources" then + position = { 0, 0.06, 0.1 } + elseif name == "Horror" then + position = { -0.025, 0.06, -0.025 } + else + position = { 0, 0.06, 0 } + end + self.createButton({ label = tostring(val), click_function = "addOrSubtract", function_owner = self, - position = { 0, 0.06, 0 }, + position = position, height = 600, width = 1000, scale = { 1.5, 1.5, 1.5 },