diff --git a/gradle.properties b/gradle.properties index e2c4b81ae96..449f651ad96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,10 +28,10 @@ org.gradle.parallel=true org.gradle.caching=false project.build.group=net.runelite -project.build.version=1.12.12.1 +project.build.version=1.12.13 glslang.path= -microbot.version=2.1.13 +microbot.version=2.1.15 microbot.commit.sha=nogit microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/ microbot.repo.username= 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 1f46bdfd607..ada7dd32357 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -13552,8 +13552,8 @@ public final class ItemID public static final int SIGIL_OF_AGILE_FORTUNE_28493 = 28493; public static final int SIGIL_OF_THE_FOOD_MASTER = 28495; public static final int SIGIL_OF_THE_FOOD_MASTER_28496 = 28496; - public static final int SIGIL_OF_THE_WELLFED = 28498; - public static final int SIGIL_OF_THE_WELLFED_28499 = 28499; + public static final int SIGIL_OF_THE_WELL_FED = 28498; + public static final int SIGIL_OF_THE_WELL_FED_28499 = 28499; public static final int SIGIL_OF_THE_INFERNAL_CHEF = 28501; public static final int SIGIL_OF_THE_INFERNAL_CHEF_28502 = 28502; public static final int SIGIL_OF_THE_INFERNAL_SMITH = 28504; @@ -13582,10 +13582,10 @@ public final class ItemID public static final int CORRUPTED_SCYTHE_OF_VITUR_UNCHARGED = 28545; public static final int CORRUPTED_TUMEKENS_SHADOW = 28547; public static final int CORRUPTED_TUMEKENS_SHADOW_UNCHARGED = 28549; - public static final int QUEST_LAMP = 28551; - public static final int QUEST_LAMP_28552 = 28552; - public static final int QUEST_LAMP_28553 = 28553; - public static final int QUEST_LAMP_28554 = 28554; + public static final int FREMENNIK_QUEST_LAMP = 28551; + public static final int ELF_QUEST_LAMP = 28552; + public static final int GNOME_QUEST_LAMP = 28553; + public static final int MAHJARRAT_1_QUEST_LAMP = 28554; public static final int STARTER_BOW_28555 = 28555; public static final int STARTER_STAFF_28557 = 28557; public static final int STARTER_SWORD_28559 = 28559; @@ -14125,22 +14125,22 @@ public final class ItemID public static final int SIGIL_OF_METICULOUSNESS_29649 = 29649; public static final int SIGIL_OF_REVOKED_LIMITATION = 29651; public static final int SIGIL_OF_REVOKED_LIMITATION_29652 = 29652; - public static final int SIGIL_OF_RAMPART = 29654; - public static final int SIGIL_OF_RAMPART_29655 = 29655; + public static final int SIGIL_OF_THE_RAMPART = 29654; + public static final int SIGIL_OF_THE_RAMPART_29655 = 29655; public static final int SIGIL_OF_DECEPTION = 29657; public static final int SIGIL_OF_DECEPTION_29658 = 29658; - public static final int SIGIL_OF_LITHE = 29660; - public static final int SIGIL_OF_LITHE_29661 = 29661; - public static final int SIGIL_OF_ADROIT = 29663; - public static final int SIGIL_OF_ADROIT_29664 = 29664; + public static final int SIGIL_OF_LITHENESS = 29660; + public static final int SIGIL_OF_LITHENESS_29661 = 29661; + public static final int SIGIL_OF_THE_ADROIT = 29663; + public static final int SIGIL_OF_THE_ADROIT_29664 = 29664; public static final int SIGIL_OF_ONSLAUGHT = 29666; public static final int SIGIL_OF_ONSLAUGHT_29667 = 29667; public static final int SIGIL_OF_RESTORATION = 29669; public static final int SIGIL_OF_RESTORATION_29670 = 29670; - public static final int SIGIL_OF_SWASHBUCKLER = 29672; - public static final int SIGIL_OF_SWASHBUCKLER_29673 = 29673; - public static final int SIGIL_OF_GUNSLINGER = 29675; - public static final int SIGIL_OF_GUNSLINGER_29676 = 29676; + public static final int SIGIL_OF_THE_SWASHBUCKLER = 29672; + public static final int SIGIL_OF_THE_SWASHBUCKLER_29673 = 29673; + public static final int SIGIL_OF_THE_GUNSLINGER = 29675; + public static final int SIGIL_OF_THE_GUNSLINGER_29676 = 29676; public static final int SIGIL_OF_ARCANE_SWIFTNESS = 29678; public static final int SIGIL_OF_ARCANE_SWIFTNESS_29679 = 29679; public static final int GUTHIXIAN_TEMPLE_TELEPORT = 29684; @@ -16091,5 +16091,46 @@ public final class ItemID public static final int CRATE_OF_POTIONS_32999 = 32999; public static final int CRATE_OF_ORES_33000 = 33000; public static final int CRATE_OF_POTIONS_33001 = 33001; + public static final int HOLY_MOLEYS = 33002; + public static final int KHARIDIAN_QUEST_LAMP = 33004; + public static final int MYREQUE_QUEST_LAMP = 33005; + public static final int DRAGONKIN_QUEST_LAMP = 33006; + public static final int MAHJARRAT_2_QUEST_LAMP = 33007; + public static final int CAMELOT_QUEST_LAMP = 33008; + public static final int RECIPE_FOR_DISASTER_QUEST_LAMP = 33009; + public static final int RUINOUS_POWERS_33010 = 33010; + public static final int ANNIHILATION_WEAPON_SCROLL = 33012; + public static final int ANNIHILATION_BLUEPRINTS = 33015; + public static final int ANNIHILATION_TELEPORT_SCROLL = 33018; + public static final int BOW_OF_FAERDHINEN_C_33021 = 33021; + public static final int CRYSTAL_BODY_33023 = 33023; + public static final int CRYSTAL_BODY_INACTIVE_33025 = 33025; + public static final int CRYSTAL_LEGS_33027 = 33027; + public static final int CRYSTAL_LEGS_INACTIVE_33029 = 33029; + public static final int CRYSTAL_HELM_33031 = 33031; + public static final int CRYSTAL_HELM_INACTIVE_33033 = 33033; + public static final int TOXIC_STAFF_UNCHARGED_33035 = 33035; + public static final int TOXIC_STAFF_DEADMAN = 33036; + public static final int THE_DOGSWORD_33038 = 33038; + public static final int THUNDER_KHOPESH_33041 = 33041; + public static final int TRINKET_OF_AVARICE = 33044; + public static final int TRINKET_OF_FORTUITY_INACTIVE = 33047; + public static final int TRINKET_OF_FORTUITY_ACTIVE = 33050; + public static final int SIGIL_OF_THE_GODS = 33053; + public static final int SIGIL_OF_THE_GODS_33054 = 33054; + public static final int SIGIL_OF_CONCLUSION = 33055; + public static final int SIGIL_OF_CONCLUSION_33056 = 33056; + public static final int SIGIL_OF_AUTOMATION = 33057; + public static final int SIGIL_OF_AUTOMATION_33058 = 33058; + public static final int SIGIL_OF_ETERNAL_BELIEF = 33059; + public static final int SIGIL_OF_ETERNAL_BELIEF_33060 = 33060; + public static final int SIGIL_OF_EFFICIENCY = 33061; + public static final int SIGIL_OF_EFFICIENCY_33062 = 33062; + public static final int STARTER_CAPE = 33063; + public static final int DEADMANS_SKULL = 33065; + public static final int HOODED_SLAYER_HELMET = 33066; + public static final int HOODED_SLAYER_HELMET_I = 33068; + public static final int HOODED_SLAYER_HELMET_I_33070 = 33070; + public static final int HOODED_SLAYER_HELMET_I_33072 = 33072; /* This file is automatically generated. Do not edit. */ } \ No newline at end of file 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 d5b4ce22d53..4d227ec4729 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -12363,6 +12363,7 @@ public final class NpcID public static final int RUSTY_CHEST = 14811; public static final int TARNISHED_CHEST = 14812; public static final int RUSTY_CHEST_14813 = 14813; + public static final int REVENANT_IMP_14814 = 14814; public static final int SPOOKY_CHAIR = 14815; public static final int MAKO = 14816; public static final int MORA = 14817; @@ -12405,6 +12406,8 @@ public final class NpcID public static final int SHELLBANE_GRYPHON = 14860; public static final int ELDER_KELMO = 14861; public static final int ELDER_NAMA = 14863; + public static final int REVENANT_GOBLIN_14864 = 14864; + public static final int REVENANT_PYREFIEND_14865 = 14865; public static final int HENDERSON = 14866; public static final int ONE_EYED_ROSALEE = 14867; public static final int CAPTAIN_DAWSON = 14868; @@ -12675,6 +12678,14 @@ public final class NpcID public static final int DRINK_TROLL_QUEEN = 15175; public static final int DRINK_TROLL_QUEEN_15176 = 15176; public static final int SAILING_CAT = 15177; + public static final int REVENANT_HOBGOBLIN_15178 = 15178; + public static final int REVENANT_CYCLOPS_15179 = 15179; + public static final int REVENANT_HELLHOUND_15180 = 15180; + public static final int REVENANT_DEMON_15181 = 15181; + public static final int REVENANT_ORK_15182 = 15182; + public static final int REVENANT_DARK_BEAST_15183 = 15183; + public static final int REVENANT_KNIGHT_15184 = 15184; + public static final int REVENANT_DRAGON_15185 = 15185; public static final int PUNCHING_BAG = 15191; public static final int PUNCHING_BAG_15192 = 15192; public static final int DPS_CALC = 15193; @@ -12721,6 +12732,7 @@ public final class NpcID public static final int DOLPHIN = 15234; public static final int DOLPHIN_15235 = 15235; public static final int DOLPHIN_CALF = 15236; + public static final int ZEMOUREGAL_15237 = 15237; public static final int JUNIOR_JIM_15238 = 15238; public static final int JUMBO_JIM = 15239; public static final int CREW_REGISTRAR = 15245; @@ -12983,5 +12995,25 @@ public final class NpcID public static final int TRADER_CREWMEMBER_15544 = 15544; public static final int TRADER_CREWMEMBER_15545 = 15545; public static final int TRADER_CREWMEMBER_15546 = 15546; + public static final int BIG_EVIL_CHICKEN = 15547; + public static final int SCURRIUS_15548 = 15548; + public static final int PHANTOM_MUSPAH_15549 = 15549; + public static final int SPLATTER_15550 = 15550; + public static final int TUMEKENS_WARDEN_15551 = 15551; + public static final int ELIDINIS_WARDEN_15552 = 15552; + public static final int I_DSCIM_YOU = 15553; + public static final int SOL_HEREDIT_15554 = 15554; + public static final int YAMA_15555 = 15555; + public static final int PESTILENT_BLOAT_15556 = 15556; + public static final int TZTOKJADREK = 15557; + public static final int ZEMOUREGAL_SUMMON = 15558; + public static final int ZEMOUREGAL_SUMMON_15559 = 15559; + public static final int ZEMOUREGAL_SUMMON_15560 = 15560; + public static final int ZEMOUREGAL_SUMMON_15561 = 15561; + public static final int ZEMOUREGAL_SUMMON_15562 = 15562; + public static final int ZEMOUREGAL_SUMMON_15563 = 15563; + public static final int ZEMOUREGAL_15564 = 15564; + public static final int GUARD_15566 = 15566; + public static final int GUARD_15568 = 15568; /* 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 8d2acb8c4a6..bf0e4db7177 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13686,59 +13686,6 @@ public final class NullItemID public static final int NULL_25987 = 25987; public static final int NULL_25988 = 25988; public static final int NULL_25989 = 25989; - public static final int NULL_25992 = 25992; - public static final int NULL_25995 = 25995; - public static final int NULL_25998 = 25998; - public static final int NULL_26001 = 26001; - public static final int NULL_26004 = 26004; - public static final int NULL_26007 = 26007; - public static final int NULL_26010 = 26010; - public static final int NULL_26013 = 26013; - public static final int NULL_26016 = 26016; - public static final int NULL_26019 = 26019; - public static final int NULL_26022 = 26022; - public static final int NULL_26025 = 26025; - public static final int NULL_26028 = 26028; - public static final int NULL_26031 = 26031; - public static final int NULL_26034 = 26034; - public static final int NULL_26037 = 26037; - public static final int NULL_26040 = 26040; - public static final int NULL_26043 = 26043; - public static final int NULL_26046 = 26046; - public static final int NULL_26049 = 26049; - public static final int NULL_26052 = 26052; - public static final int NULL_26055 = 26055; - public static final int NULL_26058 = 26058; - public static final int NULL_26061 = 26061; - public static final int NULL_26064 = 26064; - public static final int NULL_26067 = 26067; - public static final int NULL_26070 = 26070; - public static final int NULL_26073 = 26073; - public static final int NULL_26076 = 26076; - public static final int NULL_26079 = 26079; - public static final int NULL_26082 = 26082; - public static final int NULL_26085 = 26085; - public static final int NULL_26088 = 26088; - public static final int NULL_26091 = 26091; - public static final int NULL_26094 = 26094; - public static final int NULL_26097 = 26097; - public static final int NULL_26100 = 26100; - public static final int NULL_26103 = 26103; - public static final int NULL_26106 = 26106; - public static final int NULL_26109 = 26109; - public static final int NULL_26112 = 26112; - public static final int NULL_26115 = 26115; - public static final int NULL_26118 = 26118; - public static final int NULL_26121 = 26121; - public static final int NULL_26124 = 26124; - public static final int NULL_26127 = 26127; - public static final int NULL_26130 = 26130; - public static final int NULL_26133 = 26133; - public static final int NULL_26136 = 26136; - public static final int NULL_26139 = 26139; - public static final int NULL_26142 = 26142; - public static final int NULL_26145 = 26145; - public static final int NULL_26148 = 26148; public static final int NULL_26155 = 26155; public static final int NULL_26157 = 26157; public static final int NULL_26159 = 26159; @@ -14738,24 +14685,6 @@ public final class NullItemID public static final int NULL_28391 = 28391; public static final int NULL_28411 = 28411; public static final int NULL_28472 = 28472; - public static final int NULL_28479 = 28479; - public static final int NULL_28482 = 28482; - public static final int NULL_28485 = 28485; - public static final int NULL_28488 = 28488; - public static final int NULL_28491 = 28491; - public static final int NULL_28494 = 28494; - public static final int NULL_28497 = 28497; - public static final int NULL_28500 = 28500; - public static final int NULL_28503 = 28503; - public static final int NULL_28506 = 28506; - public static final int NULL_28509 = 28509; - public static final int NULL_28512 = 28512; - public static final int NULL_28515 = 28515; - public static final int NULL_28518 = 28518; - public static final int NULL_28521 = 28521; - public static final int NULL_28524 = 28524; - public static final int NULL_28527 = 28527; - public static final int NULL_28530 = 28530; public static final int NULL_28532 = 28532; public static final int NULL_28533 = 28533; public static final int NULL_28535 = 28535; @@ -15326,17 +15255,6 @@ public final class NullItemID public static final int NULL_29644 = 29644; public static final int NULL_29645 = 29645; public static final int NULL_29647 = 29647; - public static final int NULL_29650 = 29650; - public static final int NULL_29653 = 29653; - public static final int NULL_29656 = 29656; - public static final int NULL_29659 = 29659; - public static final int NULL_29662 = 29662; - public static final int NULL_29665 = 29665; - public static final int NULL_29668 = 29668; - public static final int NULL_29671 = 29671; - public static final int NULL_29674 = 29674; - public static final int NULL_29677 = 29677; - public static final int NULL_29680 = 29680; public static final int NULL_29681 = 29681; public static final int NULL_29682 = 29682; public static final int NULL_29683 = 29683; @@ -16683,5 +16601,36 @@ public final class NullItemID public static final int NULL_32931 = 32931; public static final int NULL_32933 = 32933; public static final int NULL_32935 = 32935; + public static final int NULL_33003 = 33003; + public static final int NULL_33011 = 33011; + public static final int NULL_33013 = 33013; + public static final int NULL_33014 = 33014; + public static final int NULL_33016 = 33016; + public static final int NULL_33017 = 33017; + public static final int NULL_33019 = 33019; + public static final int NULL_33020 = 33020; + public static final int NULL_33022 = 33022; + public static final int NULL_33024 = 33024; + public static final int NULL_33026 = 33026; + public static final int NULL_33028 = 33028; + public static final int NULL_33030 = 33030; + public static final int NULL_33032 = 33032; + public static final int NULL_33034 = 33034; + public static final int NULL_33037 = 33037; + public static final int NULL_33039 = 33039; + public static final int NULL_33040 = 33040; + public static final int NULL_33042 = 33042; + public static final int NULL_33043 = 33043; + public static final int NULL_33045 = 33045; + public static final int NULL_33046 = 33046; + public static final int NULL_33048 = 33048; + public static final int NULL_33049 = 33049; + public static final int NULL_33051 = 33051; + public static final int NULL_33052 = 33052; + public static final int NULL_33064 = 33064; + public static final int NULL_33067 = 33067; + public static final int NULL_33069 = 33069; + public static final int NULL_33071 = 33071; + public static final int NULL_33073 = 33073; /* This file is automatically generated. Do not edit. */ } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 35a4c0af240..58a72148a36 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -2545,5 +2545,10 @@ public final class NullNpcID public static final int NULL_15493 = 15493; public static final int NULL_15494 = 15494; public static final int NULL_15495 = 15495; + public static final int NULL_15565 = 15565; + public static final int NULL_15567 = 15567; + public static final int NULL_15569 = 15569; + public static final int NULL_15570 = 15570; + public static final int NULL_15571 = 15571; /* 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 b5f2a80654a..58f37dfd9e8 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -31135,23 +31135,41 @@ public final class NullObjectID public static final int NULL_60247 = 60247; public static final int NULL_60249 = 60249; public static final int NULL_60251 = 60251; + public static final int NULL_60252 = 60252; public static final int NULL_60253 = 60253; + public static final int NULL_60254 = 60254; public static final int NULL_60255 = 60255; + public static final int NULL_60256 = 60256; public static final int NULL_60257 = 60257; + public static final int NULL_60258 = 60258; public static final int NULL_60259 = 60259; + public static final int NULL_60260 = 60260; public static final int NULL_60261 = 60261; + public static final int NULL_60262 = 60262; public static final int NULL_60263 = 60263; + public static final int NULL_60264 = 60264; public static final int NULL_60265 = 60265; + public static final int NULL_60266 = 60266; public static final int NULL_60267 = 60267; + public static final int NULL_60268 = 60268; public static final int NULL_60269 = 60269; + public static final int NULL_60270 = 60270; public static final int NULL_60271 = 60271; + public static final int NULL_60272 = 60272; public static final int NULL_60273 = 60273; + public static final int NULL_60274 = 60274; public static final int NULL_60275 = 60275; + public static final int NULL_60276 = 60276; public static final int NULL_60277 = 60277; + public static final int NULL_60278 = 60278; public static final int NULL_60279 = 60279; + public static final int NULL_60280 = 60280; public static final int NULL_60281 = 60281; + public static final int NULL_60282 = 60282; public static final int NULL_60283 = 60283; + public static final int NULL_60284 = 60284; public static final int NULL_60285 = 60285; + public static final int NULL_60286 = 60286; public static final int NULL_60311 = 60311; public static final int NULL_60322 = 60322; public static final int NULL_60323 = 60323; @@ -31310,5 +31328,9 @@ public final class NullObjectID public static final int NULL_60615 = 60615; public static final int NULL_60617 = 60617; public static final int NULL_60618 = 60618; + public static final int NULL_60643 = 60643; + public static final int NULL_60644 = 60644; + public static final int NULL_60645 = 60645; + public static final int NULL_60646 = 60646; /* 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 8ae481ec36a..f26d96b5662 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -29107,6 +29107,9 @@ public final class ObjectID public static final int HELM_60242 = 60242; public static final int SAILS_60243 = 60243; public static final int SAILS_60244 = 60244; + public static final int DEADMANS_CHEST = 60246; + public static final int DEADMANS_CHEST_60248 = 60248; + public static final int DEADMANS_CHEST_60250 = 60250; public static final int NOTICE_BOARD_60287 = 60287; public static final int NOTICE_BOARD_60288 = 60288; public static final int NOTICE_BOARD_60289 = 60289; @@ -29305,5 +29308,19 @@ public final class ObjectID public static final int IRONWOOD_CARGO_HOLD_60640 = 60640; public static final int ROSEWOOD_CARGO_HOLD_60641 = 60641; public static final int ROSEWOOD_CARGO_HOLD_60642 = 60642; + public static final int STAINEDGLASS_WINDOW_60647 = 60647; + public static final int STAINEDGLASS_WINDOW_60648 = 60648; + public static final int SHUTTERED_WINDOW_60649 = 60649; + public static final int DECORATIVE_WINDOW_60650 = 60650; + public static final int STAINEDGLASS_WINDOW_60651 = 60651; + public static final int DECORATIVE_WINDOW_60652 = 60652; + public static final int STAINEDGLASS_WINDOW_60653 = 60653; + public static final int DECORATIVE_WINDOW_60654 = 60654; + public static final int STAINEDGLASS_WINDOW_60655 = 60655; + public static final int DECORATIVE_WINDOW_60656 = 60656; + public static final int STAINEDGLASS_WINDOW_60657 = 60657; + public static final int DECORATIVE_WINDOW_60658 = 60658; + public static final int STAINEDGLASS_WINDOW_60659 = 60659; + public static final int WINDOW_SPACE_60660 = 60660; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/Quest.java b/runelite-api/src/main/java/net/runelite/api/Quest.java index 7157fbe106f..0d23a731089 100644 --- a/runelite-api/src/main/java/net/runelite/api/Quest.java +++ b/runelite-api/src/main/java/net/runelite/api/Quest.java @@ -232,8 +232,6 @@ public enum Quest THE_FINAL_DAWN(5189, "The Final Dawn"), SHADOWS_OF_CUSTODIA(5190, "Shadows of Custodia"), SCRAMBLED(5191, "Scrambled!"), - AN_EXISTENTIAL_CRISIS(5192, "An Existential Crisis"), - IMPENDING_CHAOS(5193, "Impending Chaos"), VALE_TOTEMS(5194, "Vale Totems"), TUTORIAL_ISLAND(7033, "Tutorial Island"), PANDEMONIUM(7103, "Pandemonium"), @@ -241,7 +239,6 @@ public enum Quest CURRENT_AFFAIRS(7105, "Current Affairs"), TROUBLED_TORTUGANS(7106, "Troubled Tortugans"), THE_RED_REEF(7107, "The Red Reef"), - BURIAL_AT_SEA(7108, "Burial at Sea"), ; @Getter diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java index cefa4b1be08..36c3e7ea98e 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java @@ -33,6 +33,7 @@ import net.runelite.api.Client; import static net.runelite.api.Constants.CHUNK_SIZE; import static net.runelite.api.Constants.REGION_SIZE; +import static net.runelite.api.Constants.SCENE_SIZE; import net.runelite.api.Perspective; import net.runelite.api.Scene; import net.runelite.api.WorldView; @@ -298,8 +299,11 @@ private static WorldPoint fromLocalInstance(int[][][] instanceTemplateChunks, Lo int chunkX = sceneX / CHUNK_SIZE; int chunkY = sceneY / CHUNK_SIZE; - // get the template chunk for the chunk - int templateChunk = instanceTemplateChunks[plane][chunkX][chunkY]; + int templateChunk = -1; + if (chunkX >= 0 && chunkX < (SCENE_SIZE / CHUNK_SIZE) && chunkY >= 0 && chunkY < (SCENE_SIZE / CHUNK_SIZE)) + { + templateChunk = instanceTemplateChunks[plane][chunkX][chunkY]; + } int rotation = templateChunk >> 1 & 0x3; int templateChunkY = (templateChunk >> 3 & 0x7FF) * CHUNK_SIZE; diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java index 86ae3717d18..b9a1467e74d 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java @@ -13698,5 +13698,22 @@ public final class AnimationID public static final int HUMAN_XMAS25_CHRISTMAS_DINNER_WALK_B = 13698; public static final int HUMAN_XMAS25_CHRISTMAS_DINNER_RUN = 13699; public static final int HUMAN_XMAS25_CHRISTMAS_DINNER_ATTACK = 13700; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_FULL = 13701; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_01 = 13702; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_02 = 13703; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_03 = 13704; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_04 = 13705; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_05 = 13706; + public static final int HUMAN_DEADMAN_ANNIHILATION_REWARD_TELEPORT_06 = 13707; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_FULL = 13708; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_01 = 13709; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_02 = 13710; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_03 = 13711; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_04 = 13712; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_05 = 13713; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_06 = 13714; + public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_UNCHARGED = 13715; + public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_CHARGED = 13716; + public static final int ZUK_SPAWN_NO_ROCK = 13717; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java index d271e0153f0..c899a07a741 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java @@ -4428,6 +4428,7 @@ public static final class Row public static final int ENT_TOTEMS_SHOP = 5458; public static final int ENT_TOTEMS_SHOP_IRONMAN = 5459; public static final int SAILING_BOAT_SHOP = 8548; + public static final int DEADMAN_SKULL_SHOP = 9575; } } @@ -4535,6 +4536,16 @@ public static final class OmnishopStockData */ public static final int COL_OMNISHOP_STOCK_DESCRIPTION_DYNAMIC = 22; + /** + * boolean + */ + public static final int COL_OMNISHOP_STOCK_USE_SHORTNAME = 23; + + /** + * string + */ + public static final int COL_OMNISHOP_STOCK_SHORTNAME = 24; + public static final class Row { public static final int DEADMAN_SHOP_2024_WEAPON_ORNAMENT_SCROLL = 1355; @@ -4745,6 +4756,70 @@ public static final class Row public static final int SAILING_SHIP_STOCK_RAFT = 8549; public static final int SAILING_SHIP_STOCK_SKIFF = 8550; public static final int SAILING_SHIP_STOCK_SLOOP = 8551; + public static final int DEADMAN_SHOP_2026_WEAPON_ORNAMENT_SCROLL = 9572; + public static final int DEADMAN_SHOP_2026_POH_ORNAMENT_SCROLL = 9573; + public static final int DEADMAN_SHOP_2026_HOME_TELEPORT_SCROLL = 9574; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_AGILE_FORTUNE = 9577; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_HOARDING = 9578; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_DECEPTION = 9579; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_LITHE = 9580; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_FOOD_MASTER = 9581; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_WELL_FED = 9582; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_POTION_MASTER = 9583; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_TREASURE_HUNTER = 9584; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_HUNTER = 9585; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_INFERNAL_CHEF = 9586; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_NATURE = 9587; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_DEVOTION = 9588; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_FAITH = 9589; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_ALCHEMANIAC = 9590; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_RESISTANCE = 9591; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_DEFT_STRIKES = 9592; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_AUGMENTED_THRALL = 9593; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_ONSLAUGHT = 9594; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_RESTORATION = 9595; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_TITANIUM = 9596; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_METICULOUSNESS = 9597; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_ENHANCED_HARVEST = 9598; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_SLAUGHTER = 9599; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_WOODCRAFT = 9600; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_REMOTE_STORAGE = 9601; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_CONSISTENCY = 9602; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_RIGOROUS_RANGER = 9603; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_METICULOUS_MAGE = 9604; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_LIGHTBEARER = 9605; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_SPECIALISED_STRIKES = 9606; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_PORCUPINE = 9607; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_FORTIFICATION = 9608; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_RUTHLESS_RANGER = 9609; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_FORMIDABLE_FIGHTER = 9610; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_MENACING_MAGE = 9611; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_SWASHBUCKLER = 9612; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_GUNSLINGER = 9613; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_ARCANE_SWIFTNESS = 9614; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_ADROIT = 9615; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_BARROWS = 9616; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_FINALITY = 9617; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_PIOUS_PROTECTION = 9618; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_AGGRESSION = 9619; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_RAMPAGE = 9620; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_THE_GODS = 9621; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_REVOKED_LIMITATION = 9622; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_CONCLUSION = 9623; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_AUTOMATION = 9624; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_ETERNAL_BELIEF = 9625; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_EFFICIENCY = 9626; + public static final int DEADMAN_SKULL_SHOP_SIGIL_OF_RUINOUS_PRAYER_BOOK = 9627; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_RECIPE_FOR_DISASTER = 9628; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_CAMELOT_STORYLINE = 9629; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_FREMENNIK_STORYLINE = 9630; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_ELF_STORYLINE = 9631; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_GNOME_STORYLINE = 9632; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_KHARIDIAN_STORYLINE = 9633; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_MYREQUE_STORYLINE = 9634; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_DRAGONKIN_STORYLINE = 9635; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_MAHJARRAT_STORYLINE_1 = 9636; + public static final int DEADMAN_SKULL_SHOP_QUEST_LAMP_MAHJARRAT_STORYLINE_2 = 9637; } } @@ -4817,6 +4892,7 @@ public static final class Row public static final int OMNISHOP_CURRENCY_CW_TICKETS = 5104; public static final int OMNISHOP_CURRENCY_CW_PLAUDITS = 5105; public static final int OMNISHOP_CURRENCY_ENT_TOTEMS_RESEARCH_POINTS = 5460; + public static final int OMNISHOP_CURRENCY_DEADMAN_SKULL_POINTS = 9576; } } @@ -10185,6 +10261,7 @@ public static final class Row public static final int SLAYER_REWARDS_LONGER_AQUANITES = 9418; public static final int SLAYER_REWARDS_LONGER_WYRMS = 9419; public static final int SLAYER_REWARDS_UNLOCK_GRYPHONS = 9420; + public static final int SLAYER_REWARDS_UNLOCK_HELM_HOODED = 9641; } } @@ -16075,5 +16152,42 @@ public static final class Row public static final int SKILL_GUIDE_V2_ICON_CAPTAINS_LOG = 9571; } } + + public static final class DeadmanskullInterfaceTab + { + public static final int ID = 210; + + /** + * string + */ + public static final int COL_NAME = 0; + + /** + * integer + */ + public static final int COL_TAB_NUMBER = 1; + + /** + * (struct, dbrow) + */ + public static final int COL_COMBAT_SIGIL = 2; + + /** + * (struct, dbrow) + */ + public static final int COL_SKILLING_SIGIL = 3; + + /** + * (struct, dbrow) + */ + public static final int COL_UTILITY_SIGIL = 4; + + public static final class Row + { + public static final int DEADMANSKULL_INTERFACE_TAB_PERMANENT = 9638; + public static final int DEADMANSKULL_INTERFACE_TAB_TOGGLE = 9639; + public static final int DEADMANSKULL_INTERFACE_TAB_ATTUNE = 9640; + } + } /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java index 29cdb27ccd6..2da24796a44 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java @@ -423,6 +423,7 @@ public final class InterfaceID public static final int CANOEING = 416; public static final int BREW_TOOLS = 417; public static final int BREW_WAITING_ROOM_OVERLAY = 418; + public static final int DEADMAN_TUTORIAL = 419; public static final int BEEHIVE = 420; public static final int PVP_ARENA_STAGINGAREA_SHARELOADOUT = 421; public static final int POH_VIEWER = 422; @@ -951,6 +952,7 @@ public final class InterfaceID public static final int REUSABLE_FLOATER = 945; public static final int PATCHY = 946; public static final int MENU_NEW = 947; + public static final int DEADMANSKULL_INTERFACE = 948; public static final class _100GuideEggsOverlay { @@ -15818,6 +15820,58 @@ public static final class BrewWaitingRoomOverlay public static final int CONTENTS_TEXT4 = 0x01a2_0007; } + public static final class DeadmanTutorial + { + public static final int UNIVERSE = 0x01a3_0000; + public static final int NOCLICK = 0x01a3_0001; + public static final int MAIN = 0x01a3_0002; + public static final int TUT_1_LAYER = 0x01a3_0003; + public static final int TUT_2_LAYER = 0x01a3_0004; + public static final int TUT_3_LAYER = 0x01a3_0005; + public static final int TUT_4_LAYER = 0x01a3_0006; + public static final int TUT_5_LAYER = 0x01a3_0007; + public static final int TUT_TELEPORT_LAYER = 0x01a3_0008; + public static final int BACKGROUND = 0x01a3_0009; + public static final int TUT_1_LAYER_GRAPHIC1 = 0x01a3_000a; + public static final int TUT_1_LAYER_GRAPHIC2 = 0x01a3_000b; + public static final int TUT_1_TEXT_1 = 0x01a3_000c; + public static final int CONTINUE_1 = 0x01a3_000d; + public static final int LOGOUT = 0x01a3_000e; + public static final int BACKGROUND_1 = 0x01a3_000f; + public static final int TUT_2_LAYER_GRAPHIC1 = 0x01a3_0010; + public static final int TUT_1_TEXT_2 = 0x01a3_0011; + public static final int CONTINUE_2 = 0x01a3_0012; + public static final int TUT_1_INDEX_1 = 0x01a3_0013; + public static final int TUT_2_LAYER_GRAPHIC5 = 0x01a3_0014; + public static final int TUT_2_LAYER_GRAPHIC6 = 0x01a3_0015; + public static final int BACKGROUND_2 = 0x01a3_0016; + public static final int TUT_3_LAYER_GRAPHIC1 = 0x01a3_0017; + public static final int TUT_1_TEXT_3 = 0x01a3_0018; + public static final int CONTINUE_3 = 0x01a3_0019; + public static final int BACK_3 = 0x01a3_001a; + public static final int TUT_1_INDEX_2 = 0x01a3_001b; + public static final int BACKGROUND_3 = 0x01a3_001c; + public static final int TUT_4_LAYER_GRAPHIC1 = 0x01a3_001d; + public static final int TUT_1_TEXT_4 = 0x01a3_001e; + public static final int CONTINUE_4 = 0x01a3_001f; + public static final int BACK_4 = 0x01a3_0020; + public static final int TUT_1_INDEX_3 = 0x01a3_0021; + public static final int BACKGROUND_4 = 0x01a3_0022; + public static final int TUT_TELEPORT_LAYER_GRAPHIC1 = 0x01a3_0023; + public static final int TUT_1_TEXT_TELEPORT = 0x01a3_0024; + public static final int TELE_LUMBRIDGE = 0x01a3_0025; + public static final int TELE_VARROCK = 0x01a3_0026; + public static final int TELE_ARDOUGNE = 0x01a3_0027; + public static final int TELE_KOUREND = 0x01a3_0028; + public static final int TELE_GNOMESTRONGHOLD = 0x01a3_0029; + public static final int BACKGROUND_5 = 0x01a3_002a; + public static final int TUT_5_LAYER_GRAPHIC1 = 0x01a3_002b; + public static final int TUT_1_TEXT_5 = 0x01a3_002c; + public static final int CONTINUE_5 = 0x01a3_002d; + public static final int BACK_5 = 0x01a3_002e; + public static final int TUT_1_INDEX_4 = 0x01a3_002f; + } + public static final class Beehive { public static final int UNIVERSE = 0x01a4_0000; @@ -30772,5 +30826,25 @@ public static final class MenuNew public static final int TEXT = 0x03b3_0009; public static final int SCROLLBAR = 0x03b3_000a; } + + public static final class DeadmanskullInterface + { + public static final int INFINITY = 0x03b4_0000; + public static final int FRAME = 0x03b4_0001; + public static final int CLOSE = 0x03b4_0002; + public static final int CONTENT = 0x03b4_0003; + public static final int TABS = 0x03b4_0004; + public static final int PERMANENT_TAB = 0x03b4_0005; + public static final int TOGGLE_TAB = 0x03b4_0006; + public static final int ATTUNE_TAB = 0x03b4_0007; + public static final int MAIN = 0x03b4_0008; + public static final int ITEMS = 0x03b4_0009; + public static final int ITEMS_CONTENTS = 0x03b4_000a; + public static final int ITEMS_SCROLLBAR = 0x03b4_000b; + public static final int ITEMS_RECT2 = 0x03b4_000c; + public static final int UNIVERSE = 0x03b4_000d; + public static final int RESIZE_PREVIEW = 0x03b4_000e; + public static final int TOOLTIP = 0x03b4_000f; + } /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java index e6ed929e992..9c611584cc3 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/ItemID.java @@ -72799,12 +72799,12 @@ public final class ItemID public static final int SIGIL_OF_THE_FOOD_MASTER_UNATTUNED = 28496; /** - * Sigil of the well-fed + * Sigil of the well fed */ public static final int SIGIL_OF_THE_WELL_FED_ATTUNED = 28498; /** - * Sigil of the well-fed + * Sigil of the well fed */ public static final int SIGIL_OF_THE_WELL_FED_UNATTUNED = 28499; @@ -72949,22 +72949,22 @@ public final class ItemID public static final int DEADMAN_BLIGHTED_TUMEKENS_SHADOW_UNCHARGED = 28549; /** - * Quest lamp + * Fremennik quest lamp */ public static final int DEADMAN_QUEST_LAMP_TIER_1 = 28551; /** - * Quest lamp + * Elf quest lamp */ public static final int DEADMAN_QUEST_LAMP_TIER_2 = 28552; /** - * Quest lamp + * Gnome quest lamp */ public static final int DEADMAN_QUEST_LAMP_TIER_3 = 28553; /** - * Quest lamp + * Mahjarrat 1 quest lamp */ public static final int DEADMAN_QUEST_LAMP_TIER_4 = 28554; @@ -75830,12 +75830,12 @@ public final class ItemID public static final int SIGIL_OF_REVOKED_LIMITATION_UNATTUNED = 29652; /** - * Sigil of rampart + * Sigil of the rampart */ public static final int SIGIL_OF_RAMPART_ATTUNED = 29654; /** - * Sigil of rampart + * Sigil of the rampart */ public static final int SIGIL_OF_RAMPART_UNATTUNED = 29655; @@ -75850,22 +75850,22 @@ public final class ItemID public static final int SIGIL_OF_DECEPTION_UNATTUNED = 29658; /** - * Sigil of lithe + * Sigil of litheness */ public static final int SIGIL_OF_LITHE_ATTUNED = 29660; /** - * Sigil of lithe + * Sigil of litheness */ public static final int SIGIL_OF_LITHE_UNATTUNED = 29661; /** - * Sigil of adroit + * Sigil of the adroit */ public static final int SIGIL_OF_ADROIT_ATTUNED = 29663; /** - * Sigil of adroit + * Sigil of the adroit */ public static final int SIGIL_OF_ADROIT_UNATTUNED = 29664; @@ -75890,22 +75890,22 @@ public final class ItemID public static final int SIGIL_OF_RESTORATION_UNATTUNED = 29670; /** - * Sigil of swashbuckler + * Sigil of the swashbuckler */ public static final int SIGIL_OF_SWASHBUCKLER_ATTUNED = 29672; /** - * Sigil of swashbuckler + * Sigil of the swashbuckler */ public static final int SIGIL_OF_SWASHBUCKLER_UNATTUNED = 29673; /** - * Sigil of gunslinger + * Sigil of the gunslinger */ public static final int SIGIL_OF_GUNSLINGER_ATTUNED = 29675; /** - * Sigil of gunslinger + * Sigil of the gunslinger */ public static final int SIGIL_OF_GUNSLINGER_UNATTUNED = 29676; @@ -86421,6 +86421,211 @@ public final class ItemID */ public static final int CARGO_CRATE_POTIONS_VOID_KNIGHTS_OUTPOST_2 = 33001; + /** + * Holy moleys + */ + public static final int HOLY_MOLEYS = 33002; + + /** + * Kharidian quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_5 = 33004; + + /** + * Myreque quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_6 = 33005; + + /** + * Dragonkin quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_7 = 33006; + + /** + * Mahjarrat 2 quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_8 = 33007; + + /** + * Camelot quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_9 = 33008; + + /** + * Recipe for disaster quest lamp + */ + public static final int DEADMAN_QUEST_LAMP_TIER_10 = 33009; + + /** + * Ruinous powers + */ + public static final int DEADMAN_RUINOUS_POWERS_BOOK = 33010; + + /** + * Annihilation weapon scroll + */ + public static final int DEADMAN_2026_WEAPON_ORNAMENT_SCROLL = 33012; + + /** + * Annihilation blueprints + */ + public static final int DEADMAN_2026_POH_ORNAMENT_SCROLL = 33015; + + /** + * Annihilation teleport scroll + */ + public static final int DEADMAN_2026_HOME_TELEPORT_SCROLL = 33018; + + /** + * Bow of faerdhinen (c) + */ + public static final int BOW_OF_FAERDHINEN_INFINITE_DEADMAN = 33021; + + /** + * Crystal body + */ + public static final int CRYSTAL_CHESTPLATE_DEADMAN = 33023; + + /** + * Crystal body (inactive) + */ + public static final int CRYSTAL_CHESTPLATE_INACTIVE_DEADMAN = 33025; + + /** + * Crystal legs + */ + public static final int CRYSTAL_PLATELEGS_DEADMAN = 33027; + + /** + * Crystal legs (inactive) + */ + public static final int CRYSTAL_PLATELEGS_INACTIVE_DEADMAN = 33029; + + /** + * Crystal helm + */ + public static final int CRYSTAL_HELMET_DEADMAN = 33031; + + /** + * Crystal helm (inactive) + */ + public static final int CRYSTAL_HELMET_INACTIVE_DEADMAN = 33033; + + /** + * Toxic staff (uncharged) + */ + public static final int TOXIC_SOTD_DEADMAN = 33035; + + /** + * Toxic staff (deadman) + */ + public static final int TOXIC_SOTD_CHARGED_DEADMAN = 33036; + + /** + * The dogsword + */ + public static final int DEADMAN_DOGSWORD = 33038; + + /** + * Thunder khopesh + */ + public static final int DEADMAN_THUNDER_KHOPESH = 33041; + + /** + * Trinket of avarice + */ + public static final int MAGIC_ROCK_OF_AVARICE = 33044; + + /** + * Trinket of fortuity (inactive) + */ + public static final int MAGIC_ROCK_OF_FORTUITY_INACTIVE = 33047; + + /** + * Trinket of fortuity (active) + */ + public static final int MAGIC_ROCK_OF_FORTUITY_ACTIVE = 33050; + + /** + * Sigil of the gods + */ + public static final int SIGIL_OF_THE_GODS_ATTUNED = 33053; + + /** + * Sigil of the gods + */ + public static final int SIGIL_OF_THE_GODS_UNATTUNED = 33054; + + /** + * Sigil of conclusion + */ + public static final int SIGIL_OF_CONCLUSION_ATTUNED = 33055; + + /** + * Sigil of conclusion + */ + public static final int SIGIL_OF_CONCLUSION_UNATTUNED = 33056; + + /** + * Sigil of automation + */ + public static final int SIGIL_OF_AUTOMATION_ATTUNED = 33057; + + /** + * Sigil of automation + */ + public static final int SIGIL_OF_AUTOMATION_UNATTUNED = 33058; + + /** + * Sigil of eternal belief + */ + public static final int SIGIL_OF_ETERNAL_BELIEF_ATTUNED = 33059; + + /** + * Sigil of eternal belief + */ + public static final int SIGIL_OF_ETERNAL_BELIEF_UNATTUNED = 33060; + + /** + * Sigil of efficiency + */ + public static final int SIGIL_OF_EFFICIENCY_ATTUNED = 33061; + + /** + * Sigil of efficiency + */ + public static final int SIGIL_OF_EFFICIENCY_UNATTUNED = 33062; + + /** + * Starter cape + */ + public static final int DEADMAN_STARTER_CAPE = 33063; + + /** + * Deadman's skull + */ + public static final int DEADMAN_SKULL = 33065; + + /** + * Hooded slayer helmet + */ + public static final int SLAYER_HELM_HOODED = 33066; + + /** + * Hooded slayer helmet (i) + */ + public static final int SLAYER_HELM_I_HOODED = 33068; + + /** + * Hooded slayer helmet (i) + */ + public static final int SW_SLAYER_HELM_I_HOODED = 33070; + + /** + * Hooded slayer helmet (i) + */ + public static final int PVPA_SLAYER_HELM_I_HOODED = 33072; + public static final class Cert { public static final int TWPART1 = 7; @@ -90389,59 +90594,6 @@ public static final class Cert public static final int RAW_BOAR_MEAT = 25834; public static final int PRIF_WEAPON_SEED_ENHANCED = 25860; public static final int BOW_OF_FAERDHINEN_INACTIVE = 25863; - public static final int SIGIL_OF_RESILIENCE_UNATTUNED = 25992; - public static final int SIGIL_OF_CONSISTENCY_UNATTUNED = 25995; - public static final int SIGIL_OF_THE_FORMIDABLE_FIGHTER_UNATTUNED = 25998; - public static final int SIGIL_OF_THE_RIGOROUS_RANGER_UNATTUNED = 26001; - public static final int SIGIL_OF_THE_METICULOUS_MAGE_UNATTUNED = 26004; - public static final int SIGIL_OF_FORTIFICATION_UNATTUNED = 26007; - public static final int SIGIL_OF_BARROWS_UNATTUNED = 26010; - public static final int SIGIL_OF_DEFT_STRIKES_UNATTUNED = 26013; - public static final int SIGIL_OF_FREEDOM_UNATTUNED = 26016; - public static final int SIGIL_OF_ENHANCED_HARVEST_UNATTUNED = 26019; - public static final int SIGIL_OF_STORAGE_UNATTUNED = 26022; - public static final int SIGIL_OF_THE_SMITH_UNATTUNED = 26025; - public static final int SIGIL_OF_THE_ALCHEMIST_UNATTUNED = 26028; - public static final int SIGIL_OF_THE_FLETCHER_UNATTUNED = 26031; - public static final int SIGIL_OF_THE_CHEF_UNATTUNED = 26034; - public static final int SIGIL_OF_THE_CRAFTER_UNATTUNED = 26037; - public static final int SIGIL_OF_THE_ABYSS_UNATTUNED = 26040; - public static final int SIGIL_OF_STAMINA_UNATTUNED = 26043; - public static final int SIGIL_OF_THE_POTION_MASTER_UNATTUNED = 26046; - public static final int SIGIL_OF_THE_ETERNAL_JEWELLER_UNATTUNED = 26049; - public static final int SIGIL_OF_THE_TREASURE_HUNTER_UNATTUNED = 26052; - public static final int SIGIL_OF_MOBILITY_UNATTUNED = 26055; - public static final int SIGIL_OF_EXAGGERATION_UNATTUNED = 26058; - public static final int SIGIL_OF_SPECIALISED_STRIKES_UNATTUNED = 26061; - public static final int SIGIL_OF_THE_PORCUPINE_UNATTUNED = 26064; - public static final int SIGIL_OF_BINDING_UNATTUNED = 26067; - public static final int SIGIL_OF_ESCAPING_UNATTUNED = 26070; - public static final int SIGIL_OF_THE_RUTHLESS_RANGER_UNATTUNED = 26073; - public static final int SIGIL_OF_THE_FERAL_FIGHTER_UNATTUNED = 26076; - public static final int SIGIL_OF_THE_MENACING_MAGE_UNATTUNED = 26079; - public static final int SIGIL_OF_PROSPERITY_UNATTUNED = 26082; - public static final int SIGIL_OF_THE_DWARVES_UNATTUNED = 26085; - public static final int SIGIL_OF_THE_ELVES_UNATTUNED = 26088; - public static final int SIGIL_OF_THE_BARBARIANS_UNATTUNED = 26091; - public static final int SIGIL_OF_THE_GNOMES_UNATTUNED = 26094; - public static final int SIGIL_OF_NATURE_UNATTUNED = 26097; - public static final int SIGIL_OF_DEVOTION_UNATTUNED = 26100; - public static final int SIGIL_OF_THE_FORAGER_UNATTUNED = 26103; - public static final int SIGIL_OF_GARMENTS_UNATTUNED = 26106; - public static final int SIGIL_OF_SLAUGHTER_UNATTUNED = 26109; - public static final int SIGIL_OF_THE_FORTUNE_FARMER_UNATTUNED = 26112; - public static final int SIGIL_OF_VERSATILITY_UNATTUNED = 26115; - public static final int SIGIL_OF_THE_SERPENT_UNATTUNED = 26118; - public static final int SIGIL_OF_SUPREME_STAMINA_UNATTUNED = 26121; - public static final int SIGIL_OF_PRESERVATION_UNATTUNED = 26124; - public static final int SIGIL_OF_FINALITY_UNATTUNED = 26127; - public static final int SIGIL_OF_PIOUS_PROTECTION_UNATTUNED = 26130; - public static final int SIGIL_OF_AGGRESSION_UNATTUNED = 26133; - public static final int SIGIL_OF_RAMPAGE_UNATTUNED = 26136; - public static final int SIGIL_OF_THE_SKILLER_UNATTUNED = 26139; - public static final int SIGIL_OF_REMOTE_STORAGE_UNATTUNED = 26142; - public static final int SIGIL_OF_LAST_RECALL_UNATTUNED = 26145; - public static final int SIGIL_OF_THE_GUARDIAN_ANGEL_UNATTUNED = 26148; public static final int POH_CONDENSED_GOLD = 26267; public static final int BRUTAL_2DOSEANCIENTBREW = 26351; public static final int BRUTAL_1DOSEANCIENTBREW = 26354; @@ -90586,24 +90738,6 @@ public static final class Cert public static final int DT2_AWAKENERS_ORB = 28335; public static final int SOULREAPER = 28339; public static final int DT2_STRANGLEWOOD_SURVIVAL_BARRICADE = 28391; - public static final int SIGIL_OF_SUSTENANCE_UNATTUNED = 28479; - public static final int SIGIL_OF_HOARDING_UNATTUNED = 28482; - public static final int SIGIL_OF_THE_ALCHEMANIAC_UNATTUNED = 28485; - public static final int SIGIL_OF_THE_HUNTER_UNATTUNED = 28488; - public static final int SIGIL_OF_RESISTANCE_UNATTUNED = 28491; - public static final int SIGIL_OF_AGILE_FORTUNE_UNATTUNED = 28494; - public static final int SIGIL_OF_THE_FOOD_MASTER_UNATTUNED = 28497; - public static final int SIGIL_OF_THE_WELL_FED_UNATTUNED = 28500; - public static final int SIGIL_OF_THE_INFERNAL_CHEF_UNATTUNED = 28503; - public static final int SIGIL_OF_THE_INFERNAL_SMITH_UNATTUNED = 28506; - public static final int SIGIL_OF_THE_LIGHTBEARER_UNATTUNED = 28509; - public static final int SIGIL_OF_THE_BLOODHOUND_UNATTUNED = 28512; - public static final int SIGIL_OF_PRECISION_UNATTUNED = 28515; - public static final int SIGIL_OF_THE_AUGMENTED_THRALL_UNATTUNED = 28518; - public static final int SIGIL_OF_FAITH_UNATTUNED = 28521; - public static final int SIGIL_OF_TITANIUM_UNATTUNED = 28524; - public static final int SIGIL_OF_THE_NINJA_UNATTUNED = 28527; - public static final int SIGIL_OF_WOODCRAFT_UNATTUNED = 28530; public static final int DEADMAN_BLIGHTED_VOIDWAKER = 28532; public static final int DEADMAN_BLIGHTED_DRAGON_CLAWS = 28535; public static final int DEADMAN_BLIGHTED_AGS = 28538; @@ -90750,17 +90884,6 @@ public static final class Cert public static final int DEADMAN2DOSEOVERLOAD = 29638; public static final int DEADMAN1DOSEOVERLOAD = 29641; public static final int DEADMAN_OVERLOAD_CHITIN = 29644; - public static final int SIGIL_OF_METICULOUSNESS_UNATTUNED = 29650; - public static final int SIGIL_OF_REVOKED_LIMITATION_UNATTUNED = 29653; - public static final int SIGIL_OF_RAMPART_UNATTUNED = 29656; - public static final int SIGIL_OF_DECEPTION_UNATTUNED = 29659; - public static final int SIGIL_OF_LITHE_UNATTUNED = 29662; - public static final int SIGIL_OF_ADROIT_UNATTUNED = 29665; - public static final int SIGIL_OF_ONSLAUGHT_UNATTUNED = 29668; - public static final int SIGIL_OF_RESTORATION_UNATTUNED = 29671; - public static final int SIGIL_OF_SWASHBUCKLER_UNATTUNED = 29674; - public static final int SIGIL_OF_GUNSLINGER_UNATTUNED = 29677; - public static final int SIGIL_OF_ARCANE_SWIFTNESS_UNATTUNED = 29680; public static final int NOXIOUS_HALBERD = 29797; public static final int AMULET_OF_RANCOUR = 29802; public static final int ARANEA_BOOTS = 29807; @@ -91075,6 +91198,14 @@ public static final class Cert public static final int CAMPHOR_LOGS = 32905; public static final int IRONWOOD_LOGS = 32908; public static final int ROSEWOOD_LOGS = 32911; + public static final int DEADMAN_2026_WEAPON_ORNAMENT_SCROLL = 33013; + public static final int DEADMAN_2026_POH_ORNAMENT_SCROLL = 33016; + public static final int DEADMAN_2026_HOME_TELEPORT_SCROLL = 33019; + public static final int DEADMAN_DOGSWORD = 33039; + public static final int DEADMAN_THUNDER_KHOPESH = 33042; + public static final int MAGIC_ROCK_OF_AVARICE = 33045; + public static final int MAGIC_ROCK_OF_FORTUITY_INACTIVE = 33048; + public static final int MAGIC_ROCK_OF_FORTUITY_ACTIVE = 33051; } public static final class Placeholder @@ -100504,6 +100635,29 @@ public static final class Placeholder public static final int XMAS25_BEER_BELLY_SWEATER = 32931; public static final int XMAS25_CONTEST_JUMPER = 32933; public static final int XMAS25_CHRISTMAS_DINNER = 32935; + public static final int HOLY_MOLEYS = 33003; + public static final int DEADMAN_RUINOUS_POWERS_BOOK = 33011; + public static final int DEADMAN_2026_WEAPON_ORNAMENT_SCROLL = 33014; + public static final int DEADMAN_2026_POH_ORNAMENT_SCROLL = 33017; + public static final int DEADMAN_2026_HOME_TELEPORT_SCROLL = 33020; + public static final int BOW_OF_FAERDHINEN_INFINITE_DEADMAN = 33022; + public static final int CRYSTAL_CHESTPLATE_DEADMAN = 33024; + public static final int CRYSTAL_CHESTPLATE_INACTIVE_DEADMAN = 33026; + public static final int CRYSTAL_PLATELEGS_DEADMAN = 33028; + public static final int CRYSTAL_PLATELEGS_INACTIVE_DEADMAN = 33030; + public static final int CRYSTAL_HELMET_DEADMAN = 33032; + public static final int CRYSTAL_HELMET_INACTIVE_DEADMAN = 33034; + public static final int TOXIC_SOTD_CHARGED_DEADMAN = 33037; + public static final int DEADMAN_DOGSWORD = 33040; + public static final int DEADMAN_THUNDER_KHOPESH = 33043; + public static final int MAGIC_ROCK_OF_AVARICE = 33046; + public static final int MAGIC_ROCK_OF_FORTUITY_INACTIVE = 33049; + public static final int MAGIC_ROCK_OF_FORTUITY_ACTIVE = 33052; + public static final int DEADMAN_STARTER_CAPE = 33064; + public static final int SLAYER_HELM_HOODED = 33067; + public static final int SLAYER_HELM_I_HOODED = 33069; + public static final int SW_SLAYER_HELM_I_HOODED = 33071; + public static final int PVPA_SLAYER_HELM_I_HOODED = 33073; } /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java b/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java index df29c4fce58..e23bab2d087 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/NpcID.java @@ -64331,6 +64331,11 @@ public final class NpcID */ public static final int REINFORCED_PIRATE_THIEVING_CHEST_GLE = 14813; + /** + * Revenant imp + */ + public static final int WILD_CAVE_IMP_DEADMAN = 14814; + /** * Spooky chair */ @@ -64548,6 +64553,16 @@ public final class NpcID */ public static final int SLAYER_GRYPHON_BOSS_GUARDIAN_VIS = 14863; + /** + * Revenant goblin + */ + public static final int WILD_CAVE_GOBLIN_DEADMAN = 14864; + + /** + * Revenant pyrefiend + */ + public static final int WILD_CAVE_PYREFIEND_DEADMAN = 14865; + /** * Henderson */ @@ -65939,6 +65954,46 @@ public final class NpcID * Sailing cat */ public static final int SAILING_CHARTING_DRINK_CRATE_SAILING_CAT_EFFECT = 15177; + + /** + * Revenant hobgoblin + */ + public static final int WILD_CAVE_HOBGOBLIN_DEADMAN = 15178; + + /** + * Revenant cyclops + */ + public static final int WILD_CAVE_CYCLOPS_DEADMAN = 15179; + + /** + * Revenant hellhound + */ + public static final int WILD_CAVE_HELLHOUND_DEADMAN = 15180; + + /** + * Revenant demon + */ + public static final int WILD_CAVE_DEMON_DEADMAN = 15181; + + /** + * Revenant ork + */ + public static final int WILD_CAVE_ORK_DEADMAN = 15182; + + /** + * Revenant dark beast + */ + public static final int WILD_CAVE_DARKBEAST_DEADMAN = 15183; + + /** + * Revenant knight + */ + public static final int WILD_CAVE_KNIGHT_DEADMAN = 15184; + + /** + * Revenant dragon + */ + public static final int WILD_CAVE_DRAGON_DEADMAN = 15185; public static final int BOAT_HP_NPC_TINY = 15186; public static final int BOAT_HP_NPC_SMALL = 15187; public static final int BOAT_HP_NPC_MEDIUM = 15188; @@ -66175,6 +66230,11 @@ public final class NpcID */ public static final int SAILING_DOLPHIN_BABY = 15236; + /** + * Zemouregal + */ + public static final int DEADMAN_BREACH_LUCIEN = 15237; + /** * Junior Jim */ @@ -67531,5 +67591,110 @@ public final class NpcID * Trader Crewmember */ public static final int SAILING_TRANSPORT_TRADER_STAN_CREW_WOMAN3_PORT_ROBERTS = 15546; + + /** + * Big Evil Chicken + */ + public static final int DEADMAN_BREACH_EVIL_CHICKEN = 15547; + + /** + * Scurrius + */ + public static final int DEADMAN_BREACH_SCURRIUS = 15548; + + /** + * Phantom Muspah + */ + public static final int DEADMAN_BREACH_MUSPAH = 15549; + + /** + * Splatter + */ + public static final int DEADMAN_BREACH_SPLATTER = 15550; + + /** + * Tumeken's Warden + */ + public static final int DEADMAN_BREACH_WARDEN_TUMEKEN_RANGE = 15551; + + /** + * Elidinis' Warden + */ + public static final int DEADMAN_BREACH_WARDEN_TUMEKEN_MAGE = 15552; + + /** + * I DSCIM YOU + */ + public static final int DEADMAN_BREACH_DSCIM_NPC = 15553; + + /** + * Sol Heredit + */ + public static final int DEADMAN_BREACH_SOL_HEREDIT = 15554; + + /** + * Yama + */ + public static final int DEADMAN_BREACH_YAMA = 15555; + + /** + * Pestilent Bloat + */ + public static final int DEADMAN_BREACH_BLOAT = 15556; + + /** + * TzTok-Jad-Rek + */ + public static final int DEADMAN_BREACH_JAD_MINION = 15557; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_MUMMY_MINION = 15558; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_SHADE_MINION = 15559; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_UNDEAD_ONE_MINION = 15560; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_PIRATE_MINION = 15561; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_ULFRIC_MINION = 15562; + + /** + * Zemouregal Summon + */ + public static final int DEADMAN_BREACH_KHAZARD_MINION = 15563; + + /** + * Zemouregal + */ + public static final int DEADMAN_CHEST_ZEMOUREGAL = 15564; + public static final int DEADMAN_GUARD_UNKAH = 15565; + + /** + * Guard + */ + public static final int DEADMAN_GUARD_UNKAH_VIS = 15566; + public static final int DEADMAN_GUARD_WINTERTODT = 15567; + + /** + * Guard + */ + public static final int DEADMAN_GUARD_WINTERTODT_VIS = 15568; + public static final int DEADMAN_THRALL_ZOMBIE_GREATER_ZUK = 15569; + public static final int DEADMAN_THRALL_SKELETAL_GREATER_PRINCESS = 15570; + public static final int DEADMAN_THRALL_GHOSTLY_GREATER_WISP = 15571; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java index 620bd8b10d8..b03a77d5d98 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/ObjectID1.java @@ -76854,26 +76854,59 @@ public class ObjectID1 */ public static final int SAILING_NPC_BOAT_BASIC_MEDIUM_SAIL = 60244; public static final int SAILING_BOAT_CARGO_HOLD_REGULAR_RAFT = 60245; + + /** + * Deadman's chest + */ + public static final int DEADMAN_RARE_CHEST_SPAWN = 60246; public static final int SAILING_BOAT_CARGO_HOLD_OAK_RAFT = 60247; + + /** + * Deadman's chest + */ + public static final int DEADMAN_RARE_CHEST_IDLE = 60248; public static final int SAILING_BOAT_CARGO_HOLD_TEAK_RAFT = 60249; + + /** + * Deadman's chest + */ + public static final int DEADMAN_RARE_CHEST_OPENED = 60250; public static final int SAILING_BOAT_CARGO_HOLD_MAHOGANY_RAFT = 60251; + public static final int DEADMAN_POH_WALL = 60252; public static final int SAILING_BOAT_CARGO_HOLD_CAMPHOR_RAFT = 60253; + public static final int DEADMAN_POH_WINDOW = 60254; public static final int SAILING_BOAT_CARGO_HOLD_IRONWOOD_RAFT = 60255; + public static final int DEADMAN_POH_WALL_CRUMBLY01_L = 60256; public static final int SAILING_BOAT_CARGO_HOLD_ROSEWOOD_RAFT = 60257; + public static final int DEADMAN_POH_WALL_CRUMBLY01_R = 60258; public static final int SAILING_BOAT_CARGO_HOLD_REGULAR_2X5 = 60259; + public static final int DEADMAN_POH_WALL_CRUMBLY02_L = 60260; public static final int SAILING_BOAT_CARGO_HOLD_OAK_2X5 = 60261; + public static final int DEADMAN_POH_WALL_CRUMBLY02_R = 60262; public static final int SAILING_BOAT_CARGO_HOLD_TEAK_2X5 = 60263; + public static final int DEADMAN_POH_WALL_CRUMBLY03_L = 60264; public static final int SAILING_BOAT_CARGO_HOLD_MAHOGANY_2X5 = 60265; + public static final int DEADMAN_POH_WALL_CRUMBLY03_R = 60266; public static final int SAILING_BOAT_CARGO_HOLD_CAMPHOR_2X5 = 60267; + public static final int DEADMAN_RUBBLE01 = 60268; public static final int SAILING_BOAT_CARGO_HOLD_IRONWOOD_2X5 = 60269; + public static final int DEADMAN_RUBBLE02 = 60270; public static final int SAILING_BOAT_CARGO_HOLD_ROSEWOOD_2X5 = 60271; + public static final int POH_FLOORDECOR_DEADMAN = 60272; public static final int SAILING_BOAT_CARGO_HOLD_REGULAR_LARGE = 60273; + public static final int DEADMAN_DUNGEON_INSIDEWALL_CORNER = 60274; public static final int SAILING_BOAT_CARGO_HOLD_OAK_LARGE = 60275; + public static final int DEADMAN_DUNGEON_OUTSIDEWALL_CORNER = 60276; public static final int SAILING_BOAT_CARGO_HOLD_TEAK_LARGE = 60277; + public static final int DEADMAN_DUNGEON_OUTSIDEWALL_LCORNER = 60278; public static final int SAILING_BOAT_CARGO_HOLD_MAHOGANY_LARGE = 60279; + public static final int DEADMAN_DUNGEON_OUTSIDEWALL_RCORNER = 60280; public static final int SAILING_BOAT_CARGO_HOLD_CAMPHOR_LARGE = 60281; + public static final int DEADMAN_DUNGEON_WALLTOP = 60282; public static final int SAILING_BOAT_CARGO_HOLD_IRONWOOD_LARGE = 60283; + public static final int DEADMAN_DUNGEON_OUTSIDEWALL = 60284; public static final int SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE = 60285; + public static final int DEADMAN_DUNGEON_INSIDEWALL = 60286; /** * Notice board @@ -78022,5 +78055,79 @@ public class ObjectID1 * Rosewood cargo hold */ public static final int SAILING_BOAT_CARGO_HOLD_ROSEWOOD_LARGE_CARGO = 60642; + public static final int DEADMAN_DUNGEON_CORRIDORFILLER = 60643; + public static final int DEADMAN_DUNGEON_CORRIDORFILLERL = 60644; + public static final int DEADMAN_DUNGEON_CORRIDORFILLERR = 60645; + public static final int BLACK_WALL02 = 60646; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_BINGO_01 = 60647; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_BINGO_02 = 60648; + + /** + * Shuttered window + */ + public static final int POH_DEADMAN_WINDOW_SHUTTERS = 60649; + + /** + * Decorative window + */ + public static final int POH_DEADMAN_WINDOW_BOB = 60650; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_BOB2 = 60651; + + /** + * Decorative window + */ + public static final int POH_DEADMAN_WINDOW_GUTHIX = 60652; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_GUTHIX2 = 60653; + + /** + * Decorative window + */ + public static final int POH_DEADMAN_WINDOW_SARADOMIN = 60654; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_SARADOMIN2 = 60655; + + /** + * Decorative window + */ + public static final int POH_DEADMAN_WINDOW_ZAMORAK = 60656; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_ZAMORAK2 = 60657; + + /** + * Decorative window + */ + public static final int POH_DEADMAN_WINDOW_GNOMECHILD = 60658; + + /** + * Stained-glass window + */ + public static final int POH_DEADMAN_WINDOW_GNOMECHILD2 = 60659; + + /** + * Window space + */ + public static final int POH_CHAPELWINDOW_HOTSPOT_DEADMAN = 60660; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java b/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java index bd72fff6a45..aa0d430bc8f 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/SpotanimID.java @@ -3569,5 +3569,15 @@ public final class SpotanimID public static final int VFX_WIND_SAIL_3X10_01 = 3562; public static final int VFX_WIND_SAIL_3X10_SPEEDBOOST01 = 3563; public static final int SHIPYARD_DOG_BALL = 3564; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_FULL = 3565; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_01 = 3566; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_02 = 3567; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_03 = 3568; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_04 = 3569; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_05 = 3570; + public static final int DEADMAN_2026_HOME_TELE_SPOTANIM_06 = 3571; + public static final int DEADMAN_2026_SOTD_SPECIAL_START = 3572; + public static final int DEADMAN_2026_SOTD_SPECIAL_EXTRA = 3573; + public static final int SARADOMIN_LIGHTNING_DEADMAN = 3574; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java index df52b04de05..7001df833df 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/SpriteID.java @@ -10907,4 +10907,112 @@ public static final class Sideicons18x18 public static final int _1 = 7320; public static final int _2 = 7321; } + + public static final class DeadmanSigilCombatIconsLargeInactive + { + public static final int _0 = 7322; + public static final int _1 = 7323; + public static final int _2 = 7324; + public static final int _3 = 7325; + public static final int _4 = 7326; + public static final int _5 = 7327; + public static final int _6 = 7328; + public static final int _7 = 7329; + public static final int _8 = 7330; + public static final int _9 = 7331; + public static final int _10 = 7332; + public static final int _11 = 7333; + public static final int _12 = 7334; + public static final int _13 = 7335; + public static final int _14 = 7336; + public static final int _15 = 7337; + public static final int _16 = 7338; + public static final int _17 = 7339; + public static final int _18 = 7340; + public static final int _19 = 7341; + public static final int _20 = 7342; + public static final int _21 = 7343; + public static final int _22 = 7344; + public static final int _23 = 7345; + public static final int _24 = 7346; + public static final int _25 = 7347; + public static final int _26 = 7348; + public static final int _27 = 7349; + public static final int _28 = 7350; + public static final int _29 = 7351; + public static final int _30 = 7352; + public static final int _31 = 7353; + } + + public static final class DeadmanSigilSkillingIconsLargeInactive + { + public static final int _0 = 7354; + public static final int _1 = 7355; + public static final int _2 = 7356; + public static final int _3 = 7357; + public static final int _4 = 7358; + public static final int _5 = 7359; + public static final int _6 = 7360; + public static final int _7 = 7361; + public static final int _8 = 7362; + public static final int _9 = 7363; + public static final int _10 = 7364; + public static final int _11 = 7365; + public static final int _12 = 7366; + public static final int _13 = 7367; + public static final int _14 = 7368; + public static final int _15 = 7369; + public static final int _16 = 7370; + public static final int _17 = 7371; + public static final int _18 = 7372; + public static final int _19 = 7373; + public static final int _20 = 7374; + public static final int _21 = 7375; + public static final int _22 = 7376; + public static final int _23 = 7377; + public static final int _24 = 7378; + public static final int _25 = 7379; + public static final int _26 = 7380; + public static final int _27 = 7381; + public static final int _28 = 7382; + public static final int _29 = 7383; + public static final int _30 = 7384; + public static final int _31 = 7385; + } + + public static final class DeadmanSigilUtilityIconsLargeInactive + { + public static final int _0 = 7386; + public static final int _1 = 7387; + public static final int _2 = 7388; + public static final int _3 = 7389; + public static final int _4 = 7390; + public static final int _5 = 7391; + public static final int _6 = 7392; + public static final int _7 = 7393; + public static final int _8 = 7394; + public static final int _9 = 7395; + public static final int _10 = 7396; + public static final int _11 = 7397; + public static final int _12 = 7398; + public static final int _13 = 7399; + public static final int _14 = 7400; + public static final int _15 = 7401; + public static final int _16 = 7402; + public static final int _17 = 7403; + public static final int _18 = 7404; + public static final int _19 = 7405; + public static final int _20 = 7406; + public static final int _21 = 7407; + public static final int _22 = 7408; + public static final int _23 = 7409; + public static final int _24 = 7410; + public static final int _25 = 7411; + public static final int _26 = 7412; + public static final int _27 = 7413; + public static final int _28 = 7414; + public static final int _29 = 7415; + public static final int _30 = 7416; + public static final int _31 = 7417; + } } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java index de4e0b83b60..3c8a0cbde6e 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.java @@ -2588,5 +2588,12 @@ public final class VarPlayerID public static final int COLLECTION_PERSONAL_BEST_TRANSMIT = 5217; public static final int COLLECTION_PERSONAL_BEST_TRANSMIT_2 = 5218; public static final int ERNESTHANDIN = 5219; + public static final int DEADMAN_POINTS_2026 = 5220; + public static final int DEADMAN_TUTORIAL = 5224; + public static final int DEADMAN_SKULL_POINTS = 5225; + public static final int DEADMAN_SKULL_POINTS_USED = 5226; + public static final int DEADMAN_SKULL_GENERAL = 5227; + public static final int SIGIL_STATE_1 = 5228; + public static final int SIGIL_TOGGLE_1 = 5229; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java index 52db5425f0a..4d788155208 100644 --- a/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java +++ b/runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java @@ -13880,5 +13880,62 @@ public final class VarbitID public static final int DRAGONSLAYER_MET_SAWMILL = 19653; public static final int DRAGONSLAYER_PLANKS_MADE = 19654; public static final int ERNESTHANDIN_COMPLETE = 19655; + public static final int DEADMAN_FINALE_TELEPORT_BH_COMPLETE = 19656; + public static final int DEADMAN_FINALE_TELEPORT_COLOSSEUM_COMPLETE = 19657; + public static final int DEADMAN_FINALE_TEAM = 19658; + public static final int DEADMAN_QUEST_LAMP_TIER_5 = 19660; + public static final int DEADMAN_QUEST_LAMP_TIER_6 = 19661; + public static final int DEADMAN_QUEST_LAMP_TIER_7 = 19662; + public static final int DEADMAN_QUEST_LAMP_TIER_8 = 19663; + public static final int DEADMAN_QUEST_LAMP_TIER_9 = 19664; + public static final int DEADMAN_QUEST_LAMP_TIER_10 = 19665; + public static final int DEADMAN_RUINOUS_PRAYERS_UNLOCK_CHECK = 19666; + public static final int DEADMAN_2026_WEAPON_ORNAMENT_UNLOCKED = 19671; + public static final int DEADMAN_2026_POH_ORNAMENT_UNLOCKED = 19672; + public static final int DEADMAN_2026_TELEPORT_UNLOCKED = 19673; + public static final int DEADMAN_2026_TUTORIAL_STEP = 19677; + public static final int DEADMAN_2026_INITIAL_SETUP_DONE = 19678; + public static final int DEADMAN_2026_TUTORIAL_END = 19679; + public static final int DEADMAN_2026_TUTORIAL_TELEPORT_DEST = 19680; + public static final int DEADMAN_FACTION_CHARACTER_CREATION_COMPLETE = 19681; + public static final int DEADMAN_SKULL_TAB = 19682; + public static final int SIGIL_OF_AGILE_FORTUNE_STATE = 19683; + public static final int SIGIL_OF_HOARDING_STATE = 19684; + public static final int SIGIL_OF_DECEPTION_STATE = 19685; + public static final int SIGIL_OF_LITHE_STATE = 19686; + public static final int SIGIL_OF_THE_FOOD_MASTER_STATE = 19687; + public static final int SIGIL_OF_THE_WELL_FED_STATE = 19688; + public static final int SIGIL_OF_THE_POTION_MASTER_STATE = 19689; + public static final int SIGIL_OF_THE_TREASURE_HUNTER_STATE = 19690; + public static final int SIGIL_OF_THE_HUNTER_STATE = 19691; + public static final int SIGIL_OF_THE_INFERNAL_CHEF_STATE = 19692; + public static final int SIGIL_OF_NATURE_STATE = 19693; + public static final int SIGIL_OF_FAITH_STATE = 19694; + public static final int SIGIL_OF_DEVOTION_STATE = 19695; + public static final int SIGIL_OF_THE_ALCHEMANIAC_STATE = 19696; + public static final int SIGIL_OF_RESISTANCE_STATE = 19697; + public static final int SIGIL_OF_DEFT_STRIKES_STATE = 19698; + public static final int SIGIL_OF_THE_AUGMENTED_THRALL_STATE = 19699; + public static final int SIGIL_OF_ONSLAUGHT_STATE = 19700; + public static final int SIGIL_OF_RESTORATION_STATE = 19701; + public static final int SIGIL_OF_TITANIUM_STATE = 19702; + public static final int SIGIL_OF_METICULOUSNESS_STATE = 19703; + public static final int SIGIL_OF_ENHANCED_HARVEST_STATE = 19704; + public static final int SIGIL_OF_MOBILITY_STATE = 19705; + public static final int SIGIL_OF_SLAUGHTER_STATE = 19706; + public static final int SIGIL_OF_WOODCRAFT_STATE = 19707; + public static final int SIGIL_OF_REMOTE_STORAGE_STATE = 19708; + public static final int SIGIL_OF_CONCLUSION_STATE = 19709; + public static final int SIGIL_OF_AUTOMATION_STATE = 19710; + public static final int SIGIL_OF_ETERNAL_BELIEF_STATE = 19711; + public static final int SIGIL_OF_EFFICIENCY_STATE = 19712; + public static final int SIGIL_OF_REVOKED_LIMITATION_STATE = 19713; + public static final int SIGIL_OF_ENHANCED_HARVEST_TOGGLE = 19714; + public static final int SIGIL_OF_MOBILITY_TOGGLE = 19715; + public static final int SIGIL_OF_SLAUGHTER_TOGGLE = 19716; + public static final int SIGIL_OF_WOODCRAFT_TOGGLE = 19717; + public static final int SIGIL_OF_REMOTE_STORAGE_TOGGLE = 19718; + public static final int SIGIL_OF_DEVOTION_TOGGLE = 19719; + public static final int SLAYER_UNLOCK_HELM_HOODED = 19720; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java b/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java index 3978a4ae245..51cb1a9dcc3 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java @@ -46,7 +46,7 @@ public enum RuneScapeProfileType SHATTERED_RELICS_LEAGUE, TRAILBLAZER_RELOADED_LEAGUE, RAGING_ECHOES_LEAGUE, - GRID_MASTER(client -> client.getWorldType().contains(WorldType.TOURNAMENT_WORLD)), + GRID_MASTER, ; private final Predicate test; diff --git a/runelite-client/src/main/java/net/runelite/client/hiscore/HiscoreEndpoint.java b/runelite-client/src/main/java/net/runelite/client/hiscore/HiscoreEndpoint.java index 22808ac867f..29703676da0 100644 --- a/runelite-client/src/main/java/net/runelite/client/hiscore/HiscoreEndpoint.java +++ b/runelite-client/src/main/java/net/runelite/client/hiscore/HiscoreEndpoint.java @@ -39,7 +39,7 @@ public enum HiscoreEndpoint ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.json"), DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.json"), SEASONAL("Leagues", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.json"), - TOURNAMENT("Grid Master", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.json"), + TOURNAMENT("Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.json"), FRESH_START_WORLD("Fresh Start", "https://secure.runescape.com/m=hiscore_oldschool_fresh_start/index_lite.json"), PURE("1 Defence Pure", "https://secure.runescape.com/m=hiscore_oldschool_skiller_defence/index_lite.json"), LEVEL_3_SKILLER("Level 3 Skiller", "https://secure.runescape.com/m=hiscore_oldschool_skiller/index_lite.json"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VBO.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VBO.java index 8e0aa13f361..c20fc96c58c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VBO.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/VBO.java @@ -73,7 +73,8 @@ void map() buffer = glMapBufferRange(GL_ARRAY_BUFFER, 0, size, GL_MAP_WRITE_BIT | (usage == GL_STATIC_DRAW ? 0 : (GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_FLUSH_EXPLICIT_BIT)), buffer); if (buffer == null) { - throw new RuntimeException("unable to map GL buffer " + bufId + " size " + size); + int err = glGetError(); + throw new RuntimeException("unable to map GL buffer (bufId: " + bufId + " size: " + size + " renderer: " + glGetString(GL_RENDERER) + " version: " + glGetString(GL_VERSION) + " err: " + err + ")"); } this.vb = buffer.asIntBuffer(); glBindBuffer(GL_ARRAY_BUFFER, 0); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java index 2dfa06569fc..2f3b6c3bf44 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java @@ -133,6 +133,10 @@ enum ItemWithCharge BELLOWS3(BELLOWS, ItemID.FILLED_OGRE_BELLOW3, 3), BLACK_WARLOCK_MIX1(POTION, ItemID.HUNTER_MIX_WARLOCK_1DOSE, 1), BLACK_WARLOCK_MIX2(POTION, ItemID.HUNTER_MIX_WARLOCK_2DOSE, 2), + BLIGHTED_OVERLOAD1(POTION, ItemID.DEADMAN1DOSEOVERLOAD, 1), + BLIGHTED_OVERLOAD2(POTION, ItemID.DEADMAN2DOSEOVERLOAD, 2), + BLIGHTED_OVERLOAD3(POTION, ItemID.DEADMAN3DOSEOVERLOAD, 3), + BLIGHTED_OVERLOAD4(POTION, ItemID.DEADMAN4DOSEOVERLOAD, 4), BLIGHTED_SUPER_REST1(POTION, ItemID.BLIGHTED_1DOSE2RESTORE, 1), BLIGHTED_SUPER_REST2(POTION, ItemID.BLIGHTED_2DOSE2RESTORE, 2), BLIGHTED_SUPER_REST3(POTION, ItemID.BLIGHTED_3DOSE2RESTORE, 3), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java index b7cc2ff8691..fe8708a9782 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java @@ -279,6 +279,8 @@ private void init() // Regular overload (NMZ) add(combo(SUPER_ATTACK_POT, SUPER_STRENGTH_POT, SUPER_DEFENCE_POT, superRangingPot, superMagicPot, heal(HITPOINTS, -50)), ItemID.NZONE1DOSEOVERLOADPOTION, ItemID.NZONE2DOSEOVERLOADPOTION, ItemID.NZONE3DOSEOVERLOADPOTION, ItemID.NZONE4DOSEOVERLOADPOTION); + // Blighted overload (DMM) + add(combo(boost(ATTACK, perc(.15, 8)), boost(STRENGTH, perc(.15, 8)), new BoostedStatBoost(DEFENCE, false, perc(.1, -1)), boost(RANGED, perc(.1, 7)), boost(MAGIC, perc(.1, 1)), heal(HITPOINTS, -25)), ItemID.DEADMAN1DOSEOVERLOAD, ItemID.DEADMAN2DOSEOVERLOAD, ItemID.DEADMAN3DOSEOVERLOAD, ItemID.DEADMAN4DOSEOVERLOAD); // Bandages (Castle Wars) add(new CastleWarsBandage(), ItemID.CASTLEWARS_BANDAGES); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/BreakHandlerScript.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/BreakHandlerScript.java index bab66286ae3..4bb0967c987 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/BreakHandlerScript.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/breakhandler/BreakHandlerScript.java @@ -466,9 +466,10 @@ private void handleLoggedOutState() { * In micro break state (no logout), waiting for duration to complete. */ private void handleLoginBreakActiveState() { - // Check if micro break should end - if ((breakDuration <= 0 && !Rs2AntibanSettings.microBreakActive) || config.breakEndNow()) { - log.debug("Micro break completed"); + // Check if in-game break (micro break or no-logout break) should end + if (breakDuration <= 0 || config.breakEndNow()) { + String breakType = Rs2AntibanSettings.microBreakActive ? "Micro break" : "In-game break"; + log.debug("{} completed", breakType); transitionToState(BreakHandlerState.BREAK_ENDING); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roofremoval/RoofRemovalPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roofremoval/RoofRemovalPlugin.java index b12fc4a75a6..ec56fb5f183 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roofremoval/RoofRemovalPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roofremoval/RoofRemovalPlugin.java @@ -273,17 +273,16 @@ private void applyRoofOverrides(Scene scene) return; } - Tile[][][] tiles = scene.getTiles(); + Tile[][][] tiles = scene.getExtendedTiles(); // the extended tile settings control what is actually drawn, the normal // tile settings are just a copy byte[][][] settings = scene.getExtendedTileSettings(); - final int SCENE_OFFSET = (Constants.EXTENDED_SCENE_SIZE - Constants.SCENE_SIZE) / 2; for (int z = 0; z < Constants.MAX_Z; z++) { - for (int x = 0; x < Constants.SCENE_SIZE; x++) + for (int x = 0; x < Constants.EXTENDED_SCENE_SIZE; x++) { - for (int y = 0; y < Constants.SCENE_SIZE; y++) + for (int y = 0; y < Constants.EXTENDED_SCENE_SIZE; y++) { Tile tile = tiles[z][x][y]; if (tile == null) @@ -297,7 +296,7 @@ private void applyRoofOverrides(Scene scene) int regionAndPlane = wp.getRegionID() << 2 | wp.getPlane(); if (configOverrideRegions.contains(wp.getRegionID())) { - settings[z][x + SCENE_OFFSET][y + SCENE_OFFSET] |= Constants.TILE_FLAG_UNDER_ROOF; + settings[z][x][y] |= Constants.TILE_FLAG_UNDER_ROOF; } else if (overrides.containsKey(regionAndPlane)) { @@ -306,7 +305,7 @@ else if (overrides.containsKey(regionAndPlane)) long[] region = overrides.get(regionAndPlane); if ((region[ry] & (1L << rx)) != 0) { - settings[z][x + SCENE_OFFSET][y + SCENE_OFFSET] |= Constants.TILE_FLAG_UNDER_ROOF; + settings[z][x][y] |= Constants.TILE_FLAG_UNDER_ROOF; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/GameTimer.java index d0ea2456e9d..4e460ab93b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/GameTimer.java @@ -103,6 +103,7 @@ public enum GameTimer GOADING(ItemID._4DOSEGOADING, GameTimerImageType.ITEM, "Goading potion", false), PRAYER_REGENERATION(ItemID._4DOSE1PRAYER_REGENERATION, GameTimerImageType.ITEM, "Prayer regeneration", false), SURGE_POTION(ItemID._4DOSESURGE, GameTimerImageType.ITEM, "Surge potion", false), + BLIGHTED_OVERLOAD(ItemID.DEADMAN4DOSEOVERLOAD, GameTimerImageType.ITEM, "Blighted Overload", false), ; @Nullable diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/TimersAndBuffsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/TimersAndBuffsPlugin.java index e6b3d09a1c1..f6d4b531e78 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/TimersAndBuffsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timersandbuffs/TimersAndBuffsPlugin.java @@ -379,7 +379,8 @@ else if (nextPoisonTick - tickCount <= 0) } if ((event.getVarbitId() == VarbitID.NZONE_OVERLOAD_POTION_EFFECTS - || event.getVarbitId() == VarbitID.RAIDS_OVERLOAD_TIMER) && config.showOverload()) + || event.getVarbitId() == VarbitID.RAIDS_OVERLOAD_TIMER + || event.getVarbitId() == VarbitID.DEADMAN_OVERLOAD_POTION_EFFECTS) && config.showOverload()) { final int overloadVarb = event.getValue(); final int tickCount = client.getTickCount(); @@ -393,7 +394,16 @@ else if (nextOverloadRefreshTick - tickCount <= 0) nextOverloadRefreshTick = tickCount + OVERLOAD_TICK_LENGTH; } - GameTimer overloadTimer = client.getVarbitValue(VarbitID.RAIDS_CLIENT_INDUNGEON) == 1 ? OVERLOAD_RAID : OVERLOAD; + GameTimer overloadTimer; + if (event.getVarbitId() == VarbitID.DEADMAN_OVERLOAD_POTION_EFFECTS) + { + overloadTimer = BLIGHTED_OVERLOAD; + } + else + { + overloadTimer = client.getVarbitValue(VarbitID.RAIDS_CLIENT_INDUNGEON) == 1 ? OVERLOAD_RAID : OVERLOAD; + } + updateVarTimer(overloadTimer, overloadVarb, i -> nextOverloadRefreshTick - tickCount + (i - 1) * OVERLOAD_TICK_LENGTH); } @@ -722,6 +732,7 @@ else if (client.getGameState() == GameState.LOGGED_IN) { removeGameTimer(OVERLOAD); removeGameTimer(OVERLOAD_RAID); + removeGameTimer(BLIGHTED_OVERLOAD); removeGameTimer(SMELLING_SALTS); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PaymentTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PaymentTracker.java index 46731a69ae6..e90bb529972 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PaymentTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PaymentTracker.java @@ -31,9 +31,11 @@ import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MenuAction; import net.runelite.api.ScriptID; +import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.ScriptPreFired; @@ -60,6 +62,8 @@ public class PaymentTracker "Alright, leave it with me. I'll look after that nursery for
you." ); + private static final String FALADOR_DIARY_TEXT = "The gardener protects your tree for you, free of charge, as a token of gratitude for completing the Falador elite diary."; + private final Client client; private final ConfigManager configManager; private final FarmingWorld farmingWorld; @@ -120,6 +124,35 @@ else if ((action == MenuAction.NPC_THIRD_OPTION || action == MenuAction.NPC_FOUR } } + @Subscribe + public void onChatMessage(ChatMessage event) + { + if (event.getType() != ChatMessageType.GAMEMESSAGE || !event.getMessage().equals(FALADOR_DIARY_TEXT)) + { + return; + } + + FarmingPatch p = null; + for (FarmingRegion region : farmingWorld.getRegionsForLocation(client.getLocalPlayer().getWorldLocation())) + { + for (FarmingPatch patch : region.getPatches()) + { + if (region.getName().equals("Falador") && patch.getImplementation() == PatchImplementation.TREE) + { + p = patch; + } + } + } + + if (p == null || getProtectedState(p)) + { + return; + } + + log.debug("Detected patch protection for {}", p); + setProtectedState(p, true); + } + @Subscribe public void onScriptPreFired(ScriptPreFired scriptPreFired) { diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 0c361932f2d..e529cbc5659 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -7975,7 +7975,11 @@ 29816, 29818, 29820, - 29822 + 29822, + 33066, + 33068, + 33070, + 33072 ], "slayer ring": [ 11866, @@ -8458,7 +8462,9 @@ ], "toxic staff": [ 12902, - 12904 + 12904, + 33035, + 33036 ], "antivenom": [ 12905, @@ -10305,7 +10311,9 @@ 27765, 27767, 27777, - 27779 + 27779, + 33031, + 33033 ], "crystal body": [ 23889, @@ -10327,7 +10335,9 @@ 27757, 27759, 27769, - 27771 + 27771, + 33023, + 33025 ], "crystal legs": [ 23892, @@ -10349,7 +10359,9 @@ 27761, 27763, 27773, - 27775 + 27775, + 33027, + 33029 ], "crystal staff": [ 23898, @@ -10990,7 +11002,8 @@ 25892, 25894, 25896, - 27187 + 27187, + 33021 ], "ghommals hilt": [ 25926, @@ -11947,7 +11960,7 @@ 28495, 28496 ], - "sigil of the wellfed": [ + "sigil of the well fed": [ 28498, 28499 ], @@ -11999,11 +12012,9 @@ 28547, 28549 ], - "quest lamp": [ - 28551, - 28552, - 28553, - 28554 + "mahjarrat quest lamp": [ + 28554, + 33007 ], "warped sceptre": [ 28583, @@ -12054,6 +12065,10 @@ 28733, 28745 ], + "ruinous powers": [ + 28775, + 33010 + ], "trailblazer reloaded relic hunter armour set": [ 28777, 28780, @@ -12307,7 +12322,7 @@ 29651, 29652 ], - "sigil of rampart": [ + "sigil of the rampart": [ 29654, 29655 ], @@ -12315,11 +12330,11 @@ 29657, 29658 ], - "sigil of lithe": [ + "sigil of litheness": [ 29660, 29661 ], - "sigil of adroit": [ + "sigil of the adroit": [ 29663, 29664 ], @@ -12331,11 +12346,11 @@ 29669, 29670 ], - "sigil of swashbuckler": [ + "sigil of the swashbuckler": [ 29672, 29673 ], - "sigil of gunslinger": [ + "sigil of the gunslinger": [ 29675, 29676 ], @@ -12591,10 +12606,18 @@ 30334, 30337 ], + "the dogsword": [ + 30367, + 33038 + ], "drygore blowpipe": [ 30373, 30374 ], + "thunder khopesh": [ + 30388, + 33041 + ], "natures reprisal": [ 30390, 30392 @@ -13655,5 +13678,29 @@ "crate of maces": [ 32761, 32799 + ], + "trinket of fortuity": [ + 33047, + 33050 + ], + "sigil of the gods": [ + 33053, + 33054 + ], + "sigil of conclusion": [ + 33055, + 33056 + ], + "sigil of automation": [ + 33057, + 33058 + ], + "sigil of eternal belief": [ + 33059, + 33060 + ], + "sigil of efficiency": [ + 33061, + 33062 ] } \ No newline at end of file diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/tournament.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/tournament.png index 6d74c4f5797..4a2128fa999 100644 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/tournament.png and b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/tournament.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip index 1828709adf5..2d38bd55c29 100644 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip and b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip differ diff --git a/runelite-client/src/main/scripts/MagicSpellbookRedraw.hash b/runelite-client/src/main/scripts/MagicSpellbookRedraw.hash index 719d4ce0623..d9a9de12656 100644 --- a/runelite-client/src/main/scripts/MagicSpellbookRedraw.hash +++ b/runelite-client/src/main/scripts/MagicSpellbookRedraw.hash @@ -1 +1 @@ -973BEC2DE26EF911FD097FB168CB4B58B5F6FDF739AA11700CEA7B1A74040B0A \ No newline at end of file +7E3E372CFE585F4F2FF4ABF6720B2E25623A3E4F6233F13307BC07AD10E7DB95 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/MagicSpellbookRedraw.rs2asm b/runelite-client/src/main/scripts/MagicSpellbookRedraw.rs2asm index e7e6f2aa2df..a55f35e4f66 100644 --- a/runelite-client/src/main/scripts/MagicSpellbookRedraw.rs2asm +++ b/runelite-client/src/main/scripts/MagicSpellbookRedraw.rs2asm @@ -519,33 +519,38 @@ LABEL448: multiply add istore 31 - jump LABEL642 + jump LABEL646 LABEL459: get_varbit 6548 iconst 1 - if_icmpeq LABEL473 + if_icmpeq LABEL477 iload 10 iconst 0 if_icmpeq LABEL466 - jump LABEL553 + jump LABEL557 LABEL466: + invoke 1138 + iconst 0 + if_icmpeq LABEL470 + jump LABEL557 +LABEL470: get_varbit 8121 iconst 1 - if_icmpeq LABEL473 + if_icmpeq LABEL477 get_varbit 6549 iconst 1 - if_icmpeq LABEL473 - jump LABEL553 -LABEL473: + if_icmpeq LABEL477 + jump LABEL557 +LABEL477: iload 22 iconst 28 - if_icmple LABEL477 - jump LABEL480 -LABEL477: + if_icmple LABEL481 + jump LABEL484 +LABEL481: iconst 4 istore 27 - jump LABEL490 -LABEL480: + jump LABEL494 +LABEL484: iconst 4 iconst 7 iload 22 @@ -556,7 +561,7 @@ LABEL480: invoke 1046 invoke 1045 istore 27 -LABEL490: +LABEL494: iconst 0 iload 26 iload 11 @@ -583,9 +588,9 @@ LABEL490: istore 28 iload 28 iconst 2 - if_icmpge LABEL518 - jump LABEL532 -LABEL518: + if_icmpge LABEL522 + jump LABEL536 +LABEL522: iconst 0 iload 30 iload 12 @@ -600,7 +605,7 @@ LABEL518: invoke 1046 invoke 1045 istore 29 -LABEL532: +LABEL536: iload 28 iload 26 multiply @@ -621,30 +626,30 @@ LABEL532: iconst 1 iload 0 if_setposition - jump LABEL642 -LABEL553: + jump LABEL646 +LABEL557: iload 22 iconst 15 - if_icmple LABEL557 - jump LABEL562 -LABEL557: + if_icmple LABEL561 + jump LABEL566 +LABEL561: iconst 40 iconst 3 istore 27 istore 26 - jump LABEL581 -LABEL562: + jump LABEL585 +LABEL566: iload 22 iconst 20 - if_icmple LABEL566 - jump LABEL571 -LABEL566: + if_icmple LABEL570 + jump LABEL575 +LABEL570: iconst 40 iconst 4 istore 27 istore 26 - jump LABEL581 -LABEL571: + jump LABEL585 +LABEL575: iconst 4 iconst 7 iload 22 @@ -655,7 +660,7 @@ LABEL571: invoke 1046 invoke 1045 istore 27 -LABEL581: +LABEL585: iconst 0 iconst 5 iconst 7 @@ -685,9 +690,9 @@ LABEL581: istore 28 iload 28 iconst 2 - if_icmpge LABEL612 - jump LABEL626 -LABEL612: + if_icmpge LABEL616 + jump LABEL630 +LABEL616: iconst 0 iload 30 iload 12 @@ -702,7 +707,7 @@ LABEL612: invoke 1046 invoke 1045 istore 29 -LABEL626: +LABEL630: iload 28 iload 26 multiply @@ -719,7 +724,7 @@ LABEL626: iconst 1 iload 0 if_setposition -LABEL642: +LABEL646: iload 27 iload 26 multiply @@ -754,12 +759,12 @@ LABEL642: istore 38 iconst 0 istore 24 -LABEL676: +LABEL680: iload 24 iload 22 - if_icmplt LABEL680 - jump LABEL859 -LABEL680: + if_icmplt LABEL684 + jump LABEL863 +LABEL684: iconst 105 iconst 111 iload 14 @@ -769,13 +774,13 @@ LABEL680: istore 23 invoke 3160 iconst 1 - if_icmpeq LABEL691 - jump LABEL694 -LABEL691: + if_icmpeq LABEL695 + jump LABEL698 +LABEL695: iload 23 invoke 3159 istore 23 -LABEL694: +LABEL698: iload 23 iconst 596 oc_param @@ -812,52 +817,52 @@ LABEL694: istore 32 iload 32 iconst 1 - if_icmpeq LABEL732 - jump LABEL748 -LABEL732: + if_icmpeq LABEL736 + jump LABEL752 +LABEL736: iload 26 iconst 40 - if_icmpge LABEL736 - jump LABEL742 -LABEL736: + if_icmpge LABEL740 + jump LABEL746 +LABEL740: iload 23 iconst 599 oc_param iload 33 if_setgraphic - jump LABEL747 -LABEL742: + jump LABEL751 +LABEL746: iload 23 iconst 597 oc_param iload 33 if_setgraphic -LABEL747: - jump LABEL788 -LABEL748: +LABEL751: + jump LABEL792 +LABEL752: iload 26 iconst 40 - if_icmpge LABEL752 - jump LABEL758 -LABEL752: + if_icmpge LABEL756 + jump LABEL762 +LABEL756: iload 23 iconst 600 oc_param iload 33 if_setgraphic - jump LABEL763 -LABEL758: + jump LABEL767 +LABEL762: iload 23 iconst 598 oc_param iload 33 if_setgraphic -LABEL763: +LABEL767: iload 36 iconst -1 - if_icmpne LABEL767 - jump LABEL788 -LABEL767: + if_icmpne LABEL771 + jump LABEL792 +LABEL771: iload 0 iconst 5 iload 25 @@ -879,14 +884,14 @@ LABEL767: iconst 1 add istore 25 -LABEL788: +LABEL792: iload 33 invoke 2615 iload 10 iconst 1 - if_icmpeq LABEL794 - jump LABEL822 -LABEL794: + if_icmpeq LABEL798 + jump LABEL826 +LABEL798: iload 1 iconst 5 iload 24 @@ -914,8 +919,8 @@ LABEL794: iload 12 sconst "iiii" cc_setonclick - jump LABEL854 -LABEL822: + jump LABEL858 +LABEL826: iconst 2622 iconst 1 iload 23 @@ -948,11 +953,11 @@ LABEL822: sconst "iiiiiiii" iload 33 if_setonmouseleave -LABEL854: +LABEL858: iload 24 iconst 1 add istore 24 - jump LABEL676 -LABEL859: + jump LABEL680 +LABEL863: return diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatEffectTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatEffectTest.java index f35e45def1c..ce6fdb05aea 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatEffectTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatEffectTest.java @@ -516,6 +516,47 @@ public void testHaddock() assertEquals(18, skillChange(Skill.HITPOINTS, 99, 1, haddock)); } + @Test + public void testBlightedOverload() + { + final Effect blightedOverload = new ItemStatChanges().get(ItemID.DEADMAN4DOSEOVERLOAD); + + assertEquals(-25, skillChange(Skill.HITPOINTS, 49, 44, blightedOverload)); + assertEquals(-25, skillChange(Skill.HITPOINTS, 64, 64, blightedOverload)); + assertEquals(-25, skillChange(Skill.HITPOINTS, 99, 77, blightedOverload)); + + assertEquals(13, skillChange(Skill.STRENGTH, 36, 36, blightedOverload)); + assertEquals(17, skillChange(Skill.STRENGTH, 66, 66, blightedOverload)); + assertEquals(19, skillChange(Skill.STRENGTH, 74, 74, blightedOverload)); + assertEquals(20, skillChange(Skill.STRENGTH, 83, 83, blightedOverload)); + assertEquals(22, skillChange(Skill.STRENGTH, 99, 99, blightedOverload)); + + assertEquals(0, skillChange(Skill.DEFENCE, 1, 0, blightedOverload)); + assertEquals(-1, skillChange(Skill.DEFENCE, 1, 1, blightedOverload)); + assertEquals(-3, skillChange(Skill.DEFENCE, 29, 29, blightedOverload)); + assertEquals(-6, skillChange(Skill.DEFENCE, 54, 54, blightedOverload)); + assertEquals(-8, skillChange(Skill.DEFENCE, 71, 71, blightedOverload)); + assertEquals(-10, skillChange(Skill.DEFENCE, 90, 90, blightedOverload)); + assertEquals(-9, skillChange(Skill.DEFENCE, 99, 89, blightedOverload)); + assertEquals(-10, skillChange(Skill.DEFENCE, 99, 99, blightedOverload)); + assertEquals(-11, skillChange(Skill.DEFENCE, 99, 101, blightedOverload)); + assertEquals(-12, skillChange(Skill.DEFENCE, 99, 113, blightedOverload)); + + assertEquals(7, skillChange(Skill.RANGED, 3, 3, blightedOverload)); + assertEquals(11, skillChange(Skill.RANGED, 49, 49, blightedOverload)); + assertEquals(14, skillChange(Skill.RANGED, 72, 72, blightedOverload)); + assertEquals(15, skillChange(Skill.RANGED, 87, 87, blightedOverload)); + assertEquals(16, skillChange(Skill.RANGED, 99, 99, blightedOverload)); + + assertEquals(1, skillChange(Skill.MAGIC, 8, 8, blightedOverload)); + assertEquals(3, skillChange(Skill.MAGIC, 28, 28, blightedOverload)); + assertEquals(7, skillChange(Skill.MAGIC, 68, 68, blightedOverload)); + assertEquals(9, skillChange(Skill.MAGIC, 80, 80, blightedOverload)); + assertEquals(9, skillChange(Skill.MAGIC, 89, 89, blightedOverload)); + assertEquals(10, skillChange(Skill.MAGIC, 99, 89, blightedOverload)); + assertEquals(9, skillChange(Skill.MAGIC, 99, 100, blightedOverload)); + } + private int skillChange(Skill skill, int maxValue, int currentValue, Effect effect) { if (effect == null)