Skip to content

Commit

Permalink
Merge remote-tracking branch 'runelite/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Owain94
Owain94 committed Jan 29, 2020
2 parents add4ca8 + 38c6478 commit 7f2f433
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 82 deletions.
4 changes: 4 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/ItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11394,5 +11394,9 @@ public final class ItemID
public static final int OPENED_COAL_BAG = 24480;
public static final int OPENED_GEM_BAG = 24481;
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. */
}
34 changes: 21 additions & 13 deletions runelite-api/src/main/java/net/runelite/api/NpcID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,12 @@ public final class NpcID
public static final int BUTTERFLY_238 = 238;
public static final int KING_BLACK_DRAGON = 239;
public static final int BLACK_DEMON = 240;
public static final int BABY_DRAGON = 241;
public static final int BABY_DRAGON_242 = 242;
public static final int BABY_DRAGON_243 = 243;
public static final int BABY_DRAGON_244 = 244;
public static final int BABY_DRAGON_245 = 245;
public static final int BABY_DRAGON_246 = 246;
public static final int BABY_BLUE_DRAGON = 241;
public static final int BABY_BLUE_DRAGON_242 = 242;
public static final int BABY_BLUE_DRAGON_243 = 243;
public static final int BABY_RED_DRAGON_244 = 244;
public static final int BABY_RED_DRAGON_245 = 245;
public static final int BABY_RED_DRAGON_246 = 246;
public static final int RED_DRAGON = 247;
public static final int RED_DRAGON_248 = 248;
public static final int RED_DRAGON_249 = 249;
Expand Down Expand Up @@ -1767,8 +1767,8 @@ public final class NpcID
public static final int SIR_AMIK_VARZE = 1867;
public static final int SIR_AMIK_VARZE_1869 = 1869;
public static final int EVIL_CHICKEN = 1870;
public static final int BABY_DRAGON_1871 = 1871;
public static final int BABY_DRAGON_1872 = 1872;
public static final int BABY_BLACK_DRAGON = 1871;
public static final int BABY_BLACK_DRAGON_1872 = 1872;
public static final int KKLIK = 1873;
public static final int ICE_TROLL_RUNT = 1874;
public static final int ICE_TROLL_MALE = 1875;
Expand Down Expand Up @@ -2884,6 +2884,14 @@ public final class NpcID
public static final int GOBLIN_3074 = 3074;
public static final int GOBLIN_3075 = 3075;
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_3088 = 3088;
public static final int BANKER_3089 = 3089;
Expand Down Expand Up @@ -4864,7 +4872,7 @@ public final class NpcID
public static final int CAPTAIN_LAWGOF = 5191;
public static final int GOBLIN_5192 = 5192;
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_5196 = 5196;
public static final int GOBLIN_5197 = 5197;
Expand Down Expand Up @@ -5501,8 +5509,8 @@ public final class NpcID
public static final int SUMMONED_SOUL_5869 = 5869;
public static final int KEY_MASTER = 5870;
public static final int KING_ARTHUR_5871 = 5871;
public static final int BABY_DRAGON_5872 = 5872;
public static final int BABY_DRAGON_5873 = 5873;
public static final int BABY_GREEN_DRAGON_5872 = 5872;
public static final int BABY_GREEN_DRAGON_5873 = 5873;
public static final int BLACK_DEMON_5874 = 5874;
public static final int BLACK_DEMON_5875 = 5875;
public static final int BLACK_DEMON_5876 = 5876;
Expand Down Expand Up @@ -6677,7 +6685,7 @@ public final class NpcID
public static final int RIFT_GUARDIAN_7365 = 7365;
public static final int RIFT_GUARDIAN_7366 = 7366;
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 PHOENIX_7370 = 7370;
public static final int PYROMANCER = 7371;
Expand Down Expand Up @@ -7175,7 +7183,7 @@ public final class NpcID
public static final int ERDAN = 7952;
public static final int PRIMULA = 7953;
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_7957 = 7957;
public static final int CAPTAIN_TOCK_7958 = 7958;
Expand Down
1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/NullItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12880,5 +12880,6 @@ public final class NullItemID
public static final int NULL_24474 = 24474;
public static final int NULL_24476 = 24476;
public static final int NULL_24477 = 24477;
public static final int NULL_24487 = 24487;
/* This file is automatically generated. Do not edit. */
}
7 changes: 7 additions & 0 deletions runelite-client/src/main/resources/item_variations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8692,6 +8692,13 @@
20691,
21990
],
"phoenix": [
20693,
24483,
24484,
24485,
24486
],
"rejuvenation potion": [
20697,
20699,
Expand Down
2 changes: 1 addition & 1 deletion runelite-client/src/main/scripts/CommandScript.hash
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1E915795AFAA25E3ABE595EEAC55423C3E5E9E5CE2582AD1A5AAEC91647CC124
E8860FBA051B1F98771592610F056C95C509C403A16522D4D7C31AF8EA21E6D3
141 changes: 73 additions & 68 deletions runelite-client/src/main/scripts/CommandScript.rs2asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ LABEL58:
iload 0
iconst 84
if_icmpeq LABEL62
jump LABEL189
jump LABEL194
LABEL62:
invoke 1984
iload 2
iconst 0
if_icmpgt LABEL67
jump LABEL188
jump LABEL193
LABEL67:
get_varc_string 335
sconst "/"
Expand Down Expand Up @@ -146,20 +146,20 @@ LABEL108:
iconst 0
invoke 96
LABEL111:
jump LABEL184
jump LABEL189
LABEL112:
get_varc_string 335
sconst "::"
iconst 0
string_indexof_string
iconst 0
if_icmpeq LABEL119
jump LABEL181
jump LABEL186
LABEL119:
iload 2
iconst 2
if_icmpgt LABEL123
jump LABEL177
jump LABEL182
LABEL123:
get_varc_string 335
sconst "::toggleroof"
Expand All @@ -185,35 +185,40 @@ LABEL139:
sconst "Roofs are now all hidden."
mes
LABEL143:
jump LABEL176
jump LABEL181
LABEL144:
get_varc_string 335
sconst "::wiki"
sconst "::wiki "
iconst 0
string_indexof_string
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
runelite_callback ; invoke callback
jump LABEL154
LABEL151:
jump LABEL159
LABEL156:
get_varc_string 335
invoke 3299
jump LABEL176
LABEL154:
jump LABEL181
LABEL159:
get_varc_string 335
sconst "::bank"
iconst 0
string_indexof_string
iconst 0
if_icmpeq LABEL161
jump LABEL165
LABEL161:
if_icmpeq LABEL166
jump LABEL170
LABEL166:
sconst "Hey, everyone, I just tried to do something very silly!"
iconst 0
invoke 96
jump LABEL176
LABEL165:
jump LABEL181
LABEL170:
get_varc_string 335
invoke 224
set_varc_string 335
Expand All @@ -225,106 +230,106 @@ LABEL165:
iload 2
substring
docheat
LABEL176:
jump LABEL180
LABEL177:
LABEL181:
jump LABEL185
LABEL182:
get_varc_string 335
iconst 0
invoke 96
LABEL180:
jump LABEL184
LABEL181:
LABEL185:
jump LABEL189
LABEL186:
get_varc_string 335
iconst 0
invoke 96
LABEL184:
LABEL189:
get_varc_string 335
invoke 77
sconst ""
set_varc_string 335
LABEL188:
jump LABEL257
LABEL189:
LABEL193:
jump LABEL262
LABEL194:
iload 0
iconst 104
if_icmpeq LABEL193
jump LABEL199
LABEL193:
if_icmpeq LABEL198
jump LABEL204
LABEL198:
iload 3
iconst 1
if_icmpeq LABEL197
jump LABEL198
LABEL197:
if_icmpeq LABEL202
jump LABEL203
LABEL202:
invoke 75
LABEL198:
jump LABEL257
LABEL199:
LABEL203:
jump LABEL262
LABEL204:
iload 0
iconst 105
if_icmpeq LABEL203
jump LABEL209
LABEL203:
if_icmpeq LABEL208
jump LABEL214
LABEL208:
iload 3
iconst 1
if_icmpeq LABEL207
jump LABEL208
LABEL207:
if_icmpeq LABEL212
jump LABEL213
LABEL212:
invoke 76
LABEL208:
jump LABEL257
LABEL209:
LABEL213:
jump LABEL262
LABEL214:
iload 0
iconst 80
if_icmpeq LABEL213
jump LABEL251
LABEL213:
if_icmpeq LABEL218
jump LABEL256
LABEL218:
get_varc_string 356
string_length
iconst 0
if_icmpgt LABEL218
jump LABEL238
LABEL218:
if_icmpgt LABEL223
jump LABEL243
LABEL223:
get_varc_string 356
friend_test
iconst 1
if_icmpeq LABEL223
jump LABEL226
LABEL223:
if_icmpeq LABEL228
jump LABEL231
LABEL228:
get_varc_string 356
invoke 107
return
LABEL226:
LABEL231:
get_varc_int 60
clientclock
if_icmpgt LABEL230
jump LABEL231
LABEL230:
if_icmpgt LABEL235
jump LABEL236
LABEL235:
return
LABEL231:
LABEL236:
clientclock
iconst 50
add
set_varc_int 60
sconst "That player was not found on your Friends list."
mes
return
LABEL238:
LABEL243:
get_varc_int 60
clientclock
if_icmpgt LABEL242
jump LABEL243
LABEL242:
if_icmpgt LABEL247
jump LABEL248
LABEL247:
return
LABEL243:
LABEL248:
clientclock
iconst 50
add
set_varc_int 60
sconst "You haven't received any messages to which you can reply."
mes
return
jump LABEL257
LABEL251:
jump LABEL262
LABEL256:
get_varc_string 335
iconst 0
iload 0
Expand All @@ -336,9 +341,9 @@ LABEL251:
runelite_callback ;
if_icmpeq SKIPSETVARC ; skip setting varc with input
set_varc_string 335
jump LABEL257 ; jump over SKIPSETVARC
jump LABEL262 ; jump over SKIPSETVARC
SKIPSETVARC:
pop_string ; pop message
LABEL257:
LABEL262:
invoke 223
return

0 comments on commit 7f2f433

Please sign in to comment.