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

Use wiki scraped npcs for npc healths

Browse Source
This commit is contained in:
Adam
2020-01-20 13:28:17 -05:00
parent 1549e38fa7
commit f6640844b5
7 changed files with 154 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
runelite-client/src/main/java/net/runelite/client/game/NPCManager.java
View File

@@ -24,42 +24,54 @@
*/
package net.runelite.client.game;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.http.api.npc.NpcInfo;
import net.runelite.http.api.npc.NpcInfoClient;
import okhttp3.OkHttpClient;
@Singleton
@Slf4j
public class NPCManager
{
private final Map<String, Integer> healthMap;
private final OkHttpClient okHttpClient;
private Map<Integer, NpcInfo> npcMap = Collections.emptyMap();
@Inject
private NPCManager()
private NPCManager(OkHttpClient okHttpClient, ScheduledExecutorService scheduledExecutorService)
{
final Gson gson = new Gson();
final Type typeToken = new TypeToken<Map<String, Integer>>()
{
}.getType();
final InputStream healthFile = getClass().getResourceAsStream("/npc_health.json");
healthMap = gson.fromJson(new InputStreamReader(healthFile), typeToken);
this.okHttpClient = okHttpClient;
scheduledExecutorService.execute(this::loadNpcs);
}
/**
* Returns health for target NPC based on it's combat level and name
* @param name npc name
* @param combatLevel npc combat level
* @return health or null if HP is unknown
*/
@Nullable
public Integer getHealth(final String name, final int combatLevel)
public NpcInfo getNpcInfo(int npcId)
{
return healthMap.get(name + "_" + combatLevel);
return npcMap.get(npcId);
}
@Nullable
public Integer getHealth(int npcId)
{
NpcInfo npcInfo = npcMap.get(npcId);
return npcInfo == null ? null : npcInfo.getHitpoints();
}
private void loadNpcs()
{
try
{
npcMap = new NpcInfoClient(okHttpClient).getNpcs();
}
catch (IOException e)
{
log.warn("error loading npc stats", e);
}
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
View File

@@ -112,7 +112,7 @@ class OpponentInfoOverlay extends Overlay
lastMaxHealth = null;
if (opponent instanceof NPC)
{
lastMaxHealth = npcManager.getHealth(opponentName, opponent.getCombatLevel());
lastMaxHealth = npcManager.getHealth(((NPC) opponent).getId());
}
else if (opponent instanceof Player)
{

4
runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java
View File

@@ -40,7 +40,6 @@ import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.Text;
class TargetWeaknessOverlay extends Overlay
{
@@ -109,8 +108,7 @@ class TargetWeaknessOverlay extends Overlay
final int healthScale = target.getHealth();
final int healthRatio = target.getHealthRatio();
final String targetName = Text.removeTags(target.getName());
final Integer maxHealth = npcManager.getHealth(targetName, target.getCombatLevel());
final Integer maxHealth = npcManager.getHealth(target.getId());
if (healthRatio < 0 || healthScale <= 0 || maxHealth == null)
{

4
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
View File

@@ -369,7 +369,7 @@ public class XpTrackerPlugin extends Plugin
if (interacting instanceof NPC && COMBAT.contains(skill))
{
final NPC npc = (NPC) interacting;
xpState.updateNpcExperience(skill, npc, npcManager.getHealth(npc.getName(), npc.getCombatLevel()));
xpState.updateNpcExperience(skill, npc, npcManager.getHealth(npc.getId()));
}
final XpUpdateResult updateResult = xpState.updateSkill(skill, currentXp, startGoalXp, endGoalXp);
@@ -392,7 +392,7 @@ public class XpTrackerPlugin extends Plugin
for (Skill skill : COMBAT)
{
final XpUpdateResult updateResult = xpState.updateNpcKills(skill, npc, npcManager.getHealth(npc.getName(), npc.getCombatLevel()));
final XpUpdateResult updateResult = xpState.updateNpcKills(skill, npc, npcManager.getHealth(npc.getId()));
final boolean updated = XpUpdateResult.UPDATED.equals(updateResult);
xpPanel.updateSkillExperience(updated, xpPauseState.isPaused(skill), skill, xpState.getSkillSnapshot(skill));
}