From d8c451a55dd952cef79ec79af5e814bde450d479 Mon Sep 17 00:00:00 2001 From: Tal Skverer Date: Tue, 14 Sep 2021 18:35:18 +0300 Subject: [PATCH] cannon: Increase max distance for cannon overlays --- .../net/runelite/client/plugins/cannon/CannonOverlay.java | 5 ++--- .../net/runelite/client/plugins/cannon/CannonPlugin.java | 1 + .../runelite/client/plugins/cannon/CannonSpotOverlay.java | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java index 69e553da75..b2a4c7df36 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java @@ -39,11 +39,10 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.TextComponent; +import static net.runelite.client.plugins.cannon.CannonPlugin.MAX_OVERLAY_DISTANCE; class CannonOverlay extends Overlay { - private static final int MAX_DISTANCE = 2500; - private final Client client; private final CannonConfig config; private final CannonPlugin plugin; @@ -76,7 +75,7 @@ class CannonOverlay extends Overlay LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); - if (localLocation.distanceTo(cannonPoint) <= MAX_DISTANCE) + if (localLocation.distanceTo(cannonPoint) <= MAX_OVERLAY_DISTANCE) { Point cannonLoc = Perspective.getCanvasTextLocation(client, graphics, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index 535a50b19a..23202ff99e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -72,6 +72,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; public class CannonPlugin extends Plugin { private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)"); + static final int MAX_OVERLAY_DISTANCE = 4100; static final int MAX_CBALLS = 30; private CannonCounter counter; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java index b7774855b5..b58c4969aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java @@ -43,11 +43,10 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +import static net.runelite.client.plugins.cannon.CannonPlugin.MAX_OVERLAY_DISTANCE; class CannonSpotOverlay extends Overlay { - private static final int MAX_DISTANCE = 2350; - private final Client client; private final CannonPlugin plugin; private final CannonConfig config; @@ -87,7 +86,7 @@ class CannonSpotOverlay extends Overlay LocalPoint spotPoint = LocalPoint.fromWorld(client, spot); LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); - if (spotPoint != null && localLocation.distanceTo(spotPoint) <= MAX_DISTANCE) + if (spotPoint != null && localLocation.distanceTo(spotPoint) <= MAX_OVERLAY_DISTANCE) { renderCannonSpot(graphics, client, spotPoint, itemManager.getImage(CANNONBALL), Color.RED); }