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

Fix teleport scrolls

Browse Source
This commit is contained in:
Owain van Brakel
2019-12-19 11:47:55 +01:00
parent 000f714cdd
commit 37a130c68a
1 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
View File

@@ -89,7 +89,6 @@ public class SuppliesTrackerPlugin extends Plugin
private static final String DRINK_PATTERN = "^drink"; private static final String DRINK_PATTERN = "^drink";
private static final String TELEPORT_PATTERN = "^teleport"; private static final String TELEPORT_PATTERN = "^teleport";
private static final String TELETAB_PATTERN = "^break"; private static final String TELETAB_PATTERN = "^break";
private static final String TELEPORT_SCROLL_BOOK_PATTERN = "teleport scroll$";
private static final String SPELL_PATTERN = "^cast|^grand\\sexchange|^outside|^seers|^yanille"; private static final String SPELL_PATTERN = "^cast|^grand\\sexchange|^outside|^seers|^yanille";
//Equipment slot constants //Equipment slot constants
@@ -681,58 +680,68 @@ public class SuppliesTrackerPlugin extends Plugin
} }
Pattern scrollPattern = Pattern.compile(TELEPORT_SCROLL_BOOK_PATTERN); if (event.getOption().toLowerCase().equals("activate") || event.getOption().toLowerCase().equals("teleport"))
if (event.getOption().toLowerCase().equals("activate"))
{ {
String target = event.getTarget(); String target = event.getTarget().toLowerCase();
if (target.toLowerCase().contains("teleport scroll")) if (target.contains("watson teleport"))
{ {
switch (target.toLowerCase().substring(target.indexOf(">") + 1)) buildEntries(WATSON_TELEPORT);
{ }
case "watson teleport scroll": else if (target.contains("zul-andra teleport"))
buildEntries(WATSON_TELEPORT); {
break; buildEntries(ZULANDRA_TELEPORT);
case "zul-andra teleport scroll": }
buildEntries(ZULANDRA_TELEPORT); else if (target.contains("nardah teleport"))
break; {
case "nardah teleport scroll": buildEntries(NARDAH_TELEPORT);
buildEntries(NARDAH_TELEPORT); }
break; else if (target.contains("digsite teleport"))
case "digsite teleport scroll": {
buildEntries(DIGSITE_TELEPORT); buildEntries(DIGSITE_TELEPORT);
break; }
case "feldip hills teleport scroll": else if (target.contains("feldip hills teleport"))
buildEntries(FELDIP_HILLS_TELEPORT); {
break; buildEntries(FELDIP_HILLS_TELEPORT);
case "lunar isle teleport scroll": }
buildEntries(LUNAR_ISLE_TELEPORT); else if (target.contains("lunar isle teleport"))
break; {
case "mort'ton teleport scroll": buildEntries(LUNAR_ISLE_TELEPORT);
buildEntries(MORTTON_TELEPORT); }
break; else if (target.contains("mort'ton teleport"))
case "pest control teleport scroll": {
buildEntries(PEST_CONTROL_TELEPORT); buildEntries(MORTTON_TELEPORT);
break; }
case "piscatoris teleport scroll": else if (target.contains("pest control teleport"))
buildEntries(PISCATORIS_TELEPORT); {
break; buildEntries(PEST_CONTROL_TELEPORT);
case "iorwerth camp teleport scroll": }
buildEntries(IORWERTH_CAMP_TELEPORT); else if (target.contains("piscatoris teleport"))
break; {
case "mos le'harmless teleport scroll": buildEntries(PISCATORIS_TELEPORT);
buildEntries(MOS_LEHARMLESS_TELEPORT); }
break; else if (target.contains("iorwerth camp teleport"))
case "lumberyard teleport scroll": {
buildEntries(LUMBERYARD_TELEPORT); buildEntries(IORWERTH_CAMP_TELEPORT);
break; }
case "revenant cave teleport scroll": else if (target.contains("mos le'harmless teleport"))
buildEntries(REVENANT_CAVE_TELEPORT); {
break; buildEntries(MOS_LEHARMLESS_TELEPORT);
case "tai bwo wannai teleport scroll": }
buildEntries(TAI_BWO_WANNAI_TELEPORT); else if (target.contains("lumberyard teleport"))
break; {
} buildEntries(LUMBERYARD_TELEPORT);
}
else if (target.contains("revenant cave teleport"))
{
buildEntries(REVENANT_CAVE_TELEPORT);
}
else if (target.contains("tai bwo wannai teleport"))
{
buildEntries(TAI_BWO_WANNAI_TELEPORT);
}
else if (target.contains("key master teleport"))
{
buildEntries(KEY_MASTER_TELEPORT);
} }
} }
} }