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

Merge pull request #9347 from Nightfirecat/hot-cold-strange-device-marker

Browse Source 
hotcoldclue: Display npc location before using device
This commit is contained in:
Tomas Slusny
2019-07-12 11:36:17 +02:00
committed by GitHub
parent 43e2ff5445 1ba77fbc20
commit 92f3b2e5bc
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
View File

@@ -62,14 +62,17 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
private static final int HOT_COLD_PANEL_WIDTH = 200; private static final int HOT_COLD_PANEL_WIDTH = 200;
private static final HotColdClue BEGINNER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Reldo may have a clue.", private static final HotColdClue BEGINNER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Reldo may have a clue.",
"Reldo", "Reldo",
"Speak to Reldo to receive a strange device."); "Speak to Reldo to receive a strange device.",
new WorldPoint(3211, 3494, 0));
private static final HotColdClue MASTER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Jorral may have a clue.", private static final HotColdClue MASTER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Jorral may have a clue.",
"Jorral", "Jorral",
"Speak to Jorral to receive a strange device."); "Speak to Jorral to receive a strange device.",
new WorldPoint(2436, 3347, 0));
private final String text; private final String text;
private final String npc; private final String npc;
private final String solution; private final String solution;
private final WorldPoint npcLocation;
@Nullable @Nullable
private HotColdSolver hotColdSolver; private HotColdSolver hotColdSolver;
private WorldPoint location; private WorldPoint location;
@@ -90,11 +93,12 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
return null; return null;
} }
private HotColdClue(String text, String npc, String solution) private HotColdClue(String text, String npc, String solution, WorldPoint npcLocation)
{ {
this.text = text; this.text = text;
this.npc = npc; this.npc = npc;
this.solution = solution; this.solution = solution;
this.npcLocation = npcLocation;
setRequiresSpade(true); setRequiresSpade(true);
initializeSolver(); initializeSolver();
} }
@@ -107,7 +111,14 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
return new WorldPoint[0]; return new WorldPoint[0];
} }
return hotColdSolver.getPossibleLocations().stream().map(HotColdLocation::getWorldPoint).toArray(WorldPoint[]::new); if (hotColdSolver.getLastWorldPoint() == null)
{
return new WorldPoint[] {npcLocation};
}
else
{
return hotColdSolver.getPossibleLocations().stream().map(HotColdLocation::getWorldPoint).toArray(WorldPoint[]::new);
}
} }
@Override @Override