From 0e969c1a088da5bb5a484e1e47750a0a3532a460 Mon Sep 17 00:00:00 2001 From: Mr Extremez Date: Thu, 17 Oct 2019 10:20:09 -0500 Subject: [PATCH] Only quests that are added will display on quest tab with this. (#62) (fixes issue #25) - mr extremez :) --- .../game/content/quests/QuestAssistant.java | 227 ++++++++++-------- 1 file changed, 122 insertions(+), 105 deletions(-) diff --git a/2006Redone Server/src/redone/game/content/quests/QuestAssistant.java b/2006Redone Server/src/redone/game/content/quests/QuestAssistant.java index fde8abc1..2694c148 100644 --- a/2006Redone Server/src/redone/game/content/quests/QuestAssistant.java +++ b/2006Redone Server/src/redone/game/content/quests/QuestAssistant.java @@ -14,6 +14,11 @@ public class QuestAssistant { public static void sendStages(Client client) { client.getPlayerAssistant().sendFrame126("QP: " + client.questPoints + " ", 3985); + for (Quests quests : Quests.values()) { + if (!quests.questStatus() && quests.getStringId() > 0) { + client.getPlayerAssistant().sendFrame126("", quests.getStringId()); + } + } if (client.pirateTreasure == 0) { client.getPlayerAssistant().sendFrame126("Pirate's Treasure", 7341); } else if (client.pirateTreasure == 6) { @@ -110,116 +115,128 @@ public class QuestAssistant { } public enum Quests { - BLACK_KNIGHT(28164, "Black Knights' Fortress"), - COOKS_ASSISTANT(28165, "Cook's Assistant"), - DEMON_SLAYER(28166, "Demon Slayer"), - DORICS_QUEST(28168, "Doric's Quest"), - DRAGON_SLAYER(28215, "Dragon Slayer"), - ERNEST(28171, "Ernest the Chicken"), - GOBLIN(28170, "Goblin Diplomacy"), - IMP_CATCHER(28172, "Imp Catcher"), - KNIGHTS_SWORD(28178, "The Knight's Sword"), - PIRATES_TREASURE(28173, "Pirates Treasure"), - PRINCE_RESCUE(28174, "Prince Ali Rescue"), - RESTLESS_GHOST(28169, "Restless Ghost"), - ROMEO_JULIET(28175, "Romeo Juliet"), - RUNE_MYSTERIES(28167, "Rune Mysteries"), - SHEEP_SHEARER(28176, "Sheep Shearer"), - SHIELD_OF_ARRAV(28177, "Shield of Arrav"), - VAMPYRE_SLAYER(28179, "Vampyre Slayer"), - WITCHS_POTION(28180, "Witchs Potion"), - BETWEEN_A_ROCK(49228, "Between A Rock"), - CHOMPY(2161, "Big Chompy Bird Hunting"), - BIOHAZARD(28124, "Biohazard"), - CABIN(68102, "Cabin Fever"), - CLOCK(28185, "Clock Tower"), - DEATH(32246, "Death Plateau"), - CREATURE(47097, "Creature of Fenkenstrain"), - DESERT_TREASURE(50052, "Desert Treasure"), - DRUDIC_RITUAL(28187, "Drudic Ritual"), - DWARF_CANNON(28188, "Dwarf Cannon"), - EADGARS_RUSE(33231, "Eadgars Ruse"), - DEVIOUS(61225, "Devious Minds"), - DIGSITE(28186, "Digsite Quest"), - ELEMENTAL(29035, "Elemental Workshop"), - ENAKHRA(63021, "Enakhra's Lamet"), - FAIRY1(27075, "A Fairy Tale Pt. 1"), - FAMILYCREST(28189, "Family Crest"), - FEUD(50036, "The Feud"), - FIGHT_ARENA(28190, "Fight Arena"), - FISHING_CONTEST(28191, "Fishing Contest"), - FORGETTABLE_TABLE(50089, "Forgettable Tale..."), - FREMMY_TRIALS(39131, "The Fremennik Trials"), - GARDEN(57012, "Garden of Tranquillity"), - GHOSTS(47250, "Ghosts Ahoy"), - GIANT_DWARF(53009, "The Giant Dwarf"), - GOLEM(50039, "The Golem"), - GRAND_TREE(28193, "The Grand Tree"), - HAND_IN_THE_SAND(63000, "The Hand in the Sand"), - HAUNTED_MINE(46081, "Haunted Mine"), - HAZEEL(28194, "Hazeel Cult"), - HEROES(28195, "Heroes Quest"), - HOLY(28196, "Holy Grail"), - HORROR(39151, "Horror from the Deep"), - ITCHLARIN(17156, "Itchlarin's Little Helper"), - AID_OF_MYREQUE(72085, "In Aid of the Myreque"), - SEARCH_OF_MYREQUE(46131, "In Search of the Myreque"), - JUNGLE_POTION(28197, "Jungle Potion"), - LEGENDS_QUEST(28198, "Legends Quest"), - LOST_CITY(28199, "Lost City"), - LOST_TRIBE(52077, "The Lost Tribe"), - MAKING_HISTORY(60127, "Making History"), - MONKEY_MADNESS(43124, "Monkey Madness"), - MERLINS_CRYSTAL(28200, "Merlins Crystal"), - MONKS_FRIEND(28201, "Monks Friend"), - MOUNTAIN_DAUGHTER(48101, "Mountain Daughter"), - MOURNINGS_END_1(54150, "Mourning's Ends Part 1"), - MOURNINGS_END_2(23139, "Mourning's Ends Part 2"), - MURDER_MYSTERY(28202, "Murder Mystery"), - NATURE_SPIRIT(31201, "Nature Spirit"), - OBSERVATORY(28203, "Observatory Quest"), - ONE_SMALL_FAVOUR(48057, "One Small Favour"), - PLAGUE_CITY(28204, "Plague City"), - PRIEST_IN_PERIL(31179, "Priest in Peril"), - RAG_AND_BONE_MAN(72252, "Rag and Bone Man"), - RAT_CATCHERS(60139, "Rat Catchers"), - RECIPE(71130, "Recipe for Disaster"), - RECRUITMENT_DRIVE(2156, "Recruitment Drive"), - REGICIDE(33128, "Regicide"), - ROVING_ELVES(47017, "Roving Elves"), - RUM_DEAL(58064, "Rum Deal"), - SCORPION_CATCHER(28205, "Scorpion Catcher"), - SEA_SLUG(28206, "Sea Slug Quest"), - SHADES_OF_MORTON(35009, "Shades of Mort'ton"), - SHADOW_OF_THE_STORM(59248, "Shadow of the Storm"), - SHEEP_HERDER(28207, "Sheep Herder"), - SHILO_VILLAGE(28208, "Shilo Village"), - SOULS_BANE(28250, "A Soul's Bane"), - SPIRITS_OF_THE_ELID(60232, "Spirits of The Elid"), - SWAN_SONG(249, "Swan Song"), - TAI_BWO(6204, "Tai Bwo Wannai Trio"), - TWO_CATS(59131, "A Tail of Two Cats"), - TEARS_OF_GUTHIX(12206, "Tears of Guthix"), - TEMPLE_OF_IKOV(28210, "Temple of Ikov"), - THRONE_OF_MISCELLANIA(25118, "Throne of Miscellania"), - TOURIST_TRAP(28211, "The Tourist Trap"), - TREE_GNOME_VILLAGE(28212, "Tree Gnome Village"), - TRIBAL_TOTEM(28213, "Tribal Totem"), - TROLL_ROMANCE(46082, "Troll Romance"), - TROLL_STRONGHOLD(191, "Troll Stronghold"), - UNDERGROUND_PASS(38199, "Underground Pass"), - WANTED(23136, "Wanted"), - WATCHTOWER(28181, "Watch Tower"), - WATERFALL(28182, "Waterfall Quest"), - WITCH(28183, "Witch's House"), - ZOGRE(52044, "Zogre Flesh Eaters"); + BLACK_KNIGHT(28164, 7332, "Black Knights' Fortress", true), + COOKS_ASSISTANT(28165, 7333, "Cook's Assistant", true), + DEMON_SLAYER(28166, 7334, "Demon Slayer", false), + DORICS_QUEST(28168, 7336, "Doric's Quest", true), + DRAGON_SLAYER(28215, 7383, "Dragon Slayer", false), + ERNEST(28171, 7339, "Ernest the Chicken", false), + GOBLIN(28170, 7338, "Goblin Diplomacy", false), + IMP_CATCHER(28172, 7340, "Imp Catcher", true), + KNIGHTS_SWORD(28178, 7346, "The Knight's Sword", true), + PIRATES_TREASURE(28173, 7341, "Pirates Treasure", true), + PRINCE_RESCUE(28174, 7342, "Prince Ali Rescue", false), + RESTLESS_GHOST(28169, 7337, "Restless Ghost", true), + ROMEO_JULIET(28175, 7343, "Romeo Juliet", false), + RUNE_MYSTERIES(28167, 7335, "Rune Mysteries", true), + SHEEP_SHEARER(28176, 7344, "Sheep Shearer", true), + SHIELD_OF_ARRAV(28177, 7345, "Shield of Arrav", false), + VAMPYRE_SLAYER(28179, 7347, "Vampyre Slayer", true), + WITCHS_POTION(28180, 7348, "Witchs Potion", true), + BETWEEN_A_ROCK(49228, 12772, "Between A Rock", false), + CHOMPY(2161, 673, "Big Chompy Bird Hunting", false), + BIOHAZARD(28124, 7352, "Biohazard", false), + CABIN(68102, 17510, "Cabin Fever", false), + CLOCK(28185, 7353, "Clock Tower", false), + DEATH(32246, 8438, "Death Plateau", false), + CREATURE(47097, 12129, "Creature of Fenkenstrain", false), + DESERT_TREASURE(50052, 12852, "Desert Treasure", false), + DRUDIC_RITUAL(28187, 7355, "Drudic Ritual", false), + DWARF_CANNON(28188, 7356, "Dwarf Cannon", false), + EADGARS_RUSE(33231, 8679, "Eadgars Ruse", false), + DEVIOUS(61225, 15841, "Devious Minds", false), + DIGSITE(28186, 7354, "Digsite Quest", false), + ELEMENTAL(29035, 7459, "Elemental Workshop", false), + ENAKHRA(63021, 16149, "Enakhra's Lamet", false), + FAIRY1(27075, 6987, "A Fairy Tale Pt. 1", false), + FAMILYCREST(28189, 7357, "Family Crest", false), + FEUD(50036, 12836, "The Feud", false), + FIGHT_ARENA(28190, 7358, "Fight Arena", false), + FISHING_CONTEST(28191, 7359, "Fishing Contest", false), + FORGETTABLE_TABLE(50089, 14169, "Forgettable Tale...", false), + FREMMY_TRIALS(39131, 10115, "The Fremennik Trials", false), + GARDEN(57012, 14604, "Garden of Tranquillity", false), + GERTRUDES_CAT(28192, 7360, "Gertrude's Cat", true), + GHOSTS(47250, 12282, "Ghosts Ahoy", false), + GIANT_DWARF(53009, 13577, "The Giant Dwarf", false), + GOLEM(50039, 12839, "The Golem", false), + GRAND_TREE(28193, 7361, "The Grand Tree", false), + HAND_IN_THE_SAND(63000, 16128, "The Hand in the Sand", false), + HAUNTED_MINE(46081, 11857, "Haunted Mine", false), + HAZEEL(28194, 7362, "Hazeel Cult", false), + HEROES(28195, 7363, "Heroes Quest", false), + HOLY(28196, 7364, "Holy Grail", false), + HORROR(39151, 10135, "Horror from the Deep", false), + ITCHLARIN(17156, 4508, "Itchlarin's Little Helper", false), + AID_OF_MYREQUE(72085, 18517, "In Aid of the Myreque", false), + SEARCH_OF_MYREQUE(46131, 11907, "In Search of the Myreque", false), + JUNGLE_POTION(28197, 7365, "Jungle Potion", false), + LEGENDS_QUEST(28198, 7366, "Legends Quest", false), + LOST_CITY(28199, 7367, "Lost City", false), + LOST_TRIBE(52077, 13389, "The Lost Tribe", false), + MAKING_HISTORY(60127, 15487, "Making History", false), + MONKEY_MADNESS(43124, 11132, "Monkey Madness", false), + MERLINS_CRYSTAL(28200, 7368, "Merlins Crystal", false), + MONKS_FRIEND(28201, 7369, "Monks Friend", false), + MOUNTAIN_DAUGHTER(48101, 12389, "Mountain Daughter", false), + MOURNINGS_END_1(54150, 13974, "Mourning's Ends Part 1", false), + MOURNINGS_END_2(23139, 6027, "Mourning's Ends Part 2", false), + MURDER_MYSTERY(28202, 7370, "Murder Mystery", false), + NATURE_SPIRIT(31201, 8137, "Nature Spirit", false), + OBSERVATORY(28203, 7371, "Observatory Quest", false), + ONE_SMALL_FAVOUR(48057, 12345, "One Small Favour", false), + PLAGUE_CITY(28204, 7372, "Plague City", false), + PRIEST_IN_PERIL(31179, 8115, "Priest in Peril", false), + RAG_AND_BONE_MAN(72252, 18684, "Rag and Bone Man", false), + RAT_CATCHERS(60139, 15499, "Rat Catchers", false), + RECIPE(71130, 18306, "Recipe for Disaster", false), + RECRUITMENT_DRIVE(2156, 668, "Recruitment Drive", false), + REGICIDE(33128, 8576, "Regicide", false), + ROVING_ELVES(47017, 12139, "Roving Elves", false), + RUM_DEAL(58064, 14912, "Rum Deal", false), + SCORPION_CATCHER(28205, 7373, "Scorpion Catcher", false), + SEA_SLUG(28206, 7374, "Sea Slug Quest", false), + SHADES_OF_MORTON(35009, 8969, "Shades of Mort'ton", false), + SHADOW_OF_THE_STORM(59248, 15352, "Shadow of the Storm", false), + SHEEP_HERDER(28207, 7375, "Sheep Herder", false), + SHILO_VILLAGE(28208, 7376, "Shilo Village", false), + SOULS_BANE(28250, 15098, "A Soul's Bane", false), + SPIRITS_OF_THE_ELID(60232, 15592, "Spirits of The Elid", false), + SWAN_SONG(249, 249, "Swan Song", false), + TAI_BWO(6204, 1740, "Tai Bwo Wannai Trio", false), + TWO_CATS(59131, 15235, "A Tail of Two Cats", false), + TEARS_OF_GUTHIX(12206, 3278, "Tears of Guthix", false), + TEMPLE_OF_IKOV(28210, 7378, "Temple of Ikov", false), + THRONE_OF_MISCELLANIA(25118, 6518, "Throne of Miscellania", false), + TOURIST_TRAP(28211, 7379, "The Tourist Trap", false), + TREE_GNOME_VILLAGE(28212, 7380, "Tree Gnome Village", false), + TRIBAL_TOTEM(28213, 7381, "Tribal Totem", false), + TROLL_ROMANCE(46082, 11858, "Troll Romance", false), + TROLL_STRONGHOLD(191, 191, "Troll Stronghold", false), + UNDERGROUND_PASS(38199, 9927, "Underground Pass", false), + WANTED(23136, 6024, "Wanted", false), + WATCHTOWER(28181, 7349, "Watch Tower", false), + WATERFALL(28182, 7350, "Waterfall Quest", false), + WITCH(28183, 7351, "Witch's House", false), + ZOGRE(52044, 13356, "Zogre Flesh Eaters", false); - private final int button; + private final int button, string; private final String name; + private final boolean questStatus; - private Quests(final int button, final String name) { + private Quests(final int button, final int string, final String name, final boolean questStatus) { this.button = button; this.name = name; + this.string = string; + this.questStatus = questStatus; + } + + public int getStringId() { + return string; + } + + public boolean questStatus() { + return questStatus; } public int getButton() {