diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b81b266c5c..5fb002187c 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,9 +25,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.7.22" + const val rlVersion = "1.7.23" - const val openosrsVersion = "4.9.13" + const val openosrsVersion = "4.9.14" const val rsversion = 199 const val cacheversion = 165 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 196a9103b5..d364d73f48 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -12028,5 +12028,128 @@ public final class ItemID public static final int SULPHURIC_ACID = 25966; public static final int STICKY_NOTE = 25967; public static final int HESPORI_BARK = 25968; + public static final int MASORI_CHESTPLATE = 25969; + public static final int MASORI_CHAINSKIRT = 25971; + public static final int MASORI_AMULET = 25973; + public static final int LIGHTBEARER = 25975; + public static final int OSMUMTENS_KHOPESH = 25977; + public static final int KERIS_PARTISAN = 25979; + public static final int KERIS_PARTISAN_OF_BREACHING = 25981; + public static final int ELIDINIS_BROKEN_WARD = 25983; + public static final int ELIDINIS_WARD = 25985; + public static final int TUMEKENS_HEKA = 25987; + public static final int TUMEKENS_HEKA_UNCHARGED = 25989; + public static final int SIGIL_OF_RESILIENCE = 25990; + public static final int SIGIL_OF_RESILIENCE_25991 = 25991; + public static final int SIGIL_OF_CONSISTENCY = 25993; + public static final int SIGIL_OF_CONSISTENCY_25994 = 25994; + public static final int SIGIL_OF_THE_FORMIDABLE_FIGHTER = 25996; + public static final int SIGIL_OF_THE_FORMIDABLE_FIGHTER_25997 = 25997; + public static final int SIGIL_OF_THE_RIGOROUS_RANGER = 25999; + public static final int SIGIL_OF_THE_RIGOROUS_RANGER_26000 = 26000; + public static final int SIGIL_OF_THE_METICULOUS_MAGE = 26002; + public static final int SIGIL_OF_THE_METICULOUS_MAGE_26003 = 26003; + public static final int SIGIL_OF_FORTIFICATION = 26005; + public static final int SIGIL_OF_FORTIFICATION_26006 = 26006; + public static final int SIGIL_OF_BARROWS = 26008; + public static final int SIGIL_OF_BARROWS_26009 = 26009; + public static final int SIGIL_OF_DEFT_STRIKES = 26011; + public static final int SIGIL_OF_DEFT_STRIKES_26012 = 26012; + public static final int SIGIL_OF_FREEDOM = 26014; + public static final int SIGIL_OF_FREEDOM_26015 = 26015; + public static final int SIGIL_OF_ENHANCED_HARVEST = 26017; + public static final int SIGIL_OF_ENHANCED_HARVEST_26018 = 26018; + public static final int SIGIL_OF_STORAGE = 26020; + public static final int SIGIL_OF_STORAGE_26021 = 26021; + public static final int SIGIL_OF_THE_SMITH = 26023; + public static final int SIGIL_OF_THE_SMITH_26024 = 26024; + public static final int SIGIL_OF_THE_ALCHEMIST = 26026; + public static final int SIGIL_OF_THE_ALCHEMIST_26027 = 26027; + public static final int SIGIL_OF_THE_FLETCHER = 26029; + public static final int SIGIL_OF_THE_FLETCHER_26030 = 26030; + public static final int SIGIL_OF_THE_CHEF = 26032; + public static final int SIGIL_OF_THE_CHEF_26033 = 26033; + public static final int SIGIL_OF_THE_CRAFTSMAN = 26035; + public static final int SIGIL_OF_THE_CRAFTSMAN_26036 = 26036; + public static final int SIGIL_OF_THE_ABYSS = 26038; + public static final int SIGIL_OF_THE_ABYSS_26039 = 26039; + public static final int SIGIL_OF_STAMINA = 26041; + public static final int SIGIL_OF_STAMINA_26042 = 26042; + public static final int SIGIL_OF_THE_POTION_MASTER = 26044; + public static final int SIGIL_OF_THE_POTION_MASTER_26045 = 26045; + public static final int SIGIL_OF_THE_ETERNAL_JEWELLER = 26047; + public static final int SIGIL_OF_THE_ETERNAL_JEWELLER_26048 = 26048; + public static final int SIGIL_OF_THE_TREASURE_HUNTER = 26050; + public static final int SIGIL_OF_THE_TREASURE_HUNTER_26051 = 26051; + public static final int SIGIL_OF_MOBILITY = 26053; + public static final int SIGIL_OF_MOBILITY_26054 = 26054; + public static final int SIGIL_OF_EXAGGERATION = 26056; + public static final int SIGIL_OF_EXAGGERATION_26057 = 26057; + public static final int SIGIL_OF_SPECIALISED_STRIKES = 26059; + public static final int SIGIL_OF_SPECIALISED_STRIKES_26060 = 26060; + public static final int SIGIL_OF_THE_PORCUPINE = 26062; + public static final int SIGIL_OF_THE_PORCUPINE_26063 = 26063; + public static final int SIGIL_OF_BINDING = 26065; + public static final int SIGIL_OF_BINDING_26066 = 26066; + public static final int SIGIL_OF_ESCAPING = 26068; + public static final int SIGIL_OF_ESCAPING_26069 = 26069; + public static final int SIGIL_OF_THE_RUTHLESS_RANGER = 26071; + public static final int SIGIL_OF_THE_RUTHLESS_RANGER_26072 = 26072; + public static final int SIGIL_OF_THE_FERAL_FIGHTER = 26074; + public static final int SIGIL_OF_THE_FERAL_FIGHTER_26075 = 26075; + public static final int SIGIL_OF_THE_MENACING_MAGE = 26077; + public static final int SIGIL_OF_THE_MENACING_MAGE_26078 = 26078; + public static final int SIGIL_OF_PROSPERITY = 26080; + public static final int SIGIL_OF_PROSPERITY_26081 = 26081; + public static final int SIGIL_OF_THE_DWARVES = 26083; + public static final int SIGIL_OF_THE_DWARVES_26084 = 26084; + public static final int SIGIL_OF_THE_ELVES = 26086; + public static final int SIGIL_OF_THE_ELVES_26087 = 26087; + public static final int SIGIL_OF_THE_BARBARIANS = 26089; + public static final int SIGIL_OF_THE_BARBARIANS_26090 = 26090; + public static final int SIGIL_OF_THE_GNOMES = 26092; + public static final int SIGIL_OF_THE_GNOMES_26093 = 26093; + public static final int SIGIL_OF_NATURE = 26095; + public static final int SIGIL_OF_NATURE_26096 = 26096; + public static final int SIGIL_OF_DEVOTION = 26098; + public static final int SIGIL_OF_DEVOTION_26099 = 26099; + public static final int SIGIL_OF_THE_FORAGER = 26101; + public static final int SIGIL_OF_THE_FORAGER_26102 = 26102; + public static final int SIGIL_OF_GARMENTS = 26104; + public static final int SIGIL_OF_GARMENTS_26105 = 26105; + public static final int SIGIL_OF_SLAUGHTER = 26107; + public static final int SIGIL_OF_SLAUGHTER_26108 = 26108; + public static final int SIGIL_OF_THE_FORTUNE_FARMER = 26110; + public static final int SIGIL_OF_THE_FORTUNE_FARMER_26111 = 26111; + public static final int SIGIL_OF_VERSATILITY = 26113; + public static final int SIGIL_OF_VERSATILITY_26114 = 26114; + public static final int SIGIL_OF_THE_SERPENT = 26116; + public static final int SIGIL_OF_THE_SERPENT_26117 = 26117; + public static final int SIGIL_OF_SUPREME_STAMINA = 26119; + public static final int SIGIL_OF_SUPREME_STAMINA_26120 = 26120; + public static final int SIGIL_OF_PRESERVATION = 26122; + public static final int SIGIL_OF_PRESERVATION_26123 = 26123; + public static final int SIGIL_OF_FINALITY = 26125; + public static final int SIGIL_OF_FINALITY_26126 = 26126; + public static final int SIGIL_OF_PIOUS_PROTECTION = 26128; + public static final int SIGIL_OF_PIOUS_PROTECTION_26129 = 26129; + public static final int SIGIL_OF_AGGRESSION = 26131; + public static final int SIGIL_OF_AGGRESSION_26132 = 26132; + public static final int SIGIL_OF_RAMPAGE = 26134; + public static final int SIGIL_OF_RAMPAGE_26135 = 26135; + public static final int SIGIL_OF_THE_SKILLER = 26137; + public static final int SIGIL_OF_THE_SKILLER_26138 = 26138; + public static final int SIGIL_OF_REMOTE_STORAGE = 26140; + public static final int SIGIL_OF_REMOTE_STORAGE_26141 = 26141; + public static final int SIGIL_OF_LAST_RECALL = 26143; + public static final int SIGIL_OF_LAST_RECALL_26144 = 26144; + public static final int SIGIL_OF_THE_GUARDIAN_ANGEL = 26146; + public static final int SIGIL_OF_THE_GUARDIAN_ANGEL_26147 = 26147; + public static final int TUNA_26149 = 26149; + public static final int COMBAT_POTION4_26150 = 26150; + public static final int COMBAT_POTION3_26151 = 26151; + public static final int COMBAT_POTION2_26152 = 26152; + public static final int COMBAT_POTION1_26153 = 26153; + public static final int MOUNT_KARUULM_DIARY = 26154; /* 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 e87336fd5d..2a8f641a2b 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8215,7 +8215,7 @@ public final class NpcID public static final int RAVEN = 9192; public static final int LENNY = 9193; public static final int GHOST_9194 = 9194; - public static final int IAN_9195 = 9195; + public static final int FLOKI = 9195; public static final int SURMA = 9196; public static final int SLIPPERS = 9197; public static final int RED_PANDA = 9198; @@ -9453,5 +9453,22 @@ public final class NpcID public static final int HESPORI_11192 = 11192; public static final int FLOWER_11193 = 11193; public static final int FLOWER_11194 = 11194; + public static final int HILL_GIANT_11195 = 11195; + public static final int LYNX_TAMER_11196 = 11196; + public static final int LYNX_11197 = 11197; + public static final int SERGEANT_11198 = 11198; + public static final int GNOME_GUARD_11199 = 11199; + public static final int GUARD_11200 = 11200; + public static final int GUARD_11201 = 11201; + public static final int GUARD_11202 = 11202; + public static final int GUARD_11203 = 11203; + public static final int GUARD_11204 = 11204; + public static final int GHOST_GUARD_11205 = 11205; + public static final int GUARD_11206 = 11206; + public static final int GUARD_11207 = 11207; + public static final int GUARD_11208 = 11208; + public static final int GUARD_11209 = 11209; + public static final int GUARD_11210 = 11210; + public static final int PRIFDDINAS_GUARD_11211 = 11211; /* 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 88ea88234f..91d761c002 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13730,5 +13730,69 @@ public final class NullItemID public static final int NULL_25955 = 25955; public static final int NULL_25957 = 25957; public static final int NULL_25962 = 25962; + public static final int NULL_25970 = 25970; + public static final int NULL_25972 = 25972; + public static final int NULL_25974 = 25974; + public static final int NULL_25976 = 25976; + public static final int NULL_25978 = 25978; + public static final int NULL_25980 = 25980; + public static final int NULL_25982 = 25982; + public static final int NULL_25984 = 25984; + public static final int NULL_25986 = 25986; + public static final int NULL_25988 = 25988; + 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; /* This file is automatically generated. Do not edit. */ } 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 187bb360d8..384854ea53 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -1725,5 +1725,18 @@ public final class NullNpcID public static final int NULL_11166 = 11166; public static final int NULL_11167 = 11167; public static final int NULL_11168 = 11168; + public static final int NULL_11212 = 11212; + public static final int NULL_11213 = 11213; + public static final int NULL_11214 = 11214; + public static final int NULL_11215 = 11215; + public static final int NULL_11216 = 11216; + public static final int NULL_11217 = 11217; + public static final int NULL_11218 = 11218; + public static final int NULL_11219 = 11219; + public static final int NULL_11220 = 11220; + public static final int NULL_11221 = 11221; + public static final int NULL_11222 = 11222; + public static final int NULL_11223 = 11223; + public static final int NULL_11224 = 11224; /* 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 f753cecd92..e51c148478 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -20988,5 +20988,8 @@ public final class NullObjectID public static final int NULL_42798 = 42798; public static final int NULL_42799 = 42799; public static final int NULL_42800 = 42800; + public static final int NULL_42802 = 42802; + public static final int NULL_42804 = 42804; + public static final int NULL_42816 = 42816; /* 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 4cdc64ad5d..e72ebf15b3 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -18370,6 +18370,7 @@ public final class ObjectID public static final int REDWOOD_TREE_34314 = 34314; public static final int REDWOOD_TREE_34315 = 34315; public static final int SPIKE_DEFENCE_34316 = 34316; + public static final int DEATH = 34318; public static final int GLASS_TABLE_34319 = 34319; public static final int DEAD_TREE_34334 = 34334; public static final int SULPHUR_VENT_34335 = 34335; @@ -21206,6 +21207,7 @@ public final class ObjectID public static final int LADDER_41427 = 41427; public static final int LADDER_41428 = 41428; public static final int GANGPLANK_41429 = 41429; + public static final int DRUMMER_41430 = 41430; public static final int SHELVES_41431 = 41431; public static final int STASH_CHART = 41434; public static final int REWARDS_CHEST_41435 = 41435; @@ -21797,5 +21799,18 @@ public final class ObjectID public static final int SPIDER_EGGS_42646 = 42646; public static final int TREE_42649 = 42649; public static final int BENCH_42801 = 42801; + public static final int SKULLS_42803 = 42803; + public static final int BANNER_42805 = 42805; + public static final int BANNER_42806 = 42806; + public static final int BANNER_42807 = 42807; + public static final int BANNER_42808 = 42808; + public static final int BANNER_42809 = 42809; + public static final int BANNER_42810 = 42810; + public static final int BANNER_42811 = 42811; + public static final int BANNER_42812 = 42812; + public static final int BANNER_42813 = 42813; + public static final int BANNER_42814 = 42814; + public static final int BANNER_42815 = 42815; + public static final int ROCKS_42817 = 42817; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java b/runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java index f1393146df..c68f62a1f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java @@ -424,6 +424,13 @@ public class ExternalPluginManager public static void loadBuiltin(Class... plugins) { + boolean assertsEnabled = false; + assert (assertsEnabled = true); + if (!assertsEnabled) + { + throw new RuntimeException("Assertions are not enabled, add '-ea' to your VM options. Enabling assertions during development catches undefined behavior and incorrect API usage."); + } + builtinExternals = plugins; } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcMinimapOverlay.java index 1639a2f8c9..9e0481ed65 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcMinimapOverlay.java @@ -80,7 +80,7 @@ class NpcMinimapOverlay extends Overlay if (minimapLocation != null) { Color color = highlightedNpc.getHighlightColor(); - OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color.darker()); + OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color); if (highlightedNpc.isNameOnMinimap() && actor.getName() != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index 01bf41dc18..eb9cedf087 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -495,12 +495,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener return; } - if (event.getScriptId() != ScriptID.BANKMAIN_BUILD || !config.removeSeparators()) - { - return; - } - - if (!tabInterface.isActive()) + if (event.getScriptId() != ScriptID.BANKMAIN_BUILD) { return; } @@ -511,6 +506,20 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener return; } + if (tabInterface.isTagTabActive()) + { + int numTabs = (int) Arrays.stream(itemContainer.getDynamicChildren()) + .filter(child -> child.getItemId() != -1 && !child.isHidden()) + .count(); + updateBankContainerScrollHeight(numTabs); + return; + } + + if (!tabInterface.isActive() || !config.removeSeparators()) + { + return; + } + int items = 0; Widget[] containerChildren = itemContainer.getDynamicChildren(); @@ -550,10 +559,15 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener } } - final Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER); + updateBankContainerScrollHeight(items); + } + + private void updateBankContainerScrollHeight(int items) + { + Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER); int itemContainerHeight = bankItemContainer.getHeight(); final int adjustedScrollHeight = (Math.max(0, items - 1) / ITEMS_PER_ROW) * ITEM_VERTICAL_SPACING + ITEM_VERTICAL_SPACING + ITEM_CONTAINER_BOTTOM_PADDING; - itemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight)); + bankItemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight)); final int itemContainerScroll = bankItemContainer.getScrollY(); clientThread.invokeLater(() -> @@ -561,7 +575,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener WidgetInfo.BANK_SCROLLBAR.getId(), WidgetInfo.BANK_ITEM_CONTAINER.getId(), itemContainerScroll)); - } @Subscribe 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 8de3fe8715..c07fbee562 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 @@ -209,7 +209,7 @@ public class ItemStatChanges add(combo(range(food(1), food(3)), heal(RUN_ENERGY, 10)), PURPLE_SWEETS_10476); add(new SpicyStew(), SPICY_STEW); add(boost(MAGIC, perc(.10, 1)), IMBUED_HEART); - add(combo(boost(ATTACK, 2), boost(STRENGTH, 1), heal(DEFENCE, -1)), JANGERBERRIES); + add(combo(boost(ATTACK, 2), boost(STRENGTH, 1), heal(PRAYER, 1), heal(DEFENCE, -1)), JANGERBERRIES); // Gauntlet items add(heal(HITPOINTS, 16), CRYSTAL_PADDLEFISH, CORRUPTED_PADDLEFISH); diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index cb3fa513d4..d5f4d28d83 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -276,6 +276,10 @@ 20854, 23873 ], + "tuna": [ + 361, + 26149 + ], "shark": [ 385, 6969, @@ -6479,7 +6483,11 @@ 9739, 9741, 9743, - 9745 + 9745, + 26150, + 26151, + 26152, + 26153 ], "attack cape": [ 9747, @@ -9920,5 +9928,221 @@ 25947, 25950, 25953 + ], + "tumekens heka": [ + 25987, + 25989 + ], + "sigil of resilience": [ + 25990, + 25991 + ], + "sigil of consistency": [ + 25993, + 25994 + ], + "sigil of the formidable fighter": [ + 25996, + 25997 + ], + "sigil of the rigorous ranger": [ + 25999, + 26000 + ], + "sigil of the meticulous mage": [ + 26002, + 26003 + ], + "sigil of fortification": [ + 26005, + 26006 + ], + "sigil of barrows": [ + 26008, + 26009 + ], + "sigil of deft strikes": [ + 26011, + 26012 + ], + "sigil of freedom": [ + 26014, + 26015 + ], + "sigil of enhanced harvest": [ + 26017, + 26018 + ], + "sigil of storage": [ + 26020, + 26021 + ], + "sigil of the smith": [ + 26023, + 26024 + ], + "sigil of the alchemist": [ + 26026, + 26027 + ], + "sigil of the fletcher": [ + 26029, + 26030 + ], + "sigil of the chef": [ + 26032, + 26033 + ], + "sigil of the craftsman": [ + 26035, + 26036 + ], + "sigil of the abyss": [ + 26038, + 26039 + ], + "sigil of stamina": [ + 26041, + 26042 + ], + "sigil of the potion master": [ + 26044, + 26045 + ], + "sigil of the eternal jeweller": [ + 26047, + 26048 + ], + "sigil of the treasure hunter": [ + 26050, + 26051 + ], + "sigil of mobility": [ + 26053, + 26054 + ], + "sigil of exaggeration": [ + 26056, + 26057 + ], + "sigil of specialised strikes": [ + 26059, + 26060 + ], + "sigil of the porcupine": [ + 26062, + 26063 + ], + "sigil of binding": [ + 26065, + 26066 + ], + "sigil of escaping": [ + 26068, + 26069 + ], + "sigil of the ruthless ranger": [ + 26071, + 26072 + ], + "sigil of the feral fighter": [ + 26074, + 26075 + ], + "sigil of the menacing mage": [ + 26077, + 26078 + ], + "sigil of prosperity": [ + 26080, + 26081 + ], + "sigil of the dwarves": [ + 26083, + 26084 + ], + "sigil of the elves": [ + 26086, + 26087 + ], + "sigil of the barbarians": [ + 26089, + 26090 + ], + "sigil of the gnomes": [ + 26092, + 26093 + ], + "sigil of nature": [ + 26095, + 26096 + ], + "sigil of devotion": [ + 26098, + 26099 + ], + "sigil of the forager": [ + 26101, + 26102 + ], + "sigil of garments": [ + 26104, + 26105 + ], + "sigil of slaughter": [ + 26107, + 26108 + ], + "sigil of the fortune farmer": [ + 26110, + 26111 + ], + "sigil of versatility": [ + 26113, + 26114 + ], + "sigil of the serpent": [ + 26116, + 26117 + ], + "sigil of supreme stamina": [ + 26119, + 26120 + ], + "sigil of preservation": [ + 26122, + 26123 + ], + "sigil of finality": [ + 26125, + 26126 + ], + "sigil of pious protection": [ + 26128, + 26129 + ], + "sigil of aggression": [ + 26131, + 26132 + ], + "sigil of rampage": [ + 26134, + 26135 + ], + "sigil of the skiller": [ + 26137, + 26138 + ], + "sigil of remote storage": [ + 26140, + 26141 + ], + "sigil of last recall": [ + 26143, + 26144 + ], + "sigil of the guardian angel": [ + 26146, + 26147 ] } \ No newline at end of file diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.hash b/runelite-client/src/main/scripts/LayoutResizableStones.hash index 60dc015aa3..82811973a9 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.hash +++ b/runelite-client/src/main/scripts/LayoutResizableStones.hash @@ -1 +1 @@ -A9D5E42A864BFEEE2BB8CAF4A111A68426B7CE5DF5C982AF168F90A28CAE4423 \ No newline at end of file +877DB1B5A5AC999371A3E16052E79A613DD060A217FCEF6CB3D5611D42D780AC \ No newline at end of file diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm index 65fd994c2d..b9c8560f76 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm +++ b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm @@ -14,11 +14,11 @@ istore 4 iload 1 switch - 1745: LABEL145 - 1129: LABEL125 - 1130: LABEL95 + 1745: LABEL169 + 1129: LABEL149 + 1130: LABEL107 1131: LABEL9 - jump LABEL220 + jump LABEL244 LABEL9: iconst 10747945 if_getwidth @@ -96,8 +96,22 @@ LABEL69: iconst 10551330 enum 2122 - jump LABEL84 + jump LABEL96 LABEL77: + get_varbit 13037 + iconst 1 + if_icmpeq LABEL81 + jump LABEL89 +LABEL81: + iconst 3513 + iconst 73 + iconst 73 + iload 1 + iconst 10551330 + enum + 2122 + jump LABEL96 +LABEL89: iconst 2154 iconst 73 iconst 73 @@ -105,26 +119,26 @@ LABEL77: iconst 10551330 enum 2122 -LABEL84: +LABEL96: clientclock set_varc_int 384 invoke 2357 iconst 1 - if_icmpeq LABEL90 - jump LABEL94 -LABEL90: + if_icmpeq LABEL102 + jump LABEL106 +LABEL102: get_varbit 12986 invoke 633 iconst 10747930 if_sethide -LABEL94: - jump LABEL220 -LABEL95: +LABEL106: + jump LABEL244 +LABEL107: get_varbit 4084 iconst 1 - if_icmpeq LABEL99 - jump LABEL107 -LABEL99: + if_icmpeq LABEL111 + jump LABEL119 +LABEL111: iconst 1178 iconst 73 iconst 73 @@ -132,8 +146,22 @@ LABEL99: iconst 10551330 enum 2122 - jump LABEL114 -LABEL107: + jump LABEL138 +LABEL119: + get_varbit 13037 + iconst 1 + if_icmpeq LABEL123 + jump LABEL131 +LABEL123: + iconst 3513 + iconst 73 + iconst 73 + iload 1 + iconst 10551330 + enum + 2122 + jump LABEL138 +LABEL131: iconst 2154 iconst 73 iconst 73 @@ -141,26 +169,26 @@ LABEL107: iconst 10551330 enum 2122 -LABEL114: +LABEL138: clientclock set_varc_int 384 invoke 2357 iconst 1 - if_icmpeq LABEL120 - jump LABEL124 -LABEL120: + if_icmpeq LABEL144 + jump LABEL148 +LABEL144: get_varbit 12986 invoke 633 iconst 10551322 if_sethide -LABEL124: - jump LABEL220 -LABEL125: +LABEL148: + jump LABEL244 +LABEL149: invoke 3297 iconst 1 - if_icmpeq LABEL129 - jump LABEL137 -LABEL129: + if_icmpeq LABEL153 + jump LABEL161 +LABEL153: iconst 2422 iconst 73 iconst 73 @@ -168,8 +196,8 @@ LABEL129: iconst 10551330 enum 2122 - jump LABEL144 -LABEL137: + jump LABEL168 +LABEL161: iconst 1200 iconst 73 iconst 73 @@ -177,22 +205,22 @@ LABEL137: iconst 10551330 enum 2122 -LABEL144: - jump LABEL220 -LABEL145: +LABEL168: + jump LABEL244 +LABEL169: get_varbit 6257 iconst 1 - if_icmpeq LABEL152 + if_icmpeq LABEL176 get_varbit 542 iconst 1 - if_icmpeq LABEL152 - jump LABEL156 -LABEL152: + if_icmpeq LABEL176 + jump LABEL180 +LABEL176: iconst 1 iconst 39387175 if_sethide - jump LABEL211 -LABEL156: + jump LABEL235 +LABEL180: iconst 0 iconst 39387175 if_sethide @@ -201,11 +229,11 @@ LABEL156: 2308 get_varbit 6255 switch - 1: LABEL173 - 2: LABEL165 - 3: LABEL181 - jump LABEL189 -LABEL165: + 1: LABEL197 + 2: LABEL189 + 3: LABEL205 + jump LABEL213 +LABEL189: iconst 1718 iconst 39387177 if_setgraphic @@ -213,8 +241,8 @@ LABEL165: sconst "Toggle single-tap mode" iconst 39387175 if_setop - jump LABEL196 -LABEL173: + jump LABEL220 +LABEL197: iconst 1717 iconst 39387177 if_setgraphic @@ -222,8 +250,8 @@ LABEL173: sconst "Toggle tap-to-drop mode" iconst 39387175 if_setop - jump LABEL196 -LABEL181: + jump LABEL220 +LABEL205: iconst 1716 iconst 39387177 if_setgraphic @@ -231,8 +259,8 @@ LABEL181: sconst "Show Keyboard" iconst 39387175 if_setop - jump LABEL196 -LABEL189: + jump LABEL220 +LABEL213: iconst 1715 iconst 39387177 if_setgraphic @@ -240,26 +268,26 @@ LABEL189: sconst "" iconst 39387175 if_setop -LABEL196: +LABEL220: get_varbit 6255 iconst 3 - if_icmpne LABEL200 - jump LABEL208 -LABEL200: + if_icmpne LABEL224 + jump LABEL232 +LABEL224: get_varbit 6256 iconst 0 - if_icmpeq LABEL204 - jump LABEL208 -LABEL204: + if_icmpeq LABEL228 + jump LABEL232 +LABEL228: iconst 155 iconst 39387177 if_settrans - jump LABEL211 -LABEL208: + jump LABEL235 +LABEL232: iconst 0 iconst 39387177 if_settrans -LABEL211: +LABEL235: invoke 2581 get_varbit 6254 invoke 633 @@ -269,5 +297,5 @@ LABEL211: pop_int clientclock set_varc_int 384 -LABEL220: +LABEL244: return