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

theatre: Fix sote projectiles. (#1264)

Browse Source 
theatre: Fix sote projectiles.
This commit is contained in:
Owain van Brakel
2019-08-05 19:33:26 +02:00
committed by GitHub
parent a23cb15ec6 b6e9d49a89
commit 5b52bbe8d4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-api/src/main/java/net/runelite/api/ProjectileID.java
View File

@@ -95,6 +95,10 @@ public class ProjectileID
public static final int VORKATH_VENOM = 1470; public static final int VORKATH_VENOM = 1470;
public static final int VORKATH_ICE = 395; public static final int VORKATH_ICE = 395;
public static final int SOTETSEG_BOMB = 1604;
public static final int SOTETSEG_RANGE = 1607;
public static final int SOTETSEG_MAGE = 1606;
public static final int HYDRA_MAGIC = 1662; public static final int HYDRA_MAGIC = 1662;
public static final int HYDRA_RANGED = 1663; public static final int HYDRA_RANGED = 1663;
public static final int HYDRA_POISON = 1644; public static final int HYDRA_POISON = 1644;

18
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java
View File

@@ -1,5 +1,6 @@
package net.runelite.client.plugins.theatre.rooms; package net.runelite.client.plugins.theatre.rooms;
import com.google.common.collect.ImmutableSet;
import java.awt.BasicStroke; import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
@@ -19,6 +20,7 @@ import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.Projectile; import net.runelite.api.Projectile;
import net.runelite.api.ProjectileID;
import net.runelite.api.Tile; import net.runelite.api.Tile;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.GroundObjectSpawned;
@@ -33,12 +35,11 @@ import net.runelite.client.ui.overlay.OverlayUtil;
public class SotetsegHandler extends RoomHandler public class SotetsegHandler extends RoomHandler
{ {
private static final Set<Integer> SOTE_PROJ = ImmutableSet.of(
ProjectileID.SOTETSEG_MAGE, ProjectileID.SOTETSEG_BOMB, ProjectileID.SOTETSEG_RANGE
);
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private final Map<GroundObject, Tile> redTiles = new LinkedHashMap<>(); private final Map<GroundObject, Tile> redTiles = new LinkedHashMap<>();
//My variables
private int playerX;
private int playerY;
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private List<WorldPoint> redOverworld = new ArrayList<>(); private List<WorldPoint> redOverworld = new ArrayList<>();
private final List<WorldPoint> blackOverworld = new ArrayList<>(); private final List<WorldPoint> blackOverworld = new ArrayList<>();
@@ -147,7 +148,7 @@ public class SotetsegHandler extends RoomHandler
final Projectile projectile = event.getProjectile(); final Projectile projectile = event.getProjectile();
//1604 ball //1604 ball
if (projectile.getId() == 1604 && projectile.getInteracting() == client.getLocalPlayer()) if (SOTE_PROJ.contains(projectile.getId()) && projectile.getInteracting() == client.getLocalPlayer())
{ {
soteyProjectiles.add(projectile); soteyProjectiles.add(projectile);
} }
@@ -234,18 +235,13 @@ public class SotetsegHandler extends RoomHandler
return; return;
} }
//Update player position every game tick
playerX = client.getLocalPlayer().getLocalLocation().getX();
playerY = client.getLocalPlayer().getLocalLocation().getY();
//Remove projectiles that are about to die
if (!soteyProjectiles.isEmpty()) if (!soteyProjectiles.isEmpty())
{ {
soteyProjectiles.removeIf(p -> p.getRemainingCycles() <= 0); soteyProjectiles.removeIf(p -> p.getRemainingCycles() <= 0);
} }
boolean sotetsegFighting = false; boolean sotetsegFighting = false;
for (NPC npc : client.getNpcs()) for (NPC npc : client.getNpcs())
{ {
if (npc.getId() == NpcID.SOTETSEG_8388) if (npc.getId() == NpcID.SOTETSEG_8388)