From 1d6bef33c07ff46ade25d6d7ae626b7e8dbe06d5 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 6 Sep 2018 04:52:07 -0600 Subject: [PATCH 1/4] Update Item IDs to 2018-09-06-rev174 --- .../main/java/net/runelite/api/ItemID.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index c3cb733709..94d680d8d3 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -6564,7 +6564,6 @@ public final class ItemID public static final int REINDEER_HAT = 10507; public static final int WINTUMBER_TREE = 10508; public static final int FREMENNIK_SEA_BOOTS = 10510; - public static final int ZANARIS_CHOIR = 10511; public static final int SCROLL_10512 = 10512; public static final int CRACKERS = 10513; public static final int TOFU = 10514; @@ -10434,5 +10433,36 @@ public final class ItemID public static final int THAMMARONS_SCEPTRE = 22555; public static final int AMULET_OF_AVARICE = 22557; public static final int LOOTING_BAG_22586 = 22586; + public static final int OLD_MANS_COFFIN = 22588; + public static final int REDUCED_CADAVA_POTION = 22589; + public static final int GOAT_DUNG = 22590; + public static final int WEISS_FIRE_NOTES = 22591; + public static final int TE_SALT = 22593; + public static final int EFH_SALT = 22595; + public static final int URT_SALT = 22597; + public static final int ICY_BASALT = 22599; + public static final int STONY_BASALT = 22601; + public static final int BASALT = 22603; + public static final int FIRE_OF_ETERNAL_LIGHT = 22606; + public static final int FIRE_OF_DEHUMIDIFICATION = 22607; + public static final int FIRE_OF_NOURISHMENT = 22608; + public static final int FIRE_OF_UNSEASONAL_WARMTH = 22609; + public static final int VESTAS_SPEAR = 22610; + public static final int VESTAS_LONGSWORD = 22613; + public static final int VESTAS_CHAINBODY = 22616; + public static final int VESTAS_PLATESKIRT = 22619; + public static final int STATIUSS_WARHAMMER = 22622; + public static final int STATIUSS_FULL_HELM = 22625; + public static final int STATIUSS_PLATEBODY = 22628; + public static final int STATIUSS_PLATELEGS = 22631; + public static final int MORRIGANS_THROWING_AXE = 22634; + public static final int MORRIGANS_JAVELIN = 22636; + public static final int MORRIGANS_COIF = 22638; + public static final int MORRIGANS_LEATHER_BODY = 22641; + public static final int MORRIGANS_LEATHER_CHAPS = 22644; + public static final int ZURIELS_STAFF = 22647; + public static final int ZURIELS_HOOD = 22650; + public static final int ZURIELS_ROBE_TOP = 22653; + public static final int ZURIELS_ROBE_BOTTOM = 22656; /* This file is automatically generated. Do not edit. */ } From 78cf55757cfea4a0ed20bfca47af825aa1013d37 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 6 Sep 2018 04:52:08 -0600 Subject: [PATCH 2/4] Update Object IDs to 2018-09-06-rev174 --- .../java/net/runelite/api/NullObjectID.java | 80 +++++++++++++++++ .../main/java/net/runelite/api/ObjectID.java | 86 ++++++++++++++++++- 2 files changed, 165 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 25cd56be91..06ad3482b5 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -9476,6 +9476,7 @@ public final class NullObjectID public static final int NULL_21168 = 21168; public static final int NULL_21173 = 21173; public static final int NULL_21174 = 21174; + public static final int NULL_21176 = 21176; public static final int NULL_21178 = 21178; public static final int NULL_21186 = 21186; public static final int NULL_21188 = 21188; @@ -15680,5 +15681,84 @@ public final class NullObjectID public static final int NULL_33173 = 33173; public static final int NULL_33174 = 33174; public static final int NULL_33175 = 33175; + public static final int NULL_33176 = 33176; + public static final int NULL_33178 = 33178; + public static final int NULL_33183 = 33183; + public static final int NULL_33197 = 33197; + public static final int NULL_33215 = 33215; + public static final int NULL_33216 = 33216; + public static final int NULL_33217 = 33217; + public static final int NULL_33218 = 33218; + public static final int NULL_33220 = 33220; + public static final int NULL_33221 = 33221; + public static final int NULL_33225 = 33225; + public static final int NULL_33226 = 33226; + public static final int NULL_33228 = 33228; + public static final int NULL_33229 = 33229; + public static final int NULL_33230 = 33230; + public static final int NULL_33231 = 33231; + public static final int NULL_33248 = 33248; + public static final int NULL_33249 = 33249; + public static final int NULL_33250 = 33250; + public static final int NULL_33251 = 33251; + public static final int NULL_33266 = 33266; + public static final int NULL_33267 = 33267; + public static final int NULL_33268 = 33268; + public static final int NULL_33269 = 33269; + public static final int NULL_33270 = 33270; + public static final int NULL_33271 = 33271; + public static final int NULL_33272 = 33272; + public static final int NULL_33273 = 33273; + public static final int NULL_33274 = 33274; + public static final int NULL_33275 = 33275; + public static final int NULL_33276 = 33276; + public static final int NULL_33277 = 33277; + public static final int NULL_33278 = 33278; + public static final int NULL_33279 = 33279; + public static final int NULL_33280 = 33280; + public static final int NULL_33281 = 33281; + public static final int NULL_33282 = 33282; + public static final int NULL_33283 = 33283; + public static final int NULL_33284 = 33284; + public static final int NULL_33285 = 33285; + public static final int NULL_33286 = 33286; + public static final int NULL_33287 = 33287; + public static final int NULL_33288 = 33288; + public static final int NULL_33289 = 33289; + public static final int NULL_33290 = 33290; + public static final int NULL_33291 = 33291; + public static final int NULL_33292 = 33292; + public static final int NULL_33293 = 33293; + public static final int NULL_33294 = 33294; + public static final int NULL_33295 = 33295; + public static final int NULL_33296 = 33296; + public static final int NULL_33297 = 33297; + public static final int NULL_33298 = 33298; + public static final int NULL_33299 = 33299; + public static final int NULL_33300 = 33300; + public static final int NULL_33301 = 33301; + public static final int NULL_33302 = 33302; + public static final int NULL_33303 = 33303; + public static final int NULL_33304 = 33304; + public static final int NULL_33305 = 33305; + public static final int NULL_33306 = 33306; + public static final int NULL_33313 = 33313; + public static final int NULL_33323 = 33323; + public static final int NULL_33324 = 33324; + public static final int NULL_33325 = 33325; + public static final int NULL_33326 = 33326; + public static final int NULL_33327 = 33327; + public static final int NULL_33328 = 33328; + public static final int NULL_33329 = 33329; + public static final int NULL_33330 = 33330; + public static final int NULL_33331 = 33331; + public static final int NULL_33332 = 33332; + public static final int NULL_33333 = 33333; + public static final int NULL_33334 = 33334; + public static final int NULL_33335 = 33335; + public static final int NULL_33336 = 33336; + public static final int NULL_33337 = 33337; + public static final int NULL_33338 = 33338; + public static final int NULL_33339 = 33339; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index e2a206b051..f0282c0801 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -11703,7 +11703,6 @@ public final class ObjectID public static final int DOOR_21171 = 21171; public static final int GATE_21172 = 21172; public static final int BOAT_21175 = 21175; - public static final int BOAT_21176 = 21176; public static final int BOAT_21177 = 21177; public static final int FIRM_SNOW_PATCH = 21179; public static final int BIRD_HIDE_STRUCTURE = 21180; @@ -17484,5 +17483,90 @@ public final class ObjectID public static final int BLOOD_CRYSTAL_33147 = 33147; public static final int SHADOW_CRYSTAL = 33148; public static final int SMOKE_CRYSTAL = 33149; + public static final int ICY_ROCKS = 33177; + public static final int TROLL_STRONGHOLD_PORTAL = 33179; + public static final int TROLL_STRONGHOLD_PORTAL_33180 = 33180; + public static final int TROLL_STRONGHOLD_PORTAL_33181 = 33181; + public static final int BOAT_33182 = 33182; + public static final int ROCKSLIDE_33184 = 33184; + public static final int ROCKSLIDE_33185 = 33185; + public static final int TREE_33186 = 33186; + public static final int ROPED_TREE = 33187; + public static final int ROPE_33188 = 33188; + public static final int CLIFF_33189 = 33189; + public static final int LEDGE_33190 = 33190; + public static final int ROCKSLIDE_33191 = 33191; + public static final int FALLEN_TREE_33192 = 33192; + public static final int CAVE_ENTRANCE_33193 = 33193; + public static final int CAVE_ENTRANCE_33194 = 33194; + public static final int WRECKED_BOAT = 33195; + public static final int SKELETON_33196 = 33196; + public static final int FLOWER_33198 = 33198; + public static final int MOTHER = 33199; + public static final int DONT_KNOW_WHAT = 33200; + public static final int BOULDER_33201 = 33201; + public static final int ROOT_33202 = 33202; + public static final int ICICLE_33203 = 33203; + public static final int DRIFTWOOD_33204 = 33204; + public static final int PEBBLE = 33205; + public static final int GOAT_POO = 33206; + public static final int YELLOW_SNOW = 33207; + public static final int BUTTERFLY = 33208; + public static final int ODD_STONE = 33209; + public static final int SQUIRREL = 33210; + public static final int MOUNTAIN_GOAT = 33211; + public static final int ICE_WOLF = 33212; + public static final int SQUIRREL_33213 = 33213; + public static final int GOAT_POO_33214 = 33214; + public static final int FENCE_33219 = 33219; + public static final int TE_SALT = 33222; + public static final int URT_SALT = 33223; + public static final int EFH_SALT = 33224; + public static final int HOLE_33227 = 33227; + public static final int THRONE_OF_WEISS = 33232; + public static final int WEISS_BANNER = 33233; + public static final int STAIRS_33234 = 33234; + public static final int STONE_LADDER_33235 = 33235; + public static final int RAMP = 33236; + public static final int NARROW_GAP = 33237; + public static final int WATERS_EDGE = 33238; + public static final int WATERS_EDGE_33239 = 33239; + public static final int STEPPING_STONE_33240 = 33240; + public static final int STEPPING_STONE_33241 = 33241; + public static final int STEPPING_STONE_33242 = 33242; + public static final int STEPPING_STONE_33243 = 33243; + public static final int STEPPING_STONE_33244 = 33244; + public static final int STEPPING_STONE_33245 = 33245; + public static final int CAVE_EXIT_33246 = 33246; + public static final int CAVE_EXIT_33247 = 33247; + public static final int DANGER_SIGN_33252 = 33252; + public static final int ROCKS_33253 = 33253; + public static final int ROCKS_33254 = 33254; + public static final int ROCKS_33255 = 33255; + public static final int ROCKS_33256 = 33256; + public static final int ROCKS_33257 = 33257; + public static final int CELL_DOOR_33258 = 33258; + public static final int MINE_DOOR = 33259; + public static final int MINE_DOOR_33260 = 33260; + public static final int STEPS_33261 = 33261; + public static final int SMELLY_HOLE = 33262; + public static final int COFFIN_HOTSPOT = 33263; + public static final int COFFIN_33264 = 33264; + public static final int OLD_MANS_COFFIN = 33265; + public static final int OLD_SHRINE = 33307; + public static final int BARREL_OF_WATER = 33308; + public static final int BUCKETS = 33309; + public static final int FIRE_PIT_33310 = 33310; + public static final int FIRE_33311 = 33311; + public static final int LITTLE_BOULDER = 33312; + public static final int NEW_FARMING_PATCH_33314 = 33314; + public static final int HARDY_GOUTWEED_33315 = 33315; + public static final int HARDY_GOUTWEED_33316 = 33316; + public static final int OLD_FIRE_PIT = 33317; + public static final int FIRE_OF_DOMINATION = 33318; + public static final int FIRE_OF_NOURISHMENT = 33319; + public static final int FIRE_OF_ETERNAL_LIGHT = 33320; + public static final int FIRE_OF_UNSEASONAL_WARMTH = 33321; + public static final int FIRE_OF_DEHUMIDIFICATION = 33322; /* This file is automatically generated. Do not edit. */ } From 2061773ef623adef3851f0e056912612df3a1355 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 6 Sep 2018 04:52:09 -0600 Subject: [PATCH 3/4] Update NPC IDs to 2018-09-06-rev174 --- .../src/main/java/net/runelite/api/NpcID.java | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 496d1cda8e..68894577ed 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -727,8 +727,7 @@ public final class NpcID public static final int BANDIT_737 = 737; public static final int BANDIT_CHAMPION = 738; public static final int COWARDLY_BANDIT = 739; - public static final int MY_ARM = 740; - public static final int MY_ARM_741 = 741; + public static final int MY_ARM = 741; public static final int MY_ARM_742 = 742; public static final int MY_ARM_750 = 750; public static final int MY_ARM_751 = 751; @@ -7653,5 +7652,50 @@ public final class NpcID public static final int ASKELADDEN_8403 = 8403; public static final int ASKELADDEN_8404 = 8404; public static final int ASKELADDEN_8405 = 8405; + public static final int WISE_OLD_MAN_8407 = 8407; + public static final int WISE_OLD_MAN_8409 = 8409; + public static final int WISE_YOUNG_MAN = 8410; + public static final int MY_ARM_8411 = 8411; + public static final int DRUNKEN_DWARFS_LEG_8419 = 8419; + public static final int SQUIRREL_8422 = 8422; + public static final int WOLFBONE = 8424; + public static final int MOTHER = 8425; + public static final int MOTHER_8426 = 8426; + public static final int MOTHER_8428 = 8428; + public static final int MOTHER_8429 = 8429; + public static final int MOTHER_8430 = 8430; + public static final int SNOWFLAKE = 8431; + public static final int ODD_MUSHROOM = 8434; + public static final int ODD_MUSHROOM_8435 = 8435; + public static final int DONT_KNOW_WHAT = 8438; + public static final int DONT_KNOW_WHAT_8439 = 8439; + public static final int DONT_KNOW_WHAT_8440 = 8440; + public static final int BOULDER_8442 = 8442; + public static final int ROOT = 8444; + public static final int ROOT_8445 = 8445; + public static final int ICICLE = 8446; + public static final int ICICLE_8447 = 8447; + public static final int DRIFTWOOD = 8448; + public static final int DRIFTWOOD_8449 = 8449; + public static final int PEBBLE = 8450; + public static final int PEBBLE_8451 = 8451; + public static final int GOAT_POO = 8452; + public static final int GOAT_POO_8453 = 8453; + public static final int YELLOW_SNOW = 8454; + public static final int YELLOW_SNOW_8455 = 8455; + public static final int BUTTERFLY_8456 = 8456; + public static final int BUTTERFLY_8459 = 8459; + public static final int ODD_STONE = 8460; + public static final int ODD_STONE_8463 = 8463; + public static final int SQUIRREL_8464 = 8464; + public static final int SQUIRREL_8467 = 8467; + public static final int TROLL_8470 = 8470; + public static final int TROLL_8471 = 8471; + public static final int TROLL_8472 = 8472; + public static final int TROLL_8473 = 8473; + public static final int BLACK_GUARD_8474 = 8474; + public static final int BLACK_GUARD_8475 = 8475; + public static final int BLACK_GUARD_8476 = 8476; + public static final int COMBAT_TEST_MAXHIT = 8479; /* This file is automatically generated. Do not edit. */ } From 0d516b8f5af42e19f75567cfba06e5087c5ff0ea Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 6 Sep 2018 04:52:20 -0600 Subject: [PATCH 4/4] Update Scripts to 2018-09-06-rev174 --- .../src/main/scripts/OptionsPanelRebuilder.hash | 2 +- .../src/main/scripts/OptionsPanelRebuilder.rs2asm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash index 653d6d2fef..7d3af70d52 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash @@ -1 +1 @@ -4340BAFCF4EA1926DB0148E0673169B4224EA4D83CAEFF8E6146799E4D6770D7 \ No newline at end of file +8A14A290729CC72A0683A7370439A9679F3F29F5E1B4DEADB51F8C0A274EE62A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index 268cfcf19a..347a0410a7 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -291,28 +291,28 @@ LABEL264: get_varc 73 load_int 195 load_string "fixedOuterZoomLimit" - runelite_callback + runelite_callback if_icmpge LABEL276 jump LABEL292 LABEL276: get_varc 73 load_int 700 load_string "fixedInnerZoomLimit" - runelite_callback + runelite_callback if_icmple LABEL280 jump LABEL292 LABEL280: get_varc 74 load_int 175 load_string "resizableOuterZoomLimit" - runelite_callback + runelite_callback if_icmpge LABEL284 jump LABEL292 LABEL284: get_varc 74 load_int 715 load_string "resizableInnerZoomLimit" - runelite_callback + runelite_callback if_icmple LABEL288 jump LABEL292 LABEL288: @@ -517,7 +517,7 @@ LABEL464: istore 20 jump LABEL469 LABEL467: - load_int 36 + load_int 38 istore 20 LABEL469: invoke 1972 @@ -530,7 +530,7 @@ LABEL473: if_icmpeq LABEL477 jump LABEL482 LABEL477: - load_int 176 + load_int 182 load_int 4 iadd istore 19 @@ -576,7 +576,7 @@ LABEL511: if_icmpeq LABEL515 jump LABEL518 LABEL515: - load_int 176 + load_int 182 istore 19 jump LABEL520 LABEL518: