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 bd4068c616..4af6a34bfc 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15764,5 +15764,6 @@ public final class NullObjectID public static final int NULL_33339 = 33339; public static final int NULL_33342 = 33342; public static final int NULL_33345 = 33345; + public static final int NULL_33421 = 33421; /* 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 ac2a80e26f..14d33954ac 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -16985,7 +16985,7 @@ public final class ObjectID public static final int RUNITE_MINOR = 31917; public static final int GREAT_OLM_DISPLAY = 31918; public static final int TZKALZUK_DISPLAY = 31919; - public static final int GENERAL_GRAADOR_DISPLAY = 31920; + public static final int GENERAL_GRAARDOR_DISPLAY = 31920; public static final int CORPOREAL_BEAST_DISPLAY = 31921; public static final int GILDED_ADVENTURE_LOG_31922 = 31922; public static final int ALTAR_OF_THE_OCCULT_31923 = 31923; @@ -17645,5 +17645,24 @@ public final class ObjectID public static final int DIGSITE_PENDANT_33418 = 33418; public static final int XERICS_TALISMAN_33419 = 33419; public static final int DIGSITE_PENDANT_33420 = 33420; + public static final int ROCKS_33422 = 33422; + public static final int PORTAL_NEXUS_33423 = 33423; + public static final int PORTAL_NEXUS_33424 = 33424; + public static final int PORTAL_NEXUS_33425 = 33425; + public static final int PORTAL_NEXUS_33426 = 33426; + public static final int PORTAL_NEXUS_33427 = 33427; + public static final int PORTAL_NEXUS_33428 = 33428; + public static final int PORTAL_NEXUS_33429 = 33429; + public static final int PORTAL_NEXUS_33430 = 33430; + public static final int PORTAL_NEXUS_33431 = 33431; + public static final int CATHERBY_PORTAL = 33432; + public static final int GHORROCK_PORTAL = 33433; + public static final int CARRALLANGAR_PORTAL = 33434; + public static final int CATHERBY_PORTAL_33435 = 33435; + public static final int GHORROCK_PORTAL_33436 = 33436; + public static final int CARRALLANGAR_PORTAL_33437 = 33437; + public static final int CATHERBY_PORTAL_33438 = 33438; + public static final int GHORROCK_PORTAL_33439 = 33439; + public static final int CARRALLANGAR_PORTAL_33440 = 33440; /* This file is automatically generated. Do not edit. */ } 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 993d62c369..079547a968 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 @@ -62,7 +62,7 @@ public enum PohIcons JEWELLERYBOX("jewellery", BASIC_JEWELLERY_BOX, FANCY_JEWELLERY_BOX, ORNATE_JEWELLERY_BOX), MAGICTRAVEL("transportation", SPIRIT_TREE_29227, NULL_29228, NULL_29229, OBELISK_31554), PORTALNEXUS("portalnexus", - PORTAL_NEXUS, PORTAL_NEXUS_33355, PORTAL_NEXUS_33356, PORTAL_NEXUS_33357, PORTAL_NEXUS_33358 , PORTAL_NEXUS_33359, PORTAL_NEXUS_33360, + PORTAL_NEXUS, PORTAL_NEXUS_33355, PORTAL_NEXUS_33356, PORTAL_NEXUS_33357, PORTAL_NEXUS_33358, PORTAL_NEXUS_33359, PORTAL_NEXUS_33360, PORTAL_NEXUS_33361, PORTAL_NEXUS_33362, PORTAL_NEXUS_33363, PORTAL_NEXUS_33364, PORTAL_NEXUS_33365, PORTAL_NEXUS_33366, PORTAL_NEXUS_33367, PORTAL_NEXUS_33368, PORTAL_NEXUS_33369, PORTAL_NEXUS_33370, PORTAL_NEXUS_33371, PORTAL_NEXUS_33372, PORTAL_NEXUS_33373, PORTAL_NEXUS_33374, PORTAL_NEXUS_33375, PORTAL_NEXUS_33376, PORTAL_NEXUS_33377, PORTAL_NEXUS_33378, PORTAL_NEXUS_33379, PORTAL_NEXUS_33380, PORTAL_NEXUS_33381, @@ -70,8 +70,9 @@ public enum PohIcons PORTAL_NEXUS_33389, PORTAL_NEXUS_33390, PORTAL_NEXUS_33391, PORTAL_NEXUS_33392, PORTAL_NEXUS_33393, PORTAL_NEXUS_33394, PORTAL_NEXUS_33395, 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_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 + ), 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/scripts/SkillTabTotalLevel.hash b/runelite-client/src/main/scripts/SkillTabTotalLevel.hash index ec24d9433f..ebf379aeb3 100644 --- a/runelite-client/src/main/scripts/SkillTabTotalLevel.hash +++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.hash @@ -1 +1 @@ -7919E8EDC994A53EC15CB5D29A9295C91A871FDA6998DC3B4EBCE8C1A091691E \ No newline at end of file +B6196093530C36795254AA35C06E5DFB9B6D0280939FDFC05BE38B5752AAE758 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm index 46de8155db..2d1142dc7a 100644 --- a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm @@ -1,11 +1,13 @@ .id 396 .int_stack_count 2 .string_stack_count 0 -.int_var_count 2 +.int_var_count 3 .string_var_count 2 + invoke 1007 + istore 2 load_string "Total level:" load_string "
" - invoke 1007 + iload 2 int_to_string string_append 3 iload 0 @@ -18,14 +20,36 @@ sstore 0 load_string "" sstore 1 - invoke 2685 - sstore 1 + get_ismembers + load_int 1 + if_icmpeq LABEL22 + get_varc 103 + load_int 1 + if_icmpeq LABEL22 + jump LABEL28 +LABEL22: + load_string "Total XP:" sstore 0 + invoke 1008 + invoke 1009 + sstore 1 + jump LABEL37 +LABEL28: + load_string "Total XP:|Free Total Level:" + sstore 0 + invoke 1008 + invoke 1009 + load_string "|" + invoke 1320 + int_to_string + string_append 3 + sstore 1 +LABEL37: invoke 1972 load_int 1 - if_icmpeq LABEL20 - jump LABEL51 -LABEL20: + if_icmpeq LABEL41 + jump LABEL72 +LABEL41: load_int 1 load_string "Toggle Total XP" iload 0 @@ -43,14 +67,14 @@ LABEL20: widget_put_option_click_listener_widget get_varc 218 iload 0 - if_icmpeq LABEL39 - jump LABEL50 -LABEL39: + if_icmpeq LABEL60 + jump LABEL71 +LABEL60: get_varc 217 load_int -1 - if_icmpeq LABEL43 - jump LABEL50 -LABEL43: + if_icmpeq LABEL64 + jump LABEL71 +LABEL64: iload 0 load_int -1 iload 1 @@ -58,9 +82,9 @@ LABEL43: sload 1 load_int 495 invoke 2344 -LABEL50: - jump LABEL71 -LABEL51: +LABEL71: + jump LABEL92 +LABEL72: load_int 992 load_int -2147483645 load_int -1 @@ -81,5 +105,5 @@ LABEL51: widget_put_mouse_exit_listener_widget load_int 0 put_varc 2 -LABEL71: +LABEL92: return