Skip to content

Commit

Permalink
feat: add support for clan hall bank
Browse files Browse the repository at this point in the history
  • Loading branch information
@g-mason0
g-mason0 committed Dec 31, 2024
1 parent 99eac4b commit 5dc707c
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 104 deletions.
4 changes: 4 additions & 0 deletions ...ient/src/main/java/net/runelite/client/plugins/microbot/util/bank/enums/BankLocation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public enum BankLocation {
CANIFIS(new WorldPoint(3512, 3480, 0)),
CASTLE_WARS(new WorldPoint(2443, 3083, 0)),
CATHERBY(new WorldPoint(2808, 3441, 0)),
CLAN_HALL(new WorldPoint(1747, 5476, 0)),
COOKS_GUILD(new WorldPoint(3147,3450,0)),
CORSAIR_COVE(new WorldPoint(2570, 2864, 0)),
CRAFTING_GUILD(new WorldPoint(2936, 3281, 0)),
Expand Down Expand Up @@ -167,6 +168,9 @@ public boolean hasRequirements() {
return Rs2Player.getQuestState(Quest.THE_CORSAIR_CURSE) == QuestState.FINISHED;
case SOPHANEM:
return Rs2Player.getQuestState(Quest.CONTACT) == QuestState.FINISHED;
case CLAN_HALL:
// Requires Clan Membership, varbit 933
return Microbot.getVarbitValue(933) > 1;
default:
return true;
}
Expand Down
4 changes: 1 addition & 3 deletions ...lite-client/src/main/java/net/runelite/client/plugins/microbot/util/walker/Rs2Walker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1307,10 +1307,8 @@ public void setStart(WorldPoint start) {
* @return distance
*/
public static int getDistanceBetween(WorldPoint startpoint, WorldPoint endpoint) {
ExecutorService pathfindingExecutor = Executors.newSingleThreadExecutor();
Pathfinder pathfinder = new Pathfinder(ShortestPathPlugin.getPathfinderConfig(), startpoint, endpoint);
pathfindingExecutor.submit(pathfinder);
sleepUntil(pathfinder::isDone);
pathfinder.run();
return pathfinder.getPath().size();
}

Expand Down
204 changes: 103 additions & 101 deletions ...ain/resources/net/runelite/client/plugins/microbot/shortestpath/teleportation_portals.tsv
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,103 @@
# Origin Destination menuOption menuTarget objectID Skills Items Quests Duration isMembers Display info
3147 3638 0 2440 3089 0 Enter;Castle Wars portal;30386 1
3147 3639 0 2440 3089 0 Enter;Castle Wars portal;30386 1
3147 3640 0 2440 3089 0 Enter;Castle Wars portal;30386 1
2444 3089 0 3151 3635 0 Enter;Large door;30388 1
2444 3090 0 3151 3635 0 Enter;Large door;30388 1
2438 3097 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2438 3096 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2436 3095 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2437 3095 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2436 3091 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3091 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3090 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3089 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3088 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3088 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3091 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3091 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3090 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3089 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3088 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3088 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3084 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2437 3084 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2438 3083 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2438 3082 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2374 9488 0 2440 3089 0 Exit;Portal;4389 1
2375 9488 0 2440 3089 0 Exit;Portal;4389 1
2376 9487 0 2440 3089 0 Exit;Portal;4389 1
2376 9486 0 2440 3089 0 Exit;Portal;4389 1
2374 9485 0 2440 3089 0 Exit;Portal;4389 1
2375 9485 0 2440 3089 0 Exit;Portal;4389 1
2373 9486 0 2440 3089 0 Exit;Portal;4389 1
2373 9487 0 2440 3089 0 Exit;Portal;4389 1
2424 9531 0 2440 3089 0 Exit;Portal;4390 1
2425 9531 0 2440 3089 0 Exit;Portal;4390 1
2426 9530 0 2440 3089 0 Exit;Portal;4390 1
2426 9529 0 2440 3089 0 Exit;Portal;4390 1
2424 9528 0 2440 3089 0 Exit;Portal;4390 1
2425 9528 0 2440 3089 0 Exit;Portal;4390 1
2423 9529 0 2440 3089 0 Exit;Portal;4390 1
2423 9530 0 2440 3089 0 Exit;Portal;4390 1
3128 3625 0 3327 4751 0 Enter;Free-for-all portal;26645 1
3128 3627 0 3327 4751 0 Enter;Free-for-all portal;26645 1
2595 3087 2 3109 3159 0 Enter;Magic Portal;2156 1
2595 3088 2 3109 3159 0 Enter;Magic Portal;2156 1
2590 3083 2 2907 3333 0 Enter;Magic Portal;2157 1
2591 3083 2 2907 3333 0 Enter;Magic Portal;2157 1
2586 3087 2 2703 3406 0 Enter;Magic Portal;2158 1
2586 3088 2 2703 3406 0 Enter;Magic Portal;2158 1
2206 2858 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2857 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2859 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2859 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2858 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2857 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2205 2856 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2205 2860 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2858 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2206 2859 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2206 2857 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2205 2856 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2205 2860 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2859 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2858 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2857 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2720 4884 2 2721 4911 0 Enter;Portal;6282 1
2719 4884 2 2721 4911 0 Enter;Portal;6282 1
2721 4884 2 2721 4911 0 Enter;Portal;6282 1
2718 4883 2 2721 4911 0 Enter;Portal;6282 1
2722 4883 2 2721 4911 0 Enter;Portal;6282 1
2719 4882 2 2721 4911 0 Enter;Portal;6282 1
2720 4882 2 2721 4911 0 Enter;Portal;6282 1
2721 4882 2 2721 4911 0 Enter;Portal;6282 1
2677 5214 2 3110 3363 2 Enter;Portal Home;11356 1
2677 5215 2 3110 3363 2 Enter;Portal Home;11356 1
2678 5213 2 3110 3363 2 Enter;Portal Home;11356 1
3084 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3083 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3082 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3475 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3474 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3473 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3158 10028 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3158 10027 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3158 10026 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3327 4751 0 3128 3628 0 Exit;Portal;26646 1
3328 4751 0 3128 3629 0 Exit;Portal;26646 1
3097 3508 1 3157 9818 0 Use;Clan Cup portal;27094 1
3157 9818 0 3097 3508 1 Use;Clan Cup portal;27095 1
2040 5240 0 2021 5223 0 Use;Portal;19005 1
1863 5239 0 1914 5222 0 Use;Portal;20786 1
2120 5257 0 2146 5287 0 Use;Portal;23707 1
2119 5258 0 2146 5287 0 Use;Portal;23707 1
2121 5258 0 2146 5287 0 Use;Portal;23707 1
2119 5258 0 2146 5287 0 Use;Portal;23707 1
2121 5258 0 2146 5287 0 Use;Portal;23707 1
2364 5212 0 2341 5219 0 Use;Portal;23922 1
3233 9313 0 3233 2887 0 Use;Portal;6550 1
3234 9312 0 3233 2887 0 Use;Portal;6550 1
3232 9312 0 3233 2887 0 Use;Portal;6550 1
# Origin Destination menuOption menuTarget objectID Skills Items Quests Varbits Duration isMembers Display info
3147 3638 0 2440 3089 0 Enter;Castle Wars portal;30386 1
3147 3639 0 2440 3089 0 Enter;Castle Wars portal;30386 1
3147 3640 0 2440 3089 0 Enter;Castle Wars portal;30386 1
2444 3089 0 3151 3635 0 Enter;Large door;30388 1
2444 3090 0 3151 3635 0 Enter;Large door;30388 1
2438 3097 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2438 3096 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2436 3095 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2437 3095 0 2376 9489 0 Enter;Saradomin Portal;4387 0 Headslot;0 Capeslot 1
2436 3091 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3091 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3090 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3089 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3088 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3088 0 2376 9489 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3091 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3091 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3090 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2438 3089 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3088 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2437 3088 0 2416 9524 0 Enter;Guthix Portal;4408 0 Headslot;0 Capeslot 1
2436 3084 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2437 3084 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2438 3083 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2438 3082 0 2416 9524 0 Enter;Zamorak Portal;4388 0 Headslot;0 Capeslot 1
2374 9488 0 2440 3089 0 Exit;Portal;4389 1
2375 9488 0 2440 3089 0 Exit;Portal;4389 1
2376 9487 0 2440 3089 0 Exit;Portal;4389 1
2376 9486 0 2440 3089 0 Exit;Portal;4389 1
2374 9485 0 2440 3089 0 Exit;Portal;4389 1
2375 9485 0 2440 3089 0 Exit;Portal;4389 1
2373 9486 0 2440 3089 0 Exit;Portal;4389 1
2373 9487 0 2440 3089 0 Exit;Portal;4389 1
2424 9531 0 2440 3089 0 Exit;Portal;4390 1
2425 9531 0 2440 3089 0 Exit;Portal;4390 1
2426 9530 0 2440 3089 0 Exit;Portal;4390 1
2426 9529 0 2440 3089 0 Exit;Portal;4390 1
2424 9528 0 2440 3089 0 Exit;Portal;4390 1
2425 9528 0 2440 3089 0 Exit;Portal;4390 1
2423 9529 0 2440 3089 0 Exit;Portal;4390 1
2423 9530 0 2440 3089 0 Exit;Portal;4390 1
3128 3625 0 3327 4751 0 Enter;Free-for-all portal;26645 1
3128 3627 0 3327 4751 0 Enter;Free-for-all portal;26645 1
2595 3087 2 3109 3159 0 Enter;Magic Portal;2156 1
2595 3088 2 3109 3159 0 Enter;Magic Portal;2156 1
2590 3083 2 2907 3333 0 Enter;Magic Portal;2157 1
2591 3083 2 2907 3333 0 Enter;Magic Portal;2157 1
2586 3087 2 2703 3406 0 Enter;Magic Portal;2158 1
2586 3088 2 2703 3406 0 Enter;Magic Portal;2158 1
2206 2858 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2857 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2859 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2859 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2858 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2204 2857 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2205 2856 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2205 2860 0 3158 10027 0 Ferox Enclave;Portal;40476 1 Y Soul Wars: Ferox Enclave
2206 2858 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2206 2859 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2206 2857 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2205 2856 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2205 2860 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2859 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2858 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2204 2857 0 3081 3475 0 Edgeville;Portal;40476 1 Y Soul Wars: Edgeville
2720 4884 2 2721 4911 0 Enter;Portal;6282 1
2719 4884 2 2721 4911 0 Enter;Portal;6282 1
2721 4884 2 2721 4911 0 Enter;Portal;6282 1
2718 4883 2 2721 4911 0 Enter;Portal;6282 1
2722 4883 2 2721 4911 0 Enter;Portal;6282 1
2719 4882 2 2721 4911 0 Enter;Portal;6282 1
2720 4882 2 2721 4911 0 Enter;Portal;6282 1
2721 4882 2 2721 4911 0 Enter;Portal;6282 1
2677 5214 2 3110 3363 2 Enter;Portal Home;11356 1
2677 5215 2 3110 3363 2 Enter;Portal Home;11356 1
2678 5213 2 3110 3363 2 Enter;Portal Home;11356 1
3084 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3083 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3082 3476 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3475 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3474 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3081 3473 0 2206 2858 0 Enter;Soul Wars Portal;40474 1 Y Soul Wars
3158 10028 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3158 10027 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3158 10026 0 2206 2858 0 Enter;Soul Wars Portal;40475 1 Y Soul Wars
3327 4751 0 3128 3628 0 Exit;Portal;26646 1
3328 4751 0 3128 3629 0 Exit;Portal;26646 1
3097 3508 1 3157 9818 0 Use;Clan Cup portal;27094 1
3157 9818 0 3097 3508 1 Use;Clan Cup portal;27095 1
2040 5240 0 2021 5223 0 Use;Portal;19005 1
1863 5239 0 1914 5222 0 Use;Portal;20786 1
2120 5257 0 2146 5287 0 Use;Portal;23707 1
2119 5258 0 2146 5287 0 Use;Portal;23707 1
2121 5258 0 2146 5287 0 Use;Portal;23707 1
2119 5258 0 2146 5287 0 Use;Portal;23707 1
2121 5258 0 2146 5287 0 Use;Portal;23707 1
2364 5212 0 2341 5219 0 Use;Portal;23922 1
3233 9313 0 3233 2887 0 Use;Portal;6550 1
3234 9312 0 3233 2887 0 Use;Portal;6550 1
3232 9312 0 3233 2887 0 Use;Portal;6550 1
3185 3472 0 1760 5487 0 Enter-member;Clan hall portal;41724 933>1
1760 5487 0 3185 3472 0 Leave;Portal;41617

0 comments on commit 5dc707c

Please sign in to comment.