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

Merge branch 'master' into better-script-info

Browse Source 
# Conflicts:
#	runelite-client/src/main/resources/scripts/ChatboxInputWidgetBuilder.rs2asm
#	runelite-client/src/main/resources/scripts/OptionsPanelRebuilder.rs2asm
#	runelite-client/src/main/resources/scripts/SpecbarRedraw.rs2asm
#	runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
#	runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
#	runelite-client/src/main/scripts/SpecbarRedraw.hash
This commit is contained in:
therealunull
2020-10-29 13:23:04 -04:00
parent c626769ca4 0b13503b1d
commit 1eab6b46cd
36 changed files with 603 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2413,6 +2413,10 @@
1947,
5607
],
"pumpkin": [
1959,
24979
],
"easter egg": [
1961,
7928,
@@ -2432,7 +2436,11 @@
22519,
22520,
24367,
24426
24426,
24971,
24973,
24994,
24996
],
"empty cup": [
1980,
@@ -6238,6 +6246,10 @@
9179,
9459
],
"mithril crossbow": [
9181,
9461
],
"adamant crossbow": [
9183,
9463
@@ -7251,7 +7263,9 @@
21061,
21063,
24743,
24745
24745,
25069,
25071
],
"graceful cape": [
11852,
@@ -7271,7 +7285,9 @@
21064,
21066,
24746,
24748
24748,
25072,
25074
],
"graceful top": [
11854,
@@ -7291,7 +7307,9 @@
21067,
21069,
24749,
24751
24751,
25075,
25077
],
"graceful legs": [
11856,
@@ -7311,7 +7329,9 @@
21070,
21072,
24752,
24754
24754,
25078,
25080
],
"graceful gloves": [
11858,
@@ -7331,7 +7351,9 @@
21073,
21075,
24755,
24757
24757,
25081,
25083
],
"graceful boots": [
11860,
@@ -7351,7 +7373,9 @@
21076,
21078,
24758,
24760
24760,
25084,
25086
],
"slayer helmet": [
11864,
@@ -9282,6 +9306,10 @@
24365,
24366
],
"twisted adamant trophy": [
24376,
25046
],
"twisted hat": [
24387,
24397,
@@ -9311,7 +9339,7 @@
24439,
24440
],
"twisted relichunter armour set": [
"twisted relic hunter armour set": [
24469,
24472,
24475
@@ -9428,5 +9456,41 @@
"mahogany bed": [
24921,
24925
],
"trailblazer hood": [
25001,
25016,
25028
],
"trailblazer coat": [
25004,
25019,
25031
],
"trailblazer trousers": [
25007,
25022,
25034
],
"trailblazer boots": [
25010,
25025,
25037
],
"trailblazer harpoon": [
25059,
25114
],
"trailblazer pickaxe": [
25063,
25112
],
"trailblazer axe": [
25066,
25110
],
"extradimensional bag": [
25106,
25108
]
}

52
runelite-client/src/main/resources/scripts/ChatboxInputWidgetBuilder.rs2asm
View File

@@ -55,7 +55,7 @@ LABEL42:
jump LABEL51
LABEL46:
sconst "<img=22>"
chat_playername
chat_playername
join_string 2
sstore 2
jump LABEL59
@@ -64,8 +64,8 @@ LABEL51:
iconst 115
iconst 1894
get_varbit 1777
enum
chat_playername
enum
chat_playername
join_string 2
sstore 2
LABEL59:
@@ -76,7 +76,7 @@ LABEL59:
LABEL63:
sload 2
sconst "<img=19>"
append
append
sstore 2
LABEL67:
sload 2
@@ -85,7 +85,7 @@ LABEL67:
sload 1
sconst "</col>"
join_string 4
append
append
sstore 2
iload 2
iconst 80
@@ -97,13 +97,13 @@ LABEL79:
sconst "*"
sconst "</col>"
join_string 3
append
append
sstore 2
LABEL86:
sload 2
iconst 2147483647
iconst 495
parawidth
parawidth
istore 3
iload 4
iconst 1
@@ -113,19 +113,19 @@ LABEL95:
iconst 60
iconst 5
iload 3
add
add
invoke 1045
iconst 30
iconst 0
iconst 0
iconst 10616871
if_setsize
if_setsize
iconst 0
iconst 0
iconst 0
iconst 2
iconst 10616871
if_setposition
if_setposition
jump LABEL124
LABEL112:
iconst 0
@@ -133,17 +133,17 @@ LABEL112:
iconst 0
iconst 1
iconst 10616871
if_setsize
if_setsize
iconst 0
iconst 0
iconst 0
iconst 2
iconst 10616871
if_setposition
if_setposition
LABEL124:
iload 3
iconst 10616890
if_getwidth
if_getwidth
if_icmpgt LABEL129
jump LABEL135
LABEL129:
@@ -151,29 +151,29 @@ LABEL129:
iconst 2
iconst 0
iconst 10616890
if_settextalign
if_settextalign
jump LABEL140
LABEL135:
iconst 0
iconst 2
iconst 0
iconst 10616890
if_settextalign
if_settextalign
LABEL140:
iconst 10616890
if_clearops
if_clearops
iconst -1
sconst ""
iconst 10616890
if_setonmouserepeat
if_setonmouserepeat
iconst -1
sconst ""
iconst 10616890
if_setonmouseleave
if_setonmouseleave
iconst -1
sconst ""
iconst 10616890
if_setonop
if_setonop
jump LABEL205
LABEL155:
invoke 3160
@@ -191,7 +191,7 @@ LABEL164:
iconst 115
iconst 1894
get_varbit 1777
enum
enum
sconst " You must set a name before you can chat."
join_string 2
sstore 2
@@ -200,35 +200,35 @@ LABEL172:
iconst 2
iconst 0
iconst 10616890
if_settextalign
if_settextalign
iconst 10
sconst "Configure"
iconst 10616890
if_setop
if_setop
sconst "<col=ff9040>"
sconst "Display name"
sconst "</col>"
join_string 3
iconst 10616890
if_setopbase
if_setopbase
iconst 45
iconst -2147483645
iload 1
sconst "Ii"
iconst 10616890
if_setonmouserepeat
if_setonmouserepeat
iconst 45
iconst -2147483645
iload 0
sconst "Ii"
iconst 10616890
if_setonmouseleave
if_setonmouseleave
iconst 489
iconst -2147483644
iconst 1024
sconst "ii"
iconst 10616890
if_setonop
if_setonop
LABEL205:
sload 2
iconst 10616890

60
runelite-client/src/main/resources/scripts/OptionsPanelRebuilder.rs2asm
View File

@@ -277,28 +277,28 @@ LABEL253:
get_varc_int 73
iconst 128
sconst "outerZoomLimit"
runelite_callback
runelite_callback
if_icmpge LABEL262
jump LABEL278
LABEL262:
get_varc_int 73
iconst 896
sconst "innerZoomLimit"
runelite_callback
runelite_callback
if_icmple LABEL266
jump LABEL278
LABEL266:
get_varc_int 74
iconst 128
sconst "outerZoomLimit"
runelite_callback
runelite_callback
if_icmpge LABEL270
jump LABEL278
LABEL270:
get_varc_int 74
iconst 896
sconst "innerZoomLimit"
runelite_callback
runelite_callback
if_icmple LABEL274
jump LABEL278
LABEL274:
@@ -329,17 +329,17 @@ LABEL292:
iconst 0
iconst 0
iload 2
if_setsize
if_setsize
iload 10
iload 14
sub
sub
iload 11
iload 15
sub
sub
iconst 0
iconst 0
iload 3
if_setsize
if_setsize
iload 4
iconst -1
if_icmpne LABEL312
@@ -355,39 +355,39 @@ LABEL316:
iconst 0
iconst 0
iload 4
if_setposition
if_setposition
iload 6
iload 7
iconst 0
iconst 0
iload 5
if_setposition
if_setposition
iload 6
iload 8
add
add
iload 7
iload 9
add
add
iconst 1
iconst 1
iload 4
if_setsize
if_setsize
iload 6
iload 8
add
add
iload 7
iload 9
add
add
iconst 1
iconst 1
iload 5
if_setsize
if_setsize
iload 1
iconst 73
iconst 73
iload 1
iconst 10551309
enum
enum
iload 5
iload 8
iload 9
@@ -399,7 +399,7 @@ LABEL359:
iconst 73
iload 1
iconst 10551309
enum
enum
iload 3
iconst 0
iconst 0
@@ -409,7 +409,7 @@ LABEL369:
iconst 73
iload 1
iconst 10551311
enum
enum
istore 18
iload 18
iconst -1
@@ -422,7 +422,7 @@ LABEL379:
jump LABEL417
LABEL383:
iload 18
if_hassub
if_hassub
iconst 1
if_icmpeq LABEL388
jump LABEL417
@@ -437,7 +437,7 @@ LABEL392:
iconst 0
iconst 1
iload 18
if_setsize
if_setsize
jump LABEL416
LABEL399:
get_varc_int 173
@@ -450,7 +450,7 @@ LABEL403:
iconst 1
iconst 1
iload 18
if_setsize
if_setsize
jump LABEL416
LABEL410:
iconst 512
@@ -458,7 +458,7 @@ LABEL410:
iconst 0
iconst 0
iload 18
if_setsize
if_setsize
LABEL416:
jump LABEL423
LABEL417:
@@ -467,13 +467,13 @@ LABEL417:
iconst 0
iconst 0
iload 18
if_setsize
if_setsize
LABEL423:
iconst 73
iconst 73
iload 1
iconst 10551313
enum
enum
istore 18
iconst 0
istore 19
@@ -488,8 +488,8 @@ LABEL437:
iconst 73
iload 1
iconst 10551304
enum
if_hassub
enum
if_hassub
iconst 1
if_icmpeq LABEL446
jump LABEL455
@@ -518,13 +518,13 @@ LABEL459:
LABEL463:
iconst 182
iconst 4
add
add
istore 19
jump LABEL472
LABEL468:
iconst 120
iconst 4
add
add
istore 19
LABEL472:
jump LABEL475
@@ -537,7 +537,7 @@ LABEL475:
iconst 2
iconst 0
iload 18
if_setposition
if_setposition
LABEL481:
iconst 73
iconst 73

13
runelite-client/src/main/resources/scripts/SpecbarRedraw.rs2asm
View File

@@ -28,7 +28,7 @@ LABEL18:
iconst 0 ; Boolean
sconst "drawSpecbarAnyway"
runelite_callback
if_icmpeq LABEL38 ; change this
if_icmpeq LABEL38
iconst 1
iconst 38862883
if_sethide
@@ -103,6 +103,17 @@ LABEL69:
iload 3
iload 2
invoke 189
iconst 38862884
iconst 0
invoke 835
pop_int ; Specbar is fully built here
iload 1
iconst 0
if_icmple RETURN ; Return if the weapon isn't supposed to have a spec
jump CONTINUE ; Idk why I'm doing it like this but it's the jagex way
RETURN:
return
CONTINUE:
iload 3
iload 1
if_icmpge LABEL86