Merge pull request #318 from argonui/nav-overlay

Add camera_ignore tags and reduce X_BUFFER

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,

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,

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,

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,

objects/VictoryDisplay.6ccd6d.json

@@ -163,7 +163,9 @@
   "Snap": false,
   "Sticky": true,
   "Tags": [
-    "CleanUpHelper_ignore"
+    "CameraZoom_ignore",
+    "CleanUpHelper_ignore",
+    "displacement_excluded"
   ],
   "Tooltip": true,
   "Transform": {

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

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 = {