ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #13287 from Broooklyn/discord-and-worldmap

Browse Source
This commit is contained in:
Jordan
2021-03-12 04:01:37 +00:00
committed by GitHub
parent 36ec314ab7 45c3140449
commit 4b8f2120ed
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java
View File

@@ -169,6 +169,7 @@ public enum AgilityShortcut
SLAYER_DUNGEON_CREVICE(62, "Narrow Crevice", new WorldPoint(2729, 10008, 0), CREVICE_16539),
MOUNT_KARUULM_UPPER(62, "Rocks", new WorldPoint(1322, 3791, 0), ROCKS_34396),
TAVERLEY_DUNGEON_RAILING(63, "Loose Railing", new WorldPoint(2935, 9811, 0), LOOSE_RAILING_28849),
DARKMEYER_WALL(63, "Wall (Long rope)", new WorldPoint(3669, 3375, 0), NULL_39541, NULL_39542),
TROLLHEIM_WILDERNESS_ROCKS_EAST(64, "Rocks", new WorldPoint(2945, 3678, 0), ROCKS_16545),
TROLLHEIM_WILDERNESS_ROCKS_WEST(64, "Rocks", new WorldPoint(2917, 3672, 0), ROCKS_16545),
FOSSIL_ISLAND_VOLCANO(64, "Rope", new WorldPoint(3780, 3822, 0), ROPE_ANCHOR, ROPE_ANCHOR_30917),

4
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
View File

@@ -237,6 +237,7 @@ enum DiscordGameEventType
DUNGEON_OURANIA("Ourania Cave", DiscordAreaType.DUNGEONS, 12119),
DUNGEON_QUIDAMORTEM_CAVE("Quidamortem Cave", DiscordAreaType.DUNGEONS, 4763),
DUNGEON_RASHILIYIAS_TOMB("Rashiliyta's Tomb", DiscordAreaType.DUNGEONS, 11668),
DUNGEON_SALT_MINE("Salt Mine", DiscordAreaType.DUNGEONS, 11425),
DUNGEON_SARADOMINSHRINE("Saradomin Shrine (Paterdomus)", DiscordAreaType.DUNGEONS, 13722),
DUNGEON_SHADE_CATACOMBS("Shade Catacombs", DiscordAreaType.DUNGEONS, 13975),
DUNGEON_SHADOW("Shadow Dungeon", DiscordAreaType.DUNGEONS, 10575, 10831),
@@ -294,7 +295,7 @@ enum DiscordGameEventType
MG_PEST_CONTROL("Pest Control", DiscordAreaType.MINIGAMES, 10536),
MG_PORT_SARIM_RAT_PITS("Port Sarim Rat Pits", DiscordAreaType.MINIGAMES, 11926),
MG_PYRAMID_PLUNDER("Pyramid Plunder", DiscordAreaType.MINIGAMES, 7749),
MG_ROGUES_DEN("Rogues' Den", DiscordAreaType.MINIGAMES, 11855, 11854, 12111, 12110),
MG_ROGUES_DEN("Rogues' Den", DiscordAreaType.MINIGAMES, 11854, 11855, 12109, 12110, 12111),
MG_SORCERESS_GARDEN("Sorceress's Garden", DiscordAreaType.MINIGAMES, 11605),
MG_SOUL_WARS("Soul Wars", DiscordAreaType.MINIGAMES, 8493, 8748, 8749, 9005),
MG_TEMPLE_TREKKING("Temple Trekking", DiscordAreaType.MINIGAMES, 8014, 8270, 8256, 8782, 9038, 9294, 9550, 9806),
@@ -424,6 +425,7 @@ enum DiscordGameEventType
REGION_TROLLWEISS_MTN("Trollweiss Mountain", DiscordAreaType.REGIONS, 11066, 11067, 11068),
REGION_UNDERWATER("Underwater", DiscordAreaType.REGIONS, 15008, 15264),
REGION_WATER_ALTAR("Water Altar", DiscordAreaType.REGIONS, 10827),
REGION_WATERBIRTH_ISLAND("Waterbirth Island", DiscordAreaType.REGIONS, 10042),
REGION_WINTERTODT_CAMP("Wintertodt Camp", DiscordAreaType.REGIONS, 6461),
REGION_WIZARDS_TOWER("Wizards' Tower", DiscordAreaType.REGIONS, 12337),
REGION_WOODCUTTING_GUILD("Woodcutting Guild", DiscordAreaType.REGIONS, 6198, 6454),

3
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/DungeonLocation.java
View File

@@ -80,7 +80,7 @@ enum DungeonLocation
FREMENNIK_SLAYER("Fremennik Slayer Dungeon", new WorldPoint(2796, 3615, 0)),
GOBLIN_CAVE("Goblin Cave", new WorldPoint(2622, 3393, 0)),
GOD_WARS("God Wars Dungeon", new WorldPoint(2917, 3747, 0)),
GRAND_TREE("Grand Tree Tunnels", new WorldPoint(2464, 3496, 0)),
GRAND_TREE("Grand Tree Tunnels", new WorldPoint(2462, 3496, 0)),
GAUNTLET("The Gauntlet", new WorldPoint(3227, 6116, 0)),
HAM_HIDEOUT("H.A.M. Hideout", new WorldPoint(3164, 3252, 0)),
HEROES_GUILD("Heroes' Guild mine", new WorldPoint(2891, 3507, 0)),
@@ -140,6 +140,7 @@ enum DungeonLocation
RED_CHIN_HUNTING("Red chinchompa hunting ground", new WorldPoint(2525, 2894, 0)),
REVENANT_CAVES_N("Revenant Caves", new WorldPoint(3124, 3832, 0)),
REVENANT_CAVES_S("Revenant Caves", new WorldPoint(3074, 3655, 0)),
REVENANT_CAVES_W("Revenant Caves", new WorldPoint(3065, 3740, 0)),
RIVER_ELID("River Elid Dungeon", new WorldPoint(3370, 3132, 0)),
RIVER_KELDA("River Kelda", new WorldPoint(2835, 10112, 0)),
SALT_MINE("Salt Mine", new WorldPoint(2866, 3941, 0)),

4
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RareTreeLocation.java
View File

@@ -199,6 +199,10 @@ enum RareTreeLocation
// Feldip Hills
new WorldPoint(2476, 2893, 0)),
BLISTERWOOD("Blisterwood tree", 62,
// Darkmeyer
new WorldPoint(3631, 3362, 0)),
SULLIUSCEP("Sulliuscep", 65,
// Fossil Island
new WorldPoint(3662, 3802, 0),