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 813c354a01..517d093058 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -6618,6 +6618,7 @@ public final class ItemID public static final int NO_EGGS = 10563; public static final int GRANITE_BODY = 10564; public static final int FIRE_CAPE_10566 = 10566; + public static final int HEALER_ICON_10567 = 10567; public static final int KERIS = 10581; public static final int KERISP = 10582; public static final int KERISP_10583 = 10583; @@ -9483,6 +9484,7 @@ public final class ItemID public static final int KINDLING_20799 = 20799; public static final int EMPTY_GOURD_VIAL = 20800; public static final int WATERFILLED_GOURD_VIAL = 20801; + public static final int HEALER_ICON_20802 = 20802; public static final int SNOW_GLOBE = 20832; public static final int SACK_OF_PRESENTS = 20834; public static final int GIANT_PRESENT = 20836; @@ -10305,6 +10307,14 @@ public final class ItemID public static final int ANCIENT_MEDALLION = 22299; public static final int ANCIENT_EFFIGY = 22302; public static final int ANCIENT_RELIC = 22305; + public static final int HEALER_ICON_22308 = 22308; + public static final int HEALER_ICON_22309 = 22309; + public static final int HEALER_ICON_22310 = 22310; + public static final int HEALER_ICON_22311 = 22311; + public static final int COLLECTOR_ICON_22312 = 22312; + public static final int COLLECTOR_ICON_22313 = 22313; + public static final int COLLECTOR_ICON_22314 = 22314; + public static final int COLLECTOR_ICON_22315 = 22315; public static final int PROP_SWORD = 22316; public static final int PET_CORPOREAL_CRITTER = 22318; public static final int TZREKZUK = 22319; @@ -10321,6 +10331,19 @@ public final class ItemID public static final int STARTER_SWORD = 22331; public static final int STARTER_BOW = 22333; public static final int STARTER_STAFF = 22335; + public static final int COLLECTOR_ICON_22337 = 22337; + public static final int COLLECTOR_ICON_22338 = 22338; + public static final int COLLECTOR_ICON_22339 = 22339; + public static final int DEFENDER_ICON_22340 = 22340; + public static final int DEFENDER_ICON_22341 = 22341; + public static final int DEFENDER_ICON_22342 = 22342; + public static final int DEFENDER_ICON_22343 = 22343; + public static final int DEFENDER_ICON_22344 = 22344; + public static final int DEFENDER_ICON_22345 = 22345; + public static final int ATTACKER_ICON_22346 = 22346; + public static final int ATTACKER_ICON_22347 = 22347; + public static final int ATTACKER_ICON_22348 = 22348; + public static final int ATTACKER_ICON_22349 = 22349; public static final int EGGSHELL_PLATEBODY = 22351; public static final int EGGSHELL_PLATELEGS = 22353; public static final int HOLY_HANDEGG = 22355; @@ -10487,6 +10510,16 @@ public final class ItemID 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 ATTACKER_ICON_22721 = 22721; + public static final int ATTACKER_ICON_22722 = 22722; + public static final int ATTACKER_ICON_22723 = 22723; + public static final int COLLECTOR_ICON_22724 = 22724; + public static final int DEFENDER_ICON_22725 = 22725; + public static final int DEFENDER_ICON_22726 = 22726; + public static final int DEFENDER_ICON_22727 = 22727; + public static final int DEFENDER_ICON_22728 = 22728; + public static final int ATTACKER_ICON_22729 = 22729; + public static final int ATTACKER_ICON_22730 = 22730; public static final int DRAGON_HASTA = 22731; public static final int DRAGON_HASTAP = 22734; public static final int DRAGON_HASTAP_22737 = 22737; @@ -10791,5 +10824,33 @@ public final class ItemID public static final int TORMENTED_BRACELET_OR = 23444; public static final int GIANT_EASTER_EGG = 23446; public static final int BUNNYMAN_MASK = 23448; + public static final int ENCHANTED_LYREI = 23458; + public static final int ATTACKER_ICON_23460 = 23460; + public static final int ATTACKER_ICON_23461 = 23461; + public static final int ATTACKER_ICON_23462 = 23462; + public static final int ATTACKER_ICON_23463 = 23463; + public static final int ATTACKER_ICON_23464 = 23464; + public static final int ATTACKER_ICON_23465 = 23465; + public static final int DEFENDER_ICON_23466 = 23466; + public static final int DEFENDER_ICON_23467 = 23467; + public static final int DEFENDER_ICON_23468 = 23468; + public static final int DEFENDER_ICON_23469 = 23469; + public static final int DEFENDER_ICON_23470 = 23470; + public static final int COLLECTOR_ICON_23471 = 23471; + public static final int COLLECTOR_ICON_23472 = 23472; + public static final int COLLECTOR_ICON_23473 = 23473; + public static final int COLLECTOR_ICON_23474 = 23474; + public static final int COLLECTOR_ICON_23475 = 23475; + public static final int COLLECTOR_ICON_23476 = 23476; + public static final int COLLECTOR_ICON_23477 = 23477; + public static final int HEALER_ICON_23478 = 23478; + public static final int HEALER_ICON_23479 = 23479; + public static final int HEALER_ICON_23480 = 23480; + public static final int HEALER_ICON_23481 = 23481; + public static final int HEALER_ICON_23482 = 23482; + public static final int HEALER_ICON_23483 = 23483; + public static final int HEALER_ICON_23484 = 23484; + public static final int HEALER_ICON_23485 = 23485; + public static final int HEALER_ICON_23486 = 23486; /* 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 1bc9028389..9007300837 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -3834,7 +3834,6 @@ public final class NullItemID public static final int NULL_10509 = 10509; public static final int NULL_10511 = 10511; public static final int NULL_10565 = 10565; - public static final int NULL_10567 = 10567; public static final int NULL_10568 = 10568; public static final int NULL_10569 = 10569; public static final int NULL_10570 = 10570; @@ -11132,7 +11131,6 @@ public final class NullItemID public static final int NULL_20793 = 20793; public static final int NULL_20795 = 20795; public static final int NULL_20797 = 20797; - public static final int NULL_20802 = 20802; public static final int NULL_20803 = 20803; public static final int NULL_20804 = 20804; public static final int NULL_20805 = 20805; @@ -11816,32 +11814,11 @@ public final class NullItemID public static final int NULL_22304 = 22304; public static final int NULL_22306 = 22306; public static final int NULL_22307 = 22307; - public static final int NULL_22308 = 22308; - public static final int NULL_22309 = 22309; - public static final int NULL_22310 = 22310; - public static final int NULL_22311 = 22311; - public static final int NULL_22312 = 22312; - public static final int NULL_22313 = 22313; - public static final int NULL_22314 = 22314; - public static final int NULL_22315 = 22315; public static final int NULL_22317 = 22317; public static final int NULL_22329 = 22329; public static final int NULL_22332 = 22332; public static final int NULL_22334 = 22334; public static final int NULL_22336 = 22336; - public static final int NULL_22337 = 22337; - public static final int NULL_22338 = 22338; - public static final int NULL_22339 = 22339; - public static final int NULL_22340 = 22340; - public static final int NULL_22341 = 22341; - public static final int NULL_22342 = 22342; - public static final int NULL_22343 = 22343; - public static final int NULL_22344 = 22344; - public static final int NULL_22345 = 22345; - public static final int NULL_22346 = 22346; - public static final int NULL_22347 = 22347; - public static final int NULL_22348 = 22348; - public static final int NULL_22349 = 22349; public static final int NULL_22350 = 22350; public static final int NULL_22352 = 22352; public static final int NULL_22354 = 22354; @@ -12047,16 +12024,6 @@ public final class NullItemID public static final int NULL_22716 = 22716; public static final int NULL_22718 = 22718; public static final int NULL_22720 = 22720; - public static final int NULL_22721 = 22721; - public static final int NULL_22722 = 22722; - public static final int NULL_22723 = 22723; - public static final int NULL_22724 = 22724; - public static final int NULL_22725 = 22725; - public static final int NULL_22726 = 22726; - public static final int NULL_22727 = 22727; - public static final int NULL_22728 = 22728; - public static final int NULL_22729 = 22729; - public static final int NULL_22730 = 22730; public static final int NULL_22732 = 22732; public static final int NULL_22733 = 22733; public static final int NULL_22735 = 22735; @@ -12456,5 +12423,6 @@ public final class NullItemID public static final int NULL_23455 = 23455; public static final int NULL_23456 = 23456; public static final int NULL_23457 = 23457; + public static final int NULL_23459 = 23459; /* 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 523c0335c8..0c1c2697a8 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 @@ -519,20 +519,20 @@ public class WidgetID static class Combat { static final int WEAPON_NAME = 1; - static final int LEVEL = 2; - static final int STYLE_ONE = 3; - static final int STYLE_TWO = 7; - static final int STYLE_THREE = 11; - static final int STYLE_FOUR = 15; - static final int SPELLS = 19; - static final int DEFENSIVE_SPELL_BOX = 20; - static final int DEFENSIVE_SPELL_ICON = 22; - static final int DEFENSIVE_SPELL_SHIELD = 23; - static final int DEFENSIVE_SPELL_TEXT = 24; - static final int SPELL_BOX = 25; - static final int SPELL_ICON = 27; - static final int SPELL_TEXT = 28; - static final int AUTO_RETALIATE = 29; + static final int LEVEL = 3; + static final int STYLE_ONE = 4; + static final int STYLE_TWO = 8; + static final int STYLE_THREE = 12; + static final int STYLE_FOUR = 16; + static final int SPELLS = 20; + static final int DEFENSIVE_SPELL_BOX = 21; + static final int DEFENSIVE_SPELL_ICON = 23; + static final int DEFENSIVE_SPELL_SHIELD = 24; + static final int DEFENSIVE_SPELL_TEXT = 25; + static final int SPELL_BOX = 26; + static final int SPELL_ICON = 28; + static final int SPELL_TEXT = 29; + static final int AUTO_RETALIATE = 30; } static class VolcanicMine diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 81603408c9..8105a02ee2 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -3243,7 +3243,8 @@ 6125, 6126, 6127, - 13079 + 13079, + 23458 ], "branch": [ 3692, @@ -6912,6 +6913,78 @@ 10555, 20515 ], + "attacker icon": [ + 10556, + 22346, + 22347, + 22348, + 22349, + 22721, + 22722, + 22723, + 22729, + 22730, + 23460, + 23461, + 23462, + 23463, + 23464, + 23465 + ], + "collector icon": [ + 10557, + 22312, + 22313, + 22314, + 22315, + 22337, + 22338, + 22339, + 22724, + 23471, + 23472, + 23473, + 23474, + 23475, + 23476, + 23477 + ], + "defender icon": [ + 10558, + 22340, + 22341, + 22342, + 22343, + 22344, + 22345, + 22725, + 22726, + 22727, + 22728, + 23466, + 23467, + 23468, + 23469, + 23470 + ], + "healer icon": [ + 10559, + 10567, + 20802, + 22308, + 22309, + 22310, + 22311, + 23478, + 23479, + 23480, + 23481, + 23482, + 23483, + 23484, + 23485, + 23486 + ], "keris": [ 10581, 10582,