ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #14125 from TalSk/jormungand-cannon-spot

Browse Source
This commit is contained in:
Jordan
2021-09-14 21:26:08 +00:00
committed by GitHub
parent 4e0211b490 d8c451a55d
commit 59c3dcd291
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
View File

@@ -39,11 +39,10 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.components.TextComponent;
import static net.runelite.client.plugins.cannon.CannonPlugin.MAX_OVERLAY_DISTANCE;
class CannonOverlay extends Overlay class CannonOverlay extends Overlay
{ {
private static final int MAX_DISTANCE = 2500;
private final Client client; private final Client client;
private final CannonConfig config; private final CannonConfig config;
private final CannonPlugin plugin; private final CannonPlugin plugin;
@@ -76,7 +75,7 @@ class CannonOverlay extends Overlay
LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); LocalPoint localLocation = client.getLocalPlayer().getLocalLocation();
if (localLocation.distanceTo(cannonPoint) <= MAX_DISTANCE) if (localLocation.distanceTo(cannonPoint) <= MAX_OVERLAY_DISTANCE)
{ {
Point cannonLoc = Perspective.getCanvasTextLocation(client, Point cannonLoc = Perspective.getCanvasTextLocation(client,
graphics, graphics,

1
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
View File

@@ -72,6 +72,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
public class CannonPlugin extends Plugin public class CannonPlugin extends Plugin
{ {
private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)"); private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)");
static final int MAX_OVERLAY_DISTANCE = 4100;
static final int MAX_CBALLS = 30; static final int MAX_CBALLS = 30;
private CannonCounter counter; private CannonCounter counter;

5
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
View File

@@ -43,11 +43,10 @@ import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import static net.runelite.client.plugins.cannon.CannonPlugin.MAX_OVERLAY_DISTANCE;
class CannonSpotOverlay extends Overlay class CannonSpotOverlay extends Overlay
{ {
private static final int MAX_DISTANCE = 2350;
private final Client client; private final Client client;
private final CannonPlugin plugin; private final CannonPlugin plugin;
private final CannonConfig config; private final CannonConfig config;
@@ -87,7 +86,7 @@ class CannonSpotOverlay extends Overlay
LocalPoint spotPoint = LocalPoint.fromWorld(client, spot); LocalPoint spotPoint = LocalPoint.fromWorld(client, spot);
LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); 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); renderCannonSpot(graphics, client, spotPoint, itemManager.getImage(CANNONBALL), Color.RED);
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java
View File

@@ -43,7 +43,7 @@ enum CannonSpots
BLUE_DRAGON(new WorldPoint(1933, 8973, 1)), BLUE_DRAGON(new WorldPoint(1933, 8973, 1)),
BRINE_RAT(new WorldPoint(2707, 10132, 0)), BRINE_RAT(new WorldPoint(2707, 10132, 0)),
CAVE_HORROR(new WorldPoint(3785, 9460, 0)), CAVE_HORROR(new WorldPoint(3785, 9460, 0)),
DAGGANOTH(new WorldPoint(2524, 10020, 0)), DAGGANOTH(new WorldPoint(2524, 10020, 0), new WorldPoint(2478, 10443, 0), new WorldPoint(2420, 10425, 0)),
DARK_BEAST(new WorldPoint(1992, 4655, 0)), DARK_BEAST(new WorldPoint(1992, 4655, 0)),
DARK_WARRIOR(new WorldPoint(3030, 3632, 0)), DARK_WARRIOR(new WorldPoint(3030, 3632, 0)),
DUST_DEVIL(new WorldPoint(3218, 9366, 0)), DUST_DEVIL(new WorldPoint(3218, 9366, 0)),