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

Use only southermost ghost wave for cerb plugin

Browse Source 
Closes #2252
This commit is contained in:
Adam
2018-05-02 19:53:50 -04:00
parent 8714544223
commit 8da3109520
3 changed files with 117 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusOverlay.java
View File

@@ -29,7 +29,6 @@ import java.awt.Graphics2D;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.NPC;
import net.runelite.client.game.SkillIconManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
@@ -61,11 +60,16 @@ public class CerberusOverlay extends Overlay
final ImagePanelComponent imagePanelComponent = new ImagePanelComponent();
imagePanelComponent.setTitle("Ghost order");
for (final NPC npc : plugin.getGhosts())
{
CerberusGhost.fromNPC(npc).ifPresent(ghost -> imagePanelComponent
.getImages().add(iconManager.getSkillImage(ghost.getType())));
}
// Ghosts are already sorted
plugin.getGhosts().stream()
// Iterate only through the correct amount of ghosts
.limit(CerberusGhost.values().length)
.forEach(npc -> CerberusGhost
.fromNPC(npc)
.ifPresent(ghost -> imagePanelComponent
.getImages()
.add(iconManager.getSkillImage(ghost.getType()))));
return imagePanelComponent.render(graphics);
}

34
runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java
View File

@@ -25,13 +25,16 @@
package net.runelite.client.plugins.cerberus;
import com.google.common.collect.ComparisonChain;
import com.google.common.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.Getter;
import net.runelite.api.NPC;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.client.plugins.Plugin;
@@ -64,18 +67,7 @@ public class CerberusPlugin extends Plugin
public void onNpcSpawned(final NpcSpawned event)
{
final NPC npc = event.getNpc();
CerberusGhost.fromNPC(npc).ifPresent(ghost ->
{
if (ghosts.size() == CerberusGhost.values().length)
{
// Reset ghosts as this is new ghost wave
ghosts.clear();
}
ghosts.add(npc);
ghosts.sort((a, b) -> Integer.compare(b.getLocalLocation().getY(), a.getLocalLocation().getY()));
});
CerberusGhost.fromNPC(npc).ifPresent(ghost -> ghosts.add(npc));
}
@Subscribe
@@ -83,4 +75,22 @@ public class CerberusPlugin extends Plugin
{
ghosts.remove(event.getNpc());
}
@Subscribe
public void onGameTick(GameTick gameTick)
{
if (ghosts.isEmpty())
{
return;
}
Collections.sort(ghosts, (a, b) -> ComparisonChain.start()
// First, sort by the southernmost ghost (e.g with lowest y)
.compare(a.getLocalLocation().getY(), b.getLocalLocation().getY())
// Then, sort by the westernmost ghost (e.g with lowest x)
.compare(a.getLocalLocation().getX(), b.getLocalLocation().getX())
// This will give use the current wave and order of the ghosts based on
// what ghost will attack first
.result());
}
}