diff --git a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java index c3ebc24ee5..d7191aca72 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java +++ b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java @@ -38,242 +38,47 @@ import static net.runelite.api.NullObjectID.NULL_31823; import static net.runelite.api.NullObjectID.NULL_31849; import static net.runelite.api.NullObjectID.NULL_33327; import static net.runelite.api.NullObjectID.NULL_33328; -import static net.runelite.api.ObjectID.A_WOODEN_LOG; -import static net.runelite.api.ObjectID.BALANCING_LEDGE_23548; -import static net.runelite.api.ObjectID.BIG_WINDOW; -import static net.runelite.api.ObjectID.BOULDER_27990; -import static net.runelite.api.ObjectID.BROKEN_FENCE; -import static net.runelite.api.ObjectID.BROKEN_FENCE_2618; -import static net.runelite.api.ObjectID.BROKEN_RAFT; -import static net.runelite.api.ObjectID.BROKEN_WALL_33344; -import static net.runelite.api.ObjectID.CASTLE_WALL; -import static net.runelite.api.ObjectID.CLIMBING_ROCKS; -import static net.runelite.api.ObjectID.CLIMBING_ROCKS_11948; -import static net.runelite.api.ObjectID.CLIMBING_ROCKS_11949; -import static net.runelite.api.ObjectID.CREVICE_16465; -import static net.runelite.api.ObjectID.CREVICE_16539; -import static net.runelite.api.ObjectID.CREVICE_16543; -import static net.runelite.api.ObjectID.CREVICE_19043; -import static net.runelite.api.ObjectID.CREVICE_30198; -import static net.runelite.api.ObjectID.CREVICE_9739; -import static net.runelite.api.ObjectID.CREVICE_9740; -import static net.runelite.api.ObjectID.CROSSBOW_TREE_17062; -import static net.runelite.api.ObjectID.CRUMBLING_WALL_24222; -import static net.runelite.api.ObjectID.DARK_TUNNEL_10047; -import static net.runelite.api.ObjectID.DENSE_FOREST; -import static net.runelite.api.ObjectID.DENSE_FOREST_3938; -import static net.runelite.api.ObjectID.DENSE_FOREST_3939; -import static net.runelite.api.ObjectID.DENSE_FOREST_3998; -import static net.runelite.api.ObjectID.DENSE_FOREST_3999; -import static net.runelite.api.ObjectID.FALLEN_TREE_33192; -import static net.runelite.api.ObjectID.FENCE_16518; -import static net.runelite.api.ObjectID.GAP; -import static net.runelite.api.ObjectID.GAP_2831; -import static net.runelite.api.ObjectID.GAP_29326; -import static net.runelite.api.ObjectID.HOLE_16520; -import static net.runelite.api.ObjectID.HOLE_30966; -import static net.runelite.api.ObjectID.HOLE_31481; -import static net.runelite.api.ObjectID.HOLE_31482; -import static net.runelite.api.ObjectID.ICE_CHUNKS_31822; -import static net.runelite.api.ObjectID.ICE_CHUNKS_31990; -import static net.runelite.api.ObjectID.JUTTING_WALL_17002; -import static net.runelite.api.ObjectID.LADDER_30938; -import static net.runelite.api.ObjectID.LADDER_30939; -import static net.runelite.api.ObjectID.LADDER_30940; -import static net.runelite.api.ObjectID.LADDER_30941; -import static net.runelite.api.ObjectID.LEAVES; -import static net.runelite.api.ObjectID.LEAVES_3924; -import static net.runelite.api.ObjectID.LEAVES_3925; -import static net.runelite.api.ObjectID.LEDGE_33190; -import static net.runelite.api.ObjectID.LITTLE_BOULDER; -import static net.runelite.api.ObjectID.LOG_BALANCE_16540; -import static net.runelite.api.ObjectID.LOG_BALANCE_16541; -import static net.runelite.api.ObjectID.LOG_BALANCE_16542; -import static net.runelite.api.ObjectID.LOG_BALANCE_16546; -import static net.runelite.api.ObjectID.LOG_BALANCE_16547; -import static net.runelite.api.ObjectID.LOG_BALANCE_16548; -import static net.runelite.api.ObjectID.LOG_BALANCE_20882; -import static net.runelite.api.ObjectID.LOG_BALANCE_20884; -import static net.runelite.api.ObjectID.LOG_BALANCE_23274; -import static net.runelite.api.ObjectID.LOG_BALANCE_3929; -import static net.runelite.api.ObjectID.LOG_BALANCE_3930; -import static net.runelite.api.ObjectID.LOG_BALANCE_3931; -import static net.runelite.api.ObjectID.LOG_BALANCE_3932; -import static net.runelite.api.ObjectID.LOG_BALANCE_3933; -import static net.runelite.api.ObjectID.LOOSE_RAILING; -import static net.runelite.api.ObjectID.LOOSE_RAILING_2186; -import static net.runelite.api.ObjectID.LOOSE_RAILING_28849; -import static net.runelite.api.ObjectID.LOW_FENCE; -import static net.runelite.api.ObjectID.MONKEYBARS_23566; -import static net.runelite.api.ObjectID.MONKEYBARS_23567; -import static net.runelite.api.ObjectID.MYSTERIOUS_PIPE; -import static net.runelite.api.ObjectID.OBSTACLE; -import static net.runelite.api.ObjectID.OBSTACLE_30767; -import static net.runelite.api.ObjectID.OBSTACLE_30962; -import static net.runelite.api.ObjectID.OBSTACLE_30964; -import static net.runelite.api.ObjectID.OBSTACLE_PIPE_16509; -import static net.runelite.api.ObjectID.OBSTACLE_PIPE_16511; -import static net.runelite.api.ObjectID.OBSTACLE_PIPE_23140; -import static net.runelite.api.ObjectID.ORNATE_RAILING; -import static net.runelite.api.ObjectID.ORNATE_RAILING_17000; -import static net.runelite.api.ObjectID.PILE_OF_RUBBLE_23563; -import static net.runelite.api.ObjectID.PILE_OF_RUBBLE_23564; -import static net.runelite.api.ObjectID.PILLAR_31561; -import static net.runelite.api.ObjectID.PILLAR_31809; -import static net.runelite.api.ObjectID.PIPE_21727; -import static net.runelite.api.ObjectID.PIPE_21728; -import static net.runelite.api.ObjectID.ROCKS; -import static net.runelite.api.ObjectID.ROCKSLIDE_33184; -import static net.runelite.api.ObjectID.ROCKSLIDE_33185; -import static net.runelite.api.ObjectID.ROCKSLIDE_33191; -import static net.runelite.api.ObjectID.ROCKS_14106; -import static net.runelite.api.ObjectID.ROCKS_16464; -import static net.runelite.api.ObjectID.ROCKS_16514; -import static net.runelite.api.ObjectID.ROCKS_16515; -import static net.runelite.api.ObjectID.ROCKS_16521; -import static net.runelite.api.ObjectID.ROCKS_16522; -import static net.runelite.api.ObjectID.ROCKS_16523; -import static net.runelite.api.ObjectID.ROCKS_16524; -import static net.runelite.api.ObjectID.ROCKS_16534; -import static net.runelite.api.ObjectID.ROCKS_16535; -import static net.runelite.api.ObjectID.ROCKS_16545; -import static net.runelite.api.ObjectID.ROCKS_16549; -import static net.runelite.api.ObjectID.ROCKS_16550; -import static net.runelite.api.ObjectID.ROCKS_16998; -import static net.runelite.api.ObjectID.ROCKS_16999; -import static net.runelite.api.ObjectID.ROCKS_17042; -import static net.runelite.api.ObjectID.ROCKS_19849; -import static net.runelite.api.ObjectID.ROCKS_2231; -import static net.runelite.api.ObjectID.ROCKS_27984; -import static net.runelite.api.ObjectID.ROCKS_27985; -import static net.runelite.api.ObjectID.ROCKS_27987; -import static net.runelite.api.ObjectID.ROCKS_27988; -import static net.runelite.api.ObjectID.ROCKS_31757; -import static net.runelite.api.ObjectID.ROCKS_31758; -import static net.runelite.api.ObjectID.ROCKS_31759; -import static net.runelite.api.ObjectID.ROCKS_34396; -import static net.runelite.api.ObjectID.ROCKS_34397; -import static net.runelite.api.ObjectID.ROCKS_34741; -import static net.runelite.api.ObjectID.ROCKS_3748; -import static net.runelite.api.ObjectID.ROCKS_3790; -import static net.runelite.api.ObjectID.ROCKS_3791; -import static net.runelite.api.ObjectID.ROCKS_3803; -import static net.runelite.api.ObjectID.ROCKS_3804; -import static net.runelite.api.ObjectID.ROCKS_6673; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26400; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26401; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26402; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26404; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26405; -import static net.runelite.api.ObjectID.ROCKY_HANDHOLDS_26406; -import static net.runelite.api.ObjectID.ROCK_16115; -import static net.runelite.api.ObjectID.ROPESWING_23568; -import static net.runelite.api.ObjectID.ROPESWING_23569; -import static net.runelite.api.ObjectID.ROPE_ANCHOR; -import static net.runelite.api.ObjectID.ROPE_ANCHOR_30917; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21306; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21307; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21308; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21309; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21310; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21311; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21312; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21313; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21314; -import static net.runelite.api.ObjectID.ROPE_BRIDGE_21315; -import static net.runelite.api.ObjectID.RUBBER_CAP_MUSHROOM; -import static net.runelite.api.ObjectID.SPIKEY_CHAIN; -import static net.runelite.api.ObjectID.SPIKEY_CHAIN_16538; -import static net.runelite.api.ObjectID.STAIRS_31485; -import static net.runelite.api.ObjectID.STEPPING_STONES; -import static net.runelite.api.ObjectID.STEPPING_STONES_23646; -import static net.runelite.api.ObjectID.STEPPING_STONES_23647; -import static net.runelite.api.ObjectID.STEPPING_STONE_10663; -import static net.runelite.api.ObjectID.STEPPING_STONE_11768; -import static net.runelite.api.ObjectID.STEPPING_STONE_13504; -import static net.runelite.api.ObjectID.STEPPING_STONE_14917; -import static net.runelite.api.ObjectID.STEPPING_STONE_14918; -import static net.runelite.api.ObjectID.STEPPING_STONE_16466; -import static net.runelite.api.ObjectID.STEPPING_STONE_16513; -import static net.runelite.api.ObjectID.STEPPING_STONE_16533; -import static net.runelite.api.ObjectID.STEPPING_STONE_19040; -import static net.runelite.api.ObjectID.STEPPING_STONE_19042; -import static net.runelite.api.ObjectID.STEPPING_STONE_21738; -import static net.runelite.api.ObjectID.STEPPING_STONE_21739; -import static net.runelite.api.ObjectID.STEPPING_STONE_29728; -import static net.runelite.api.ObjectID.STEPPING_STONE_29729; -import static net.runelite.api.ObjectID.STEPPING_STONE_29730; -import static net.runelite.api.ObjectID.STEPPING_STONE_5948; -import static net.runelite.api.ObjectID.STEPPING_STONE_5949; -import static net.runelite.api.ObjectID.STEPS; -import static net.runelite.api.ObjectID.STEPS_29993; -import static net.runelite.api.ObjectID.STICKS; -import static net.runelite.api.ObjectID.STILE; -import static net.runelite.api.ObjectID.STILE_12982; -import static net.runelite.api.ObjectID.STRANGE_FLOOR; -import static net.runelite.api.ObjectID.STRANGE_FLOOR_16544; -import static net.runelite.api.ObjectID.STRONG_TREE_17074; -import static net.runelite.api.ObjectID.TIGHTGAP; -import static net.runelite.api.ObjectID.TIGHT_GAP; -import static net.runelite.api.ObjectID.TIGHT_GAP_36693; -import static net.runelite.api.ObjectID.TIGHT_GAP_36694; -import static net.runelite.api.ObjectID.TIGHT_GAP_36695; -import static net.runelite.api.ObjectID.TRELLIS_20056; -import static net.runelite.api.ObjectID.TRIPWIRE; -import static net.runelite.api.ObjectID.TUNNEL_30174; -import static net.runelite.api.ObjectID.TUNNEL_30175; -import static net.runelite.api.ObjectID.TUNNEL_30959; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16528; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16529; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_16530; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_19032; -import static net.runelite.api.ObjectID.UNDERWALL_TUNNEL_19036; -import static net.runelite.api.ObjectID.VINE_26880; -import static net.runelite.api.ObjectID.VINE_26882; -import static net.runelite.api.ObjectID.WALL_17047; -import static net.runelite.api.ObjectID.WALL_17049; -import static net.runelite.api.ObjectID.WALL_17050; -import static net.runelite.api.ObjectID.WEATHERED_WALL; -import static net.runelite.api.ObjectID.WEATHERED_WALL_16526; +import static net.runelite.api.ObjectID.*; import net.runelite.api.coords.WorldPoint; @Getter public enum AgilityShortcut { GENERIC_SHORTCUT(1, "Shortcut", null, - // Trollheim - ROCKS_3790, ROCKS_3791, - // Fremennik Slayer Cave - STEPS_29993, - // Fossil Island - LADDER_30938, LADDER_30939, LADDER_30940, LADDER_30941, RUBBER_CAP_MUSHROOM, - // Brimhaven dungeon - CREVICE_30198, - // Lumbridge - STILE_12982, - // Gu'Tanoth Bridge - GAP, GAP_2831, - // Lumbridge Swamp Caves - STEPPING_STONE_5948, STEPPING_STONE_5949, ROCKS_6673, - // Morytania Pirate Ship - ROCK_16115, - // Lumber Yard - BROKEN_FENCE_2618, - // McGrubor's Wood - LOOSE_RAILING, - // Underwater Area Fossil Island - TUNNEL_30959, HOLE_30966, OBSTACLE, OBSTACLE_30767, OBSTACLE_30964, OBSTACLE_30962, - // Tree Gnome Village - LOOSE_RAILING_2186, - // Burgh de Rott - LOW_FENCE, - // Taverley - STILE, - // Asgarnian Ice Dungeon - STEPS, - // Fossil Island Wyvern Cave - STAIRS_31485), + // Trollheim + ROCKS_3790, ROCKS_3791, + // Fremennik Slayer Cave + STEPS_29993, + // Fossil Island + LADDER_30938, LADDER_30939, LADDER_30940, LADDER_30941, RUBBER_CAP_MUSHROOM, + // Brimhaven dungeon + CREVICE_30198, + // Lumbridge + STILE_12982, + // Gu'Tanoth Bridge + GAP, GAP_2831, + // Lumbridge Swamp Caves + STEPPING_STONE_5948, STEPPING_STONE_5949, ROCKS_6673, + // Morytania Pirate Ship + ROCK_16115, + // Lumber Yard + BROKEN_FENCE_2618, + // McGrubor's Wood + LOOSE_RAILING, + // Underwater Area Fossil Island + TUNNEL_30959, HOLE_30966, OBSTACLE, OBSTACLE_30767, OBSTACLE_30964, OBSTACLE_30962, + // Tree Gnome Village + LOOSE_RAILING_2186, + // Burgh de Rott + LOW_FENCE, + // Taverley + STILE, + // Asgarnian Ice Dungeon + STEPS, + // Fossil Island Wyvern Cave + STAIRS_31485, + // Trollweiss Mountain Cave + ROCKY_HANDHOLDS, ROCKY_HANDHOLDS_19847), BRIMHAVEN_DUNGEON_MEDIUM_PIPE_RETURN(1, "Pipe Squeeze", null, new WorldPoint(2698, 9491, 0), PIPE_21727), BRIMHAVEN_DUNGEON_PIPE_RETURN(1, "Pipe Squeeze", null, new WorldPoint(2655, 9573, 0), PIPE_21728), BRIMHAVEN_DUNGEON_STEPPING_STONES_RETURN(1, "Pipe Squeeze", null, STEPPING_STONE_21739), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index 7e78d776f1..d493b9980c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -184,7 +184,7 @@ enum DiscordGameEventType DUNGEON_GRAND_TREE_TUNNELS("Grand Tree Tunnels", DiscordAreaType.DUNGEONS, 9882), DUNGEON_HAM("H.A.M Dungeon", DiscordAreaType.DUNGEONS, 12694, 10321), DUNGEON_IORWERTH("Iorwerth Dungeon", DiscordAreaType.DUNGEONS, 12738, 12993, 12994), - DUNGEON_JATIZSO_MINES("Jatizo Mines", DiscordAreaType.DUNGEONS, 9631), + DUNGEON_JATIZSO_MINES("Jatizso Mines", DiscordAreaType.DUNGEONS, 9631), DUNGEON_JIGGIG_BURIAL_TOMB("Jiggig Burial Tomb", DiscordAreaType.DUNGEONS, 9875, 9874), DUNGEON_JOGRE("Jogre Dungeon", DiscordAreaType.DUNGEONS, 11412), DUNGEON_KARAMJA_VOLCANO("Karamja Volcano", DiscordAreaType.DUNGEONS, 11413, 11414), @@ -224,7 +224,7 @@ enum DiscordGameEventType DUNGEON_WATERFALL("Waterfall Dungeon", DiscordAreaType.DUNGEONS, 10394), DUNGEON_WHITE_WOLF_MOUNTAIN_CAVES("White Wolf Mountain Caves", DiscordAreaType.DUNGEONS, 11418, 11419, 11675), DUNGEON_WITCHAVEN_SHRINE("Witchhaven Shrine Dungeon", DiscordAreaType.DUNGEONS, 10903), - DUNGEON_YANILLE_AGILITY("Yanile Agility Dungeon", DiscordAreaType.DUNGEONS, 10388), + DUNGEON_YANILLE_AGILITY("Yanille Agility Dungeon", DiscordAreaType.DUNGEONS, 10388), DUNGEON_MOTHERLODE_MINE("Motherlode Mine", DiscordAreaType.DUNGEONS, 14679, 14680, 14681, 14935, 14936, 14937, 15191, 15192, 15193), // Minigames diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json index afc007325d..83ce6dfb7d 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json @@ -4092,5 +4092,13 @@ "23517": 100, "23522": 70, "23525": 4, - "23528": 70 + "23528": 70, + "22856": 200, + "22859": 200, + "22866": 200, + "22869": 200, + "22871": 200, + "22877": 200, + "22879": 200, + "22935": 12000 }