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

Maiden Handler now utilizes npc definition changed for nylos.

Browse Source
This commit is contained in:
Ganom
2019-07-01 16:33:35 -04:00
parent 4cbfc8dda0
commit 65f7d0f6b1
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java
View File

@@ -23,6 +23,7 @@ import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.GroundObjectSpawned;
import net.runelite.api.events.NpcDefinitionChanged;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.ProjectileMoved;
@@ -154,6 +155,15 @@ public class TheatrePlugin extends Plugin
} }
} }
@Subscribe
public void onNpcDefinitionChanged(NpcDefinitionChanged event)
{
if (maidenHandler != null)
{
maidenHandler.onNpcDefinitionChanged(event);
}
}
@Subscribe @Subscribe
public void onNpcSpawned(NpcSpawned event) public void onNpcSpawned(NpcSpawned event)
{ {

31
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java
View File

@@ -14,6 +14,7 @@ import net.runelite.api.GraphicsObject;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.NpcDefinitionChanged;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.SpotAnimationChanged;
@@ -59,7 +60,7 @@ public class MaidenHandler extends RoomHandler
private List<WorldPoint> bloodSpawnLocation = new ArrayList<>(); private List<WorldPoint> bloodSpawnLocation = new ArrayList<>();
private List<WorldPoint> bloodSpawnTarget = new ArrayList<>(); private List<WorldPoint> bloodSpawnTarget = new ArrayList<>();
private NPC maiden; private NPC maiden;
private String nyloCall = "n1"; private String nyloCall;
private Set<Nylos> nylos = new HashSet<>(); private Set<Nylos> nylos = new HashSet<>();
private List<NPC> healers = new ArrayList<>(); private List<NPC> healers = new ArrayList<>();
private int healerCount = 0; private int healerCount = 0;
@@ -101,6 +102,7 @@ public class MaidenHandler extends RoomHandler
this.bloodSpawnLocation.clear(); this.bloodSpawnLocation.clear();
this.bloodSpawnTarget.clear(); this.bloodSpawnTarget.clear();
this.healers.clear(); this.healers.clear();
this.nylos.clear();
this.healerCount = 0; this.healerCount = 0;
this.startTime = -1; this.startTime = -1;
this.wave = 1; this.wave = 1;
@@ -117,6 +119,11 @@ public class MaidenHandler extends RoomHandler
final String location = nylo.getSpawnLocation().getName(); final String location = nylo.getSpawnLocation().getName();
if (nyloCall == null || nyloCall.equals(""))
{
nyloCall = "n1";
}
if (location.equals(nyloCall)) if (location.equals(nyloCall))
{ {
Color color = Color.WHITE; Color color = Color.WHITE;
@@ -233,6 +240,19 @@ public class MaidenHandler extends RoomHandler
} }
} }
public void onNpcDefinitionChanged(NpcDefinitionChanged event)
{
NPC npc = event.getNpc();
if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos"))
{
if (npc.getId() == -1)
{
nylos.removeIf(c -> c.getNpc() == npc);
}
}
}
public void onChatMessage(ChatMessage event) public void onChatMessage(ChatMessage event)
{ {
if (event.getSender() != null && !event.getSender().equals(client.getLocalPlayer().getName())) if (event.getSender() != null && !event.getSender().equals(client.getLocalPlayer().getName()))
@@ -249,6 +269,7 @@ public class MaidenHandler extends RoomHandler
case "s1": case "s1":
case "s2": case "s2":
nyloCall = msg; nyloCall = msg;
log.debug("Nylo Call Assigned: " + msg);
break; break;
} }
} }
@@ -280,14 +301,6 @@ public class MaidenHandler extends RoomHandler
return; return;
} }
if (!nylos.isEmpty())
{
for (Nylos nylo : nylos)
{
nylos.removeIf(c -> c.getNpc().getId() == -1);
}
}
bloodThrows.clear(); bloodThrows.clear();
for (GraphicsObject o : client.getGraphicsObjects()) for (GraphicsObject o : client.getGraphicsObjects())