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-29 14:20:52 +01:00
parent add4ca8005 38c6478c40
commit 7f2f43364b
6 changed files with 109 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+4
View File
@@ -11394,5 +11394,9 @@ public final class ItemID
public static final int OPENED_COAL_BAG = 24480; public static final int OPENED_COAL_BAG = 24480;
public static final int OPENED_GEM_BAG = 24481; public static final int OPENED_GEM_BAG = 24481;
public static final int OPEN_SEED_BOX = 24482; public static final int OPEN_SEED_BOX = 24482;
public static final int PHOENIX_24483 = 24483;
public static final int PHOENIX_24484 = 24484;
public static final int PHOENIX_24485 = 24485;
public static final int PHOENIX_24486 = 24486;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NpcID.java
+21 -13
View File
@@ -235,12 +235,12 @@ public final class NpcID
public static final int BUTTERFLY_238 = 238; public static final int BUTTERFLY_238 = 238;
public static final int KING_BLACK_DRAGON = 239; public static final int KING_BLACK_DRAGON = 239;
public static final int BLACK_DEMON = 240; public static final int BLACK_DEMON = 240;
public static final int BABY_DRAGON = 241; public static final int BABY_BLUE_DRAGON = 241;
public static final int BABY_DRAGON_242 = 242; public static final int BABY_BLUE_DRAGON_242 = 242;
public static final int BABY_DRAGON_243 = 243; public static final int BABY_BLUE_DRAGON_243 = 243;
public static final int BABY_DRAGON_244 = 244; public static final int BABY_RED_DRAGON_244 = 244;
public static final int BABY_DRAGON_245 = 245; public static final int BABY_RED_DRAGON_245 = 245;
public static final int BABY_DRAGON_246 = 246; public static final int BABY_RED_DRAGON_246 = 246;
public static final int RED_DRAGON = 247; public static final int RED_DRAGON = 247;
public static final int RED_DRAGON_248 = 248; public static final int RED_DRAGON_248 = 248;
public static final int RED_DRAGON_249 = 249; public static final int RED_DRAGON_249 = 249;
@@ -1767,8 +1767,8 @@ public final class NpcID
public static final int SIR_AMIK_VARZE = 1867; public static final int SIR_AMIK_VARZE = 1867;
public static final int SIR_AMIK_VARZE_1869 = 1869; public static final int SIR_AMIK_VARZE_1869 = 1869;
public static final int EVIL_CHICKEN = 1870; public static final int EVIL_CHICKEN = 1870;
public static final int BABY_DRAGON_1871 = 1871; public static final int BABY_BLACK_DRAGON = 1871;
public static final int BABY_DRAGON_1872 = 1872; public static final int BABY_BLACK_DRAGON_1872 = 1872;
public static final int KKLIK = 1873; public static final int KKLIK = 1873;
public static final int ICE_TROLL_RUNT = 1874; public static final int ICE_TROLL_RUNT = 1874;
public static final int ICE_TROLL_MALE = 1875; public static final int ICE_TROLL_MALE = 1875;
@@ -2884,6 +2884,14 @@ public final class NpcID
public static final int GOBLIN_3074 = 3074; public static final int GOBLIN_3074 = 3074;
public static final int GOBLIN_3075 = 3075; public static final int GOBLIN_3075 = 3075;
public static final int GOBLIN_3076 = 3076; public static final int GOBLIN_3076 = 3076;
public static final int PHOENIX = 3077;
public static final int PHOENIX_3078 = 3078;
public static final int PHOENIX_3079 = 3079;
public static final int PHOENIX_3080 = 3080;
public static final int PHOENIX_3081 = 3081;
public static final int PHOENIX_3082 = 3082;
public static final int PHOENIX_3083 = 3083;
public static final int PHOENIX_3084 = 3084;
public static final int PORTAL_3086 = 3086; public static final int PORTAL_3086 = 3086;
public static final int PORTAL_3088 = 3088; public static final int PORTAL_3088 = 3088;
public static final int BANKER_3089 = 3089; public static final int BANKER_3089 = 3089;
@@ -4864,7 +4872,7 @@ public final class NpcID
public static final int CAPTAIN_LAWGOF = 5191; public static final int CAPTAIN_LAWGOF = 5191;
public static final int GOBLIN_5192 = 5192; public static final int GOBLIN_5192 = 5192;
public static final int GOBLIN_5193 = 5193; public static final int GOBLIN_5193 = 5193;
public static final int BABY_DRAGON_5194 = 5194; public static final int BABY_GREEN_DRAGON = 5194;
public static final int GOBLIN_5195 = 5195; public static final int GOBLIN_5195 = 5195;
public static final int GOBLIN_5196 = 5196; public static final int GOBLIN_5196 = 5196;
public static final int GOBLIN_5197 = 5197; public static final int GOBLIN_5197 = 5197;
@@ -5501,8 +5509,8 @@ public final class NpcID
public static final int SUMMONED_SOUL_5869 = 5869; public static final int SUMMONED_SOUL_5869 = 5869;
public static final int KEY_MASTER = 5870; public static final int KEY_MASTER = 5870;
public static final int KING_ARTHUR_5871 = 5871; public static final int KING_ARTHUR_5871 = 5871;
public static final int BABY_DRAGON_5872 = 5872; public static final int BABY_GREEN_DRAGON_5872 = 5872;
public static final int BABY_DRAGON_5873 = 5873; public static final int BABY_GREEN_DRAGON_5873 = 5873;
public static final int BLACK_DEMON_5874 = 5874; public static final int BLACK_DEMON_5874 = 5874;
public static final int BLACK_DEMON_5875 = 5875; public static final int BLACK_DEMON_5875 = 5875;
public static final int BLACK_DEMON_5876 = 5876; public static final int BLACK_DEMON_5876 = 5876;
@@ -6677,7 +6685,7 @@ public final class NpcID
public static final int RIFT_GUARDIAN_7365 = 7365; public static final int RIFT_GUARDIAN_7365 = 7365;
public static final int RIFT_GUARDIAN_7366 = 7366; public static final int RIFT_GUARDIAN_7366 = 7366;
public static final int RIFT_GUARDIAN_7367 = 7367; public static final int RIFT_GUARDIAN_7367 = 7367;
public static final int PHOENIX = 7368; public static final int PHOENIX_7368 = 7368;
public static final int WESLEY = 7369; public static final int WESLEY = 7369;
public static final int PHOENIX_7370 = 7370; public static final int PHOENIX_7370 = 7370;
public static final int PYROMANCER = 7371; public static final int PYROMANCER = 7371;
@@ -7175,7 +7183,7 @@ public final class NpcID
public static final int ERDAN = 7952; public static final int ERDAN = 7952;
public static final int PRIMULA = 7953; public static final int PRIMULA = 7953;
public static final int MYSTERIOUS_ADVENTURER = 7954; public static final int MYSTERIOUS_ADVENTURER = 7954;
public static final int BABY_DRAGON_7955 = 7955; public static final int BABY_BLACK_DRAGON_7955 = 7955;
public static final int CAPTAIN_TOCK = 7956; public static final int CAPTAIN_TOCK = 7956;
public static final int CAPTAIN_TOCK_7957 = 7957; public static final int CAPTAIN_TOCK_7957 = 7957;
public static final int CAPTAIN_TOCK_7958 = 7958; public static final int CAPTAIN_TOCK_7958 = 7958;
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+1
View File
@@ -12880,5 +12880,6 @@ public final class NullItemID
public static final int NULL_24474 = 24474; public static final int NULL_24474 = 24474;
public static final int NULL_24476 = 24476; public static final int NULL_24476 = 24476;
public static final int NULL_24477 = 24477; public static final int NULL_24477 = 24477;
public static final int NULL_24487 = 24487;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-client/src/main/resources/item_variations.json
+7
View File
@@ -8692,6 +8692,13 @@
20691, 20691,
21990 21990
], ],
"phoenix": [
20693,
24483,
24484,
24485,
24486
],
"rejuvenation potion": [ "rejuvenation potion": [
20697, 20697,
20699, 20699,
runelite-client/src/main/scripts/CommandScript.hash
+1 -1
View File
@@ -1 +1 @@
1E915795AFAA25E3ABE595EEAC55423C3E5E9E5CE2582AD1A5AAEC91647CC124 E8860FBA051B1F98771592610F056C95C509C403A16522D4D7C31AF8EA21E6D3
runelite-client/src/main/scripts/CommandScript.rs2asm
+74 -69
View File
@@ -82,13 +82,13 @@ LABEL58:
iload 0 iload 0
iconst 84 iconst 84
if_icmpeq LABEL62 if_icmpeq LABEL62
jump LABEL189 jump LABEL194
LABEL62: LABEL62:
invoke 1984 invoke 1984
iload 2 iload 2
iconst 0 iconst 0
if_icmpgt LABEL67 if_icmpgt LABEL67
jump LABEL188 jump LABEL193
LABEL67: LABEL67:
get_varc_string 335 get_varc_string 335
sconst "/" sconst "/"
@@ -146,7 +146,7 @@ LABEL108:
iconst 0 iconst 0
invoke 96 invoke 96
LABEL111: LABEL111:
jump LABEL184 jump LABEL189
LABEL112: LABEL112:
get_varc_string 335 get_varc_string 335
sconst "::" sconst "::"
@@ -154,12 +154,12 @@ LABEL112:
string_indexof_string string_indexof_string
iconst 0 iconst 0
if_icmpeq LABEL119 if_icmpeq LABEL119
jump LABEL181 jump LABEL186
LABEL119: LABEL119:
iload 2 iload 2
iconst 2 iconst 2
if_icmpgt LABEL123 if_icmpgt LABEL123
jump LABEL177 jump LABEL182
LABEL123: LABEL123:
get_varc_string 335 get_varc_string 335
sconst "::toggleroof" sconst "::toggleroof"
@@ -185,35 +185,40 @@ LABEL139:
sconst "Roofs are now all hidden." sconst "Roofs are now all hidden."
mes mes
LABEL143: LABEL143:
jump LABEL176 jump LABEL181
LABEL144: LABEL144:
get_varc_string 335 get_varc_string 335
sconst "::wiki " sconst "::wiki "
iconst 0 iconst 0
string_indexof_string string_indexof_string
iconst 0 iconst 0
if_icmpeq LABEL151 if_icmpeq LABEL156
get_varc_string 335
sconst "::wiki"
compare
iconst 0
if_icmpeq LABEL156
sconst "runeliteCommand" ; load callback name sconst "runeliteCommand" ; load callback name
runelite_callback ; invoke callback runelite_callback ; invoke callback
jump LABEL154 jump LABEL159
LABEL151: LABEL156:
get_varc_string 335 get_varc_string 335
invoke 3299 invoke 3299
jump LABEL176 jump LABEL181
LABEL154: LABEL159:
get_varc_string 335 get_varc_string 335
sconst "::bank" sconst "::bank"
iconst 0 iconst 0
string_indexof_string string_indexof_string
iconst 0 iconst 0
if_icmpeq LABEL161 if_icmpeq LABEL166
jump LABEL165 jump LABEL170
LABEL161: LABEL166:
sconst "Hey, everyone, I just tried to do something very silly!" sconst "Hey, everyone, I just tried to do something very silly!"
iconst 0 iconst 0
invoke 96 invoke 96
jump LABEL176 jump LABEL181
LABEL165: LABEL170:
get_varc_string 335 get_varc_string 335
invoke 224 invoke 224
set_varc_string 335 set_varc_string 335
@@ -225,82 +230,82 @@ LABEL165:
iload 2 iload 2
substring substring
docheat docheat
LABEL176:
jump LABEL180
LABEL177:
get_varc_string 335
iconst 0
invoke 96
LABEL180:
jump LABEL184
LABEL181: LABEL181:
jump LABEL185
LABEL182:
get_varc_string 335 get_varc_string 335
iconst 0 iconst 0
invoke 96 invoke 96
LABEL184: LABEL185:
jump LABEL189
LABEL186:
get_varc_string 335
iconst 0
invoke 96
LABEL189:
get_varc_string 335 get_varc_string 335
invoke 77 invoke 77
sconst "" sconst ""
set_varc_string 335 set_varc_string 335
LABEL188: LABEL193:
jump LABEL257 jump LABEL262
LABEL189: LABEL194:
iload 0 iload 0
iconst 104 iconst 104
if_icmpeq LABEL193 if_icmpeq LABEL198
jump LABEL199 jump LABEL204
LABEL193: LABEL198:
iload 3 iload 3
iconst 1 iconst 1
if_icmpeq LABEL197 if_icmpeq LABEL202
jump LABEL198 jump LABEL203
LABEL197: LABEL202:
invoke 75 invoke 75
LABEL198: LABEL203:
jump LABEL257 jump LABEL262
LABEL199: LABEL204:
iload 0 iload 0
iconst 105 iconst 105
if_icmpeq LABEL203 if_icmpeq LABEL208
jump LABEL209 jump LABEL214
LABEL203: LABEL208:
iload 3 iload 3
iconst 1 iconst 1
if_icmpeq LABEL207 if_icmpeq LABEL212
jump LABEL208 jump LABEL213
LABEL207: LABEL212:
invoke 76 invoke 76
LABEL208: LABEL213:
jump LABEL257 jump LABEL262
LABEL209: LABEL214:
iload 0 iload 0
iconst 80 iconst 80
if_icmpeq LABEL213 if_icmpeq LABEL218
jump LABEL251 jump LABEL256
LABEL213: LABEL218:
get_varc_string 356 get_varc_string 356
string_length string_length
iconst 0 iconst 0
if_icmpgt LABEL218 if_icmpgt LABEL223
jump LABEL238 jump LABEL243
LABEL218: LABEL223:
get_varc_string 356 get_varc_string 356
friend_test friend_test
iconst 1 iconst 1
if_icmpeq LABEL223 if_icmpeq LABEL228
jump LABEL226 jump LABEL231
LABEL223: LABEL228:
get_varc_string 356 get_varc_string 356
invoke 107 invoke 107
return return
LABEL226: LABEL231:
get_varc_int 60 get_varc_int 60
clientclock clientclock
if_icmpgt LABEL230 if_icmpgt LABEL235
jump LABEL231 jump LABEL236
LABEL230: LABEL235:
return return
LABEL231: LABEL236:
clientclock clientclock
iconst 50 iconst 50
add add
@@ -308,14 +313,14 @@ LABEL231:
sconst "That player was not found on your Friends list." sconst "That player was not found on your Friends list."
mes mes
return return
LABEL238: LABEL243:
get_varc_int 60 get_varc_int 60
clientclock clientclock
if_icmpgt LABEL242 if_icmpgt LABEL247
jump LABEL243 jump LABEL248
LABEL242: LABEL247:
return return
LABEL243: LABEL248:
clientclock clientclock
iconst 50 iconst 50
add add
@@ -323,8 +328,8 @@ LABEL243:
sconst "You haven't received any messages to which you can reply." sconst "You haven't received any messages to which you can reply."
mes mes
return return
jump LABEL257 jump LABEL262
LABEL251: LABEL256:
get_varc_string 335 get_varc_string 335
iconst 0 iconst 0
iload 0 iload 0
@@ -336,9 +341,9 @@ LABEL251:
runelite_callback ; runelite_callback ;
if_icmpeq SKIPSETVARC ; skip setting varc with input if_icmpeq SKIPSETVARC ; skip setting varc with input
set_varc_string 335 set_varc_string 335
jump LABEL257 ; jump over SKIPSETVARC jump LABEL262 ; jump over SKIPSETVARC
SKIPSETVARC: SKIPSETVARC:
pop_string ; pop message pop_string ; pop message
LABEL257: LABEL262:
invoke 223 invoke 223
return return