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

Merge pull request #548 from runelite-extended/more-inferno-stuff

Browse Source 
More inferno stuff
This commit is contained in:
Tyler Bochard
2019-06-11 22:51:13 -04:00
committed by GitHub
parent 1772003d09 f102779597
commit 39f1c28575
8 changed files with 798 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
View File

@@ -52,4 +52,15 @@ public interface InfernoConfig extends Config
{ {
return false; return false;
} }
@ConfigItem(
position = 2,
keyName = "Wave Display",
name = "Wave display",
description = "Shows monsters that will spawn on the selected wave(s)."
)
default InfernoWaveDisplayMode waveDisplay()
{
return InfernoWaveDisplayMode.BOTH;
}
} }

53
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright (c) 2017, Devin French <https://github.com/devinfrench>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.inferno;
import net.runelite.api.AnimationID;
import net.runelite.api.Prayer;
public enum InfernoJadAttack
{
MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
private final int animation;
private final Prayer prayer;
InfernoJadAttack(int animation, Prayer prayer)
{
this.animation = animation;
this.prayer = prayer;
}
public int getAnimation()
{
return animation;
}
public Prayer getPrayer()
{
return prayer;
}
}

87
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java Normal file
View File

@@ -0,0 +1,87 @@
/*
* Copyright (c) 2017, Devin French <https://github.com/devinfrench>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.inferno;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.SpriteID;
import net.runelite.client.game.SpriteManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.ImageComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
public class InfernoJadOverlay extends Overlay
{
private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
private final Client client;
private final InfernoPlugin plugin;
private final SpriteManager spriteManager;
private final PanelComponent imagePanelComponent = new PanelComponent();
@Inject
private InfernoJadOverlay(Client client, InfernoPlugin plugin, SpriteManager spriteManager)
{
setPosition(OverlayPosition.BOTTOM_RIGHT);
setPriority(OverlayPriority.HIGH);
this.client = client;
this.plugin = plugin;
this.spriteManager = spriteManager;
}
@Override
public Dimension render(Graphics2D graphics)
{
final InfernoJadAttack attack = plugin.getAttack();
if (attack == null)
{
return null;
}
final BufferedImage prayerImage = getPrayerImage(attack);
imagePanelComponent.getChildren().clear();
imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
? ComponentConstants.STANDARD_BACKGROUND_COLOR
: NOT_ACTIVATED_BACKGROUND_COLOR);
return imagePanelComponent.render(graphics);
}
private BufferedImage getPrayerImage(InfernoJadAttack attack)
{
final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
return spriteManager.getSprite(prayerSpriteID, 0);
}
}

1
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
View File

@@ -36,7 +36,6 @@ import net.runelite.api.Perspective;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;

702
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
View File

@@ -1,275 +1,427 @@
/* /*
* Copyright (c) 2019, Jacky <liangj97@gmail.com> * Copyright (c) 2019, Jacky <liangj97@gmail.com>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this * 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.inferno; package net.runelite.client.plugins.inferno;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.EnumMap;
import java.util.List; import java.util.HashMap;
import java.util.Map; import java.util.List;
import javax.inject.Inject; import java.util.Map;
import lombok.Getter; import java.util.regex.Matcher;
import net.runelite.api.Client; import java.util.regex.Pattern;
import net.runelite.api.HeadIcon; import javax.annotation.Nullable;
import net.runelite.api.NPC; import javax.inject.Inject;
import net.runelite.api.NpcID; import lombok.AccessLevel;
import net.runelite.api.events.GameTick; import lombok.Getter;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.ChatMessageType;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.Client;
import net.runelite.client.config.ConfigManager; import net.runelite.api.GameState;
import net.runelite.client.eventbus.Subscribe; import net.runelite.api.HeadIcon;
import net.runelite.client.plugins.Plugin; import net.runelite.api.NPC;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.api.NpcID;
import net.runelite.client.plugins.PluginType; import net.runelite.api.events.AnimationChanged;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameStateChanged;
@PluginDescriptor( import net.runelite.api.events.GameTick;
name = "Inferno", import net.runelite.api.events.NpcDespawned;
description = "Inferno helper", import net.runelite.api.events.NpcSpawned;
tags = {"combat", "overlay", "pve", "pvm"}, import net.runelite.client.config.ConfigManager;
type = PluginType.PVM import net.runelite.client.eventbus.Subscribe;
) import net.runelite.client.plugins.Plugin;
public class InfernoPlugin extends Plugin import net.runelite.client.plugins.PluginDescriptor;
{ import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
@Inject import org.apache.commons.lang3.ArrayUtils;
private Client client;
@PluginDescriptor(
@Inject name = "Inferno",
private OverlayManager overlayManager; description = "Inferno helper",
tags = {"combat", "overlay", "pve", "pvm"},
@Inject type = PluginType.PVM
private InfernoOverlay infernoOverlay; )
public class InfernoPlugin extends Plugin
@Inject {
private InfernoInfobox infernoInfobox;
private static final Pattern WAVE_PATTERN = Pattern.compile(".*Wave: (\\d+).*");
@Inject private static final int MAX_MONSTERS_OF_TYPE_PER_WAVE = 6;
private InfernoNibblerOverlay nibblerOverlay; private static final int INFERNO_REGION = 9043;
static final int MAX_WAVE = 69;
@Inject
private InfernoConfig config; @Inject
private Client client;
@Getter
private Map<NPC, InfernoNPC> monsters; @Inject
private OverlayManager overlayManager;
@Getter
private Map<Integer, ArrayList<InfernoNPC>> monsterCurrentAttackMap; @Inject
private InfernoOverlay infernoOverlay;
@Getter
private List<NPC> nibblers; @Inject
private InfernoWaveOverlay waveOverlay;
@Getter
private InfernoNPC[] priorityNPC; @Inject
private InfernoJadOverlay jadOverlay;
@Provides
InfernoConfig provideConfig(ConfigManager configManager) @Inject
{ private InfernoInfobox infernoInfobox;
return configManager.getConfig(InfernoConfig.class);
} @Inject
private InfernoNibblerOverlay nibblerOverlay;
@Override
protected void startUp() throws Exception @Inject
{ private InfernoConfig config;
overlayManager.add(infernoOverlay);
overlayManager.add(infernoInfobox); @Getter
overlayManager.add(nibblerOverlay); static final List<EnumMap<InfernoWaveMonster, Integer>> WAVES = new ArrayList<>();
monsters = new HashMap<>();
monsterCurrentAttackMap = new HashMap<>(6); @Getter
for (int i = 1; i <= 6; i++) private int currentWave = -1;
{
monsterCurrentAttackMap.put(i, new ArrayList<>()); @Getter
} private Map<NPC, InfernoNPC> monsters;
nibblers = new ArrayList<>();
priorityNPC = new InfernoNPC[4]; @Getter
} private Map<Integer, ArrayList<InfernoNPC>> monsterCurrentAttackMap;
@Override @Getter
protected void shutDown() throws Exception private List<NPC> nibblers;
{
overlayManager.remove(infernoInfobox); @Getter
overlayManager.remove(infernoOverlay); private InfernoNPC[] priorityNPC;
overlayManager.remove(nibblerOverlay);
}
@Getter(AccessLevel.PACKAGE)
@Subscribe @Nullable
public void onNpcSpawned(NpcSpawned event) private InfernoJadAttack attack;
{
if (client.getMapRegions()[0] != 9043) return; private NPC jad;
NPC npc = event.getNpc();
if (isValidInfernoMob(npc)) static
{ {
monsters.put(npc, new InfernoNPC(npc)); final InfernoWaveMonster[] waveMonsters = InfernoWaveMonster.values();
System.out.println(monsters.size());
} // Add wave 1, future waves are derived from its contents
if (npc.getId() == NpcID.JALNIB) final EnumMap<InfernoWaveMonster, Integer> waveOne = new EnumMap<>(InfernoWaveMonster.class);
{ waveOne.put(waveMonsters[0], 1);
nibblers.add(npc); WAVES.add(waveOne);
}
} for (int wave = 1; wave < MAX_WAVE; wave++)
{
@Subscribe final EnumMap<InfernoWaveMonster, Integer> prevWave = WAVES.get(wave - 1).clone();
public void onNpcDespawned(NpcDespawned event) int maxMonsterOrdinal = -1;
{
if (client.getMapRegions()[0] != 9043) return; for (int i = 0; i < waveMonsters.length; i++)
{
NPC npc = event.getNpc(); final int ordinalMonsterQuantity = prevWave.getOrDefault(waveMonsters[i], 0);
if (monsters.containsKey(npc))
{ if (ordinalMonsterQuantity == MAX_MONSTERS_OF_TYPE_PER_WAVE)
monsters.remove(npc); {
System.out.println(monsters.size()); maxMonsterOrdinal = i;
} break;
}
if (npc.getId() == NpcID.JALNIB) }
{
nibblers.remove(npc); if (maxMonsterOrdinal >= 0)
} {
} prevWave.remove(waveMonsters[maxMonsterOrdinal]);
}
@Subscribe
public void onGameTick(GameTick event) final int addedMonsterOrdinal = maxMonsterOrdinal >= 0 ? maxMonsterOrdinal + 1 : 0;
{ final InfernoWaveMonster addedMonster = waveMonsters[addedMonsterOrdinal];
if (client.getMapRegions()[0] != 9043) return; final int addedMonsterQuantity = prevWave.getOrDefault(addedMonster, 0);
clearMapAndPriority(); prevWave.put(addedMonster, addedMonsterQuantity + 1);
for (InfernoNPC monster : monsters.values()) WAVES.add(prevWave);
{ }
calculateDistanceToPlayer(monster); }
NPC npc = monster.getNpc(); @Provides
InfernoConfig provideConfig(ConfigManager configManager)
// if they are not attacking but are still attacking {
if (monster.isAttacking()) return configManager.getConfig(InfernoConfig.class);
{ }
monster.setTicksTillAttack(monster.getTicksTillAttack() - 1);
@Override
// sets the blobs attack style protected void startUp() throws Exception
if (monster.getName().equals("blob") && monster.getTicksTillAttack() == 3 && monster.getDistanceToPlayer() <= 15) {
{ overlayManager.add(infernoOverlay);
if (client.getLocalPlayer().getOverheadIcon() == null) overlayManager.add(infernoInfobox);
{ overlayManager.add(nibblerOverlay);
monster.setAttackstyle(InfernoNPC.Attackstyle.RANDOM); overlayManager.add(waveOverlay);
} overlayManager.add(jadOverlay);
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.MAGIC)) monsters = new HashMap<>();
{ monsterCurrentAttackMap = new HashMap<>(6);
monster.setAttackstyle(InfernoNPC.Attackstyle.RANGE); for (int i = 1; i <= 6; i++)
} {
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.RANGED)) monsterCurrentAttackMap.put(i, new ArrayList<>());
{ }
monster.setAttackstyle(InfernoNPC.Attackstyle.MAGE); nibblers = new ArrayList<>();
} priorityNPC = new InfernoNPC[4];
} }
// we know the monster is not attacking because it should have attacked and is idling @Override
if (monster.getTicksTillAttack() == 0) protected void shutDown() throws Exception
{ {
if (npc.getAnimation() == -1) overlayManager.remove(infernoInfobox);
{ overlayManager.remove(infernoOverlay);
monster.setAttacking(false); overlayManager.remove(nibblerOverlay);
} overlayManager.remove(waveOverlay);
else overlayManager.remove(jadOverlay);
{ jad = null;
// want to reset the monsters attack back to attacking attack = null;
monster.attacked(); }
}
} @Subscribe
} public void onNpcSpawned(NpcSpawned event)
else {
{ if (client.getMapRegions()[0] != 9043) return;
// they've just attacked
if (npc.getAnimation() == monster.getAttackAnimation() || npc.getAnimation() == 7581) // special case for blob NPC npc = event.getNpc();
{ if (isValidInfernoMob(npc))
monster.attacked(); {
} monsters.put(npc, new InfernoNPC(npc));
} System.out.println(monsters.size());
}
if (monster.getTicksTillAttack() >= 1) if (npc.getId() == NpcID.JALNIB)
{ {
monsterCurrentAttackMap.get(monster.getTicksTillAttack()).add(monster); nibblers.add(npc);
} }
}
final int id = event.getNpc().getId();
calculatePriorityNPC();
} if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704)
{
private void calculatePriorityNPC() jad = event.getNpc();
{ }
for (int i = 0; i < priorityNPC.length; i++) }
{
ArrayList<InfernoNPC> monsters = monsterCurrentAttackMap.get(i + 1); @Subscribe
public void onNpcDespawned(NpcDespawned event)
if ( monsters.size() == 0) continue; {
if (client.getMapRegions()[0] != 9043) return;
int priority = monsters.get(0).getPriority();
NPC npc = event.getNpc();
InfernoNPC infernoNPC = monsters.get(0); if (monsters.containsKey(npc))
{
for (InfernoNPC npc : monsters) monsters.remove(npc);
{ System.out.println(monsters.size());
if (npc.getPriority() < priority) }
{
priority = npc.getPriority(); if (npc.getId() == NpcID.JALNIB)
infernoNPC = npc; {
} nibblers.remove(npc);
} }
priorityNPC[i] = infernoNPC;
System.out.println("i: " + i + " " + infernoNPC.getName()); if (jad == event.getNpc())
} {
} jad = null;
attack = null;
// TODO: blob calculator }
private void calculateDistanceToPlayer(InfernoNPC monster) }
{
monster.setDistanceToPlayer(client.getLocalPlayer().getWorldLocation().distanceTo(monster.getNpc().getWorldArea())); @Subscribe
} public void onGameStateChanged(GameStateChanged event)
{
private void clearMapAndPriority() if (event.getGameState() != GameState.LOGGED_IN)
{ {
for (List<InfernoNPC> l : monsterCurrentAttackMap.values()) return;
{ }
l.clear();
} if (!inInferno())
{
for (int i = 0; i < priorityNPC.length; i++) currentWave = -1;
{ }
priorityNPC[i] = null; }
}
} @Subscribe
public void onChatMessage(ChatMessage event)
public boolean isValidInfernoMob(NPC npc) {
{ final Matcher waveMatcher = WAVE_PATTERN.matcher(event.getMessage());
// we only want the bat, blob, melee, ranger and mager
if (npc.getId() == NpcID.JALMEJRAH || if (event.getType() != ChatMessageType.GAMEMESSAGE
npc.getId() == NpcID.JALAK || || !inInferno()
npc.getId() == NpcID.JALIMKOT || || !waveMatcher.matches())
npc.getId() == NpcID.JALXIL || {
npc.getId() == NpcID.JALZEK) return true; return;
}
return false;
} currentWave = Integer.parseInt(waveMatcher.group(1));
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if (client.getMapRegions()[0] != 9043) return;
clearMapAndPriority();
for (InfernoNPC monster : monsters.values())
{
calculateDistanceToPlayer(monster);
NPC npc = monster.getNpc();
// if they are not attacking but are still attacking
if (monster.isAttacking())
{
monster.setTicksTillAttack(monster.getTicksTillAttack() - 1);
// sets the blobs attack style
if (monster.getName().equals("blob") && monster.getTicksTillAttack() == 3 && monster.getDistanceToPlayer() <= 15)
{
if (client.getLocalPlayer().getOverheadIcon() == null)
{
monster.setAttackstyle(InfernoNPC.Attackstyle.RANDOM);
}
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.MAGIC))
{
monster.setAttackstyle(InfernoNPC.Attackstyle.RANGE);
}
else if (client.getLocalPlayer().getOverheadIcon().equals(HeadIcon.RANGED))
{
monster.setAttackstyle(InfernoNPC.Attackstyle.MAGE);
}
}
// we know the monster is not attacking because it should have attacked and is idling
if (monster.getTicksTillAttack() == 0)
{
if (npc.getAnimation() == -1)
{
monster.setAttacking(false);
}
else
{
// want to reset the monsters attack back to attacking
monster.attacked();
}
}
}
else
{
// they've just attacked
if (npc.getAnimation() == monster.getAttackAnimation() || npc.getAnimation() == 7581) // special case for blob
{
monster.attacked();
}
}
if (monster.getTicksTillAttack() >= 1)
{
monsterCurrentAttackMap.get(monster.getTicksTillAttack()).add(monster);
}
}
calculatePriorityNPC();
}
@Subscribe
public void onAnimationChanged(final AnimationChanged event)
{
if (event.getActor() != jad)
{
return;
}
if (jad.getAnimation() == InfernoJadAttack.MAGIC.getAnimation())
{
attack = InfernoJadAttack.MAGIC;
}
else if (jad.getAnimation() == InfernoJadAttack.RANGE.getAnimation())
{
attack = InfernoJadAttack.RANGE;
}
}
private void calculatePriorityNPC()
{
for (int i = 0; i < priorityNPC.length; i++)
{
ArrayList<InfernoNPC> monsters = monsterCurrentAttackMap.get(i + 1);
if ( monsters.size() == 0) continue;
int priority = monsters.get(0).getPriority();
InfernoNPC infernoNPC = monsters.get(0);
for (InfernoNPC npc : monsters)
{
if (npc.getPriority() < priority)
{
priority = npc.getPriority();
infernoNPC = npc;
}
}
priorityNPC[i] = infernoNPC;
System.out.println("i: " + i + " " + infernoNPC.getName());
}
}
// TODO: blob calculator
private void calculateDistanceToPlayer(InfernoNPC monster)
{
monster.setDistanceToPlayer(client.getLocalPlayer().getWorldLocation().distanceTo(monster.getNpc().getWorldArea()));
}
private void clearMapAndPriority()
{
for (List<InfernoNPC> l : monsterCurrentAttackMap.values())
{
l.clear();
}
for (int i = 0; i < priorityNPC.length; i++)
{
priorityNPC[i] = null;
}
}
public boolean isValidInfernoMob(NPC npc)
{
// we only want the bat, blob, melee, ranger and mager
if (npc.getId() == NpcID.JALMEJRAH ||
npc.getId() == NpcID.JALAK ||
npc.getId() == NpcID.JALIMKOT ||
npc.getId() == NpcID.JALXIL ||
npc.getId() == NpcID.JALZEK) return true;
return false;
}
boolean inInferno()
{
return ArrayUtils.contains(client.getMapRegions(), INFERNO_REGION);
}
static String formatMonsterQuantity(final InfernoWaveMonster monster, final int quantity)
{
return String.format("%dx %s", quantity, monster);
}
}

43
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveDisplayMode.java Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2018, Jordan Atwood <jordan.atwood423@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.inferno;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum InfernoWaveDisplayMode
{
CURRENT("Current wave"),
NEXT("Next wave"),
BOTH("Both");
private final String name;
@Override
public String toString()
{
return name;
}
}

50
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMonster.java Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright (c) 2018, Jordan Atwood <jordan.atwood423@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.inferno;
import lombok.AllArgsConstructor;
@AllArgsConstructor
enum InfernoWaveMonster
{
JAL_NIB("Jal-Nib", 32),
JAL_MEJRAH("Jal-MejRah", 85),
JAL_AK("Jal-Ak", 165),
JAL_IMKOT("Jal-ImKot", 240),
JAL_XIL("Jal-XIL", 370),
JAL_ZEK("Jal-Zek", 490),
JALTOK_JAD("JalTok-Jad", 900),
TZKAL_ZUK("TzKal-Zuk", 1400);
private final String name;
private final int level;
@Override
public String toString()
{
return String.format("%s - Level %s", name, level);
}
}

127
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java Normal file
View File

@@ -0,0 +1,127 @@
/*
* Copyright (c) 2018, Jordan Atwood <jordan.atwood423@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.inferno;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableComponent;
class InfernoWaveOverlay extends Overlay
{
private static final Color HEADER_COLOR = ColorScheme.BRAND_ORANGE;
private final InfernoConfig config;
private final InfernoPlugin plugin;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
private InfernoWaveOverlay(InfernoConfig config, InfernoPlugin plugin)
{
setPosition(OverlayPosition.TOP_RIGHT);
this.config = config;
this.plugin = plugin;
}
@Override
public Dimension render(Graphics2D graphics)
{
if (!plugin.inInferno()
|| plugin.getCurrentWave() < 0)
{
return null;
}
panelComponent.getChildren().clear();
final int currentWave = plugin.getCurrentWave();
final int waveIndex = currentWave - 1;
if (config.waveDisplay() == InfernoWaveDisplayMode.CURRENT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
{
final Map<InfernoWaveMonster, Integer> waveContents = InfernoPlugin.getWAVES().get(waveIndex);
addWaveInfo("Wave " + plugin.getCurrentWave(), waveContents);
}
if ((config.waveDisplay() == InfernoWaveDisplayMode.NEXT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
&& currentWave != InfernoPlugin.MAX_WAVE)
{
final Map<InfernoWaveMonster, Integer> waveContents = InfernoPlugin.getWAVES().get(waveIndex + 1);
addWaveInfo("Next wave", waveContents);
}
return panelComponent.render(graphics);
}
private void addWaveInfo(final String headerText, final Map<InfernoWaveMonster, Integer> waveContents)
{
panelComponent.getChildren().add(TitleComponent.builder()
.text(headerText)
.color(HEADER_COLOR)
.build());
TableComponent tableComponent = new TableComponent();
for (String line : buildWaveLines(waveContents))
{
tableComponent.addRow(line);
}
panelComponent.getChildren().add(tableComponent);
}
private static Collection<String> buildWaveLines(final Map<InfernoWaveMonster, Integer> wave)
{
final List<Map.Entry<InfernoWaveMonster, Integer>> monsters = new ArrayList<>(wave.entrySet());
monsters.sort(Map.Entry.comparingByKey());
final List<String> outputLines = new ArrayList<>();
for (Map.Entry<InfernoWaveMonster, Integer> monsterEntry : monsters)
{
final InfernoWaveMonster monster = monsterEntry.getKey();
final int quantity = monsterEntry.getValue();
final String line = InfernoPlugin.formatMonsterQuantity(monster, quantity);
outputLines.add(line);
}
return outputLines;
}
}