Skip to content

Commit bfae8b8

Browse files
chsamichsami
authored
Merge pull request chsami#1504 from chsami/development
2.0.5
2 parents 72e0600 + c9b477a commit bfae8b8

7 files changed

Lines changed: 1270 additions & 361 deletions

File tree

‎runelite-client/src/main/java/net/runelite/client/plugins/microbot/tempoross/TemporossScript.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -671,10 +671,13 @@ private void handleMainLoop() {
671671
if(!fightFiresInPath(fishSpot.getWorldLocation()))
672672
return;
673673
}
674-
if (Rs2Player.isInteracting() && Rs2Player.getInteracting() != null) {
675-
Actor interactingNpc = Microbot.getClient().getLocalPlayer().getInteracting();
676-
if (interactingNpc.equals(fishSpot.getActor())) {
677-
return;
674+
if (Rs2Player.isInteracting()) {
675+
Actor currentTarget = Rs2Player.getInteracting();
676+
if (currentTarget != null && currentTarget instanceof NPC) {
677+
NPC targetNpc = (NPC) currentTarget;
678+
if (targetNpc.getId() == fishSpot.getId()) {
679+
return;
680+
}
678681
}
679682
}
680683
Rs2Camera.turnTo(fishSpot);

‎runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/poh/data/HouseStyle.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@
1212
@RequiredArgsConstructor
1313
public enum HouseStyle {
1414
BASIC_WOOD(1, new WorldPoint(1858, 5707, 0)),
15-
BASIC_STONE(2, new WorldPoint(1858, 5707, 0)),
16-
WHITEWASHED_STONE(3, new WorldPoint(1858, 5707, 0)),
17-
FREMENNIK_STYLE_WOOD(4, new WorldPoint(1858, 5707, 0)),
18-
TROPICAL_WOOD(5, new WorldPoint(1922, 5707, 2)),
19-
FANCY_STONE(6, new WorldPoint(1922, 5707, 2)),
15+
BASIC_STONE(2, new WorldPoint(1858, 5707, 1)),
16+
WHITEWASHED_STONE(3, new WorldPoint(1858, 5707, 2)),
17+
FREMENNIK_STYLE_WOOD(4, new WorldPoint(1858, 5707, 3)),
18+
TROPICAL_WOOD(5, new WorldPoint(1922, 5707, 0)),
19+
FANCY_STONE(6, new WorldPoint(1922, 5707, 1)),
2020
DEADLY_MANSION(7, new WorldPoint(1922, 5707, 2)),
21-
TWISTED_THEME(8, new WorldPoint(1922, 5707, 2)),
21+
TWISTED_THEME(8, new WorldPoint(1922, 5707, 3)),
2222
COSY_CABIN(10, new WorldPoint(1986, 5707, 0)),
2323
HOSIDIUS(11, new WorldPoint(1986, 5707, 0)),
24-
CIVITAS(13, new WorldPoint(1986, 5707, 0)),
25-
CANIFIS(14, new WorldPoint(1986, 5707, 0)),
24+
UNKNOWN(12, new WorldPoint(1986, 5707, 1)),
25+
CIVITAS(13, new WorldPoint(1986, 5707, 2)),
26+
CANIFIS(14, new WorldPoint(1986, 5707, 3)),
2627
;
2728

2829
private final int varbitValue;

‎runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/fairy_rings.tsv‎

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,72 @@
11
# Origin Destination Skills Item IDs Quests Varbits Duration Display info
2-
2412 4434 0 5
3-
2996 3114 0 5
4-
2700 3247 0 5
5-
2328 4426 0 5
6-
2735 5221 0 Death to the Dorgeshuun 5
7-
2780 3613 0 5
8-
2500 3896 0 5
9-
3284 2706 0 5
10-
2319 3619 0 5
11-
1826 3540 0 5
12-
2571 2956 0 5
13-
2503 3636 0 5
14-
3597 3495 0 5
15-
3059 4875 0 5
16-
2644 3495 0 5
17-
3410 3324 0 5
18-
3251 3095 0 5
19-
2635 3266 0 5
20-
2267 2976 0 5
21-
2650 4730 0 Holy Grail 5
22-
2150 3070 0 Regicide 5
23-
2385 3035 0 5
24-
3041 4532 0 5
25-
3469 3431 0 5
26-
2437 5126 0 5
27-
3572 4372 0 Hopespear's Will 5
28-
2740 3351 0 5
29-
1295 3493 0 5
30-
2513 3884 0 The Fremennik Trials 5
31-
2528 3127 0 5
32-
1302 3762 0 5
33-
1639 3868 0 5
34-
2705 3576 0 5
35-
2075 4848 0 5
36-
2801 3003 0 5
37-
3447 3470 0 5
38-
3082 3206 0 5
39-
2740 2738 0 Monkey Madness I 5
40-
2682 3081 0 5
41-
3037 4763 0 5
42-
# POH ring
43-
1858 5707 0 2188=1 5
44-
1858 5707 0 2188=2 5
45-
1858 5707 0 2188=3 5
46-
1858 5707 0 2188=4 5
47-
1922 5707 2 2188=5 5
48-
1922 5707 2 2188=6 5
49-
1922 5707 2 2188=7 5
50-
1922 5707 2 2188=8 5
51-
1986 5707 0 2188=10 5
52-
1986 5707 0 2188=11 5
53-
1986 5707 0 2188=13 5
54-
1986 5707 0 2188=14 5
55-
# 2027 5700 0 5
56-
3038 5348 0 5
57-
3108 3149 0 5
58-
2658 3230 0 5
59-
1455 3658 0 5
60-
2900 3111 0 5
61-
3129 3496 0 5
62-
2744 3719 0 5
63-
3423 3016 0 5
64-
2213 3099 0 5
65-
3447 9824 0 In Search of the Myreque 5
66-
1651 3010 0 9650=1 5
67-
1359 2941 0 9650=1 5
68-
1429 3324 0 9650=1 5
2+
2412 4434 0 5
3+
2996 3114 0 5
4+
2700 3247 0 5
5+
2328 4426 0 5
6+
2735 5221 0 Death to the Dorgeshuun 5
7+
2780 3613 0 5
8+
2500 3896 0 5
9+
3284 2706 0 5
10+
2319 3619 0 5
11+
1826 3540 0 5
12+
2571 2956 0 5
13+
2503 3636 0 5
14+
3597 3495 0 5
15+
3059 4875 0 5
16+
2644 3495 0 5
17+
3410 3324 0 5
18+
3251 3095 0 5
19+
2635 3266 0 5
20+
2267 2976 0 5
21+
2650 4730 0 Holy Grail 5
22+
2150 3070 0 Regicide 5
23+
2385 3035 0 5
24+
3041 4532 0 5
25+
3469 3431 0 5
26+
2437 5126 0 5
27+
3572 4372 0 Hopespear's Will 5
28+
2740 3351 0 5
29+
1295 3493 0 5
30+
2513 3884 0 The Fremennik Trials 5
31+
2528 3127 0 5
32+
1302 3762 0 5
33+
1639 3868 0 5
34+
2705 3576 0 5
35+
2075 4848 0 5
36+
2801 3003 0 5
37+
3447 3470 0 5
38+
3082 3206 0 5
39+
2740 2738 0 Monkey Madness I 5
40+
2682 3081 0 5
41+
3037 4763 0 5
42+
# POH ring
43+
1858 5707 0 2188=1 5
44+
1858 5707 1 2188=2 5
45+
1858 5707 2 2188=3 5
46+
1858 5707 3 2188=4 5
47+
1922 5707 0 2188=5 5
48+
1922 5707 1 2188=6 5
49+
1922 5707 2 2188=7 5
50+
1922 5707 3 2188=8 5
51+
1986 5707 0 2188=10 5
52+
1986 5707 0 2188=11 5
53+
1986 5707 1 2188=12 5
54+
1986 5707 2 2188=13 5
55+
1986 5707 3 2188=14 5
56+
# 2027 5700 0 5
57+
3038 5348 0 5
58+
3108 3149 0 5
59+
2658 3230 0 5
60+
1455 3658 0 5
61+
2900 3111 0 5
62+
3129 3496 0 5
63+
2744 3719 0 5
64+
3423 3016 0 5
65+
2213 3099 0 5
66+
3447 9824 0 In Search of the Myreque 5
67+
1651 3010 0 9650=1 5
68+
1359 2941 0 9650=1 5
69+
1429 3324 0 9650=1 5
6970
2996 3114 0 5 AIQ
7071
2700 3247 0 5 AIR
7172
2328 4426 0 5 AIR DLR DJQ AJS
@@ -106,19 +107,20 @@
106107
2740 2738 0 Monkey Madness I 5 CLR
107108
2682 3081 0 5 CLS
108109
3037 4763 0 5 DIP
109-
# POH Ring
110+
# POH Ring
110111
1858 5707 0 2188=1 5 DIQ
111-
1858 5707 0 2188=2 5 DIQ
112-
1858 5707 0 2188=3 5 DIQ
113-
1858 5707 0 2188=4 5 DIQ
114-
1922 5707 2 2188=5 5 DIQ
115-
1922 5707 2 2188=6 5 DIQ
112+
1858 5707 1 2188=2 5 DIQ
113+
1858 5707 2 2188=3 5 DIQ
114+
1858 5707 3 2188=4 5 DIQ
115+
1922 5707 0 2188=5 5 DIQ
116+
1922 5707 1 2188=6 5 DIQ
116117
1922 5707 2 2188=7 5 DIQ
117-
1922 5707 2 2188=8 5 DIQ
118+
1922 5707 3 2188=8 5 DIQ
118119
1986 5707 0 2188=10 5 DIQ
119120
1986 5707 0 2188=11 5 DIQ
120-
1986 5707 0 2188=13 5 DIQ
121-
1986 5707 0 2188=14 5 DIQ
121+
1986 5707 1 2188=12 5 DIQ
122+
1986 5707 2 2188=13 5 DIQ
123+
1986 5707 3 2188=14 5 DIQ
122124
3038 5348 0 5 DIR
123125
3108 3149 0 5 DIS
124126
2658 3230 0 5 DJP

‎runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/teleportation_items.tsv‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,18 @@
112112
1740 3517 0 8013 2187=8 Y T 19 4 Teleport to House tablet: Outside
113113
# Teleport inside POH with tablet
114114
1858 5707 0 8013 2188=1 Y T 19 4 Teleport to House tablet: Inside
115-
1858 5707 0 8013 2188=2 Y T 19 4 Teleport to House tablet: Inside
116-
1858 5707 0 8013 2188=3 Y T 19 4 Teleport to House tablet: Inside
117-
1858 5707 0 8013 2188=4 Y T 19 4 Teleport to House tablet: Inside
118-
1922 5707 1 8013 2188=5 Y T 19 4 Teleport to House tablet: Inside
115+
1858 5707 1 8013 2188=2 Y T 19 4 Teleport to House tablet: Inside
116+
1858 5707 2 8013 2188=3 Y T 19 4 Teleport to House tablet: Inside
117+
1858 5707 3 8013 2188=4 Y T 19 4 Teleport to House tablet: Inside
118+
1922 5707 0 8013 2188=5 Y T 19 4 Teleport to House tablet: Inside
119119
1922 5707 1 8013 2188=6 Y T 19 4 Teleport to House tablet: Inside
120-
1922 5707 1 8013 2188=7 Y T 19 4 Teleport to House tablet: Inside
121-
1922 5707 1 8013 2188=8 Y T 19 4 Teleport to House tablet: Inside
120+
1922 5707 2 8013 2188=7 Y T 19 4 Teleport to House tablet: Inside
121+
1922 5707 3 8013 2188=8 Y T 19 4 Teleport to House tablet: Inside
122122
1986 5707 0 8013 2188=10 Y T 19 4 Teleport to House tablet: Inside
123123
1986 5707 0 8013 2188=11 Y T 19 4 Teleport to House tablet: Inside
124-
1986 5707 0 8013 2188=13 Y T 19 4 Teleport to House tablet: Inside
125-
1986 5707 0 8013 2188=14 Y T 19 4 Teleport to House tablet: Inside
124+
1986 5707 1 8013 2188=12 Y T 19 4 Teleport to House tablet: Inside
125+
1986 5707 2 8013 2188=13 Y T 19 4 Teleport to House tablet: Inside
126+
1986 5707 3 8013 2188=14 Y T 19 4 Teleport to House tablet: Inside
126127
# Teleport tablets
127128
3213 3424 0 8007 4585=0 Y T 19 4 Varrock tablet
128129
3164 3478 0 8007 4480=1;4585=1 Y T 19 4 Varrock tablet: Grand exchange
@@ -218,17 +219,18 @@
218219
2931 3286 0 9780;9781 Y F 19 4 Crafting cape: Teleport
219220
# The Construction cape's home teleports, determined by varbit 2188 (HouseStyle)
220221
1858 5707 0 9789;9790 2188=1 Y F 19 4 Construction cape: Tele to POH
221-
1858 5707 0 9789;9790 2188=2 Y F 19 4 Construction cape: Tele to POH
222-
1858 5707 0 9789;9790 2188=3 Y F 19 4 Construction cape: Tele to POH
223-
1858 5707 0 9789;9790 2188=4 Y F 19 4 Construction cape: Tele to POH
224-
1922 5707 1 9789;9790 2188=5 Y F 19 4 Construction cape: Tele to POH
222+
1858 5707 1 9789;9790 2188=2 Y F 19 4 Construction cape: Tele to POH
223+
1858 5707 2 9789;9790 2188=3 Y F 19 4 Construction cape: Tele to POH
224+
1858 5707 3 9789;9790 2188=4 Y F 19 4 Construction cape: Tele to POH
225+
1922 5707 0 9789;9790 2188=5 Y F 19 4 Construction cape: Tele to POH
225226
1922 5707 1 9789;9790 2188=6 Y F 19 4 Construction cape: Tele to POH
226-
1922 5707 1 9789;9790 2188=7 Y F 19 4 Construction cape: Tele to POH
227-
1922 5707 1 9789;9790 2188=8 Y F 19 4 Construction cape: Tele to POH
227+
1922 5707 2 9789;9790 2188=7 Y F 19 4 Construction cape: Tele to POH
228+
1922 5707 3 9789;9790 2188=8 Y F 19 4 Construction cape: Tele to POH
228229
1986 5707 0 9789;9790 2188=10 Y F 19 4 Construction cape: Tele to POH
229230
1986 5707 0 9789;9790 2188=11 Y F 19 4 Construction cape: Tele to POH
230-
1986 5707 0 9789;9790 2188=13 Y F 19 4 Construction cape: Tele to POH
231-
1986 5707 0 9789;9790 2188=14 Y F 19 4 Construction cape: Tele to POH
231+
1986 5707 1 9789;9790 2188=12 Y F 19 4 Construction cape: Tele to POH
232+
1986 5707 2 9789;9790 2188=13 Y F 19 4 Construction cape: Tele to POH
233+
1986 5707 3 9789;9790 2188=14 Y F 19 4 Construction cape: Tele to POH
232234
# 8 - Hosidius
233235
#1740 3517 0 9789;9790 2187=8 Y F 19 4 Construction cape: Home
234236
2952 3224 0 9789;9790 Y F 19 4 2. Construction cape: Rimmington

0 commit comments

Comments
 (0)