diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.hash b/runelite-client/src/main/scripts/SkillTabBuilder.hash index d679edf9ad..42a18e60aa 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.hash +++ b/runelite-client/src/main/scripts/SkillTabBuilder.hash @@ -1 +1 @@ -BE6DF54FF18E3B1D03EC67240FA1F88846AB50B8F3FC88709D0E7E69C7688107 \ No newline at end of file +CAA188A44C44A236877F1649C995F8E626DEFDD3637559220389CF3A6A77C0C1 \ 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 a3605f9b43..6e44276aa1 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm @@ -1,207 +1,213 @@ .id 395 .int_stack_count 3 .string_stack_count 1 -.int_var_count 10 +.int_var_count 11 .string_var_count 4 + load_int 83 + load_int 49 + load_int 1497 + iload 0 + get_enum_value + istore 3 iload 0 get_boostedskilllevels - int_to_string - widget_put_text + int_to_string + widget_put_text iload 0 - get_realskilllevels - istore 3 + get_realskilllevels + istore 4 iload 0 ; load the skill id from arguments - iload 3 ; load the current real skill level + iload 4 ; load the current real skill level load_string "skillTabBaseLevel" ; push event name - runelite_callback ; invoke callback - istore 3 ; store the (possibly) edited real skill level - iload 3 - int_to_string + runelite_callback ; invoke callback + istore 4 ; store the (possibly) edited real skill level + iload 4 + int_to_string widget_put_text 1 iload 0 - get_skillexperiences - istore 4 + get_skillexperiences + istore 5 load_string "," sstore 1 sload 0 load_string " XP:" string_append 2 sstore 2 - iload 4 + iload 5 sload 1 invoke 46 sstore 3 load_int 0 - istore 5 + istore 6 get_varbit 4181 load_int 0 - if_icmpeq LABEL29 - jump LABEL60 -LABEL29: - iload 3 + if_icmpeq LABEL35 + jump LABEL66 +LABEL35: + iload 4 load_int 99 load_string "skillTabMaxLevel" ; push event name - runelite_callback ; invoke callback - if_icmplt LABEL33 - jump LABEL59 -LABEL33: + runelite_callback ; invoke callback + if_icmplt LABEL39 + jump LABEL65 +LABEL39: load_int 105 load_int 105 load_int 256 - iload 3 + iload 4 load_int 1 - iadd - get_enum_value - istore 5 + iadd + get_enum_value + istore 6 sload 2 load_string "|Next level at:|Remaining XP:" - concat_string + concat_string sstore 2 sload 3 load_string "|" - iload 5 + iload 6 sload 1 invoke 46 load_string "|" + iload 6 iload 5 - iload 4 - isub + isub sload 1 invoke 46 string_append 4 - concat_string + concat_string sstore 3 -LABEL59: - jump LABEL78 -LABEL60: +LABEL65: + jump LABEL84 +LABEL66: sload 2 load_string "|Next level at:" - concat_string + concat_string sstore 2 sload 3 load_string "|" load_int 105 load_int 105 load_int 256 - iload 3 + iload 4 load_int 1 - iadd - get_enum_value + iadd + get_enum_value sload 1 invoke 46 string_append 2 - concat_string + concat_string sstore 3 -LABEL78: - load_int 0 - istore 6 +LABEL84: load_int 0 istore 7 load_int 0 istore 8 load_int 0 istore 9 + load_int 0 + istore 10 invoke 1138 load_int 1 - if_icmpeq LABEL90 - jump LABEL227 -LABEL90: + if_icmpeq LABEL96 + jump LABEL233 +LABEL96: iload 0 invoke 1936 - istore 6 - iload 6 + istore 7 + iload 7 load_int -1 - if_icmpne LABEL97 - jump LABEL127 -LABEL97: - iload 6 + if_icmpne LABEL103 + jump LABEL133 +LABEL103: + iload 7 load_int 10 - idiv - istore 6 - iload 6 - iload 4 - if_icmpgt LABEL105 - jump LABEL127 -LABEL105: + idiv + istore 7 + iload 7 + iload 5 + if_icmpgt LABEL111 + jump LABEL133 +LABEL111: sload 2 load_string "|" load_string "" load_string "XP to regain:" load_string "" string_append 4 - concat_string + concat_string sstore 2 sload 3 load_string "|" load_string "" - iload 6 - iload 4 - isub + iload 7 + iload 5 + isub sload 1 invoke 46 load_string "" string_append 4 - concat_string + concat_string sstore 3 load_int 1 - istore 7 -LABEL127: - iload 7 + istore 8 +LABEL133: + iload 8 load_int 0 - if_icmpeq LABEL131 - jump LABEL227 -LABEL131: + if_icmpeq LABEL137 + jump LABEL233 +LABEL137: get_varp 1588 load_int 0 - if_icmpgt LABEL135 - jump LABEL227 -LABEL135: + if_icmpgt LABEL141 + jump LABEL233 +LABEL141: iload 0 - switch - 0: LABEL138 - 1: LABEL183 - 2: LABEL138 - 4: LABEL183 - 6: LABEL138 - jump LABEL227 -LABEL138: + switch + 0: LABEL144 + 1: LABEL189 + 2: LABEL144 + 4: LABEL189 + 6: LABEL144 + jump LABEL233 +LABEL144: load_int 20 invoke 2031 - istore 9 - iload 9 + istore 10 + iload 10 load_int 0 - if_icmpgt LABEL145 - jump LABEL164 -LABEL145: + if_icmpgt LABEL151 + jump LABEL170 +LABEL151: sload 2 load_string "|" load_string "" load_string "XP permitted:" load_string "" string_append 4 - concat_string + concat_string sstore 2 sload 3 load_string "|" load_string "" - iload 9 + iload 10 sload 1 invoke 46 load_string "" string_append 4 - concat_string + concat_string sstore 3 - jump LABEL182 -LABEL164: + jump LABEL188 +LABEL170: load_int 1 - istore 8 + istore 9 sload 2 load_string "|" load_string "" load_string "XP permitted:" load_string "" string_append 4 - concat_string + concat_string sstore 2 sload 3 load_string "|" @@ -209,48 +215,48 @@ LABEL164: load_string "NONE" load_string "" string_append 4 - concat_string + concat_string sstore 3 -LABEL182: - jump LABEL227 -LABEL183: +LABEL188: + jump LABEL233 +LABEL189: load_int 30 invoke 2031 - istore 9 - iload 9 + istore 10 + iload 10 load_int 0 - if_icmpgt LABEL190 - jump LABEL209 -LABEL190: + if_icmpgt LABEL196 + jump LABEL215 +LABEL196: sload 2 load_string "|" load_string "" load_string "XP permitted:" load_string "" string_append 4 - concat_string + concat_string sstore 2 sload 3 load_string "|" load_string "" - iload 9 + iload 10 sload 1 invoke 46 load_string "" string_append 4 - concat_string + concat_string sstore 3 - jump LABEL227 -LABEL209: + jump LABEL233 +LABEL215: load_int 1 - istore 8 + istore 9 sload 2 load_string "|" load_string "" load_string "XP permitted:" load_string "" string_append 4 - concat_string + concat_string sstore 2 sload 3 load_string "|" @@ -258,30 +264,30 @@ LABEL209: load_string "NONE" load_string "" string_append 4 - concat_string + concat_string sstore 3 -LABEL227: +LABEL233: iload 1 load_int 5 widget_load_child 1 load_int 1 - if_icmpeq LABEL233 - jump LABEL243 -LABEL233: - iload 8 + if_icmpeq LABEL239 + jump LABEL249 +LABEL239: + iload 9 load_int 1 - if_icmpeq LABEL237 - jump LABEL240 -LABEL237: + if_icmpeq LABEL243 + jump LABEL246 +LABEL243: load_int 0 widget_put_hidden 1 - jump LABEL242 -LABEL240: + jump LABEL248 +LABEL246: load_int 1 widget_put_hidden 1 -LABEL242: - jump LABEL270 -LABEL243: +LABEL248: + jump LABEL276 +LABEL249: iload 1 load_int 5 load_int 5 @@ -300,23 +306,50 @@ LABEL243: widget_put_spriteid 1 load_int 65793 widget_put_sprite2 1 - iload 8 + iload 9 load_int 1 - if_icmpeq LABEL265 - jump LABEL268 -LABEL265: + if_icmpeq LABEL271 + jump LABEL274 +LABEL271: load_int 0 widget_put_hidden 1 - jump LABEL270 -LABEL268: + jump LABEL276 +LABEL274: load_int 1 widget_put_hidden 1 -LABEL270: +LABEL276: + iload 3 + load_int 1 + if_icmpeq LABEL280 + jump LABEL299 +LABEL280: + get_ismembers + load_int 0 + if_icmpeq LABEL284 + jump LABEL299 +LABEL284: + get_varc 103 + load_int 0 + if_icmpeq LABEL288 + jump LABEL299 +LABEL288: + load_string "" + sload 0 + load_string ":" + load_string "" + string_append 4 + sstore 2 + load_string "" + load_string "Members Only" + load_string "" + string_append 3 + sstore 3 +LABEL299: invoke 1972 load_int 1 - if_icmpeq LABEL274 - jump LABEL301 -LABEL274: + if_icmpeq LABEL303 + jump LABEL330 +LABEL303: load_int 2367 load_int -2147483644 load_int -2147483645 @@ -330,14 +363,14 @@ LABEL274: widget_put_option_click_listener_widget get_varc 218 iload 1 - if_icmpeq LABEL289 - jump LABEL300 -LABEL289: + if_icmpeq LABEL318 + jump LABEL329 +LABEL318: get_varc 217 load_int -1 - if_icmpeq LABEL293 - jump LABEL300 -LABEL293: + if_icmpeq LABEL322 + jump LABEL329 +LABEL322: iload 1 load_int -1 iload 2 @@ -345,9 +378,9 @@ LABEL293: sload 3 load_int 495 invoke 2344 -LABEL300: - jump LABEL316 -LABEL301: +LABEL329: + jump LABEL345 +LABEL330: load_int 992 load_int -2147483645 load_int -1 @@ -357,11 +390,11 @@ LABEL301: load_int 495 load_int 25 load_int 5 - idiv + idiv load_string "IiIssfi" iload 1 widget_put_mouse_hover_listener_widget load_int 0 put_varc 2 -LABEL316: - return +LABEL345: + return diff --git a/runelite-client/src/main/scripts/SkillTabTotalLevel.hash b/runelite-client/src/main/scripts/SkillTabTotalLevel.hash index c624387804..ec24d9433f 100644 --- a/runelite-client/src/main/scripts/SkillTabTotalLevel.hash +++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.hash @@ -1 +1 @@ -97557341CEF7AB7480D59D0841E480DD0FD7370D12588A2C02D4A814CAA462CE \ No newline at end of file +7919E8EDC994A53EC15CB5D29A9295C91A871FDA6998DC3B4EBCE8C1A091691E \ 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 959b0ae244..46de8155db 100644 --- a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm @@ -6,24 +6,26 @@ load_string "Total level:" load_string "
" invoke 1007 - int_to_string + int_to_string string_append 3 iload 0 load_string "skillTabTotalLevel" ; push event name - runelite_callback ; invoke callback + runelite_callback ; invoke callback widget_put_text_widget iload 0 widget_put_actions_null_widget - load_string "Total XP:" + load_string "" sstore 0 - invoke 1008 - invoke 1009 + load_string "" sstore 1 + invoke 2685 + sstore 1 + sstore 0 invoke 1972 load_int 1 - if_icmpeq LABEL18 - jump LABEL49 -LABEL18: + if_icmpeq LABEL20 + jump LABEL51 +LABEL20: load_int 1 load_string "Toggle Total XP" iload 0 @@ -41,14 +43,14 @@ LABEL18: widget_put_option_click_listener_widget get_varc 218 iload 0 - if_icmpeq LABEL37 - jump LABEL48 -LABEL37: + if_icmpeq LABEL39 + jump LABEL50 +LABEL39: get_varc 217 load_int -1 - if_icmpeq LABEL41 - jump LABEL48 -LABEL41: + if_icmpeq LABEL43 + jump LABEL50 +LABEL43: iload 0 load_int -1 iload 1 @@ -56,9 +58,9 @@ LABEL41: sload 1 load_int 495 invoke 2344 -LABEL48: - jump LABEL69 -LABEL49: +LABEL50: + jump LABEL71 +LABEL51: load_int 992 load_int -2147483645 load_int -1 @@ -68,7 +70,7 @@ LABEL49: load_int 495 load_int 25 load_int 5 - idiv + idiv load_string "IiIssfi" iload 0 widget_put_mouse_hover_listener_widget @@ -79,5 +81,5 @@ LABEL49: widget_put_mouse_exit_listener_widget load_int 0 put_varc 2 -LABEL69: - return +LABEL71: + return