diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 7b852a28d0..c8d7b375c6 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ const val kotlinVersion = "1.3.50" object ProjectVersions { const val launcherVersion = "2.0.3" - const val rlVersion = "1.5.38-SNAPSHOT" + const val rlVersion = "1.5.39-SNAPSHOT" const val openosrsVersion = "2.1.9.0" 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 a66452fcb2..8e1ed344c9 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -9155,7 +9155,7 @@ public final class ItemID public static final int ANKOU_MASK = 20095; public static final int ANKOU_TOP = 20098; public static final int ANKOU_GLOVES = 20101; - public static final int ANKOUS_LEGGINGS = 20104; + public static final int ANKOU_LEGGINGS = 20104; public static final int ANKOU_SOCKS = 20107; public static final int BOWL_WIG = 20110; public static final int ARCEUUS_HOOD = 20113; @@ -11293,5 +11293,30 @@ public final class ItemID public static final int MYSTERIOUS_EMBLEM_TIER_4 = 24283; public static final int MYSTERIOUS_EMBLEM_TIER_5 = 24285; public static final int DECORATIVE_EMBLEM = 24287; + public static final int DAGONHAI_HAT = 24288; + public static final int DAGONHAI_ROBE_TOP = 24291; + public static final int DAGONHAI_ROBE_BOTTOM = 24294; + public static final int WHITE_BED_SHEETS = 24297; + public static final int SMOKE_POWDER = 24298; + public static final int SHINY_GLASS = 24299; + public static final int SPOOKY_HOOD = 24300; + public static final int SPOOKY_ROBE = 24301; + public static final int SPOOKY_SKIRT = 24302; + public static final int SPOOKY_GLOVES = 24303; + public static final int SPOOKY_BOOTS = 24304; + public static final int SPOOKY_HOOD_24305 = 24305; + public static final int SPOOKY_ROBE_24307 = 24307; + public static final int SPOOKY_SKIRT_24309 = 24309; + public static final int SPOOKY_GLOVES_24311 = 24311; + public static final int SPOOKY_BOOTS_24313 = 24313; + public static final int SPOOKIER_HOOD = 24315; + public static final int SPOOKIER_ROBE = 24317; + public static final int SPOOKIER_SKIRT = 24319; + public static final int SPOOKIER_GLOVES = 24321; + public static final int SPOOKIER_BOOTS = 24323; + public static final int PUMPKIN_LANTERN = 24325; + public static final int SKELETON_LANTERN = 24327; + public static final int BOUNTY_CRATE = 24329; + public static final int BIRTHDAY_CAKE_24331 = 24331; /* 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 66e02eea3a..57dbfb59f2 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -286,6 +286,7 @@ public final class NpcID public static final int DWARF = 290; public static final int CHAOS_DWARF = 291; public static final int DWARF_292 = 292; + public static final int SNAILNECK = 293; public static final int DWARF_294 = 294; public static final int DWARF_295 = 295; public static final int DWARF_296 = 296; @@ -307,6 +308,7 @@ public final class NpcID public static final int FROG = 312; public static final int REACHER_313 = 313; public static final int DR_JEKYLL_314 = 314; + public static final int GRASSLEGS = 315; public static final int PAUL = 317; public static final int DARK_CORE = 318; public static final int CORPOREAL_BEAST = 319; @@ -7159,6 +7161,8 @@ public final class NpcID public static final int REVENANT_DARK_BEAST = 7938; public static final int REVENANT_KNIGHT = 7939; public static final int REVENANT_DRAGON = 7940; + public static final int EPIC_MAGER34 = 7941; + public static final int EPIC_MAGER34_7942 = 7942; public static final int EMBLEM_TRADER_7943 = 7943; public static final int FISHING_SPOT_7946 = 7946; public static final int FISHING_SPOT_7947 = 7947; @@ -8315,5 +8319,8 @@ public final class NpcID public static final int TYPHOR_9296 = 9296; public static final int VRITRA = 9297; public static final int MAZ = 9298; + public static final int MAD_MELVIN96 = 9299; + public static final int GOBLIN_9300 = 9300; + public static final int BUTTERFLY_9301 = 9301; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 28ddf86d69..84d3c356a0 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12786,5 +12786,25 @@ public final class NullItemID public static final int NULL_24282 = 24282; public static final int NULL_24284 = 24284; public static final int NULL_24286 = 24286; + public static final int NULL_24289 = 24289; + public static final int NULL_24290 = 24290; + public static final int NULL_24292 = 24292; + public static final int NULL_24293 = 24293; + public static final int NULL_24295 = 24295; + public static final int NULL_24296 = 24296; + public static final int NULL_24306 = 24306; + public static final int NULL_24308 = 24308; + public static final int NULL_24310 = 24310; + public static final int NULL_24312 = 24312; + public static final int NULL_24314 = 24314; + public static final int NULL_24316 = 24316; + public static final int NULL_24318 = 24318; + public static final int NULL_24320 = 24320; + public static final int NULL_24322 = 24322; + public static final int NULL_24324 = 24324; + public static final int NULL_24326 = 24326; + public static final int NULL_24328 = 24328; + public static final int NULL_24330 = 24330; + public static final int NULL_24332 = 24332; /* 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 8d06a4ab7f..71a515302f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -18038,5 +18038,23 @@ public final class NullObjectID public static final int NULL_37430 = 37430; public static final int NULL_37432 = 37432; public static final int NULL_37433 = 37433; + public static final int NULL_37439 = 37439; + public static final int NULL_37441 = 37441; + public static final int NULL_37442 = 37442; + public static final int NULL_37443 = 37443; + public static final int NULL_37446 = 37446; + public static final int NULL_37447 = 37447; + public static final int NULL_37448 = 37448; + public static final int NULL_37449 = 37449; + public static final int NULL_37450 = 37450; + public static final int NULL_37451 = 37451; + public static final int NULL_37452 = 37452; + public static final int NULL_37453 = 37453; + public static final int NULL_37454 = 37454; + public static final int NULL_37455 = 37455; + public static final int NULL_37456 = 37456; + public static final int NULL_37457 = 37457; + public static final int NULL_37458 = 37458; + public static final int NULL_37460 = 37460; /* 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 33a53e5f75..34a477f996 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -19384,5 +19384,13 @@ public final class ObjectID public static final int THE_JORMUNGAND = 37424; public static final int ROUGH_WALL_37431 = 37431; public static final int STREAK_INFO = 37434; + public static final int SWAMPY_SINK = 37435; + public static final int BED_37436 = 37436; + public static final int BED_37437 = 37437; + public static final int BLACK_POWDER = 37438; + public static final int SMOKE_BOMB = 37440; + public static final int LOG_PILE_37444 = 37444; + public static final int HOTSPOT_MARKER = 37445; + public static final int FOUNTAIN_37459 = 37459; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index bd0d51ac85..35ae920bba 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -991,10 +991,10 @@ public class WidgetID static final int SKULL = 56; // OUTDATED? static final int ATTACK_RANGE = 59; // OUTDATED? static final int BOUNTY_HUNTER_INFO = 6; - static final int KILLDEATH_RATIO = 33; - static final int SKULL_CONTAINER = 53; - static final int SAFE_ZONE = 55; - static final int WILDERNESS_LEVEL = 58; // this can also be the Deadman Mode "Protection" text + static final int KILLDEATH_RATIO = 34; + static final int SKULL_CONTAINER = 54; + static final int SAFE_ZONE = 56; + static final int WILDERNESS_LEVEL = 59; // this can also be the Deadman Mode "Protection" text } static class KourendFavour diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index 24aaf2a66f..c03e5e471e 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -85,6 +85,16 @@ public enum ItemMapping ITEM_DRAGON_BOOTS(DRAGON_BOOTS, DRAGON_BOOTS_G), ITEM_DRAGON_BOOTS_ORNAMENT_KIT(DRAGON_BOOTS_ORNAMENT_KIT, DRAGON_BOOTS_G), + // Rune ornament kits + ITEM_RUNE_SCIMITAR_GUTHIX(RUNE_SCIMITAR, RUNE_SCIMITAR_23330), + ITEM_RUNE_SCIMITAR_ORNAMENT_KIT_GUTHIX(RUNE_SCIMITAR_ORNAMENT_KIT_GUTHIX, RUNE_SCIMITAR_23330), + ITEM_RUNE_SCIMITAR_SARADOMIN(RUNE_SCIMITAR, RUNE_SCIMITAR_23332), + ITEM_RUNE_SCIMITAR_ORNAMENT_KIT_SARADOMIN(RUNE_SCIMITAR_ORNAMENT_KIT_SARADOMIN, RUNE_SCIMITAR_23332), + ITEM_RUNE_SCIMITAR_ZAMORAK(RUNE_SCIMITAR, RUNE_SCIMITAR_23334), + ITEM_RUNE_SCIMITAR_ORNAMENT_KIT_ZAMORAK(RUNE_SCIMITAR_ORNAMENT_KIT_ZAMORAK, RUNE_SCIMITAR_23334), + ITEM_RUNE_DEFENDER(RUNE_DEFENDER, RUNE_DEFENDER_T), + ITEM_RUNE_DEFENDER_ORNAMENT_KIT(RUNE_DEFENDER_ORNAMENT_KIT, RUNE_DEFENDER_T), + // Godsword ornament kits ITEM_ARMADYL_GODSWORD(ARMADYL_GODSWORD, ARMADYL_GODSWORD_OR), ITEM_ARMADYL_GODSWORD_ORNAMENT_KIT(ARMADYL_GODSWORD_ORNAMENT_KIT, ARMADYL_GODSWORD_OR), @@ -196,6 +206,8 @@ public enum ItemMapping ITEM_MALEDICTION_WARD(MALEDICTION_WARD, MALEDICTION_WARD_12806), ITEM_STEAM_BATTLESTAFF(STEAM_BATTLESTAFF, STEAM_BATTLESTAFF_12795), ITEM_LAVA_BATTLESTAFF(LAVA_BATTLESTAFF, LAVA_BATTLESTAFF_21198), + ITEM_TZHAARKETOM(TZHAARKETOM, TZHAARKETOM_T), + ITEM_TZHAARKETOM_ORNAMENT_KIT(TZHAARKETOM_ORNAMENT_KIT, TZHAARKETOM_T), // Slayer helm/black mask ITEM_BLACK_MASK( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java index 6f27f9f5b1..133ef6903a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java @@ -78,7 +78,7 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement add("Make a Chocolate Bomb at the Grand Tree.", new SkillRequirement(Skill.COOKING, 42)); add("Complete a delivery for the Gnome Restaurant.", - new SkillRequirement(Skill.COOKING, 42)); + new SkillRequirement(Skill.COOKING, 29)); add("Turn your small crystal seed into a Crystal saw.", new QuestRequirement(Quest.THE_EYES_OF_GLOUPHRIE)); add("Mine some Gold ore underneath the Grand Tree.", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java index 5f38bc1d06..7ed22015d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/data/UniqueItem.java @@ -824,7 +824,7 @@ public enum UniqueItem MUMMYS_FEET(ItemID.MUMMYS_FEET, BossTab.CLUE_SCROLL_MASTER, 5), ANKOU_MASK(ItemID.ANKOU_MASK, BossTab.CLUE_SCROLL_MASTER, 6), ANKOU_TOP(ItemID.ANKOU_TOP, BossTab.CLUE_SCROLL_MASTER, 6), - ANKOUS_LEGGINGS(ItemID.ANKOUS_LEGGINGS, BossTab.CLUE_SCROLL_MASTER, 6), + ANKOUS_LEGGINGS(ItemID.ANKOU_LEGGINGS, BossTab.CLUE_SCROLL_MASTER, 6), ANKOU_GLOVES(ItemID.ANKOU_GLOVES, BossTab.CLUE_SCROLL_MASTER, 6), ANKOU_SOCKS(ItemID.ANKOU_SOCKS, BossTab.CLUE_SCROLL_MASTER, 6), HOOD_OF_DARKNESS(ItemID.HOOD_OF_DARKNESS, BossTab.CLUE_SCROLL_MASTER, 7), diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 91cd7e19aa..6517488888 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -9373,6 +9373,10 @@ 23068, 23070 ], + "birthday cake": [ + 23108, + 24331 + ], "mystic set": [ 23110, 23113, @@ -9605,5 +9609,25 @@ 24281, 24283, 24285 + ], + "spooky hood": [ + 24300, + 24305 + ], + "spooky robe": [ + 24301, + 24307 + ], + "spooky skirt": [ + 24302, + 24309 + ], + "spooky gloves": [ + 24303, + 24311 + ], + "spooky boots": [ + 24304, + 24313 ] }