From d5e5f5b677ab1132d7a24174ab4bd7e40f43d1b2 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 May 2018 08:13:30 -0400 Subject: [PATCH 1/4] scripts: update comand script from live --- runelite-scripts/scripts/CommandScript.hash | 2 +- runelite-scripts/scripts/CommandScript.rs2asm | 266 ++++++++++-------- 2 files changed, 147 insertions(+), 121 deletions(-) diff --git a/runelite-scripts/scripts/CommandScript.hash b/runelite-scripts/scripts/CommandScript.hash index 6fc023efb2..2dd2425202 100644 --- a/runelite-scripts/scripts/CommandScript.hash +++ b/runelite-scripts/scripts/CommandScript.hash @@ -1 +1 @@ -CDE382CF5E33BD256AE1ED092D45E816D5F8C04130C23D73FA9DE38D3333D778 \ No newline at end of file +75212151145D5ED7A15389181C1F953B696D0E4C3CB223BEF404343CB403554B \ No newline at end of file diff --git a/runelite-scripts/scripts/CommandScript.rs2asm b/runelite-scripts/scripts/CommandScript.rs2asm index d5afbddc02..53bce82a67 100644 --- a/runelite-scripts/scripts/CommandScript.rs2asm +++ b/runelite-scripts/scripts/CommandScript.rs2asm @@ -1,7 +1,7 @@ .id 73 .int_stack_count 2 .string_stack_count 0 -.int_var_count 4 +.int_var_count 5 .string_var_count 0 load_int 10616876 widget_get_hidden_widget @@ -35,144 +35,170 @@ LABEL23: istore 2 load_int 0 istore 3 + load_int 0 + istore 4 + invoke 1972 + load_int 1 + if_icmpeq LABEL34 + jump LABEL40 +LABEL34: + get_varc 41 + load_int 4 + if_icmpeq LABEL38 + jump LABEL40 +LABEL38: + load_int 1 + istore 4 +LABEL40: get_rights load_int 0 - if_icmpgt LABEL32 - jump LABEL34 -LABEL32: + if_icmpgt LABEL44 + jump LABEL46 +LABEL44: load_int 1 istore 3 -LABEL34: +LABEL46: iload 3 load_int 1 - if_icmpeq LABEL38 - jump LABEL49 -LABEL38: + if_icmpeq LABEL50 + jump LABEL61 +LABEL50: load_string "`" iload 1 string_indexof load_int -1 - if_icmpne LABEL44 - jump LABEL49 -LABEL44: + if_icmpne LABEL56 + jump LABEL61 +LABEL56: iload 2 load_int 0 - if_icmpeq LABEL48 - jump LABEL49 -LABEL48: + if_icmpeq LABEL60 + jump LABEL61 +LABEL60: return -LABEL49: +LABEL61: iload 0 load_int 84 - if_icmpeq LABEL53 - jump LABEL159 -LABEL53: + if_icmpeq LABEL65 + jump LABEL182 +LABEL65: invoke 1984 iload 2 load_int 0 - if_icmpgt LABEL58 - jump LABEL158 -LABEL58: + if_icmpgt LABEL70 + jump LABEL181 +LABEL70: get_varc_string 1 load_string "/" load_int 0 string_indexof_from load_int 0 - if_icmpeq LABEL65 - jump LABEL92 -LABEL65: + if_icmpeq LABEL80 + iload 4 + load_int 1 + if_icmpeq LABEL80 + jump LABEL115 +LABEL80: get_clanchatcount load_int 0 - if_icmpgt LABEL69 - jump LABEL88 -LABEL69: + if_icmpgt LABEL84 + jump LABEL111 +LABEL84: iload 2 load_int 1 - if_icmple LABEL73 - jump LABEL74 -LABEL73: + if_icmple LABEL88 + jump LABEL89 +LABEL88: return -LABEL74: +LABEL89: get_varbit 4394 load_int 1 - if_icmpeq LABEL78 - jump LABEL84 -LABEL78: + if_icmpeq LABEL93 + jump LABEL99 +LABEL93: get_clanchatcount load_int 0 - if_icmpgt LABEL82 - jump LABEL83 -LABEL82: + if_icmpgt LABEL97 + jump LABEL98 +LABEL97: part_clanchat -LABEL83: - jump LABEL87 -LABEL84: +LABEL98: + jump LABEL110 +LABEL99: + iload 4 + load_int 1 + if_icmpeq LABEL103 + jump LABEL107 +LABEL103: + load_string "/" + get_varc_string 1 + concat_string + put_varc_string 1 +LABEL107: get_varc_string 1 load_int 2 invoke 96 -LABEL87: - jump LABEL91 -LABEL88: +LABEL110: + jump LABEL114 +LABEL111: get_varc_string 1 load_int 0 invoke 96 -LABEL91: - jump LABEL154 -LABEL92: +LABEL114: + jump LABEL177 +LABEL115: get_varc_string 1 load_string "::" load_int 0 string_indexof_from load_int 0 - if_icmpeq LABEL99 - jump LABEL151 -LABEL99: + if_icmpeq LABEL122 + jump LABEL174 +LABEL122: iload 2 load_int 2 - if_icmpgt LABEL103 - jump LABEL147 -LABEL103: + if_icmpgt LABEL126 + jump LABEL170 +LABEL126: get_varc_string 1 load_string "::toggleroof" load_int 0 string_indexof_from load_int 0 - if_icmpeq LABEL110 - jump LABEL124 -LABEL110: + if_icmpeq LABEL133 + jump LABEL147 +LABEL133: get_hideroofs load_int 1 - if_icmpeq LABEL114 - jump LABEL119 -LABEL114: + if_icmpeq LABEL137 + jump LABEL142 +LABEL137: load_int 0 set_hideroofs load_string "Roofs will only be removed selectively." send_game_message - jump LABEL123 -LABEL119: + jump LABEL146 +LABEL142: load_int 1 set_hideroofs load_string "Roofs are now all hidden." send_game_message -LABEL123: - jump LABEL146 -LABEL124: +LABEL146: + jump LABEL169 +LABEL147: get_varc_string 1 load_string "::bank" load_int 0 string_indexof_from load_int 0 - if_icmpeq LABEL131 - load_string "runeliteCommand" ; load callback name - runelite_callback ; invoke callback - jump LABEL135 -LABEL131: + if_icmpeq LABEL154 + jump LABEL158 +LABEL154: load_string "Hey, everyone, I just tried to do something very silly!" load_int 0 invoke 96 - jump LABEL146 -LABEL135: + jump LABEL169 +LABEL158: get_varc_string 1 invoke 224 put_varc_string 1 @@ -184,82 +210,82 @@ LABEL135: iload 2 string_substring run_command -LABEL146: - jump LABEL150 -LABEL147: +LABEL169: + jump LABEL173 +LABEL170: get_varc_string 1 load_int 0 invoke 96 -LABEL150: - jump LABEL154 -LABEL151: +LABEL173: + jump LABEL177 +LABEL174: get_varc_string 1 load_int 0 invoke 96 -LABEL154: +LABEL177: get_varc_string 1 invoke 77 load_string "" put_varc_string 1 -LABEL158: - jump LABEL227 -LABEL159: +LABEL181: + jump LABEL250 +LABEL182: iload 0 load_int 104 - if_icmpeq LABEL163 - jump LABEL169 -LABEL163: + if_icmpeq LABEL186 + jump LABEL192 +LABEL186: iload 3 load_int 1 - if_icmpeq LABEL167 - jump LABEL168 -LABEL167: + if_icmpeq LABEL190 + jump LABEL191 +LABEL190: invoke 75 -LABEL168: - jump LABEL227 -LABEL169: +LABEL191: + jump LABEL250 +LABEL192: iload 0 load_int 105 - if_icmpeq LABEL173 - jump LABEL179 -LABEL173: + if_icmpeq LABEL196 + jump LABEL202 +LABEL196: iload 3 load_int 1 - if_icmpeq LABEL177 - jump LABEL178 -LABEL177: + if_icmpeq LABEL200 + jump LABEL201 +LABEL200: invoke 76 -LABEL178: - jump LABEL227 -LABEL179: +LABEL201: + jump LABEL250 +LABEL202: iload 0 load_int 80 - if_icmpeq LABEL183 - jump LABEL221 -LABEL183: + if_icmpeq LABEL206 + jump LABEL244 +LABEL206: get_varc_string string_length load_int 0 - if_icmpgt LABEL188 - jump LABEL208 -LABEL188: + if_icmpgt LABEL211 + jump LABEL231 +LABEL211: get_varc_string is_friend load_int 1 - if_icmpeq LABEL193 - jump LABEL196 -LABEL193: + if_icmpeq LABEL216 + jump LABEL219 +LABEL216: get_varc_string invoke 107 return -LABEL196: +LABEL219: get_varc 60 get_gamecycle - if_icmpgt LABEL200 - jump LABEL201 -LABEL200: + if_icmpgt LABEL223 + jump LABEL224 +LABEL223: return -LABEL201: +LABEL224: get_gamecycle load_int 50 iadd @@ -267,14 +293,14 @@ LABEL201: load_string "That player was not found on your Friends list." send_game_message return -LABEL208: +LABEL231: get_varc 60 get_gamecycle - if_icmpgt LABEL212 - jump LABEL213 -LABEL212: + if_icmpgt LABEL235 + jump LABEL236 +LABEL235: return -LABEL213: +LABEL236: get_gamecycle load_int 50 iadd @@ -282,14 +308,14 @@ LABEL213: load_string "You haven't received any messages to which you can reply." send_game_message return - jump LABEL227 -LABEL221: + jump LABEL250 +LABEL244: get_varc_string 1 load_int 0 iload 0 iload 1 invoke 74 put_varc_string 1 -LABEL227: +LABEL250: invoke 223 return From 907b5df0ad21db108299a3c659de2272f8453ca2 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 May 2018 08:13:52 -0400 Subject: [PATCH 2/4] scripts: update options panel rebuilder from live --- .../scripts/OptionsPanelRebuilder.hash | 2 +- .../scripts/OptionsPanelRebuilder.rs2asm | 292 +++++++++--------- 2 files changed, 152 insertions(+), 142 deletions(-) diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.hash b/runelite-scripts/scripts/OptionsPanelRebuilder.hash index 3d536930f8..d379b26f64 100644 --- a/runelite-scripts/scripts/OptionsPanelRebuilder.hash +++ b/runelite-scripts/scripts/OptionsPanelRebuilder.hash @@ -1 +1 @@ -7671F8FE2112D88F9584F4B7F7C1A8BFC4DFB759DED66FC132217298061EB594 \ No newline at end of file +44D38062AA113EAC6B6D0B127273D18E8E22A85DAB6A839302BD450E7F4D9BC4 \ No newline at end of file diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm index b6d9028fb2..352739caf7 100644 --- a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm @@ -54,7 +54,7 @@ get_varbit 4606 load_int 0 if_icmpne LABEL52 - jump LABEL198 + jump LABEL202 LABEL52: get_varbit 4606 load_int 2 @@ -93,12 +93,12 @@ LABEL83: iload 2 load_int -1 if_icmpne LABEL87 - jump LABEL197 + jump LABEL201 LABEL87: iload 3 load_int -1 if_icmpne LABEL91 - jump LABEL197 + jump LABEL201 LABEL91: get_viewport_size istore 9 @@ -109,22 +109,28 @@ LABEL91: load_int 0 iload 2 widget_put_size_widget + invoke 1972 + load_int 0 + if_icmpeq LABEL104 + jump LABEL110 +LABEL104: iload 8 iload 9 load_int 0 load_int 0 iload 3 widget_put_size_widget +LABEL110: iload 4 load_int -1 - if_icmpne LABEL110 - jump LABEL187 -LABEL110: + if_icmpne LABEL114 + jump LABEL191 +LABEL114: iload 5 load_int -1 - if_icmpne LABEL114 - jump LABEL187 -LABEL114: + if_icmpne LABEL118 + jump LABEL191 +LABEL118: iload 0 widget_get_width_widget istore 10 @@ -141,20 +147,20 @@ LABEL114: istore 13 iload 12 load_int 0 - if_icmplt LABEL132 - jump LABEL134 -LABEL132: + if_icmplt LABEL136 + jump LABEL138 +LABEL136: load_int 0 istore 12 -LABEL134: +LABEL138: iload 13 load_int 0 - if_icmplt LABEL138 - jump LABEL140 -LABEL138: + if_icmplt LABEL142 + jump LABEL144 +LABEL142: load_int 0 istore 13 -LABEL140: +LABEL144: iload 6 iload 12 load_int 2 @@ -169,20 +175,20 @@ LABEL140: istore 6 iload 6 load_int 0 - if_icmplt LABEL156 - jump LABEL158 -LABEL156: + if_icmplt LABEL160 + jump LABEL162 +LABEL160: load_int 0 istore 6 -LABEL158: +LABEL162: iload 7 load_int 0 - if_icmplt LABEL162 - jump LABEL164 -LABEL162: + if_icmplt LABEL166 + jump LABEL168 +LABEL166: load_int 0 istore 7 -LABEL164: +LABEL168: iload 6 iload 7 load_int 1 @@ -205,8 +211,8 @@ LABEL164: iload 6 iload 7 invoke 910 - jump LABEL197 -LABEL187: + jump LABEL201 +LABEL191: iload 1 load_int 73 load_int 73 @@ -217,9 +223,9 @@ LABEL187: load_int 0 load_int 0 invoke 910 -LABEL197: - jump LABEL293 -LABEL198: +LABEL201: + jump LABEL305 +LABEL202: load_int 0 load_int 0 6200 @@ -230,251 +236,255 @@ LABEL198: 6202 get_varc 73 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback - if_icmpge LABEL210 - jump LABEL226 -LABEL210: + if_icmpge LABEL214 + jump LABEL230 +LABEL214: get_varc 73 load_int 700 - load_string "fixedInnerZoomLimit" - runelite_callback - if_icmple LABEL214 - jump LABEL226 -LABEL214: - get_varc 74 - load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback - if_icmpge LABEL218 - jump LABEL226 + if_icmple LABEL218 + jump LABEL230 LABEL218: get_varc 74 - load_int 715 - load_string "resizableInnerZoomLimit" - runelite_callback - if_icmple LABEL222 - jump LABEL226 + load_int 175 + if_icmpge LABEL222 + jump LABEL230 LABEL222: + get_varc 74 + load_int 715 + if_icmple LABEL226 + jump LABEL230 +LABEL226: get_varc 73 get_varc 74 invoke 42 - jump LABEL229 -LABEL226: + jump LABEL233 +LABEL230: load_int 256 load_int 320 invoke 42 -LABEL229: - get_viewport_size +LABEL233: + get_viewport_size istore 9 istore 8 iload 2 load_int -1 - if_icmpne LABEL236 - jump LABEL293 -LABEL236: + if_icmpne LABEL240 + jump LABEL305 +LABEL240: iload 3 load_int -1 - if_icmpne LABEL240 - jump LABEL293 -LABEL240: + if_icmpne LABEL244 + jump LABEL305 +LABEL244: iload 8 iload 9 load_int 0 load_int 0 iload 2 widget_put_size_widget + invoke 1972 + load_int 0 + if_icmpeq LABEL254 + jump LABEL260 +LABEL254: iload 8 iload 9 load_int 0 load_int 0 iload 3 widget_put_size_widget - iload 4 - load_int -1 - if_icmpne LABEL256 - jump LABEL283 -LABEL256: - iload 5 - load_int -1 - if_icmpne LABEL260 - jump LABEL283 LABEL260: + iload 4 + load_int -1 + if_icmpne LABEL264 + jump LABEL295 +LABEL264: + iload 5 + load_int -1 + if_icmpne LABEL268 + jump LABEL295 +LABEL268: iload 6 iload 7 load_int 1 load_int 1 iload 4 widget_put_size_widget + invoke 1972 + load_int 0 + if_icmpeq LABEL278 + jump LABEL284 +LABEL278: iload 6 iload 7 load_int 1 load_int 1 iload 5 widget_put_size_widget +LABEL284: iload 1 load_int 73 load_int 73 iload 1 load_int 10551307 - get_enum_value + get_enum_value iload 5 iload 6 iload 7 invoke 910 - jump LABEL293 -LABEL283: + jump LABEL305 +LABEL295: iload 1 load_int 73 load_int 73 iload 1 load_int 10551307 - get_enum_value + get_enum_value iload 3 load_int 0 load_int 0 invoke 910 -LABEL293: +LABEL305: load_int 73 load_int 73 iload 1 load_int 10551309 - get_enum_value + get_enum_value istore 14 iload 14 load_int -1 - if_icmpne LABEL303 - jump LABEL347 -LABEL303: + if_icmpne LABEL315 + jump LABEL359 +LABEL315: invoke 1972 load_int 0 - if_icmpeq LABEL307 - jump LABEL341 -LABEL307: + if_icmpeq LABEL319 + jump LABEL353 +LABEL319: iload 14 widget_get_index_widget load_int 1 - if_icmpeq LABEL312 - jump LABEL341 -LABEL312: + if_icmpeq LABEL324 + jump LABEL353 +LABEL324: get_varc 173 load_int -2 - if_icmpeq LABEL316 - jump LABEL323 -LABEL316: + if_icmpeq LABEL328 + jump LABEL335 +LABEL328: load_int 512 load_int 0 load_int 0 load_int 1 iload 14 widget_put_size_widget - jump LABEL340 -LABEL323: + jump LABEL352 +LABEL335: get_varc 173 load_int -3 - if_icmpeq LABEL327 - jump LABEL334 -LABEL327: + if_icmpeq LABEL339 + jump LABEL346 +LABEL339: load_int 0 load_int 0 load_int 1 load_int 1 iload 14 widget_put_size_widget - jump LABEL340 -LABEL334: + jump LABEL352 +LABEL346: load_int 512 load_int 334 load_int 0 load_int 0 iload 14 widget_put_size_widget -LABEL340: - jump LABEL347 -LABEL341: +LABEL352: + jump LABEL359 +LABEL353: load_int 512 load_int 334 load_int 0 load_int 0 iload 14 widget_put_size_widget -LABEL347: +LABEL359: load_int 73 load_int 73 iload 1 load_int 10551311 - get_enum_value + get_enum_value istore 14 iload 14 load_int -1 - if_icmpne LABEL357 - jump LABEL412 -LABEL357: + if_icmpne LABEL369 + jump LABEL424 +LABEL369: load_int 73 load_int 73 iload 1 load_int 10551303 - get_enum_value + get_enum_value widget_get_index_widget load_int 1 - if_icmpeq LABEL366 - jump LABEL395 -LABEL366: + if_icmpeq LABEL378 + jump LABEL407 +LABEL378: get_varbit 4692 load_int 0 - if_icmpne LABEL370 - jump LABEL377 -LABEL370: + if_icmpne LABEL382 + jump LABEL389 +LABEL382: load_int 0 load_int 0 load_int 2 load_int 0 iload 14 widget_put_position_widget - jump LABEL394 -LABEL377: - invoke 1972 - load_int 1 - if_icmpeq LABEL381 - jump LABEL388 -LABEL381: - load_int 8 - load_int 36 - load_int 2 - load_int 0 - iload 14 - widget_put_position_widget - jump LABEL394 -LABEL388: - load_int 0 - load_int 36 - load_int 2 - load_int 0 - iload 14 - widget_put_position_widget -LABEL394: - jump LABEL412 -LABEL395: - invoke 1972 - load_int 1 - if_icmpeq LABEL399 jump LABEL406 -LABEL399: +LABEL389: + invoke 1972 + load_int 1 + if_icmpeq LABEL393 + jump LABEL400 +LABEL393: + load_int 8 + load_int 36 + load_int 2 + load_int 0 + iload 14 + widget_put_position_widget + jump LABEL406 +LABEL400: + load_int 0 + load_int 36 + load_int 2 + load_int 0 + iload 14 + widget_put_position_widget +LABEL406: + jump LABEL424 +LABEL407: + invoke 1972 + load_int 1 + if_icmpeq LABEL411 + jump LABEL418 +LABEL411: load_int 8 load_int 0 load_int 2 load_int 0 iload 14 widget_put_position_widget - jump LABEL412 -LABEL406: + jump LABEL424 +LABEL418: load_int 0 load_int 0 load_int 2 load_int 0 iload 14 widget_put_position_widget -LABEL412: +LABEL424: iload 0 iload 1 invoke 920 From 02bbde2307e287de8547e70405eb2e1f65b250ce Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 May 2018 08:19:20 -0400 Subject: [PATCH 3/4] scripts: apply zoom limits to options panel rebuilder --- runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm index 352739caf7..955a53144b 100644 --- a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm @@ -236,21 +236,29 @@ LABEL202: 6202 get_varc 73 load_int 195 + load_string "fixedOuterZoomLimit" + runelite_callback if_icmpge LABEL214 jump LABEL230 LABEL214: get_varc 73 load_int 700 + load_string "fixedInnerZoomLimit" + runelite_callback if_icmple LABEL218 jump LABEL230 LABEL218: get_varc 74 load_int 175 + load_string "resizableOuterZoomLimit" + runelite_callback if_icmpge LABEL222 jump LABEL230 LABEL222: get_varc 74 load_int 715 + load_string "resizableInnerZoomLimit" + runelite_callback if_icmple LABEL226 jump LABEL230 LABEL226: From 32a0dff9626b2c7cc050843901834a92b618229e Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 May 2018 08:19:35 -0400 Subject: [PATCH 4/4] scripts: apply command callback to command script --- runelite-scripts/scripts/CommandScript.rs2asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-scripts/scripts/CommandScript.rs2asm b/runelite-scripts/scripts/CommandScript.rs2asm index 53bce82a67..8b12ab92a4 100644 --- a/runelite-scripts/scripts/CommandScript.rs2asm +++ b/runelite-scripts/scripts/CommandScript.rs2asm @@ -192,6 +192,8 @@ LABEL147: string_indexof_from load_int 0 if_icmpeq LABEL154 + load_string "runeliteCommand" ; load callback name + runelite_callback ; invoke callback jump LABEL158 LABEL154: load_string "Hey, everyone, I just tried to do something very silly!"