From 3e5caf0f48f375266f80f44a768712be3474e009 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Mon, 19 Jun 2023 15:16:43 +0200 Subject: [PATCH] add tags and reduce X_BUFFER --- objects/TableDivider.612072.json | 5 +++++ objects/TableDivider.75937e.json | 5 +++++ objects/TableDivider.8646eb.json | 5 +++++ objects/TableDivider.975c39.json | 5 +++++ objects/VictoryDisplay.6ccd6d.json | 4 +++- src/core/NavigationOverlayHandler.ttslua | 2 +- src/playermat/Playmat.ttslua | 4 ++-- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/objects/TableDivider.612072.json b/objects/TableDivider.612072.json index 9d9cbdc3..cd545a67 100644 --- a/objects/TableDivider.612072.json +++ b/objects/TableDivider.612072.json @@ -29,6 +29,11 @@ "Nickname": "Table Divider", "Snap": true, "Sticky": true, + "Tags": [ + "CameraZoom_ignore", + "CleanUpHelper_ignore", + "displacement_excluded" + ], "Tooltip": false, "Transform": { "posX": 0, diff --git a/objects/TableDivider.75937e.json b/objects/TableDivider.75937e.json index 214cdf13..3fb387ee 100644 --- a/objects/TableDivider.75937e.json +++ b/objects/TableDivider.75937e.json @@ -29,6 +29,11 @@ "Nickname": "Table Divider", "Snap": true, "Sticky": true, + "Tags": [ + "CameraZoom_ignore", + "CleanUpHelper_ignore", + "displacement_excluded" + ], "Tooltip": false, "Transform": { "posX": -16.807, diff --git a/objects/TableDivider.8646eb.json b/objects/TableDivider.8646eb.json index 16f3b007..d5ee3f59 100644 --- a/objects/TableDivider.8646eb.json +++ b/objects/TableDivider.8646eb.json @@ -29,6 +29,11 @@ "Nickname": "Table Divider", "Snap": true, "Sticky": true, + "Tags": [ + "CameraZoom_ignore", + "CleanUpHelper_ignore", + "displacement_excluded" + ], "Tooltip": false, "Transform": { "posX": -29.99, diff --git a/objects/TableDivider.975c39.json b/objects/TableDivider.975c39.json index 8670aa77..8d37d560 100644 --- a/objects/TableDivider.975c39.json +++ b/objects/TableDivider.975c39.json @@ -29,6 +29,11 @@ "Nickname": "Table Divider", "Snap": true, "Sticky": true, + "Tags": [ + "CameraZoom_ignore", + "CleanUpHelper_ignore", + "displacement_excluded" + ], "Tooltip": false, "Transform": { "posX": 0, diff --git a/objects/VictoryDisplay.6ccd6d.json b/objects/VictoryDisplay.6ccd6d.json index 0754bd9e..622ccfd8 100644 --- a/objects/VictoryDisplay.6ccd6d.json +++ b/objects/VictoryDisplay.6ccd6d.json @@ -163,7 +163,9 @@ "Snap": false, "Sticky": true, "Tags": [ - "CleanUpHelper_ignore" + "CameraZoom_ignore", + "CleanUpHelper_ignore", + "displacement_excluded" ], "Tooltip": true, "Transform": { diff --git a/src/core/NavigationOverlayHandler.ttslua b/src/core/NavigationOverlayHandler.ttslua index 431aa33e..9aea6188 100644 --- a/src/core/NavigationOverlayHandler.ttslua +++ b/src/core/NavigationOverlayHandler.ttslua @@ -260,7 +260,7 @@ function getDynamicViewBounds(objList) -- handling for Physics.cast() results if not obj.type then obj = obj.hit_object end - if not obj.hasTag("CameraZoom_ignore") then + if not obj.hasTag("CameraZoom_ignore") and not obj.hasTag("CampaignLog") then count = count + 1 local bounds = obj.getBounds() local x1 = bounds['center'][1] - bounds['size'][1] / 2 diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 15fb59cf..08357674 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -15,7 +15,7 @@ local DRAWN_CHAOS_TOKEN_OFFSET = {-1.55, 0.25, -0.58} -- x-Values for discard buttons local DISCARD_BUTTON_OFFSETS = {-1.365, -0.91, -0.455, 0, 0.455, 0.91} -local SEARCH_AROUND_SELF_X_BUFFER = 18 +local SEARCH_AROUND_SELF_X_BUFFER = 8 -- defined areas for the function "inArea()"" local MAIN_PLAY_AREA = { @@ -153,7 +153,7 @@ function searchArea(origin, size) type = 3, size = size, max_distance = 1, - debug = DEBUG + debug = true }) end