diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 7cc539a9cb..bf174b83aa 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10483,5 +10483,6 @@ public final class ItemID public static final int MOUNTED_XERICS_TALISMAN = 22708; public static final int MOUNTED_DIGSITE_PENDANT = 22709; public static final int CURATORS_MEDALLION = 22710; + public static final int COLLECTION_LOG = 22711; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 7c7ebd46dd..5180c44e03 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -7702,6 +7702,7 @@ public final class NpcID public static final int SMOKE_DEVIL_8483 = 8483; public static final int EEK = 8485; public static final int MAKEOVER_MAGE_8487 = 8487; + public static final int THE_COLLECTOR = 8491; public static final int SURVIVAL_EXPERT = 8503; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index f202026d97..604ea42c48 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15791,5 +15791,8 @@ public final class NullObjectID public static final int NULL_33471 = 33471; public static final int NULL_33472 = 33472; public static final int NULL_33473 = 33473; + public static final int NULL_33474 = 33474; + public static final int NULL_33475 = 33475; + public static final int NULL_33476 = 33476; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 88b62ec383..f8e9da095c 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -17671,5 +17671,6 @@ public final class ObjectID public static final int BRAZIER_33454 = 33454; public static final int HEROIC_STATUE = 33455; public static final int CHALICE_33456 = 33456; + public static final int ICE_THRONE_33477 = 33477; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 7d48fc96c8..bf74b297c4 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -708,15 +708,15 @@ public class WidgetID static class Pvp { - static final int KILLDEATH_RATIO = 6; - static final int BOUNTY_HUNTER_STATS = 25; - static final int PVP_WIDGET_CONTAINER = 52; - static final int SKULL_CONTAINER = 53; - static final int SKULL = 54; - static final int SAFE_ZONE = 55; - static final int ATTACK_RANGE = 57; - static final int WILDERNESS_LEVEL = 58; // this can also be the Deadman Mode "Protection" text - static final int DEADMAN_PROTECTION_TIME = 59; + static final int KILLDEATH_RATIO = 9; + static final int BOUNTY_HUNTER_STATS = 28; + static final int PVP_WIDGET_CONTAINER = 54; + static final int SKULL_CONTAINER = 55; + static final int SKULL = 56; + static final int SAFE_ZONE = 57; + static final int ATTACK_RANGE = 59; + static final int WILDERNESS_LEVEL = 60; // this can also be the Deadman Mode "Protection" text + static final int DEADMAN_PROTECTION_TIME = 61; } static class KourendFavour diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.hash b/runelite-client/src/main/scripts/OpenBankSearchInput.hash index 482c42bbb6..0ce901832b 100644 --- a/runelite-client/src/main/scripts/OpenBankSearchInput.hash +++ b/runelite-client/src/main/scripts/OpenBankSearchInput.hash @@ -1 +1 @@ -97B828530EF00DAD35290951F220051EB00A42B2289547090DEF96FAE4F391AC \ No newline at end of file +D503F0A0BDEC3DDA9719AB601F5EF294FBBE2747BA4B13529E61806FC65DDF77 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm index a93c371894..aa38d28de9 100644 --- a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm +++ b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm @@ -10,14 +10,13 @@ LABEL4: close_window LABEL5: + load_int 11 invoke 677 load_string "Show items whose names contain the following text:" load_string "setSearchBankInputText" ; load event name runelite_callback ; invoke callback load_int 10616876 widget_put_text_widget - load_int 11 - put_varc 5 load_string "" invoke 222 load_string "" @@ -35,11 +34,11 @@ LABEL5: widget_put_dialog_abort_listener_widget invoke 1972 load_int 1 - if_icmpeq LABEL30 - jump LABEL33 -LABEL30: + if_icmpeq LABEL29 + jump LABEL32 +LABEL29: load_int 0 load_int 80 invoke 1983 -LABEL33: +LABEL32: return diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.hash b/runelite-client/src/main/scripts/SkillTabBuilder.hash index 42a18e60aa..81f4f4f6b0 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.hash +++ b/runelite-client/src/main/scripts/SkillTabBuilder.hash @@ -1 +1 @@ -CAA188A44C44A236877F1649C995F8E626DEFDD3637559220389CF3A6A77C0C1 \ No newline at end of file +FE2F6DC87F181F2742CE1804AD15AD674748C87ACD9299BED128F569A1F65897 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm index 6e44276aa1..c3e1f8261b 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm @@ -110,7 +110,7 @@ LABEL84: invoke 1138 load_int 1 if_icmpeq LABEL96 - jump LABEL233 + jump LABEL278 LABEL96: iload 0 invoke 1936 @@ -155,21 +155,21 @@ LABEL133: iload 8 load_int 0 if_icmpeq LABEL137 - jump LABEL233 + jump LABEL278 LABEL137: get_varp 1588 load_int 0 if_icmpgt LABEL141 - jump LABEL233 + jump LABEL278 LABEL141: iload 0 switch 0: LABEL144 - 1: LABEL189 + 1: LABEL234 2: LABEL144 4: LABEL189 6: LABEL144 - jump LABEL233 + jump LABEL278 LABEL144: load_int 20 invoke 2031 @@ -218,7 +218,7 @@ LABEL170: concat_string sstore 3 LABEL188: - jump LABEL233 + jump LABEL278 LABEL189: load_int 30 invoke 2031 @@ -267,27 +267,76 @@ LABEL215: concat_string sstore 3 LABEL233: + jump LABEL278 +LABEL234: + load_int 40 + invoke 2031 + istore 10 + iload 10 + load_int 0 + if_icmpgt LABEL241 + jump LABEL260 +LABEL241: + sload 2 + load_string "|" + load_string "" + load_string "XP permitted:" + load_string "" + string_append 4 + concat_string + sstore 2 + sload 3 + load_string "|" + load_string "" + iload 10 + sload 1 + invoke 46 + load_string "" + string_append 4 + concat_string + sstore 3 + jump LABEL278 +LABEL260: + load_int 1 + istore 9 + sload 2 + load_string "|" + load_string "" + load_string "XP permitted:" + load_string "" + string_append 4 + concat_string + sstore 2 + sload 3 + load_string "|" + load_string "" + load_string "NONE" + load_string "" + string_append 4 + concat_string + sstore 3 +LABEL278: iload 1 load_int 5 widget_load_child 1 load_int 1 - if_icmpeq LABEL239 - jump LABEL249 -LABEL239: + if_icmpeq LABEL284 + jump LABEL294 +LABEL284: iload 9 load_int 1 - if_icmpeq LABEL243 - jump LABEL246 -LABEL243: + if_icmpeq LABEL288 + jump LABEL291 +LABEL288: load_int 0 widget_put_hidden 1 - jump LABEL248 -LABEL246: + jump LABEL293 +LABEL291: load_int 1 widget_put_hidden 1 -LABEL248: - jump LABEL276 -LABEL249: +LABEL293: + jump LABEL321 +LABEL294: iload 1 load_int 5 load_int 5 @@ -308,31 +357,31 @@ LABEL249: widget_put_sprite2 1 iload 9 load_int 1 - if_icmpeq LABEL271 - jump LABEL274 -LABEL271: + if_icmpeq LABEL316 + jump LABEL319 +LABEL316: load_int 0 widget_put_hidden 1 - jump LABEL276 -LABEL274: + jump LABEL321 +LABEL319: load_int 1 widget_put_hidden 1 -LABEL276: +LABEL321: iload 3 load_int 1 - if_icmpeq LABEL280 - jump LABEL299 -LABEL280: + if_icmpeq LABEL325 + jump LABEL344 +LABEL325: get_ismembers load_int 0 - if_icmpeq LABEL284 - jump LABEL299 -LABEL284: + if_icmpeq LABEL329 + jump LABEL344 +LABEL329: get_varc 103 load_int 0 - if_icmpeq LABEL288 - jump LABEL299 -LABEL288: + if_icmpeq LABEL333 + jump LABEL344 +LABEL333: load_string "" sload 0 load_string ":" @@ -344,12 +393,12 @@ LABEL288: load_string "" string_append 3 sstore 3 -LABEL299: +LABEL344: invoke 1972 load_int 1 - if_icmpeq LABEL303 - jump LABEL330 -LABEL303: + if_icmpeq LABEL348 + jump LABEL375 +LABEL348: load_int 2367 load_int -2147483644 load_int -2147483645 @@ -363,14 +412,14 @@ LABEL303: widget_put_option_click_listener_widget get_varc 218 iload 1 - if_icmpeq LABEL318 - jump LABEL329 -LABEL318: + if_icmpeq LABEL363 + jump LABEL374 +LABEL363: get_varc 217 load_int -1 - if_icmpeq LABEL322 - jump LABEL329 -LABEL322: + if_icmpeq LABEL367 + jump LABEL374 +LABEL367: iload 1 load_int -1 iload 2 @@ -378,9 +427,9 @@ LABEL322: sload 3 load_int 495 invoke 2344 -LABEL329: - jump LABEL345 -LABEL330: +LABEL374: + jump LABEL390 +LABEL375: load_int 992 load_int -2147483645 load_int -1 @@ -396,5 +445,5 @@ LABEL330: widget_put_mouse_hover_listener_widget load_int 0 put_varc 2 -LABEL345: +LABEL390: return