ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-01-23 13:13:07 +01:00
parent 6d4e1ddf85 32c8c497bd
commit 132ac1eb07
14 changed files with 130 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/scripts/CommandScript.hash
View File

@@ -1 +1 @@
2F7E219C24E4725FA8F3BCDD9F2A640666CC589B514FEBD9F5938B207F06C0EB
1E915795AFAA25E3ABE595EEAC55423C3E5E9E5CE2582AD1A5AAEC91647CC124

130
runelite-client/src/main/scripts/CommandScript.rs2asm
View File

@@ -39,7 +39,7 @@ LABEL20:
if_icmpeq LABEL31
iconst 0 ; Modified to enable clanchat input
sconst "clanchatInput"
runelite_callback
runelite_callback
iconst 1
if_icmpeq LABEL31 ; Compare to 1
jump LABEL37
@@ -82,13 +82,13 @@ LABEL58:
iload 0
iconst 84
if_icmpeq LABEL62
jump LABEL179
jump LABEL189
LABEL62:
invoke 1984
iload 2
iconst 0
if_icmpgt LABEL67
jump LABEL178
jump LABEL188
LABEL67:
get_varc_string 335
sconst "/"
@@ -146,7 +146,7 @@ LABEL108:
iconst 0
invoke 96
LABEL111:
jump LABEL174
jump LABEL184
LABEL112:
get_varc_string 335
sconst "::"
@@ -154,12 +154,12 @@ LABEL112:
string_indexof_string
iconst 0
if_icmpeq LABEL119
jump LABEL171
jump LABEL181
LABEL119:
iload 2
iconst 2
if_icmpgt LABEL123
jump LABEL167
jump LABEL177
LABEL123:
get_varc_string 335
sconst "::toggleroof"
@@ -185,23 +185,35 @@ LABEL139:
sconst "Roofs are now all hidden."
mes
LABEL143:
jump LABEL166
jump LABEL176
LABEL144:
get_varc_string 335
sconst "::bank"
sconst "::wiki"
iconst 0
string_indexof_string
iconst 0
if_icmpeq LABEL151
sconst "runeliteCommand" ; load callback name
runelite_callback ; invoke callback
jump LABEL155
jump LABEL154
LABEL151:
get_varc_string 335
invoke 3299
jump LABEL176
LABEL154:
get_varc_string 335
sconst "::bank"
iconst 0
string_indexof_string
iconst 0
if_icmpeq LABEL161
jump LABEL165
LABEL161:
sconst "Hey, everyone, I just tried to do something very silly!"
iconst 0
invoke 96
jump LABEL166
LABEL155:
jump LABEL176
LABEL165:
get_varc_string 335
invoke 224
set_varc_string 335
@@ -213,42 +225,28 @@ LABEL155:
iload 2
substring
docheat
LABEL166:
jump LABEL170
LABEL167:
LABEL176:
jump LABEL180
LABEL177:
get_varc_string 335
iconst 0
invoke 96
LABEL170:
jump LABEL174
LABEL171:
LABEL180:
jump LABEL184
LABEL181:
get_varc_string 335
iconst 0
invoke 96
LABEL174:
LABEL184:
get_varc_string 335
invoke 77
sconst ""
set_varc_string 335
LABEL178:
jump LABEL247
LABEL179:
iload 0
iconst 104
if_icmpeq LABEL183
jump LABEL189
LABEL183:
iload 3
iconst 1
if_icmpeq LABEL187
jump LABEL188
LABEL187:
invoke 75
LABEL188:
jump LABEL247
jump LABEL257
LABEL189:
iload 0
iconst 105
iconst 104
if_icmpeq LABEL193
jump LABEL199
LABEL193:
@@ -257,38 +255,52 @@ LABEL193:
if_icmpeq LABEL197
jump LABEL198
LABEL197:
invoke 76
invoke 75
LABEL198:
jump LABEL247
jump LABEL257
LABEL199:
iload 0
iconst 80
iconst 105
if_icmpeq LABEL203
jump LABEL241
jump LABEL209
LABEL203:
iload 3
iconst 1
if_icmpeq LABEL207
jump LABEL208
LABEL207:
invoke 76
LABEL208:
jump LABEL257
LABEL209:
iload 0
iconst 80
if_icmpeq LABEL213
jump LABEL251
LABEL213:
get_varc_string 356
string_length
iconst 0
if_icmpgt LABEL208
jump LABEL228
LABEL208:
if_icmpgt LABEL218
jump LABEL238
LABEL218:
get_varc_string 356
friend_test
iconst 1
if_icmpeq LABEL213
jump LABEL216
LABEL213:
if_icmpeq LABEL223
jump LABEL226
LABEL223:
get_varc_string 356
invoke 107
return
LABEL216:
LABEL226:
get_varc_int 60
clientclock
if_icmpgt LABEL220
jump LABEL221
LABEL220:
if_icmpgt LABEL230
jump LABEL231
LABEL230:
return
LABEL221:
LABEL231:
clientclock
iconst 50
add
@@ -296,14 +308,14 @@ LABEL221:
sconst "That player was not found on your Friends list."
mes
return
LABEL228:
LABEL238:
get_varc_int 60
clientclock
if_icmpgt LABEL232
jump LABEL233
LABEL232:
if_icmpgt LABEL242
jump LABEL243
LABEL242:
return
LABEL233:
LABEL243:
clientclock
iconst 50
add
@@ -311,8 +323,8 @@ LABEL233:
sconst "You haven't received any messages to which you can reply."
mes
return
jump LABEL247
LABEL241:
jump LABEL257
LABEL251:
get_varc_string 335
iconst 0
iload 0
@@ -324,9 +336,9 @@ LABEL241:
runelite_callback ;
if_icmpeq SKIPSETVARC ; skip setting varc with input
set_varc_string 335
jump LABEL247 ; jump over SKIPSETVARC
jump LABEL257 ; jump over SKIPSETVARC
SKIPSETVARC:
pop_string ; pop message
LABEL247:
pop_string ; pop message
LABEL257:
invoke 223
return