From 10dbc5e6bccf0eb2a21bbbcb9f3476bf52a4a16e Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Thu, 14 Nov 2019 14:02:42 +0100 Subject: [PATCH] update spellbook script --- .../main/scripts/MagicSpellBookRedraw.hash | 2 +- .../main/scripts/MagicSpellBookRedraw.rs2asm | 497 +++++++++--------- 2 files changed, 263 insertions(+), 236 deletions(-) diff --git a/runelite-client/src/main/scripts/MagicSpellBookRedraw.hash b/runelite-client/src/main/scripts/MagicSpellBookRedraw.hash index 42dcf2565f..9560cbccda 100644 --- a/runelite-client/src/main/scripts/MagicSpellBookRedraw.hash +++ b/runelite-client/src/main/scripts/MagicSpellBookRedraw.hash @@ -1 +1 @@ -401615A4A80516444D88DB3612D803C47C67B151C6588666701911DDACA79534 \ No newline at end of file +F4729C2DE16BB31A779316E5D5080A9B5E6871C752BB4534863E0790D5F35154 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/MagicSpellBookRedraw.rs2asm b/runelite-client/src/main/scripts/MagicSpellBookRedraw.rs2asm index 60807af8e1..45bf0691bf 100644 --- a/runelite-client/src/main/scripts/MagicSpellBookRedraw.rs2asm +++ b/runelite-client/src/main/scripts/MagicSpellBookRedraw.rs2asm @@ -21,10 +21,10 @@ LABEL10: iconst 1 iconst 0 iload 3 - if_setsize + if_setsize iconst 190 iconst 6 - sub + sub iconst 240 istore 12 istore 11 @@ -33,54 +33,54 @@ LABEL10: iconst 1 iconst 0 iload 3 - if_setposition + if_setposition iconst 0 iload 4 - if_sethide + if_sethide sload 0 iconst 190 iconst 494 - parawidth + parawidth sload 1 iconst 190 iconst 494 - parawidth + parawidth invoke 1045 iconst 14 - add + add istore 13 iload 13 iconst 0 iconst 0 iconst 1 iload 5 - if_setsize + if_setsize iload 13 iconst 0 iconst 0 iconst 1 iload 6 - if_setsize + if_setsize iconst 190 iload 13 iconst 2 - multiply - sub + multiply + sub iconst 3 - div + div istore 13 iload 13 iconst 0 iconst 0 iconst 1 iload 5 - if_setposition + if_setposition iload 13 iconst 0 iconst 2 iconst 1 iload 6 - if_setposition + if_setposition jump LABEL147 LABEL76: get_varbit 6718 @@ -93,16 +93,16 @@ LABEL80: iconst 1 iconst 1 iload 3 - if_setsize + if_setsize iconst 0 iconst 0 iconst 1 iconst 1 iload 3 - if_setposition + if_setposition iconst 1 iload 4 - if_sethide + if_sethide iconst -1 iload 10 iload 5 @@ -123,10 +123,10 @@ LABEL109: iconst 1 iconst 0 iload 3 - if_setsize + if_setsize iconst 190 iconst 6 - sub + sub iconst 240 istore 12 istore 11 @@ -135,39 +135,39 @@ LABEL109: iconst 1 iconst 0 iload 3 - if_setposition + if_setposition iconst 0 iload 4 - if_sethide + if_sethide sload 1 iconst 190 iconst 494 - parawidth + parawidth iconst 14 - add + add iconst 0 iconst 0 iconst 1 iload 6 - if_setsize + if_setsize iconst 0 iconst 0 iconst 1 iconst 1 iload 6 - if_setposition + if_setposition LABEL147: iload 0 - cc_deleteall + cc_deleteall iload 1 - cc_deleteall + cc_deleteall iload 2 - cc_deleteall + cc_deleteall iconst 105 iconst 103 iconst 1981 get_varbit 4070 - enum + enum istore 14 iload 14 iconst 1982 @@ -206,10 +206,10 @@ LABEL183: if_icmpeq LABEL187 jump LABEL188 LABEL187: - return + return LABEL188: iload 14 - enum_getoutputcount + enum_getoutputcount istore 15 iload 15 define_array 105 @@ -222,60 +222,78 @@ LABEL188: iload 10 iconst 0 if_icmpeq LABEL203 - jump LABEL235 + jump LABEL242 LABEL203: get_varbit 6718 iconst 1 if_icmpeq LABEL207 - jump LABEL235 + jump LABEL242 LABEL207: iload 18 iload 15 if_icmplt LABEL211 - jump LABEL234 + jump LABEL241 LABEL211: iconst 105 iconst 111 iload 14 iload 18 - enum + enum istore 17 + invoke 3160 + iconst 1 + if_icmpeq LABEL221 + jump LABEL224 +LABEL221: + iload 17 + invoke 3159 + istore 17 +LABEL224: iconst 0 iload 17 iconst 596 - oc_param - if_sethide + oc_param + if_sethide iload 16 iload 18 - set_array_int + set_array_int iload 16 iconst 1 - add + add istore 16 iload 18 iconst 1 - add + add istore 18 jump LABEL207 -LABEL234: - jump LABEL273 -LABEL235: +LABEL241: + jump LABEL287 +LABEL242: iload 18 iload 15 - if_icmplt LABEL239 - jump LABEL273 -LABEL239: + if_icmplt LABEL246 + jump LABEL287 +LABEL246: iconst 105 iconst 111 iload 14 iload 18 - enum + enum istore 17 + invoke 3160 + iconst 1 + if_icmpeq LABEL256 + jump LABEL259 +LABEL256: + iload 17 + invoke 3159 + istore 17 +LABEL259: iload 17 invoke 2619 iconst 1 if_icmpeq FILTER_SPELL - jump LABEL263 + jump LABEL277 FILTER_SPELL: iconst 1 ; boolean the callback modifies iload 17 @@ -289,82 +307,82 @@ FILTER_SPELL: pop_string ; pop the name pop_int ; and the widgetID iconst 1 ; default true, so the script still functions without plugin on - if_icmpeq LABEL250 - jump LABEL263 -LABEL250: + if_icmpeq LABEL264 + jump LABEL277 +LABEL264: iconst 0 iload 17 iconst 596 - oc_param - if_sethide + oc_param + if_sethide iload 16 iload 18 - set_array_int + set_array_int iload 16 iconst 1 - add + add istore 16 - jump LABEL268 -LABEL263: + jump LABEL282 +LABEL277: iconst 1 iload 17 iconst 596 - oc_param - if_sethide -LABEL268: + oc_param + if_sethide +LABEL282: iload 18 iconst 1 - add + add istore 18 - jump LABEL235 -LABEL273: + jump LABEL242 +LABEL287: iload 16 iconst 2 - if_icmpge LABEL277 - jump LABEL285 -LABEL277: + if_icmpge LABEL291 + jump LABEL299 +LABEL291: iconst 0 iconst 0 iload 16 iconst 1 - sub + sub iload 14 invoke 2621 - jump LABEL316 -LABEL285: + jump LABEL330 +LABEL299: iload 16 iconst 0 - if_icmple LABEL289 - jump LABEL316 -LABEL289: + if_icmple LABEL303 + jump LABEL330 +LABEL303: iload 0 iconst 4 iconst 0 - cc_create + cc_create iconst 0 iconst 0 iconst 1 iconst 1 - cc_setsize + cc_setsize iconst 0 iconst 0 iconst 1 iconst 1 - cc_setposition + cc_setposition iconst 16750623 - cc_setcolour + cc_setcolour iconst 495 - cc_settextfont + cc_settextfont iconst 1 - cc_settextshadow + cc_settextshadow iconst 1 iconst 1 iconst 0 - cc_settextalign + cc_settextalign sconst "No spells match your selected filters." - cc_settext - return -LABEL316: + cc_settext + return +LABEL330: iconst 24 istore 19 iconst 0 @@ -381,58 +399,58 @@ LABEL316: sconst "isMobileSpellbookEnabled" runelite_callback iconst 1 - if_icmpeq LABEL332 - jump LABEL422 -LABEL332: + if_icmpeq LABEL346 + jump LABEL436 +LABEL346: iload 16 iconst 15 - if_icmple LABEL336 - jump LABEL341 -LABEL336: + if_icmple LABEL350 + jump LABEL355 +LABEL350: iconst 40 iconst 3 sconst "resizeSpell" runelite_callback istore 20 istore 19 - jump LABEL360 -LABEL341: + jump LABEL374 +LABEL355: iload 16 iconst 20 - if_icmple LABEL345 - jump LABEL350 -LABEL345: + if_icmple LABEL359 + jump LABEL364 +LABEL359: iconst 40 iconst 4 istore 20 istore 19 - jump LABEL360 -LABEL350: + jump LABEL374 +LABEL364: iconst 4 iconst 7 iload 16 iconst 8 - add + add iconst 9 - div + div invoke 1046 invoke 1045 istore 20 -LABEL360: +LABEL374: iconst 0 iconst 5 iconst 7 iload 19 - scale + scale iload 11 iload 19 iload 20 - multiply - sub + multiply + sub iload 20 iconst 1 - sub - div + sub + div invoke 1046 invoke 1045 istore 23 @@ -440,60 +458,60 @@ LABEL360: iload 16 iload 20 iconst 1 - sub - add + sub + add iload 20 - div + div invoke 1045 istore 21 iload 21 iconst 2 - if_icmpge LABEL391 - jump LABEL405 -LABEL391: + if_icmpge LABEL405 + jump LABEL419 +LABEL405: iconst 0 iload 23 iload 12 iload 19 iload 21 - multiply - sub + multiply + sub iload 21 iconst 1 - sub - div + sub + div invoke 1046 invoke 1045 istore 22 -LABEL405: +LABEL419: iload 21 iload 19 - multiply + multiply iload 21 iconst 1 - sub + sub iload 22 - multiply - add + multiply + add istore 24 iconst 0 iconst 0 iconst 1 iconst 1 iload 0 - if_setposition - jump LABEL577 -LABEL422: + if_setposition + jump LABEL591 +LABEL436: get_varbit 6718 iconst 1 - if_icmpeq LABEL426 - jump LABEL498 -LABEL426: + if_icmpeq LABEL440 + jump LABEL512 +LABEL440: get_varbit 4070 - switch - 1: LABEL443 - 2: LABEL458 - 3: LABEL473 + switch + 1: LABEL457 + 2: LABEL472 + 3: LABEL487 iconst 7 iconst 10 iconst 0 @@ -507,9 +525,9 @@ LABEL426: iconst 1 iconst 0 iload 0 - if_setposition - jump LABEL487 -LABEL443: + if_setposition + jump LABEL501 +LABEL457: iconst 4 iconst 7 iconst 20 @@ -523,9 +541,9 @@ LABEL443: iconst 1 iconst 0 iload 0 - if_setposition - jump LABEL487 -LABEL458: + if_setposition + jump LABEL501 +LABEL472: iconst 6 iconst 8 iconst 6 @@ -539,9 +557,9 @@ LABEL458: iconst 1 iconst 0 iload 0 - if_setposition - jump LABEL487 -LABEL473: + if_setposition + jump LABEL501 +LABEL487: iconst 4 iconst 9 iconst 21 @@ -555,51 +573,51 @@ LABEL473: iconst 1 iconst 0 iload 0 - if_setposition -LABEL487: + if_setposition +LABEL501: iload 21 iload 19 - multiply + multiply iload 21 iconst 1 - sub + sub iload 22 - multiply - add + multiply + add istore 24 - jump LABEL577 -LABEL498: + jump LABEL591 +LABEL512: iload 16 iconst 28 - if_icmple LABEL502 - jump LABEL505 -LABEL502: + if_icmple LABEL516 + jump LABEL519 +LABEL516: iconst 4 istore 20 - jump LABEL515 -LABEL505: + jump LABEL529 +LABEL519: iconst 4 iconst 7 iload 16 iconst 8 - add + add iconst 9 - div + div invoke 1046 invoke 1045 istore 20 -LABEL515: +LABEL529: iconst 0 iload 19 iload 11 iload 19 iload 20 - multiply - sub + multiply + sub iload 20 iconst 1 - sub - div + sub + div invoke 1046 invoke 1045 istore 23 @@ -607,44 +625,44 @@ LABEL515: iload 16 iload 20 iconst 1 - sub - add + sub + add iload 20 - div + div invoke 1045 istore 21 iload 21 iconst 2 - if_icmpge LABEL543 - jump LABEL557 -LABEL543: + if_icmpge LABEL557 + jump LABEL571 +LABEL557: iconst 0 iload 23 iload 12 iload 19 iload 21 - multiply - sub + multiply + sub iload 21 iconst 1 - sub - div + sub + div invoke 1046 invoke 1045 istore 22 -LABEL557: +LABEL571: iload 21 iload 19 - multiply + multiply iload 21 iconst 1 - sub + sub iload 22 - multiply - add + multiply + add iload 12 iconst 30 - sub + sub invoke 1045 istore 24 iconst 0 @@ -652,14 +670,14 @@ LABEL557: iconst 1 iconst 1 iload 0 - if_setposition -LABEL577: + if_setposition +LABEL591: iload 20 iload 19 - multiply + multiply iload 20 iconst 1 - sub + sub iload 23 multiply add ; start of the label until here calcs total width @@ -669,16 +687,16 @@ LABEL577: iconst 0 iconst 0 iload 0 - if_setsize + if_setsize iconst -1 istore 25 iload 19 iload 23 - add + add istore 26 iload 19 iload 22 - add + add istore 27 iconst 0 istore 28 @@ -686,22 +704,31 @@ LABEL577: istore 29 iconst 0 istore 18 -LABEL607: +LABEL621: iload 18 iload 16 - if_icmplt LABEL611 - jump LABEL741 -LABEL611: + if_icmplt LABEL625 + jump LABEL762 +LABEL625: iconst 105 iconst 111 iload 14 iload 18 - get_array_int - enum + get_array_int + enum istore 17 + invoke 3160 + iconst 1 + if_icmpeq LABEL636 + jump LABEL639 +LABEL636: + iload 17 + invoke 3159 + istore 17 +LABEL639: iload 17 iconst 596 - oc_param + oc_param istore 25 iload 19 iload 19 @@ -712,17 +739,17 @@ LABEL611: iconst 0 iconst 0 iload 25 - if_setsize + if_setsize iload 18 iload 20 - mod + mod iload 26 - multiply + multiply iload 18 iload 20 - div + div iload 27 - multiply + multiply istore 29 istore 28 iload 28 @@ -737,82 +764,82 @@ LABEL611: iload 25 invoke 2614 iconst 1 - if_icmpeq LABEL652 - jump LABEL668 -LABEL652: + if_icmpeq LABEL673 + jump LABEL689 +LABEL673: iload 19 iconst 40 - if_icmpge LABEL656 - jump LABEL662 -LABEL656: + if_icmpge LABEL677 + jump LABEL683 +LABEL677: iload 17 iconst 599 - oc_param + oc_param iload 25 - if_setgraphic - jump LABEL667 -LABEL662: + if_setgraphic + jump LABEL688 +LABEL683: iload 17 iconst 597 - oc_param + oc_param iload 25 - if_setgraphic -LABEL667: - jump LABEL683 -LABEL668: + if_setgraphic +LABEL688: + jump LABEL704 +LABEL689: iload 19 iconst 40 - if_icmpge LABEL672 - jump LABEL678 -LABEL672: + if_icmpge LABEL693 + jump LABEL699 +LABEL693: iload 17 iconst 600 - oc_param + oc_param iload 25 - if_setgraphic - jump LABEL683 -LABEL678: + if_setgraphic + jump LABEL704 +LABEL699: iload 17 iconst 598 - oc_param + oc_param iload 25 - if_setgraphic -LABEL683: + if_setgraphic +LABEL704: iload 25 invoke 2615 iload 10 iconst 1 - if_icmpeq LABEL689 - jump LABEL716 -LABEL689: + if_icmpeq LABEL710 + jump LABEL737 +LABEL710: iload 1 iconst 5 iload 18 - cc_create + cc_create iload 19 iload 19 iconst 0 iconst 0 - cc_setsize + cc_setsize iload 28 iload 29 iconst 0 iconst 0 - cc_setposition + cc_setposition iload 17 iconst 1 - cc_setobject + cc_setobject iconst 255 - cc_settrans + cc_settrans iconst 2612 iload 17 iload 1 iload 2 iload 12 sconst "oIIi" - cc_setonclick - jump LABEL736 -LABEL716: + cc_setonclick + jump LABEL757 +LABEL737: iconst 2622 iconst 1 iload 17 @@ -822,7 +849,7 @@ LABEL716: iload 12 sconst "1oIiIi" iload 25 - if_setonmouserepeat + if_setonmouserepeat iconst 2622 iconst 0 iload 17 @@ -832,12 +859,12 @@ LABEL716: iload 12 sconst "1oIiIi" iload 25 - if_setonmouseleave -LABEL736: + if_setonmouseleave +LABEL757: iload 18 iconst 1 - add + add istore 18 - jump LABEL607 -LABEL741: - return + jump LABEL621 +LABEL762: + return