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

Make 3 step cryptic clues more robust (better splitting)

Browse Source 
- Instead of depending on specific formatting and size of clue text, just
split and parse everything stripping all tags when needed.
- Exit early on size < 3 to prevent NPEs and ArrayOutOfBounds

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-10-14 02:56:08 +02:00
parent fb1c2f4b02
commit ecfcd6d67b
1 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ThreeStepCrypticClue.java
View File

@@ -47,17 +47,16 @@ import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin;
import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.util.Text;
@Getter @Getter
public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll, ObjectClueScroll, NpcClueScroll, LocationsClueScroll public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll, ObjectClueScroll, NpcClueScroll, LocationsClueScroll
{ {
private static final int CLUE_STEPS = 3; private final List<Map.Entry<CrypticClue, Boolean>> clueSteps;
private final int[] objectIds;
private List<Map.Entry<CrypticClue, Boolean>> clueSteps; private final String[] npcs;
private int[] objectIds; private final String text;
private WorldPoint[] locations; private WorldPoint[] locations;
private String[] npcs;
private String text;
private ThreeStepCrypticClue(List<Map.Entry<CrypticClue, Boolean>> steps, String text) private ThreeStepCrypticClue(List<Map.Entry<CrypticClue, Boolean>> steps, String text)
{ {
@@ -70,8 +69,7 @@ public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll,
for (int i = 0; i < numClueSteps; i++) for (int i = 0; i < numClueSteps; i++)
{ {
CrypticClue c = clueSteps.get(i).getKey(); final CrypticClue c = clueSteps.get(i).getKey();
locations[i] = c.getLocation(); locations[i] = c.getLocation();
npcs[i] = c.getNpc(); npcs[i] = c.getNpc();
objectIds[i] = c.getObjectId(); objectIds[i] = c.getObjectId();
@@ -83,9 +81,9 @@ public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll,
{ {
panelComponent.setPreferredSize(new Dimension(200, 0)); panelComponent.setPreferredSize(new Dimension(200, 0));
for (int i = 0; i < CLUE_STEPS; i++) for (int i = 0; i < clueSteps.size(); i++)
{ {
Map.Entry<CrypticClue, Boolean> e = clueSteps.get(i); final Map.Entry<CrypticClue, Boolean> e = clueSteps.get(i);
if (!e.getValue()) if (!e.getValue())
{ {
@@ -142,48 +140,27 @@ public class ThreeStepCrypticClue extends ClueScroll implements TextClueScroll,
public static ThreeStepCrypticClue forText(String plainText, String text) public static ThreeStepCrypticClue forText(String plainText, String text)
{ {
List<Map.Entry<CrypticClue, Boolean>> steps = new ArrayList<>(CLUE_STEPS); final String[] split = text.split("<br>\\s*<br>");
StringBuilder threeStepText = new StringBuilder(text.replaceAll("<br><br>", " ").toLowerCase()); final List<Map.Entry<CrypticClue, Boolean>> steps = new ArrayList<>(split.length);
boolean stepDone;
for (int i = 0; i < CLUE_STEPS; i++) for (String part : split)
{ {
// if text has <str> - strikethrough - tag then it is already done boolean isDone = part.contains("<str>");
stepDone = threeStepText.toString().startsWith("<str>"); final String rawText = Text.sanitizeMultilineText(part);
if (stepDone)
{
// chop off <str> tag
threeStepText.delete(0, 5);
}
for (CrypticClue clue : CrypticClue.CLUES) for (CrypticClue clue : CrypticClue.CLUES)
{ {
if (threeStepText.toString().startsWith(clue.getText().toLowerCase())) if (!rawText.equalsIgnoreCase(clue.getText()))
{ {
if (stepDone) continue;
{
steps.add(new AbstractMap.SimpleEntry<>(clue, true));
// chop off </str> tag
threeStepText.delete(0, 6);
}
else
{
steps.add(new AbstractMap.SimpleEntry<>(clue, false));
}
if (i < CLUE_STEPS - 1)
{
// chop off the length of the clue text plus a space
threeStepText.delete(0, clue.getText().length() + 1);
}
break;
} }
steps.add(new AbstractMap.SimpleEntry<>(clue, isDone));
break;
} }
} }
if (steps.isEmpty()) if (steps.isEmpty() || steps.size() < 3)
{ {
return null; return null;
} }