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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-07-21 19:15:43 +02:00
parent fe4e3fc1b5 3115142853
commit 699645fc22
38 changed files with 2789 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runelite-api/src/main/java/net/runelite/api/Constants.java
View File

@@ -81,6 +81,27 @@ public class Constants
public static final int MAX_Z = 4;
public static final int TILE_FLAG_BRIDGE = 2;
public static final int TILE_FLAG_UNDER_ROOF = 4;
/**
* Flag for roof removal to remove the roofs above the player's current position.
*/
public static final int ROOF_FLAG_POSITION = 1;
/**
* Flag for roof removal to remove the roofs above the currently hovered tile.
*/
public static final int ROOF_FLAG_HOVERED = 2;
/**
* Flag for roof removal to remove the roofs above the player's destination tile.
*/
public static final int ROOF_FLAG_DESTINATION = 4;
/**
* Flag for roof removal to remove the roofs that are above any tile between the camera and the player.
*/
public static final int ROOF_FLAG_BETWEEN = 8;
/**
* The height of the overworld, in tiles. Coordinates above this are in caves and other such zones.

49
runelite-api/src/main/java/net/runelite/api/Quest.java
View File

@@ -30,12 +30,13 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum Quest
{
//Free Quests
BLACK_KNIGHTS_FORTRESS(299, "Black Knights' Fortress"),
COOKS_ASSISTANT(300, "Cook's Assistant"),
THE_CORSAIR_CURSE(301, "The Corsair Curse"),
DEMON_SLAYER(302, "Demon Slayer"),
DORICS_QUEST(303, "Doric's Quest"),
DRAGON_SLAYER_I(304, "Dragon Slayer I"),
DORICS_QUEST(3138, "Doric's Quest"),
DRAGON_SLAYER_I(3139, "Dragon Slayer I"),
ERNEST_THE_CHICKEN(305, "Ernest the Chicken"),
GOBLIN_DIPLOMACY(306, "Goblin Diplomacy"),
IMP_CATCHER(307, "Imp Catcher"),
@@ -50,7 +51,7 @@ public enum Quest
SHIELD_OF_ARRAV(316, "Shield of Arrav"),
VAMPYRE_SLAYER(1278, "Vampyre Slayer"),
WITCHS_POTION(318, "Witch's Potion"),
X_MARKS_THE_SPOT(550, "X Marks the Spot"),
X_MARKS_THE_SPOT(3155, "X Marks the Spot"),
BELOW_ICE_MOUNTAIN(2874, "Below Ice Mountain"),
//Members' Quests
@@ -89,7 +90,7 @@ public enum Quest
FIGHT_ARENA(363, "Fight Arena"),
FISHING_CONTEST(364, "Fishing Contest"),
FORGETTABLE_TALE(365, "Forgettable Tale..."),
BONE_VOYAGE(366, "Bone Voyage"),
BONE_VOYAGE(3135, "Bone Voyage"),
THE_FREMENNIK_ISLES(367, "The Fremennik Isles"),
THE_FREMENNIK_TRIALS(368, "The Fremennik Trials"),
GARDEN_OF_TRANQUILLITY(369, "Garden of Tranquillity"),
@@ -103,7 +104,7 @@ public enum Quest
THE_HAND_IN_THE_SAND(377, "The Hand in the Sand"),
HAUNTED_MINE(378, "Haunted Mine"),
HAZEEL_CULT(379, "Hazeel Cult"),
HEROES_QUEST(380, "Heroes' Quest"),
HEROES_QUEST(3142, "Heroes' Quest"),
HOLY_GRAIL(381, "Holy Grail"),
HORROR_FROM_THE_DEEP(382, "Horror from the Deep"),
ICTHLARINS_LITTLE_HELPER(383, "Icthlarin's Little Helper"),
@@ -111,7 +112,7 @@ public enum Quest
IN_SEARCH_OF_THE_MYREQUE(385, "In Search of the Myreque"),
JUNGLE_POTION(386, "Jungle Potion"),
KINGS_RANSOM(387, "King's Ransom"),
LEGENDS_QUEST(388, "Legends' Quest"),
LEGENDS_QUEST(3145, "Legends' Quest"),
LOST_CITY(389, "Lost City"),
THE_LOST_TRIBE(390, "The Lost Tribe"),
LUNAR_DIPLOMACY(391, "Lunar Diplomacy"),
@@ -122,18 +123,18 @@ public enum Quest
MONKEY_MADNESS_II(396, "Monkey Madness II"),
MONKS_FRIEND(397, "Monk's Friend"),
MOUNTAIN_DAUGHTER(398, "Mountain Daughter"),
MOURNINGS_END_PART_I(399, "Mourning's End Part I"),
MOURNINGS_END_PART_II(400, "Mourning's End Part II"),
MOURNINGS_END_PART_I(3147, "Mourning's End Part I"),
MOURNINGS_END_PART_II(3148, "Mourning's End Part II"),
MURDER_MYSTERY(401, "Murder Mystery"),
MY_ARMS_BIG_ADVENTURE(402, "My Arm's Big Adventure"),
NATURE_SPIRIT(403, "Nature Spirit"),
OBSERVATORY_QUEST(404, "Observatory Quest"),
OLAFS_QUEST(405, "Olaf's Quest"),
OBSERVATORY_QUEST(3149, "Observatory Quest"),
OLAFS_QUEST(3150, "Olaf's Quest"),
ONE_SMALL_FAVOUR(406, "One Small Favour"),
PLAGUE_CITY(407, "Plague City"),
PRIEST_IN_PERIL(408, "Priest in Peril"),
THE_QUEEN_OF_THIEVES(409, "The Queen of Thieves"),
RAG_AND_BONE_MAN_I(410, "Rag and Bone Man I"),
RAG_AND_BONE_MAN_I(3152, "Rag and Bone Man I"),
RAG_AND_BONE_MAN_II(411, "Rag and Bone Man II"),
RATCATCHERS(412, "Ratcatchers"),
RECIPE_FOR_DISASTER(413, "Recipe for Disaster"),
@@ -166,37 +167,37 @@ public enum Quest
TROLL_ROMANCE(440, "Troll Romance"),
TROLL_STRONGHOLD(441, "Troll Stronghold"),
UNDERGROUND_PASS(442, "Underground Pass"),
CLIENT_OF_KOUREND(443, "Client of Kourend"),
CLIENT_OF_KOUREND(3136, "Client of Kourend"),
WANTED(444, "Wanted!"),
WATCHTOWER(445, "Watchtower"),
WATERFALL_QUEST(446, "Waterfall Quest"),
WATERFALL_QUEST(3154, "Waterfall Quest"),
WHAT_LIES_BELOW(447, "What Lies Below"),
WITCHS_HOUSE(448, "Witch's House"),
ZOGRE_FLESH_EATERS(449, "Zogre Flesh Eaters"),
THE_ASCENT_OF_ARCEUUS(542, "The Ascent of Arceuus"),
THE_FORSAKEN_TOWER(543, "The Forsaken Tower"),
SONG_OF_THE_ELVES(603, "Song of the Elves"),
THE_FREMENNIK_EXILES(718, "The Fremennik Exiles"),
THE_FREMENNIK_EXILES(3141, "The Fremennik Exiles"),
SINS_OF_THE_FATHER(1276, "Sins of the Father"),
A_PORCINE_OF_INTEREST(1690, "A Porcine of Interest"),
A_PORCINE_OF_INTEREST(3151, "A Porcine of Interest"),
GETTING_AHEAD(752, "Getting Ahead"),
A_KINGDOM_DIVIDED(2971, "A Kingdom Divided"),
A_NIGHT_AT_THE_THEATRE(949, "A Night at the Theatre"),
//Miniquests
ENTER_THE_ABYSS(319, "Enter the Abyss"),
ENTER_THE_ABYSS(3140, "Enter the Abyss"),
ARCHITECTURAL_ALLIANCE(320, "Architectural Alliance"),
BEAR_YOUR_SOUL(321, "Bear Your Soul"),
BEAR_YOUR_SOUL(1275, "Bear Your Soul"),
ALFRED_GRIMHANDS_BARCRAWL(322, "Alfred Grimhand's Barcrawl"),
CURSE_OF_THE_EMPTY_LORD(323, "Curse of the Empty Lord"),
ENCHANTED_KEY(324, "Enchanted Key"),
CURSE_OF_THE_EMPTY_LORD(3137, "Curse of the Empty Lord"),
THE_ENCHANTED_KEY(324, "The Enchanted Key"),
THE_GENERALS_SHADOW(325, "The General's Shadow"),
SKIPPY_AND_THE_MOGRES(326, "Skippy and the Mogres"),
THE_MAGE_ARENA(327, "The Mage Arena"),
LAIR_OF_TARN_RAZORLOR(328, "Lair of Tarn Razorlor"),
SKIPPY_AND_THE_MOGRES(3153, "Skippy and the Mogres"),
MAGE_ARENA_I(3146, "Mage Arena I"),
LAIR_OF_TARN_RAZORLOR(3144, "Lair of Tarn Razorlor"),
FAMILY_PEST(329, "Family Pest"),
THE_MAGE_ARENA_II(330, "The Mage Arena II"),
IN_SEARCH_OF_KNOWLEDGE(602, "In Search of Knowledge"),
MAGE_ARENA_II(330, "Mage Arena II"),
IN_SEARCH_OF_KNOWLEDGE(3143, "In Search of Knowledge"),
DADDYS_HOME(1688, "Daddy's Home");
@Getter

4
runelite-api/src/main/java/net/runelite/api/Scene.java
View File

@@ -70,4 +70,8 @@ public interface Scene
* @param gameObject
*/
void removeGameObject(GameObject gameObject);
void generateHouses();
void setRoofRemovalMode(int flags);
}

