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 bf174b83aa..f08fdd4e70 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10484,5 +10484,19 @@ public final class ItemID public static final int MOUNTED_DIGSITE_PENDANT = 22709; public static final int CURATORS_MEDALLION = 22710; public static final int COLLECTION_LOG = 22711; + public static final int STARFACE = 22713; + public static final int TREE_TOP = 22715; + public static final int TREE_SKIRT = 22717; + public static final int CANDY_CANE = 22719; + public static final int LUMBRIDGE_TASK_LIST = 22721; + public static final int CHAIR = 22722; + public static final int FESTIVE_TREE_BRANCH = 22723; + public static final int WASTE_GEMS = 22724; + public static final int CHURCH_DECORATION = 22725; + public static final int PEAR_TREE_SAPLING = 22726; + public static final int AMULET_OF_DUPLICATION = 22727; + public static final int GOLDEN_RINGS = 22728; + public static final int KNIGHT_SUMMONER = 22729; + public static final int COW_TAIL = 22730; /* This file is automatically generated. Do not edit. */ } 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 5180c44e03..2409964f4c 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -2908,7 +2908,6 @@ 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 HANS = 3077; public static final int MAN_3078 = 3078; public static final int MAN_3079 = 3079; public static final int MAN_3080 = 3080; @@ -7703,6 +7702,22 @@ public final class NpcID public static final int EEK = 8485; public static final int MAKEOVER_MAGE_8487 = 8487; public static final int THE_COLLECTOR = 8491; + public static final int HANS = 8492; + public static final int FALADOR_KNIGHT = 8493; + public static final int HANS_8494 = 8494; + public static final int HANS_8495 = 8495; + public static final int GILLIE_GROATS_8496 = 8496; + public static final int COWBOY = 8497; + public static final int COW_8498 = 8498; + public static final int COW_8499 = 8499; + public static final int COW_8500 = 8500; + public static final int COW_8501 = 8501; + public static final int COW_8502 = 8502; public static final int SURVIVAL_EXPERT = 8503; + public static final int COW_8504 = 8504; + public static final int COW_8505 = 8505; + public static final int COW_8506 = 8506; + public static final int COW_8507 = 8507; + public static final int COW_8508 = 8508; /* This file is automatically generated. Do not edit. */ } 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 604ea42c48..9c43f9786f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15794,5 +15794,30 @@ public final class NullObjectID public static final int NULL_33474 = 33474; public static final int NULL_33475 = 33475; public static final int NULL_33476 = 33476; + public static final int NULL_33478 = 33478; + public static final int NULL_33479 = 33479; + public static final int NULL_33481 = 33481; + public static final int NULL_33482 = 33482; + public static final int NULL_33490 = 33490; + public static final int NULL_33495 = 33495; + public static final int NULL_33497 = 33497; + public static final int NULL_33498 = 33498; + public static final int NULL_33499 = 33499; + public static final int NULL_33500 = 33500; + public static final int NULL_33501 = 33501; + public static final int NULL_33502 = 33502; + public static final int NULL_33503 = 33503; + public static final int NULL_33504 = 33504; + public static final int NULL_33505 = 33505; + public static final int NULL_33506 = 33506; + public static final int NULL_33507 = 33507; + public static final int NULL_33508 = 33508; + public static final int NULL_33509 = 33509; + public static final int NULL_33511 = 33511; + public static final int NULL_33512 = 33512; + public static final int NULL_33513 = 33513; + public static final int NULL_33514 = 33514; + public static final int NULL_33515 = 33515; + public static final int NULL_33516 = 33516; /* 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 f8e9da095c..8764d38738 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -17672,5 +17672,19 @@ public final class ObjectID public static final int HEROIC_STATUE = 33455; public static final int CHALICE_33456 = 33456; public static final int ICE_THRONE_33477 = 33477; + public static final int CHRISTMAS_TREE = 33480; + public static final int TREE_33483 = 33483; + public static final int TREE_STUMP_33484 = 33484; + public static final int DEAD_FLOWER = 33485; + public static final int DEAD_FLOWER_33486 = 33486; + public static final int DEAD_FLOWER_33487 = 33487; + public static final int SNOWDROPS_33488 = 33488; + public static final int SNOWDROPS_33489 = 33489; + public static final int CHAIR_33491 = 33491; + public static final int CHAIR_33492 = 33492; + public static final int BARREL_OF_GEMS = 33493; + public static final int ALTAR_33494 = 33494; + public static final int PEAR_TREE = 33496; + public static final int SPADE_33510 = 33510; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index 480464567f..6a13a6985e 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -6BD184D96E4E955FC804AD54D0B015E7A060C5830B7B06EC1AF9C8A8F0775CAC \ No newline at end of file +C42CD26AA6484029ACED50325EF8157741A9641BA28218315551B3762CE903A6 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 58d6f75094..df1e10e0d4 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -107,22 +107,21 @@ LABEL84: iload 2 load_int 1 if_icmple LABEL88 - jump LABEL89 + jump LABEL93 LABEL88: + iload 4 + load_int 0 + if_icmpeq LABEL92 + jump LABEL93 +LABEL92: return -LABEL89: +LABEL93: get_varbit 4394 load_int 1 - if_icmpeq LABEL93 + if_icmpeq LABEL97 jump LABEL99 -LABEL93: - get_clanchatcount - load_int 0 - if_icmpgt LABEL97 - jump LABEL98 LABEL97: part_clanchat -LABEL98: jump LABEL110 LABEL99: iload 4