From ddd74ab31344f408eba79b4ccac324c18eb130dc Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 15 Dec 2021 17:56:25 -0700 Subject: [PATCH] Update Scripts to 2021-12-16 --- .../src/main/scripts/ChatSend.hash | 2 +- .../src/main/scripts/ChatSend.rs2asm | 137 ++++++++++-------- .../src/main/scripts/GeExamineInfoText.hash | 2 +- .../src/main/scripts/GeExamineInfoText.rs2asm | 32 +++- 4 files changed, 101 insertions(+), 72 deletions(-) diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash index 03fd850497..1e7ae9ee97 100644 --- a/runelite-client/src/main/scripts/ChatSend.hash +++ b/runelite-client/src/main/scripts/ChatSend.hash @@ -1 +1 @@ -77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0 \ No newline at end of file +95E7960E289ECA35DEADD35BC5A34AEBAA1C9F367AC42A71A5F3EFCCA0600D10 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSend.rs2asm b/runelite-client/src/main/scripts/ChatSend.rs2asm index 7ce4fa5d9a..e4e8725cbf 100644 --- a/runelite-client/src/main/scripts/ChatSend.rs2asm +++ b/runelite-client/src/main/scripts/ChatSend.rs2asm @@ -30,28 +30,41 @@ LABEL16: join_string 5 mes LABEL23: - iload 3 - iconst -1 - if_icmpne LABEL27 - jump LABEL60 + invoke 5262 + iconst 0 + if_icmpeq LABEL27 + jump LABEL33 LABEL27: iload 3 iconst 4 - if_icmple LABEL31 - jump LABEL60 + if_icmpeq LABEL31 + jump LABEL33 LABEL31: + get_varc_int 945 + istore 3 +LABEL33: + iload 3 + iconst -1 + if_icmpne LABEL37 + jump LABEL70 +LABEL37: + iload 3 + iconst 4 + if_icmple LABEL41 + jump LABEL70 +LABEL41: iload 3 get_varc_int 945 - if_icmpne LABEL35 - jump LABEL60 -LABEL35: + if_icmpne LABEL45 + jump LABEL70 +LABEL45: iload 3 set_varc_int 945 iload 3 iconst 0 - if_icmpne LABEL41 - jump LABEL51 -LABEL41: + if_icmpne LABEL51 + jump LABEL61 +LABEL51: sconst "Your chatbox mode is now set to " iconst 105 iconst 115 @@ -61,8 +74,8 @@ LABEL41: sconst " chat, to reset your mode type /@p" join_string 3 mes - jump LABEL60 -LABEL51: + jump LABEL70 +LABEL61: sconst "Your chatbox mode has been reset to " iconst 105 iconst 115 @@ -72,28 +85,28 @@ LABEL51: sconst " chat." join_string 3 mes -LABEL60: +LABEL70: iload 2 iconst 1 - if_icmpeq LABEL64 - jump LABEL102 -LABEL64: + if_icmpeq LABEL74 + jump LABEL112 +LABEL74: get_varc_int 945 switch - 1: LABEL67 - 2: LABEL88 - 3: LABEL93 - 4: LABEL98 - jump LABEL102 -LABEL67: + 1: LABEL77 + 2: LABEL98 + 3: LABEL103 + 4: LABEL108 + jump LABEL112 +LABEL77: iconst 2 istore 0 sload 0 string_length iconst 0 - if_icmpgt LABEL74 - jump LABEL87 -LABEL74: + if_icmpgt LABEL84 + jump LABEL97 +LABEL84: sload 0 iconst 0 iconst 1 @@ -101,33 +114,33 @@ LABEL74: sconst "/" compare iconst 0 ; - if_icmpne LABEL83 - jump LABEL87 -LABEL83: + if_icmpne LABEL93 + jump LABEL97 +LABEL93: sconst "/" sload 0 append sstore 0 -LABEL87: - jump LABEL102 -LABEL88: +LABEL97: + jump LABEL112 +LABEL98: iconst 3 iconst 0 istore 1 istore 0 - jump LABEL102 -LABEL93: + jump LABEL112 +LABEL103: iconst 4 iconst 0 istore 1 istore 0 - jump LABEL102 -LABEL98: + jump LABEL112 +LABEL108: iconst 3 iconst 1 istore 1 istore 0 -LABEL102: +LABEL112: sload 0 ; load input iload 0 ; load chat type iload 1 ; load clan target @@ -144,31 +157,31 @@ CONTINUE: sstore 1 iload 0 iconst 2 - if_icmpeq LABEL114 + if_icmpeq LABEL124 iload 0 iconst 3 - if_icmpeq LABEL114 + if_icmpeq LABEL124 iload 0 iconst 4 - if_icmpeq LABEL114 - jump LABEL154 -LABEL114: + if_icmpeq LABEL124 + jump LABEL164 +LABEL124: sload 0 invoke 5501 iconst 1 - if_icmpeq LABEL119 - jump LABEL123 -LABEL119: + if_icmpeq LABEL129 + jump LABEL133 +LABEL129: sload 0 invoke 632 sstore 0 sstore 1 -LABEL123: +LABEL133: iload 1 iconst 1 - if_icmpeq LABEL127 - jump LABEL143 -LABEL127: + if_icmpeq LABEL137 + jump LABEL153 +LABEL137: sload 0 iconst 0 iconst 1 @@ -185,33 +198,33 @@ LABEL127: sload 0 append sstore 0 -LABEL143: +LABEL153: sload 0 string_length iconst 0 - if_icmple LABEL148 - jump LABEL149 -LABEL148: + if_icmple LABEL158 + jump LABEL159 +LABEL158: return -LABEL149: +LABEL159: sload 0 iload 0 iload 1 chat_sendclan - jump LABEL163 -LABEL154: + jump LABEL173 +LABEL164: sload 0 string_length iconst 0 - if_icmple LABEL159 - jump LABEL160 -LABEL159: + if_icmple LABEL169 + jump LABEL170 +LABEL169: return -LABEL160: +LABEL170: sload 0 iload 0 chat_sendpublic -LABEL163: +LABEL173: clientclock set_varc_int 61 return diff --git a/runelite-client/src/main/scripts/GeExamineInfoText.hash b/runelite-client/src/main/scripts/GeExamineInfoText.hash index 162121bd78..e920ac8015 100644 --- a/runelite-client/src/main/scripts/GeExamineInfoText.hash +++ b/runelite-client/src/main/scripts/GeExamineInfoText.hash @@ -1 +1 @@ -157D0FE4248A0C0CAC825733A8DE7B0FA5A93451A9FCE3A4B1D8BFD54038B970 \ No newline at end of file +703C181C0453F22483854DC20D14FCBDE79E9DEC0400F9DB5404A7E299AA5CD8 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm b/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm index 20c53ea902..07eb5a9c1a 100644 --- a/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm +++ b/runelite-client/src/main/scripts/GeExamineInfoText.rs2asm @@ -21,23 +21,39 @@ string_length iconst 0 if_icmpgt LABEL13 - jump LABEL118 + jump LABEL131 LABEL13: + iload 0 + if_getwidth + istore 2 + sload 0 + iload 2 + iconst 494 + paraheight + iconst 2 + if_icmple LABEL23 + jump LABEL30 +LABEL23: sload 0 sconst "
" sconst "
" sload 1 join_string 4 - iload 0 - if_getwidth - istore 2 sstore 2 + jump LABEL35 +LABEL30: + sload 0 + sconst "
" + sload 1 + join_string 3 + sstore 2 +LABEL35: sload 0 ; examine sload 1 ; Convenience fee sload 2 ; "<$string0>

<$string1>" sconst "geExamineText" - runelite_callback + runelite_callback sstore 2 ; final text pop_string ; Convenience fee pop_string ; examine @@ -137,8 +153,8 @@ LABEL13: sconst "Info" iload 1 if_setop - jump LABEL139 -LABEL118: + jump LABEL152 +LABEL131: sload 0 sstore 2 iconst 1 @@ -160,7 +176,7 @@ LABEL118: if_setonop iload 1 if_clearops -LABEL139: +LABEL152: sload 2 iload 0 if_settext