4
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -82,6 +82,7 @@ public class WidgetID
public static final int BA_DEFENDER_GROUP_ID = 487;
public static final int BA_HEALER_GROUP_ID = 488;
public static final int BA_REWARD_GROUP_ID = 497;
public static final int BA_TEAM_GROUP_ID = 256;
public static final int LEVEL_UP_GROUP_ID = 233;
public static final int DIALOG_SPRITE_GROUP_ID = 193;
public static final int QUEST_COMPLETED_GROUP_ID = 153;
@@ -684,12 +685,15 @@ public class WidgetID
static class HLR
{
static final int TEAMMATES = 13;
static final int TEAMMATE1 = 18;
static final int TEAMMATE2 = 22;
static final int TEAMMATE3 = 26;
static final int TEAMMATE4 = 30;
}
static final int TEAM = 2;
static final int ROLE_SPRITE = 10;
static final int ROLE = 11;

3
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -373,9 +373,12 @@ public enum WidgetInfo
CHATBOX_TAB_CLAN(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CLAN),
CHATBOX_TAB_TRADE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_TRADE),
BA_TEAM(WidgetID.BA_TEAM_GROUP_ID, WidgetID.BarbarianAssault.TEAM),
BA_HEAL_ROLE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE),
BA_HEAL_ROLE_SPRITE(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE),
BA_HEAL_TEAMMATES(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATES),
BA_HEAL_TEAMMATE1(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE1),
BA_HEAL_TEAMMATE2(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE2),
BA_HEAL_TEAMMATE3(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE3),