diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 4d2fca1827..68e55adbf6 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,9 +25,9 @@ object ProjectVersions { const val launcherVersion = "2.0.4" - const val rlVersion = "1.6.2-SNAPSHOT" + const val rlVersion = "1.6.2" - const val openosrsVersion = "2.1.21-SNAPSHOT" + const val openosrsVersion = "2.1.21" const val rsversion = 187 const val cacheversion = 165 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 97c6f460a4..c5a41c5673 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11335,13 +11335,13 @@ public final class ItemID public static final int SCROLL_BOX_MASTER = 24366; public static final int CABBAGE_24367 = 24367; public static final int TWISTED_SLAYER_HELMET = 24370; - public static final int TWISTED_LEAGUE_DRAGON_TROPHY = 24372; - public static final int TWISTED_LEAGUE_RUNE_TROPHY = 24374; - public static final int TWISTED_LEAGUE_ADAMANT_TROPHY = 24376; - public static final int TWISTED_LEAGUE_MITHRIL_TROPHY = 24378; - public static final int TWISTED_LEAGUE_STEEL_TROPHY = 24380; - public static final int TWISTED_LEAGUE_IRON_TROPHY = 24382; - public static final int TWISTED_LEAGUE_BRONZE_TROPHY = 24384; + public static final int TWISTED_DRAGON_TROPHY = 24372; + public static final int TWISTED_RUNE_TROPHY = 24374; + public static final int TWISTED_ADAMANT_TROPHY = 24376; + public static final int TWISTED_MITHRIL_TROPHY = 24378; + public static final int TWISTED_STEEL_TROPHY = 24380; + public static final int TWISTED_IRON_TROPHY = 24382; + public static final int TWISTED_BRONZE_TROPHY = 24384; public static final int TWISTED_HAT_T3 = 24387; public static final int TWISTED_COAT_T3 = 24389; public static final int TWISTED_TROUSERS_T3 = 24391; @@ -11355,7 +11355,7 @@ public final class ItemID public static final int TWISTED_COAT_T1 = 24407; public static final int TWISTED_TROUSERS_T1 = 24409; public static final int TWISTED_BOOTS_T1 = 24411; - public static final int TWISTED_LEAGUE_BANNER = 24413; + public static final int TWISTED_BANNER = 24413; public static final int RUNE_POUCH_L = 24416; public static final int INQUISITORS_MACE = 24417; public static final int SIRENS_TOME = 24418; @@ -11382,5 +11382,9 @@ public final class ItemID public static final int SCAPERUNE_TELEPORT = 24441; public static final int BAKERY_STORAGE_KEY = 24442; public static final int GINGERBREAD_GNOME = 24443; + public static final int TWISTED_SLAYER_HELMET_I = 24444; + public static final int TWISTED_TELEPORT_SCROLL = 24460; + public static final int TWISTED_BLUEPRINTS = 24463; + public static final int TWISTED_HORNS = 24466; /* 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 bdadb5b768..03ad0096cb 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -993,6 +993,14 @@ public final class NpcID public static final int BANDIT_1026 = 1026; public static final int GUARD_BANDIT = 1027; public static final int BARBARIAN_GUARD = 1028; + public static final int SLEEPWALKER = 1029; + public static final int SLEEPWALKER_1030 = 1030; + public static final int SLEEPWALKER_1031 = 1031; + public static final int SLEEPWALKER_1032 = 1032; + public static final int SLEEPWALKER_1033 = 1033; + public static final int SLEEPWALKER_1034 = 1034; + public static final int SLEEPWALKER_1035 = 1035; + public static final int SLEEPWALKER_1036 = 1036; public static final int SNAKE = 1037; public static final int MONKEY_1038 = 1038; public static final int ALBINO_BAT = 1039; diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index ebdbdc27a7..261cb73dc0 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12853,5 +12853,26 @@ public final class NullItemID public static final int NULL_24415 = 24415; public static final int NULL_24427 = 24427; public static final int NULL_24429 = 24429; + public static final int NULL_24445 = 24445; + public static final int NULL_24446 = 24446; + public static final int NULL_24447 = 24447; + public static final int NULL_24448 = 24448; + public static final int NULL_24449 = 24449; + public static final int NULL_24450 = 24450; + public static final int NULL_24451 = 24451; + public static final int NULL_24452 = 24452; + public static final int NULL_24453 = 24453; + public static final int NULL_24454 = 24454; + public static final int NULL_24455 = 24455; + public static final int NULL_24456 = 24456; + public static final int NULL_24457 = 24457; + public static final int NULL_24458 = 24458; + public static final int NULL_24459 = 24459; + public static final int NULL_24461 = 24461; + public static final int NULL_24462 = 24462; + public static final int NULL_24464 = 24464; + public static final int NULL_24465 = 24465; + public static final int NULL_24467 = 24467; + public static final int NULL_24468 = 24468; /* 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 31dcfd0a06..9a71d7f886 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -14234,10 +14234,12 @@ public final class ObjectID public static final int LIGHT_27093 = 27093; public static final int CLAN_CUP_PORTAL = 27095; public static final int EXIT_PORTAL_27096 = 27096; + public static final int PORTAL_NEXUS = 27097; public static final int SOFA = 27098; public static final int CRATE_27100 = 27100; public static final int CRATES_27101 = 27101; public static final int CRATES_27102 = 27102; + public static final int PORTAL_NEXUS_27106 = 27106; public static final int CHARCOAL_FURNACE = 27107; public static final int CHARCOAL_FURNACE_27108 = 27108; public static final int CHARCOAL_FURNACE_27109 = 27109; @@ -17511,7 +17513,7 @@ public final class ObjectID public static final int CURTAIN_SPACE_33351 = 33351; public static final int AMULET_SPACE = 33352; public static final int AMULET_SPACE_33353 = 33353; - public static final int PORTAL_NEXUS = 33354; + public static final int PORTAL_NEXUS_33354 = 33354; public static final int PORTAL_NEXUS_33355 = 33355; public static final int PORTAL_NEXUS_33356 = 33356; public static final int PORTAL_NEXUS_33357 = 33357; @@ -19459,5 +19461,78 @@ public final class ObjectID public static final int ORNATE_JEWELLERY_BOX_37544 = 37544; public static final int ORNATE_JEWELLERY_BOX_37545 = 37545; public static final int ORNATE_JEWELLERY_BOX_37546 = 37546; + public static final int PORTAL_NEXUS_37547 = 37547; + public static final int PORTAL_NEXUS_37548 = 37548; + public static final int PORTAL_NEXUS_37549 = 37549; + public static final int PORTAL_NEXUS_37550 = 37550; + public static final int PORTAL_NEXUS_37551 = 37551; + public static final int PORTAL_NEXUS_37552 = 37552; + public static final int PORTAL_NEXUS_37553 = 37553; + public static final int PORTAL_NEXUS_37554 = 37554; + public static final int PORTAL_NEXUS_37555 = 37555; + public static final int PORTAL_NEXUS_37556 = 37556; + public static final int PORTAL_NEXUS_37557 = 37557; + public static final int PORTAL_NEXUS_37558 = 37558; + public static final int PORTAL_NEXUS_37559 = 37559; + public static final int PORTAL_NEXUS_37560 = 37560; + public static final int PORTAL_NEXUS_37561 = 37561; + public static final int PORTAL_NEXUS_37562 = 37562; + public static final int PORTAL_NEXUS_37563 = 37563; + public static final int PORTAL_NEXUS_37564 = 37564; + public static final int PORTAL_NEXUS_37565 = 37565; + public static final int PORTAL_NEXUS_37566 = 37566; + public static final int PORTAL_NEXUS_37567 = 37567; + public static final int PORTAL_NEXUS_37568 = 37568; + public static final int PORTAL_NEXUS_37569 = 37569; + public static final int PORTAL_NEXUS_37570 = 37570; + public static final int PORTAL_NEXUS_37571 = 37571; + public static final int PORTAL_NEXUS_37572 = 37572; + public static final int PORTAL_NEXUS_37573 = 37573; + public static final int PORTAL_NEXUS_37574 = 37574; + public static final int PORTAL_NEXUS_37575 = 37575; + public static final int PORTAL_NEXUS_37576 = 37576; + public static final int PORTAL_NEXUS_37577 = 37577; + public static final int PORTAL_NEXUS_37578 = 37578; + public static final int PORTAL_NEXUS_37579 = 37579; + public static final int PORTAL_NEXUS_37580 = 37580; + public static final int WEISS_PORTAL = 37581; + public static final int LUMBRIDGE_GRAVEYARD_PORTAL = 37582; + public static final int DRAYNOR_MANOR_PORTAL = 37583; + public static final int BATTLEFRONT_PORTAL = 37584; + public static final int MIND_ALTAR_PORTAL = 37585; + public static final int SALVE_GRAVEYARD_PORTAL = 37586; + public static final int FENKENSTRAINS_CASTLE_PORTAL = 37587; + public static final int WEST_ARDOUGNE_PORTAL = 37588; + public static final int HARMONY_ISLAND_PORTAL = 37589; + public static final int CEMETERY_PORTAL = 37590; + public static final int BARROWS_PORTAL = 37591; + public static final int APE_ATOLL_DUNGEON_PORTAL = 37592; + public static final int WEISS_PORTAL_37593 = 37593; + public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37594 = 37594; + public static final int DRAYNOR_MANOR_PORTAL_37595 = 37595; + public static final int BATTLEFRONT_PORTAL_37596 = 37596; + public static final int MIND_ALTAR_PORTAL_37597 = 37597; + public static final int SALVE_GRAVEYARD_PORTAL_37598 = 37598; + public static final int FENKENSTRAINS_CASTLE_PORTAL_37599 = 37599; + public static final int WEST_ARDOUGNE_PORTAL_37600 = 37600; + public static final int HARMONY_ISLAND_PORTAL_37601 = 37601; + public static final int CEMETERY_PORTAL_37602 = 37602; + public static final int BARROWS_PORTAL_37603 = 37603; + public static final int APE_ATOLL_DUNGEON_PORTAL_37604 = 37604; + public static final int WEISS_PORTAL_37605 = 37605; + public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37606 = 37606; + public static final int DRAYNOR_MANOR_PORTAL_37607 = 37607; + public static final int BATTLEFRONT_PORTAL_37608 = 37608; + public static final int MIND_ALTAR_PORTAL_37609 = 37609; + public static final int SALVE_GRAVEYARD_PORTAL_37610 = 37610; + public static final int FENKENSTRAINS_CASTLE_PORTAL_37611 = 37611; + public static final int WEST_ARDOUGNE_PORTAL_37612 = 37612; + public static final int HARMONY_ISLAND_PORTAL_37613 = 37613; + public static final int CEMETERY_PORTAL_37614 = 37614; + public static final int BARROWS_PORTAL_37615 = 37615; + public static final int APE_ATOLL_DUNGEON_PORTAL_37616 = 37616; + public static final int DOOR_HOTSPOT_37617 = 37617; + public static final int DOOR_HOTSPOT_37618 = 37618; + public static final int WINDOW_SPACE_37619 = 37619; /* 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 ea6d38f898..cb05094726 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 @@ -263,15 +263,15 @@ public class WidgetID { static final int BANK_CONTAINER = 1; static final int INVENTORY_ITEM_CONTAINER = 3; - static final int BANK_TITLE_BAR = 4; - static final int CONTENT_CONTAINER = 9; - static final int TAB_CONTAINER = 10; - static final int ITEM_CONTAINER = 12; - static final int SEARCH_BUTTON_BACKGROUND = 39; - static final int DEPOSIT_INVENTORY = 41; - static final int DEPOSIT_EQUIPMENT = 43; - static final int INCINERATOR = 45; - static final int INCINERATOR_CONFIRM = 46; + static final int BANK_TITLE_BAR = 3; + static final int CONTENT_CONTAINER = 8; + static final int TAB_CONTAINER = 9; + static final int ITEM_CONTAINER = 11; + static final int SEARCH_BUTTON_BACKGROUND = 38; + static final int DEPOSIT_INVENTORY = 40; + static final int DEPOSIT_EQUIPMENT = 42; + static final int INCINERATOR = 44; + static final int INCINERATOR_CONFIRM = 45; } static class GrandExchange diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java index 9ad1b80ca0..795a3ecaf4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java @@ -75,7 +75,12 @@ public enum PohIcons PORTAL_NEXUS_33396, PORTAL_NEXUS_33397, PORTAL_NEXUS_33398, PORTAL_NEXUS_33399, PORTAL_NEXUS_33400, PORTAL_NEXUS_33401, PORTAL_NEXUS_33402, PORTAL_NEXUS_33403, PORTAL_NEXUS_33404, PORTAL_NEXUS_33405, PORTAL_NEXUS_33406, PORTAL_NEXUS_33407, PORTAL_NEXUS_33408, PORTAL_NEXUS_33409, PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428, - PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431 + PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550, + PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557, + PORTAL_NEXUS_37558, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564, + PORTAL_NEXUS_37565, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37570, PORTAL_NEXUS_37571, + PORTAL_NEXUS_37572, PORTAL_NEXUS_37573, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578, + PORTAL_NEXUS_37579, PORTAL_NEXUS_37580 ), XERICSTALISMAN("xericstalisman", XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419 diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 5418a83d1c..ec379715fd 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -7787,7 +7787,8 @@ 21890, 23073, 23075, - 24370 + 24370, + 24444 ], "slayer ring": [ 11866, diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_thieving.json b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_thieving.json index 54b62200b8..7cd9621e1d 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_thieving.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_thieving.json @@ -6,6 +6,12 @@ "name": "Man / Woman", "xp": 8 }, + { + "level": 1, + "icon": 10851, + "name": "Winter Sq'irkjuice", + "xp": 350 + }, { "level": 2, "icon": 1965, @@ -78,6 +84,12 @@ "name": "Fruit Stall", "xp": 28 }, + { + "level": 25, + "icon": 10848, + "name": "Spring Sq'irkjuice", + "xp": 1350 + }, { "level": 27, "icon": 5318, @@ -132,6 +144,12 @@ "name": "Fremennik Citizen", "xp": 65 }, + { + "level": 45, + "icon": 10850, + "name": "Autumn Sq'irkjuice", + "xp": 2350 + }, { "level": 49, "icon": 837, @@ -192,6 +210,12 @@ "name": "Yanille Watchman", "xp": 137.5 }, + { + "level": 65, + "icon": 10849, + "name": "Summer Sq'irkjuice", + "xp": 3000 + }, { "level": 70, "icon": 3255, diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash index 7ffe248325..aeb599d127 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ b/runelite-client/src/main/scripts/BankSearchLayout.hash @@ -1 +1 @@ -EE35EDE5A14C6D9934C329F6921548C6E7C34810C0D441ECEE130276A38809EA \ No newline at end of file +D3B1299112E56F2F3DABC162507F243C5BCD50C21296F5CABD23A8A6F1CB4A12 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index f04b85c687..6fd37f197f 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -1,41 +1,39 @@ .id 277 -.int_stack_count 17 +.int_stack_count 16 .string_stack_count 0 -.int_var_count 36 +.int_var_count 35 .string_var_count 1 - sconst "bankLayoutInit" ; - runelite_callback ; get_varbit 5102 iconst 1 if_icmpeq LABEL4 jump LABEL8 LABEL4: iconst 0 - iload 10 + iload 9 if_sethide jump LABEL13 LABEL8: iconst 1 - iload 10 + iload 9 if_sethide - iload 12 + iload 11 invoke 41 LABEL13: iconst 0 - istore 17 + istore 16 get_varbit 5364 iconst 1 if_icmpeq LABEL19 jump LABEL21 LABEL19: iconst 1 - istore 17 + istore 16 LABEL21: - iload 17 - iload 15 - if_sethide - iload 17 iload 16 + iload 14 + if_sethide + iload 16 + iload 15 if_sethide get_varbit 8352 iconst 1 @@ -43,29 +41,29 @@ LABEL21: jump LABEL34 LABEL31: iconst 1 - istore 17 + istore 16 jump LABEL36 LABEL34: iconst 0 - istore 17 + istore 16 LABEL36: - iload 17 - iload 13 + iload 16 + iload 12 if_sethide - iload 17 - iload 14 + iload 16 + iload 13 if_sethide iconst 441 iconst 0 iconst 0 iconst 0 - iload 15 + iload 14 if_setposition iconst 444 iconst 7 iconst 0 iconst 0 - iload 16 + iload 15 if_setposition get_varbit 8352 iconst 1 @@ -77,6 +75,14 @@ LABEL58: if_icmpeq LABEL62 jump LABEL85 LABEL62: + iload 12 + if_getx + iload 12 + if_gety + iconst 0 + iconst 0 + iload 14 + if_setposition iload 13 if_getx iload 13 @@ -85,19 +91,11 @@ LABEL62: iconst 0 iload 15 if_setposition - iload 14 - if_getx - iload 14 - if_gety - iconst 0 - iconst 0 - iload 16 - if_setposition iconst 37 iconst 37 iconst 1 iconst 0 - iload 5 + iload 4 if_setsize jump LABEL121 LABEL85: @@ -115,7 +113,7 @@ LABEL93: iconst 37 iconst 1 iconst 0 - iload 5 + iload 4 if_setsize jump LABEL121 LABEL100: @@ -133,7 +131,7 @@ LABEL108: iconst 37 iconst 1 iconst 0 - iload 5 + iload 4 if_setsize jump LABEL121 LABEL115: @@ -141,16 +139,16 @@ LABEL115: iconst 37 iconst 1 iconst 0 - iload 5 + iload 4 if_setsize LABEL121: iconst 1 - iload 11 + iload 10 if_sethide - iload 11 + iload 10 cc_deleteall iconst 0 - istore 18 + istore 17 get_varbit 4170 iconst 3 if_icmpeq LABEL132 @@ -186,133 +184,123 @@ LABEL132: jump LABEL163 LABEL160: iconst 0 - istore 18 + istore 17 jump LABEL165 LABEL163: iconst 1 - istore 18 + istore 17 LABEL165: iconst 0 - istore 19 - iload 18 + istore 18 + iload 17 iconst 1 if_icmpeq LABEL171 - jump LABEL201 + jump LABEL195 LABEL171: iconst 1 - iload 9 + iload 8 if_sethide - iconst 11 - istore 19 - iconst 0 - iconst 26 - iconst 1 - iconst 1 - iload 1 - if_setsize + iconst 2 + istore 18 iconst 460 iconst 39 iconst 0 iconst 1 - iload 3 + iload 2 if_setsize iconst 16 iconst 39 iconst 0 iconst 1 - iload 4 + iload 3 if_setsize - iconst 30 - iconst 48 + iconst 28 + iconst 42 iconst 2 iconst 0 - iload 2 - if_setposition - jump LABEL228 -LABEL201: - iconst 0 - iload 9 - if_sethide - iconst 0 - iconst 0 - iconst 1 - iconst 1 iload 1 - if_setsize + if_setposition + jump LABEL216 +LABEL195: + iconst 0 + iload 8 + if_sethide iconst 460 iconst 81 iconst 0 iconst 1 - iload 3 + iload 2 if_setsize iconst 16 iconst 81 iconst 0 iconst 1 - iload 4 + iload 3 if_setsize iconst 12 iconst 42 iconst 2 iconst 0 - iload 2 + iload 1 if_setposition -LABEL228: - iload 4 +LABEL216: iload 3 + iload 2 invoke 231 iconst 816 - istore 20 + istore 19 iconst 816 iconst 9 iconst 3 multiply add - istore 21 -LABEL239: - iload 20 - iload 21 - if_icmple LABEL243 - jump LABEL256 -LABEL243: - iload 3 + istore 20 +LABEL227: + iload 19 iload 20 + if_icmple LABEL231 + jump LABEL244 +LABEL231: + iload 2 + iload 19 cc_find iconst 1 - if_icmpeq LABEL249 - jump LABEL251 -LABEL249: + if_icmpeq LABEL237 + jump LABEL239 +LABEL237: iconst 1 cc_sethide -LABEL251: - iload 20 +LABEL239: + iload 19 iconst 1 add - istore 20 - jump LABEL239 -LABEL256: + istore 19 + jump LABEL227 +LABEL244: iconst 0 - istore 20 + istore 19 iconst 8 iconst 1 sub - istore 22 - iload 3 + istore 21 + iload 2 if_getwidth iconst 51 sub iconst 35 sub - istore 23 - iload 23 + istore 22 + iload 22 iconst 8 iconst 36 multiply sub - iload 22 + iload 21 div - istore 24 + istore 23 iconst -1 + istore 24 + iconst 0 istore 25 iconst 0 istore 26 @@ -320,57 +308,55 @@ LABEL256: istore 27 iconst 0 istore 28 - iconst 0 - istore 29 iconst -1 - istore 30 + istore 29 iconst 0 - istore 31 + istore 30 sconst "" sstore 0 get_varbit 4150 iconst 0 - if_icmple LABEL300 + if_icmple LABEL288 get_varbit 4150 iconst 9 - if_icmpgt LABEL300 - jump LABEL753 -LABEL300: - iload 20 + if_icmpgt LABEL288 + jump LABEL740 +LABEL288: + iload 19 iconst 816 - if_icmplt LABEL304 - jump LABEL329 -LABEL304: - iload 3 - iload 20 + if_icmplt LABEL292 + jump LABEL317 +LABEL292: + iload 2 + iload 19 cc_find iconst 1 - if_icmpeq LABEL310 - jump LABEL312 -LABEL310: + if_icmpeq LABEL298 + jump LABEL300 +LABEL298: iconst 1 cc_sethide -LABEL312: +LABEL300: iconst 95 - iload 20 + iload 19 inv_getobj iconst -1 - if_icmpne LABEL318 - jump LABEL324 -LABEL318: - iload 29 + if_icmpne LABEL306 + jump LABEL312 +LABEL306: + iload 28 iconst 1 add - iload 20 - istore 30 + iload 19 istore 29 -LABEL324: - iload 20 + istore 28 +LABEL312: + iload 19 iconst 1 add - istore 20 - jump LABEL300 -LABEL329: + istore 19 + jump LABEL288 +LABEL317: get_varbit 4171 get_varbit 4172 add @@ -388,430 +374,430 @@ LABEL329: add get_varbit 4179 add - istore 31 - iload 31 + istore 30 + iload 30 iconst 0 - if_icmple LABEL351 - jump LABEL355 -LABEL351: + if_icmple LABEL339 + jump LABEL343 +LABEL339: iconst 816 iconst 1 sub - istore 30 -LABEL355: - iload 31 + istore 29 +LABEL343: iload 30 + iload 29 iconst 1 add iconst 0 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 + iload 26 + iload 25 + add + istore 26 iconst 0 - istore 20 - get_varbit 4171 - iconst 0 - if_icmpgt LABEL382 - jump LABEL412 -LABEL382: - iconst 1 - iload 3 - iload 28 - invoke 510 istore 19 - iload 20 - iload 20 + get_varbit 4171 + iconst 0 + if_icmpgt LABEL370 + jump LABEL400 +LABEL370: + iconst 1 + iload 2 + iload 27 + invoke 510 + istore 18 + iload 19 + iload 19 get_varbit 4171 add iconst 1 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4171 add - istore 20 -LABEL412: + istore 19 +LABEL400: get_varbit 4172 iconst 0 - if_icmpgt LABEL416 - jump LABEL446 -LABEL416: + if_icmpgt LABEL404 + jump LABEL434 +LABEL404: iconst 2 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4172 add iconst 2 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4172 add - istore 20 -LABEL446: + istore 19 +LABEL434: get_varbit 4173 iconst 0 - if_icmpgt LABEL450 - jump LABEL480 -LABEL450: + if_icmpgt LABEL438 + jump LABEL468 +LABEL438: iconst 3 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4173 add iconst 3 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4173 add - istore 20 -LABEL480: + istore 19 +LABEL468: get_varbit 4174 iconst 0 - if_icmpgt LABEL484 - jump LABEL514 -LABEL484: + if_icmpgt LABEL472 + jump LABEL502 +LABEL472: iconst 4 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4174 add iconst 4 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4174 add - istore 20 -LABEL514: + istore 19 +LABEL502: get_varbit 4175 iconst 0 - if_icmpgt LABEL518 - jump LABEL548 -LABEL518: + if_icmpgt LABEL506 + jump LABEL536 +LABEL506: iconst 5 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4175 add iconst 5 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4175 add - istore 20 -LABEL548: + istore 19 +LABEL536: get_varbit 4176 iconst 0 - if_icmpgt LABEL552 - jump LABEL582 -LABEL552: + if_icmpgt LABEL540 + jump LABEL570 +LABEL540: iconst 6 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4176 add iconst 6 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4176 add - istore 20 -LABEL582: + istore 19 +LABEL570: get_varbit 4177 iconst 0 - if_icmpgt LABEL586 - jump LABEL616 -LABEL586: + if_icmpgt LABEL574 + jump LABEL604 +LABEL574: iconst 7 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4177 add iconst 7 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4177 add - istore 20 -LABEL616: + istore 19 +LABEL604: get_varbit 4178 iconst 0 - if_icmpgt LABEL620 - jump LABEL650 -LABEL620: + if_icmpgt LABEL608 + jump LABEL638 +LABEL608: iconst 8 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4178 add iconst 8 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4178 add - istore 20 -LABEL650: + istore 19 +LABEL638: get_varbit 4179 iconst 0 - if_icmpgt LABEL654 - jump LABEL684 -LABEL654: + if_icmpgt LABEL642 + jump LABEL672 +LABEL642: iconst 9 - iload 3 - iload 28 + iload 2 + iload 27 invoke 510 - istore 19 - iload 20 - iload 20 + istore 18 + iload 19 + iload 19 get_varbit 4179 add iconst 9 + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 - iload 19 - iload 24 - iload 22 iload 18 + iload 23 + iload 21 + iload 17 invoke 509 - istore 26 - istore 28 - iload 27 - iload 26 - add + istore 25 istore 27 - iload 20 + iload 26 + iload 25 + add + istore 26 + iload 19 get_varbit 4179 add - istore 20 -LABEL684: + istore 19 +LABEL672: invoke 514 iconst 1 - if_icmpeq LABEL688 - jump LABEL729 -LABEL688: + if_icmpeq LABEL676 + jump LABEL717 +LABEL676: get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280 lowercase ; instead get the var directly and lowercase it sstore 0 sload 0 - string_length + string_length iconst 0 - if_icmpgt LABEL695 - jump LABEL714 -LABEL695: + if_icmpgt LABEL683 + jump LABEL702 +LABEL683: sconst "Showing items: " sconst "" sload 0 sconst "" join_string 4 - iload 6 + iload 5 if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL706 - jump LABEL713 -LABEL706: + if_icmpeq LABEL694 + jump LABEL701 +LABEL694: sconst "Show items whose names contain the following text: (" - iload 27 + iload 26 tostring sconst " found)" join_string 3 - iload 27 ; load number of matches + iload 26 ; load number of matches sconst "setSearchBankInputTextFound" ; load event name runelite_callback ; invoke callback pop_int ; pop number of matches iconst 10616876 if_settext -LABEL713: - jump LABEL728 -LABEL714: +LABEL701: + jump LABEL716 +LABEL702: sconst "Showing items: " sconst "" sconst "*" sconst "" join_string 4 - iload 6 + iload 5 if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL725 - jump LABEL728 -LABEL725: + if_icmpeq LABEL713 + jump LABEL716 +LABEL713: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback iconst 10616876 if_settext -LABEL728: - jump LABEL732 -LABEL729: +LABEL716: + jump LABEL720 +LABEL717: sconst "The Bank of Gielinor" sconst "setBankTitle" ; runelite_callback ; - iload 6 + iload 5 if_settext -LABEL732: +LABEL720: iload 0 iload 1 iload 2 @@ -824,141 +810,138 @@ LABEL732: iload 9 iload 10 iload 11 - iload 12 + iload 27 iload 28 - sconst "addLastRow" ; - runelite_callback ; - iload 29 + iload 12 iload 13 iload 14 iload 15 - iload 16 invoke 505 - return -LABEL753: + return +LABEL740: invoke 514 iconst 1 - if_icmpeq LABEL757 - jump LABEL760 -LABEL757: + if_icmpeq LABEL744 + jump LABEL747 +LABEL744: iconst 1 iconst 1 invoke 299 -LABEL760: +LABEL747: + iconst -1 + istore 31 iconst -1 istore 32 - iconst -1 - istore 33 get_varbit 4150 invoke 513 - istore 33 istore 32 + istore 31 + iconst 0 + istore 33 iconst 0 istore 34 - iconst 0 - istore 35 -LABEL772: - iload 20 +LABEL759: + iload 19 iconst 816 - if_icmplt LABEL776 - jump LABEL856 -LABEL776: - iload 3 - iload 20 + if_icmplt LABEL763 + jump LABEL843 +LABEL763: + iload 2 + iload 19 cc_find iconst 1 - if_icmpeq LABEL782 - jump LABEL851 -LABEL782: + if_icmpeq LABEL769 + jump LABEL838 +LABEL769: iconst 95 - iload 20 + iload 19 inv_getobj - istore 25 - iload 25 + istore 24 + iload 24 iconst -1 - if_icmpne LABEL790 - jump LABEL794 -LABEL790: - iload 29 + if_icmpne LABEL777 + jump LABEL781 +LABEL777: + iload 28 iconst 1 add - istore 29 -LABEL794: - iload 20 + istore 28 +LABEL781: + iload 19 + iload 31 + if_icmpge LABEL785 + jump LABEL836 +LABEL785: + iload 19 iload 32 - if_icmpge LABEL798 - jump LABEL849 -LABEL798: - iload 20 - iload 33 - if_icmplt LABEL802 - jump LABEL849 -LABEL802: + if_icmplt LABEL789 + jump LABEL836 +LABEL789: iconst 0 cc_sethide - iload 25 + iload 24 iconst 95 - iload 20 + iload 19 inv_getnum + iload 2 iload 3 - iload 4 + iload 9 iload 10 iload 11 - iload 12 invoke 278 - iload 35 - iconst 36 - multiply - istore 28 - iconst 51 iload 34 iconst 36 - iload 24 + multiply + istore 27 + iconst 51 + iload 33 + iconst 36 + iload 23 add multiply add - iload 28 + iload 27 iconst 0 iconst 0 cc_setposition - iload 28 + iload 27 iconst 32 add - istore 28 - iload 34 - iload 22 - if_icmplt LABEL837 - jump LABEL842 -LABEL837: - iload 34 + istore 27 + iload 33 + iload 21 + if_icmplt LABEL824 + jump LABEL829 +LABEL824: + iload 33 iconst 1 add - istore 34 - jump LABEL848 -LABEL842: + istore 33 + jump LABEL835 +LABEL829: iconst 0 - iload 35 + iload 34 iconst 1 add - istore 35 istore 34 -LABEL848: - jump LABEL851 -LABEL849: + istore 33 +LABEL835: + jump LABEL838 +LABEL836: iconst 1 cc_sethide -LABEL851: - iload 20 +LABEL838: + iload 19 iconst 1 add - istore 20 - jump LABEL772 -LABEL856: + istore 19 + jump LABEL759 +LABEL843: get_varbit 4170 iconst 2 - if_icmpeq LABEL860 - jump LABEL870 -LABEL860: + if_icmpeq LABEL847 + jump LABEL857 +LABEL847: sconst "Tab " iconst 105 iconst 115 @@ -968,19 +951,19 @@ LABEL860: join_string 2 sconst "setBankTitle" ; runelite_callback ; - iload 6 + iload 5 if_settext - jump LABEL876 -LABEL870: + jump LABEL863 +LABEL857: sconst "Tab " get_varbit 4150 tostring join_string 2 sconst "setBankTitle" ; runelite_callback ; - iload 6 + iload 5 if_settext -LABEL876: +LABEL863: iload 0 iload 1 iload 2 @@ -993,12 +976,11 @@ LABEL876: iload 9 iload 10 iload 11 - iload 12 + iload 27 iload 28 - iload 29 + iload 12 iload 13 iload 14 iload 15 - iload 16 invoke 505 - return + return \ No newline at end of file diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.hash b/runelite-client/src/main/scripts/TriggerBankLayout.hash index e4d5241bf6..51b1384d82 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.hash +++ b/runelite-client/src/main/scripts/TriggerBankLayout.hash @@ -1 +1 @@ -DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369 \ No newline at end of file +BAA6532BC7BE7C6B39DA194976DA1223646557F982A52DC7E28EFF80F59FD6E3 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm index 8fa0ed58a8..92aaf5181c 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm +++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm @@ -1,7 +1,7 @@ .id 276 -.int_stack_count 17 +.int_stack_count 16 .string_stack_count 0 -.int_var_count 17 +.int_var_count 16 .string_var_count 0 ; Check if we should allow server to relayout bank @@ -41,6 +41,5 @@ LABEL2: iload 13 iload 14 iload 15 - iload 16 invoke 277 return