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

Make special attack counter respect ids and npc deaths

Browse Source 
Closes #6009

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-10-15 21:27:29 +02:00
parent 4a0593c11b
commit 9457868257
2 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java
View File

@@ -24,40 +24,48 @@
*/ */
package net.runelite.client.plugins.specialcounter; package net.runelite.client.plugins.specialcounter;
import lombok.AllArgsConstructor; import com.google.common.collect.Sets;
import java.util.Set;
import lombok.Getter; import lombok.Getter;
import lombok.ToString; import lombok.ToString;
import net.runelite.api.NpcID;
@AllArgsConstructor
@Getter @Getter
@ToString @ToString
enum Boss enum Boss
{ {
ABYSSAL_SIRE("Abyssal sire", 1.25d), ABYSSAL_SIRE(1.25d, NpcID.ABYSSAL_SIRE, NpcID.ABYSSAL_SIRE_5887, NpcID.ABYSSAL_SIRE_5888, NpcID.ABYSSAL_SIRE_5889, NpcID.ABYSSAL_SIRE_5890, NpcID.ABYSSAL_SIRE_5891, NpcID.ABYSSAL_SIRE_5908),
CALLISTO("Callisto", 1.225d), CALLISTO(1.225d, NpcID.CALLISTO, NpcID.CALLISTO_6609),
CERBERUS("Cerberus", 1.15d), CERBERUS(1.15d, NpcID.CERBERUS, NpcID.CERBERUS_5863, NpcID.CERBERUS_5866),
CHAOS_ELEMENTAL("Chaos elemental", 1.075d), CHAOS_ELEMENTAL(1.075d, NpcID.CHAOS_ELEMENTAL, NpcID.CHAOS_ELEMENTAL_6505),
CORPOREAL_BEAST("Corporeal Beast", 1.55d), CORPOREAL_BEAST(1.55d, NpcID.CORPOREAL_BEAST),
GENERAL_GRAARDOR("General Graardor", 1.325d), GENERAL_GRAARDOR(1.325d, NpcID.GENERAL_GRAARDOR, NpcID.GENERAL_GRAARDOR_6494),
GIANT_MOLE("Giant Mole", 1.075d), GIANT_MOLE(1.075d, NpcID.GIANT_MOLE, NpcID.GIANT_MOLE_6499),
KALPHITE_QUEEN("Kalphite Queen", 1.05d), KALPHITE_QUEEN(1.05d, NpcID.KALPHITE_QUEEN, NpcID.KALPHITE_QUEEN_963, NpcID.KALPHITE_QUEEN_965, NpcID.KALPHITE_QUEEN_4303, NpcID.KALPHITE_QUEEN_4304, NpcID.KALPHITE_QUEEN_6500, NpcID.KALPHITE_QUEEN_6501),
KING_BLACK_DRAGON("King Black Dragon", 1.075d), KING_BLACK_DRAGON(1.075d, NpcID.KING_BLACK_DRAGON, NpcID.KING_BLACK_DRAGON_2642, NpcID.KING_BLACK_DRAGON_6502),
KRIL_TSUROTH("K'ril Tsutsaroth", 1.375d), KRIL_TSUROTH(1.375d, NpcID.KRIL_TSUTSAROTH, NpcID.KRIL_TSUTSAROTH_6495),
VENETENATIS("Venenatis", 1.4d), VENETENATIS(1.4d, NpcID.VENENATIS, NpcID.VENENATIS_6610),
VETION("Vet'ion", 1.225d); VETION(1.225d, NpcID.VETION, NpcID.VETION_REBORN);
private final String name; private final Set<Integer> ids;
private final double modifier; // Some NPCs have a modifier to the experience a player receives. private final double modifier; // Some NPCs have a modifier to the experience a player receives.
static Boss getBoss(String name) Boss(double modifier, Integer... ids)
{
this.modifier = modifier;
this.ids = Sets.newHashSet(ids);
}
static Boss getBoss(int id)
{ {
for (Boss boss : values()) for (Boss boss : values())
{ {
if (boss.getName().equals(name)) if (boss.ids.contains(id))
{ {
return boss; return boss;
} }
} }
return null; return null;
} }

22
runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
View File

@@ -25,6 +25,8 @@
package net.runelite.client.plugins.specialcounter; package net.runelite.client.plugins.specialcounter;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -61,7 +63,7 @@ public class SpecialCounterPlugin extends Plugin
private double modifier = 1d; private double modifier = 1d;
private SpecialWeapon specialWeapon; private SpecialWeapon specialWeapon;
private int interactedNpcId; private final Set<Integer> interactedNpcIds = new HashSet<>();
private final SpecialCounter[] specialCounter = new SpecialCounter[SpecialWeapon.values().length]; private final SpecialCounter[] specialCounter = new SpecialCounter[SpecialWeapon.values().length];
@Inject @Inject
@@ -152,13 +154,19 @@ public class SpecialCounterPlugin extends Plugin
{ {
int interactingId = ((NPC) interacting).getId(); int interactingId = ((NPC) interacting).getId();
if (interactedNpcId != interactingId) if (!interactedNpcIds.contains(interactingId))
{ {
interactedNpcId = interactingId;
removeCounters(); removeCounters();
modifier = 1d;
interactedNpcIds.add(interactingId);
final Boss boss = Boss.getBoss(interactingId);
if (boss != null)
{
modifier = boss.getModifier();
interactedNpcIds.addAll(boss.getIds());
}
Boss boss = Boss.getBoss(interacting.getName());
modifier = boss != null ? boss.getModifier() : 1d;
} }
} }
} }
@@ -168,7 +176,7 @@ public class SpecialCounterPlugin extends Plugin
{ {
NPC actor = npcDespawned.getNpc(); NPC actor = npcDespawned.getNpc();
if (actor.isDead() && actor.getId() == interactedNpcId) if (actor.isDead() && interactedNpcIds.contains(actor.getId()))
{ {
removeCounters(); removeCounters();
} }
@@ -222,6 +230,8 @@ public class SpecialCounterPlugin extends Plugin
private void removeCounters() private void removeCounters()
{ {
interactedNpcIds.clear();
for (int i = 0; i < specialCounter.length; ++i) for (int i = 0; i < specialCounter.length; ++i)
{ {
SpecialCounter counter = specialCounter[i]; SpecialCounter counter = specialCounter[i];