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

Correctly highlight ObjectClueScroll for single location

Browse Source 
This is regression by PR that introduced 3 step cryptic clues, as check
for highlighting single object was removed.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-10-05 16:17:53 +02:00
parent db815daab2
commit 6e417ba6d9
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -314,18 +314,7 @@ public class ClueScrollPlugin extends Plugin
{ {
for (WorldPoint location : locations) for (WorldPoint location : locations)
{ {
final LocalPoint localLocation = LocalPoint.fromWorld(client, location); highlightObjectsForLocation(location, objectIds);
if (localLocation != null)
{
final Scene scene = client.getScene();
final Tile[][][] tiles = scene.getTiles();
final Tile tile = tiles[client.getPlane()][localLocation.getSceneX()][localLocation.getSceneY()];
objectsToMark = Arrays.stream(tile.getGameObjects())
.filter(object -> object != null && ArrayUtils.contains(objectIds, object.getId()))
.toArray(GameObject[]::new);
}
} }
} }
} }
@@ -346,6 +335,16 @@ public class ClueScrollPlugin extends Plugin
} }
addMapPoints(location); addMapPoints(location);
if (clue instanceof ObjectClueScroll)
{
int[] objectIds = ((ObjectClueScroll) clue).getObjectIds();
if (objectIds.length > 0)
{
highlightObjectsForLocation(location, objectIds);
}
}
} }
} }
@@ -582,6 +581,24 @@ public class ClueScrollPlugin extends Plugin
} }
} }
private void highlightObjectsForLocation(final WorldPoint location, final int... objectIds)
{
final LocalPoint localLocation = LocalPoint.fromWorld(client, location);
if (localLocation == null)
{
return;
}
final Scene scene = client.getScene();
final Tile[][][] tiles = scene.getTiles();
final Tile tile = tiles[client.getPlane()][localLocation.getSceneX()][localLocation.getSceneY()];
objectsToMark = Arrays.stream(tile.getGameObjects())
.filter(object -> object != null && ArrayUtils.contains(objectIds, object.getId()))
.toArray(GameObject[]::new);
}
private void checkClueNPCs(ClueScroll clue, final NPC... npcs) private void checkClueNPCs(ClueScroll clue, final NPC... npcs)
{ {
if (!(clue instanceof NpcClueScroll)) if (!(clue instanceof NpcClueScroll))