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
2021-12-16 13:04:56 +01:00
parent ecacba413e 3c33d89a16
commit 3d2f6cf54a
14 changed files with 523 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
runelite-client/src/main/resources/item_variations.json
View File

@@ -244,7 +244,8 @@
20772,
21056,
21057,
21058
21058,
26276
],
"glarials urn": [
296,
@@ -3254,6 +3255,10 @@
3739,
3740
],
"frozen key": [
3741,
26356
],
"archer helm": [
3749,
20572
@@ -10189,5 +10194,51 @@
"ugly halloween jumper": [
26256,
26258
],
"secret santa present": [
26298,
26300,
26302,
26316,
26318,
26320,
26322,
26324
],
"chocolate chips": [
26304,
26306
],
"ancient brew": [
26340,
26342,
26344,
26346
],
"ancient mix": [
26350,
26353
],
"frozen key piece": [
26358,
26360,
26362,
26364
],
"torva helm": [
26376,
26382
],
"torva platebody": [
26378,
26384
],
"torva platelegs": [
26380,
26386
],
"blood essence": [
26390,
26392
]
}

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

@@ -1 +1 @@
77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0
95E7960E289ECA35DEADD35BC5A34AEBAA1C9F367AC42A71A5F3EFCCA0600D10

137
runelite-client/src/main/scripts/ChatSend.rs2asm
View File

@@ -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

1
runelite-client/src/main/scripts/ChatTimestamp.hash Normal file
View File

@@ -0,0 +1 @@
6943EE91A5B24C1E3C43274E34A6207A981EE9DDF1F8CBB2129666CF70DC955F

56
runelite-client/src/main/scripts/ChatTimestamp.rs2asm Normal file
View File

@@ -0,0 +1,56 @@
; used by TimestampPlugin via Chat(Split)Builder to display timestamps
; add a timestamp to a message
; string0 = timestamp
; string1 = message
; string2 = timestamp color
.id 4742
.int_stack_count 0
.string_stack_count 3
.int_var_count 0
.string_var_count 3
jump ENABLED ; jump over ~on_enhanced_any = 0 | chat_gettimestamps = 0
invoke 100
iconst 0
if_icmpeq LABEL11
5025
iconst 0
if_icmpeq LABEL11
ENABLED:
sload 0
invoke 5529
iconst 1
if_icmpeq LABEL11
jump LABEL13
LABEL11:
sload 1
return
LABEL13:
sload 1
invoke 5530
invoke 5529
iconst 1
if_icmpeq LABEL19
jump LABEL21
LABEL19:
sload 1
return
LABEL21:
sload 2
invoke 5529
iconst 0
if_icmpeq LABEL26
jump LABEL31
LABEL26:
sload 2
sload 0
sconst "</col>"
join_string 3
sstore 0
LABEL31:
sload 0
sconst " "
sload 1
join_string 3
return
sconst ""
return

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

@@ -1 +1 @@
157D0FE4248A0C0CAC825733A8DE7B0FA5A93451A9FCE3A4B1D8BFD54038B970
703C181C0453F22483854DC20D14FCBDE79E9DEC0400F9DB5404A7E299AA5CD8

32
runelite-client/src/main/scripts/GeExamineInfoText.rs2asm
View File

@@ -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 "<br>"
sconst "<br>"
sload 1
join_string 4
iload 0
if_getwidth
istore 2
sstore 2
jump LABEL35
LABEL30:
sload 0
sconst "<br>"
sload 1
join_string 3
sstore 2
LABEL35:
sload 0 ; examine
sload 1 ; Convenience fee
sload 2 ; "<$string0><br><br><$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