Change macro functions to use image bounds

Macros written in 1.17 will not expect the change to strict footprint bounds, so these all have to continue using the
token image bounds. E.g., without this change, macros written in 1.17 using `movedOverPoints()` and `movedOverToken()`
will no longer detect the same cases in 1.18.

Author: kwvanderlinde

src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java

@@ -241,7 +241,7 @@ private String tokenMoveMap(boolean fromCurrentMap, List<Object> args) throws Pa
   private TokenLocation getTokenLocation(boolean useDistancePerCell, Token token) {
     TokenLocation loc = new TokenLocation();
     if (useDistancePerCell) {
-      Rectangle tokenBounds = token.getFootprintBounds(token.getZoneRenderer().getZone());
+      Rectangle tokenBounds = token.getImageBounds(token.getZoneRenderer().getZone());
       loc.x = tokenBounds.x;
       loc.y = tokenBounds.y;
     } else {
@@ -337,10 +337,10 @@ public double getDistance(Token source, Token target, boolean units, String metr
       }
     } else {
       // take distance between center of the two tokens
-      Rectangle sourceBounds = source.getFootprintBounds(zone);
+      Rectangle sourceBounds = source.getImageBounds(zone);
       double sourceCenterX = sourceBounds.x + sourceBounds.width / 2.0;
       double sourceCenterY = sourceBounds.y + sourceBounds.height / 2.0;
-      Rectangle targetBounds = target.getFootprintBounds(zone);
+      Rectangle targetBounds = target.getImageBounds(zone);
       double targetCenterX = targetBounds.x + targetBounds.width / 2.0;
       double targetCenterY = targetBounds.y + targetBounds.height / 2.0;
 
@@ -418,7 +418,7 @@ public double getDistance(
       }
 
       // get the pixel coords for the center of the token
-      Rectangle sourceBounds = source.getFootprintBounds(zone);
+      Rectangle sourceBounds = source.getImageBounds(zone);
       double sourceCenterX = sourceBounds.x + sourceBounds.width / 2.0;
       double sourceCenterY = sourceBounds.y + sourceBounds.height / 2.0;
       double a = (int) (sourceCenterX - targetX);
@@ -452,7 +452,7 @@ public static boolean isTokenAtXY(Token token, Zone zone, Point[] points) {
         }
       }
     } else {
-      Rectangle bounds = token.getFootprintBounds(zone);
+      Rectangle bounds = token.getImageBounds(zone);
       for (Point point : points) {
         if (bounds.contains(point)) return true;
       }

src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java

@@ -267,7 +267,7 @@ private List<Map<String, Integer>> crossedPoints(
                 .getFootprint(grid)
                 .getBounds(grid, grid.convert(new ZonePoint(entry.get("x"), entry.get("y"))));
       } else {
-        originalArea = tokenInContext.getFootprintBounds(zone);
+        originalArea = tokenInContext.getImageBounds(zone);
       }
       Rectangle2D oa = originalArea.getBounds2D();
       if (targetArea.contains(oa) || targetArea.intersects(oa)) {
@@ -300,7 +300,7 @@ private List<Map<String, Integer>> crossedToken(
      * if-else sequence...
      */
     Grid grid = zone.getGrid();
-    Rectangle targetArea = target.getFootprintBounds(zone);
+    Rectangle targetArea = target.getImageBounds(zone);
 
     if (pathPoints == null) {
       return returnPoints;
@@ -326,7 +326,7 @@ private List<Map<String, Integer>> crossedToken(
       Map<String, Integer> firstPoint = new HashMap<String, Integer>(),
           secondPoint = new HashMap<String, Integer>();
       for (Map<String, Integer> entry : pathPoints) {
-        Rectangle tokenArea = tokenInContext.getFootprintBounds(zone);
+        Rectangle tokenArea = tokenInContext.getImageBounds(zone);
         Point currentPoint = new Point(entry.get("x"), entry.get("y"));
         if (ctr > 0) {
           if (targetArea.intersectsLine(new Line2D.Double(previousPoint, currentPoint))

src/main/java/net/rptools/maptool/client/functions/TokenPropertyFunctions.java

@@ -779,7 +779,7 @@ public Object childEvaluate(
       Zone zone = zoneR.getZone();
 
       // Get the pixel width or height of a given token
-      Rectangle tokenBounds = token.getFootprintBounds(zone);
+      Rectangle tokenBounds = token.getImageBounds(zone);
 
       if (functionName.equalsIgnoreCase("getTokenWidth")) {
         return BigDecimal.valueOf(tokenBounds.width);
@@ -803,7 +803,7 @@ public Object childEvaluate(
       Zone zone = zoneR.getZone();
 
       double magnitude = getBigDecimalFromParam(functionName, parameters, 0).doubleValue();
-      Rectangle tokenBounds = token.getFootprintBounds(zone);
+      Rectangle tokenBounds = token.getImageBounds(zone);
 
       double oldWidth = tokenBounds.width;
       double oldHeight = tokenBounds.height;

src/main/java/net/rptools/maptool/client/functions/TokenSightFunctions.java

@@ -110,7 +110,7 @@ public Object childEvaluate(
           target
               .getFootprint(grid)
               .getBounds(grid, grid.convert(new ZonePoint(target.getX(), target.getY())));
-      if (!target.isSnapToGrid()) bounds = target.getFootprintBounds(zone);
+      if (!target.isSnapToGrid()) bounds = target.getImageBounds(zone);
 
       int x = (int) bounds.getX();
       int y = (int) bounds.getY();