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
runelite-api/src/main/java/net/runelite/api/ItemID.java
+65 -3
View File
@@ -12206,11 +12206,11 @@ public final class ItemID
public static final int NIHIL_SHARD = 26231;
public static final int ANCIENT_GODSWORD = 26233;
public static final int ZARYTE_VAMBRACES = 26235;
public static final int ZARYTE_BOW_UNCHARGED = 26237;
public static final int ZARYTE_BOW = 26239;
public static final int ZARYTE_BOW = 26237;
public static final int ZARYTE_BOW_26239 = 26239;
public static final int VIRTUS_MASK = 26241;
public static final int VIRTUS_ROBE_TOP = 26243;
public static final int VIRTUS_ROBE_LEGS = 26245;
public static final int VIRTUS_ROBE_BOTTOMS = 26245;
public static final int PUMPKIN_PIE = 26247;
public static final int JEREDS_EMPTY_WINE_BOTTLE = 26250;
public static final int AD_COUPON = 26252;
@@ -12222,5 +12222,67 @@ public final class ItemID
public static final int STUDDED_BODY_26264 = 26264;
public static final int CONDENSED_GOLD = 26266;
public static final int GOLD_SINK = 26269;
public static final int FESTIVE_CINNAMON = 26270;
public static final int FESTIVE_HOLLY = 26272;
public static final int FESTIVE_WHITE_WINE = 26274;
public static final int NOTES_26276 = 26276;
public static final int MAGICAL_CLEANING_POTION = 26278;
public static final int PINK_STAINED_PLATEBODY = 26280;
public static final int PINK_STAINED_PLATELEGS = 26282;
public static final int PINK_STAINED_FULL_HELM = 26284;
public static final int CLEAN_PLATEBODY = 26286;
public static final int CLEAN_PLATELEGS = 26288;
public static final int CLEAN_FULL_HELM = 26290;
public static final int FESTIVE_GINGERBREAD_GNOMES = 26292;
public static final int FESTIVE_MULLED_WINE = 26294;
public static final int SNOW = 26296;
public static final int SECRET_SANTA_PRESENT = 26298;
public static final int SECRET_SANTA_PRESENT_26300 = 26300;
public static final int SECRET_SANTA_PRESENT_26302 = 26302;
public static final int CHOCOLATE_CHIPS = 26304;
public static final int CHOCOLATE_CHIPS_26306 = 26306;
public static final int A_BIG_PRESENT = 26308;
public static final int FESTIVE_ELF_SLIPPERS = 26310;
public static final int FESTIVE_ELF_HAT = 26312;
public static final int SNOWMAN_RING = 26314;
public static final int SECRET_SANTA_PRESENT_RED = 26316;
public static final int SECRET_SANTA_PRESENT_BLUE = 26318;
public static final int SECRET_SANTA_PRESENT_GREEN = 26320;
public static final int SECRET_SANTA_PRESENT_BLACK = 26322;
public static final int SECRET_SANTA_PRESENT_GOLD = 26324;
public static final int LITTLE_SNOWBALL = 26326;
public static final int SMALL_SNOWBALL = 26328;
public static final int NORMAL_SNOWBALL = 26330;
public static final int BIG_SNOWBALL = 26332;
public static final int LARGE_SNOWBALL = 26334;
public static final int HUGE_SNOWBALL = 26336;
public static final int HUMONGOUS_SNOWBALL = 26338;
public static final int ANCIENT_BREW4 = 26340;
public static final int ANCIENT_BREW3 = 26342;
public static final int ANCIENT_BREW2 = 26344;
public static final int ANCIENT_BREW1 = 26346;
public static final int NEXLING = 26348;
public static final int ANCIENT_MIX2 = 26350;
public static final int ANCIENT_MIX1 = 26353;
public static final int FROZEN_KEY_26356 = 26356;
public static final int FROZEN_KEY_PIECE_ARMADYL = 26358;
public static final int FROZEN_KEY_PIECE_BANDOS = 26360;
public static final int FROZEN_KEY_PIECE_ZAMORAK = 26362;
public static final int FROZEN_KEY_PIECE_SARADOMIN = 26364;
public static final int IMPORTANT_LETTER = 26366;
public static final int NIHIL_DUST = 26368;
public static final int ANCIENT_HILT = 26370;
public static final int NIHIL_HORN = 26372;
public static final int ZARYTE_CROSSBOW = 26374;
public static final int TORVA_FULL_HELM_DAMAGED = 26376;
public static final int TORVA_PLATEBODY_DAMAGED = 26378;
public static final int TORVA_PLATELEGS_DAMAGED = 26380;
public static final int TORVA_FULL_HELM = 26382;
public static final int TORVA_PLATEBODY = 26384;
public static final int TORVA_PLATELEGS = 26386;
public static final int ECUMENICAL_KEY_SHARD = 26388;
public static final int BLOOD_ESSENCE = 26390;
public static final int BLOOD_ESSENCE_ACTIVE = 26392;
public static final int BANDOSIAN_COMPONENTS = 26394;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+44
View File
@@ -9477,5 +9477,49 @@ public final class NpcID
public static final int REGENT = 11229;
public static final int GROUP_STORAGE_TUTOR = 11230;
public static final int GROUP_IRON_TUTOR = 11231;
public static final int TINY_SNOWBALL = 11232;
public static final int MINI_SNOWBALL = 11233;
public static final int LITTLE_SNOWBALL = 11234;
public static final int SMALL_SNOWBALL = 11235;
public static final int NORMAL_SNOWBALL = 11236;
public static final int BIG_SNOWBALL = 11237;
public static final int LARGE_SNOWBALL = 11238;
public static final int HUGE_SNOWBALL = 11239;
public static final int HUMONGOUS_SNOWBALL = 11240;
public static final int BUOY = 11241;
public static final int GURL = 11242;
public static final int BUOY_11243 = 11243;
public static final int GURL_11244 = 11244;
public static final int HERQUIN_11245 = 11245;
public static final int CECILIA_11247 = 11247;
public static final int LARRY_11248 = 11248;
public static final int SANTAS_THRONE = 11249;
public static final int SANTA = 11250;
public static final int WAYNE_11251 = 11251;
public static final int WYSON_THE_GARDENER_11252 = 11252;
public static final int HAIRDRESSER_11254 = 11254;
public static final int SIR_VYVIN_11255 = 11255;
public static final int XI_PLZPETDOGZ_XIX = 11259;
public static final int DRAKE_11260 = 11260;
public static final int DUCK_11261 = 11261;
public static final int NEXLING = 11276;
public static final int NEXLING_11277 = 11277;
public static final int NEX = 11278;
public static final int NEX_11279 = 11279;
public static final int NEX_11280 = 11280;
public static final int NEX_11281 = 11281;
public static final int NEX_11282 = 11282;
public static final int FUMUS = 11283;
public static final int UMBRA = 11284;
public static final int CRUOR = 11285;
public static final int GLACIES = 11286;
public static final int MESSENGER = 11287;
public static final int ASHUELOT_REIS = 11288;
public static final int ASHUELOT_REIS_11289 = 11289;
public static final int SPIRITUAL_WARRIOR_11290 = 11290;
public static final int SPIRITUAL_RANGER_11291 = 11291;
public static final int SPIRITUAL_MAGE_11292 = 11292;
public static final int BLOOD_REAVER = 11293;
public static final int BLOOD_REAVER_11294 = 11294;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+64
View File
@@ -13837,5 +13837,69 @@ public final class NullItemID
public static final int NULL_26265 = 26265;
public static final int NULL_26267 = 26267;
public static final int NULL_26268 = 26268;
public static final int NULL_26271 = 26271;
public static final int NULL_26273 = 26273;
public static final int NULL_26275 = 26275;
public static final int NULL_26277 = 26277;
public static final int NULL_26279 = 26279;
public static final int NULL_26281 = 26281;
public static final int NULL_26283 = 26283;
public static final int NULL_26285 = 26285;
public static final int NULL_26287 = 26287;
public static final int NULL_26289 = 26289;
public static final int NULL_26291 = 26291;
public static final int NULL_26293 = 26293;
public static final int NULL_26295 = 26295;
public static final int NULL_26297 = 26297;
public static final int NULL_26299 = 26299;
public static final int NULL_26301 = 26301;
public static final int NULL_26303 = 26303;
public static final int NULL_26305 = 26305;
public static final int NULL_26307 = 26307;
public static final int NULL_26309 = 26309;
public static final int NULL_26311 = 26311;
public static final int NULL_26313 = 26313;
public static final int NULL_26315 = 26315;
public static final int NULL_26317 = 26317;
public static final int NULL_26319 = 26319;
public static final int NULL_26321 = 26321;
public static final int NULL_26323 = 26323;
public static final int NULL_26325 = 26325;
public static final int NULL_26327 = 26327;
public static final int NULL_26329 = 26329;
public static final int NULL_26331 = 26331;
public static final int NULL_26333 = 26333;
public static final int NULL_26335 = 26335;
public static final int NULL_26337 = 26337;
public static final int NULL_26339 = 26339;
public static final int NULL_26341 = 26341;
public static final int NULL_26343 = 26343;
public static final int NULL_26345 = 26345;
public static final int NULL_26347 = 26347;
public static final int NULL_26349 = 26349;
public static final int NULL_26351 = 26351;
public static final int NULL_26352 = 26352;
public static final int NULL_26354 = 26354;
public static final int NULL_26355 = 26355;
public static final int NULL_26357 = 26357;
public static final int NULL_26359 = 26359;
public static final int NULL_26361 = 26361;
public static final int NULL_26363 = 26363;
public static final int NULL_26365 = 26365;
public static final int NULL_26367 = 26367;
public static final int NULL_26369 = 26369;
public static final int NULL_26371 = 26371;
public static final int NULL_26373 = 26373;
public static final int NULL_26375 = 26375;
public static final int NULL_26377 = 26377;
public static final int NULL_26379 = 26379;
public static final int NULL_26381 = 26381;
public static final int NULL_26383 = 26383;
public static final int NULL_26385 = 26385;
public static final int NULL_26387 = 26387;
public static final int NULL_26389 = 26389;
public static final int NULL_26391 = 26391;
public static final int NULL_26393 = 26393;
public static final int NULL_26395 = 26395;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+20
View File
@@ -1738,6 +1738,26 @@ public final class NullNpcID
public static final int NULL_11222 = 11222;
public static final int NULL_11223 = 11223;
public static final int NULL_11224 = 11224;
public static final int NULL_11246 = 11246;
public static final int NULL_11253 = 11253;
public static final int NULL_11256 = 11256;
public static final int NULL_11257 = 11257;
public static final int NULL_11258 = 11258;
public static final int NULL_11262 = 11262;
public static final int NULL_11263 = 11263;
public static final int NULL_11264 = 11264;
public static final int NULL_11265 = 11265;
public static final int NULL_11266 = 11266;
public static final int NULL_11267 = 11267;
public static final int NULL_11268 = 11268;
public static final int NULL_11269 = 11269;
public static final int NULL_11270 = 11270;
public static final int NULL_11271 = 11271;
public static final int NULL_11272 = 11272;
public static final int NULL_11273 = 11273;
public static final int NULL_11274 = 11274;
public static final int NULL_11275 = 11275;
public static final int NULL_11295 = 11295;
public static final int NULL_11296 = 11296;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+62
View File
@@ -21006,5 +21006,67 @@ public final class NullObjectID
public static final int NULL_42849 = 42849;
public static final int NULL_42850 = 42850;
public static final int NULL_42851 = 42851;
public static final int NULL_42873 = 42873;
public static final int NULL_42874 = 42874;
public static final int NULL_42875 = 42875;
public static final int NULL_42876 = 42876;
public static final int NULL_42877 = 42877;
public static final int NULL_42882 = 42882;
public static final int NULL_42883 = 42883;
public static final int NULL_42884 = 42884;
public static final int NULL_42893 = 42893;
public static final int NULL_42894 = 42894;
public static final int NULL_42896 = 42896;
public static final int NULL_42897 = 42897;
public static final int NULL_42898 = 42898;
public static final int NULL_42899 = 42899;
public static final int NULL_42900 = 42900;
public static final int NULL_42901 = 42901;
public static final int NULL_42902 = 42902;
public static final int NULL_42903 = 42903;
public static final int NULL_42904 = 42904;
public static final int NULL_42905 = 42905;
public static final int NULL_42906 = 42906;
public static final int NULL_42909 = 42909;
public static final int NULL_42910 = 42910;
public static final int NULL_42911 = 42911;
public static final int NULL_42912 = 42912;
public static final int NULL_42913 = 42913;
public static final int NULL_42914 = 42914;
public static final int NULL_42915 = 42915;
public static final int NULL_42916 = 42916;
public static final int NULL_42917 = 42917;
public static final int NULL_42918 = 42918;
public static final int NULL_42919 = 42919;
public static final int NULL_42920 = 42920;
public static final int NULL_42921 = 42921;
public static final int NULL_42922 = 42922;
public static final int NULL_42923 = 42923;
public static final int NULL_42924 = 42924;
public static final int NULL_42925 = 42925;
public static final int NULL_42926 = 42926;
public static final int NULL_42927 = 42927;
public static final int NULL_42945 = 42945;
public static final int NULL_42946 = 42946;
public static final int NULL_42947 = 42947;
public static final int NULL_42948 = 42948;
public static final int NULL_42949 = 42949;
public static final int NULL_42950 = 42950;
public static final int NULL_42951 = 42951;
public static final int NULL_42952 = 42952;
public static final int NULL_42953 = 42953;
public static final int NULL_42954 = 42954;
public static final int NULL_42955 = 42955;
public static final int NULL_42956 = 42956;
public static final int NULL_42957 = 42957;
public static final int NULL_42958 = 42958;
public static final int NULL_42959 = 42959;
public static final int NULL_42960 = 42960;
public static final int NULL_42961 = 42961;
public static final int NULL_42962 = 42962;
public static final int NULL_42963 = 42963;
public static final int NULL_42964 = 42964;
public static final int NULL_42967 = 42967;
public static final int NULL_42968 = 42968;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+55
View File
@@ -21832,5 +21832,60 @@ public final class ObjectID
public static final int FROZEN_DOOR = 42840;
public static final int FROZEN_DOOR_42841 = 42841;
public static final int GOLD_SINK_42852 = 42852;
public static final int SIGN_42853 = 42853;
public static final int SCUFFED_SNOW = 42854;
public static final int SNOWMAN = 42855;
public static final int SNOWMAN_42856 = 42856;
public static final int SNOWMAN_42857 = 42857;
public static final int SNOWMAN_42858 = 42858;
public static final int SNOWMAN_42859 = 42859;
public static final int SNOWMAN_42860 = 42860;
public static final int SNOWMAN_42861 = 42861;
public static final int SNOWMAN_42862 = 42862;
public static final int SNOWMAN_42863 = 42863;
public static final int SNOWMAN_42864 = 42864;
public static final int SPADE_42865 = 42865;
public static final int PILE_OF_SNOW = 42866;
public static final int BUSH_42867 = 42867;
public static final int PILE_OF_SNOW_42868 = 42868;
public static final int PILE_OF_SNOW_42869 = 42869;
public static final int CHRISTMAS_TREE = 42870;
public static final int CHRISTMAS_TREE_42871 = 42871;
public static final int CHRISTMAS_TREE_42872 = 42872;
public static final int PRESENTS = 42878;
public static final int PRESENTS_42879 = 42879;
public static final int PRESENTS_42880 = 42880;
public static final int PRESENTS_42881 = 42881;
public static final int POTTED_TREE = 42885;
public static final int POTTED_TREE_42886 = 42886;
public static final int MARKET_STALL_42887 = 42887;
public static final int MARKET_STALL_42888 = 42888;
public static final int MARKET_STALL_42889 = 42889;
public static final int MARKET_STALL_42890 = 42890;
public static final int MARKET_STALL_42891 = 42891;
public static final int MARKET_STALL_42892 = 42892;
public static final int ROBIN = 42895;
public static final int DEAD_TREE_42907 = 42907;
public static final int DEAD_OAK_42908 = 42908;
public static final int SANTAS_SLEIGH = 42928;
public static final int SANTAS_THRONE = 42929;
public static final int SANTAS_SACK = 42930;
public static final int FROZEN_DOOR_42931 = 42931;
public static final int FROZEN_DOOR_42932 = 42932;
public static final int DOOR_42933 = 42933;
public static final int DOOR_42934 = 42934;
public static final int ANCIENT_PLAQUE = 42935;
public static final int SCOREBOARD_42936 = 42936;
public static final int ANCIENT_BARRIER = 42937;
public static final int ANCIENT_BARRIER_42938 = 42938;
public static final int ANCIENT_BARRIER_42939 = 42939;
public static final int ANCIENT_BARRIER_42940 = 42940;
public static final int ANCIENT_BARRIER_42941 = 42941;
public static final int SHADOW = 42942;
public static final int STALAGMITE_42943 = 42943;
public static final int STALAGMITE_42944 = 42944;
public static final int ALTAR_42965 = 42965;
public static final int ANCIENT_FORGE = 42966;
public static final int BROKEN_CROSSBOW_42969 = 42969;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/Quest.java
+3 -1
View File
@@ -198,7 +198,9 @@ public enum Quest
FAMILY_PEST(329, "Family Pest"),
MAGE_ARENA_II(330, "Mage Arena II"),
IN_SEARCH_OF_KNOWLEDGE(3143, "In Search of Knowledge"),
DADDYS_HOME(1688, "Daddy's Home");
DADDYS_HOME(1688, "Daddy's Home"),
THE_FROZEN_DOOR(3768, "The Frozen Door"),
;
@Getter
private final int id;
runelite-client/src/main/resources/item_variations.json
+52 -1
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
]
}
runelite-client/src/main/scripts/ChatSend.hash
+1 -1
View File
@@ -1 +1 @@
77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0
95E7960E289ECA35DEADD35BC5A34AEBAA1C9F367AC42A71A5F3EFCCA0600D10
runelite-client/src/main/scripts/ChatSend.rs2asm
+75 -62
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
runelite-client/src/main/scripts/ChatTimestamp.hash
+1
View File
@@ -0,0 +1 @@
6943EE91A5B24C1E3C43274E34A6207A981EE9DDF1F8CBB2129666CF70DC955F
runelite-client/src/main/scripts/ChatTimestamp.rs2asm
+56
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
runelite-client/src/main/scripts/GeExamineInfoText.hash
+1 -1
View File
@@ -1 +1 @@
157D0FE4248A0C0CAC825733A8DE7B0FA5A93451A9FCE3A4B1D8BFD54038B970
703C181C0453F22483854DC20D14FCBDE79E9DEC0400F9DB5404A7E299AA5CD8
runelite-client/src/main/scripts/GeExamineInfoText.rs2asm
+24 -8
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