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

Merge pull request #12460 from Matthew-nop/Slayer-Task-Fix

Browse Source
This commit is contained in:
Jordan
2020-09-08 23:39:42 -07:00
committed by GitHub
parent 230bba0ea7 e2f848fbbf
commit cd40cade89
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
View File

@@ -45,16 +45,16 @@ enum Task
ALCHEMICAL_HYDRA("Alchemical Hydra", ItemID.IKKLE_HYDRA),
ANKOU("Ankou", ItemID.ANKOU_MASK),
AVIANSIES("Aviansies", ItemID.ENSOULED_AVIANSIE_HEAD),
BANDITS("Bandits", ItemID.BANDIT, "Bandit"),
BANSHEES("Banshees", ItemID.BANSHEE),
BARROWS_BROTHERS("Barrows Brothers", ItemID.KARILS_COIF),
BASILISKS("Basilisks", ItemID.BASILISK),
BATS("Bats", ItemID.GIRAL_BAT_2),
BEARS("Bears", ItemID.ENSOULED_BEAR_HEAD),
ENTS("Ents", ItemID.NICE_TREE, "Ent"),
LAVA_DRAGONS("Lava Dragons", ItemID.LAVA_SCALE, "Lava dragon"),
BIRDS("Birds", ItemID.FEATHER, "Chicken", "Rooster", "Terrorbird", "Seagull"),
BLACK_DEMONS("Black demons", ItemID.BLACK_DEMON_MASK),
BLACK_DRAGONS("Black dragons", ItemID.BLACK_DRAGON_MASK, "Baby black dragon"),
BLACK_KNIGHTS("Black Knights", ItemID.BLACK_FULL_HELM, "Black Knight"),
BLOODVELD("Bloodveld", ItemID.BLOODVELD),
BLUE_DRAGONS("Blue dragons", ItemID.BLUE_DRAGON_MASK, "Baby blue dragon"),
BRINE_RATS("Brine rats", ItemID.BRINE_RAT),
@@ -67,6 +67,7 @@ enum Task
CAVE_KRAKEN("Cave kraken", ItemID.CAVE_KRAKEN),
CAVE_SLIMES("Cave slimes", ItemID.SWAMP_CAVE_SLIME),
CERBERUS("Cerberus", ItemID.HELLPUPPY),
CHAOS_DRUIDS("Chaos druids", ItemID.ELDER_CHAOS_HOOD, "Elder Chaos druid", "Chaos druid"),
CHAOS_ELEMENTAL("Chaos Elemental", ItemID.PET_CHAOS_ELEMENTAL),
CHAOS_FANATIC("Chaos Fanatic", ItemID.ANCIENT_STAFF),
COCKATRICE("Cockatrice", ItemID.COCKATRICE, "Cockathrice"),
@@ -85,16 +86,16 @@ enum Task
DWARVES("Dwarves", ItemID.DWARVEN_HELMET, "Dwarf"),
EARTH_WARRIORS("Earth warriors", ItemID.BRONZE_FULL_HELM_T),
ELVES("Elves", ItemID.ELF, "Elf", "Iorwerth Warrior"),
ENTS("Ents", ItemID.NICE_TREE, "Ent"),
FEVER_SPIDERS("Fever spiders", ItemID.FEVER_SPIDER),
FIRE_GIANTS("Fire giants", ItemID.FIRE_BATTLESTAFF),
REVENANTS("Revenants", ItemID.BRACELET_OF_ETHEREUM, "Revenant imp", "Revenant goblin", "Revenant pyrefiend", "Revenant hobgoblin", "Revenant cyclops", "Revenant hellhound", "Revenant demon", "Revenant ork", "Revenant dark beast", "Revenant knight", "Revenant dragon"),
FLESH_CRAWLERS("Fleshcrawlers", ItemID.ENSOULED_SCORPION_HEAD, "Flesh crawler"),
FOSSIL_ISLAND_WYVERNS("Fossil island wyverns", ItemID.FOSSIL_ISLAND_WYVERN, "Ancient wyvern", "Long-tailed wyvern", "Spitting wyvern", "Taloned wyvern"),
GARGOYLES("Gargoyles", ItemID.GARGOYLE, 9, ItemID.ROCK_HAMMER),
GENERAL_GRAARDOR("General Graardor", ItemID.PET_GENERAL_GRAARDOR),
GHOSTS("Ghosts", ItemID.GHOSTSPEAK_AMULET, "Tortured soul"),
GIANT_MOLE("Giant Mole", ItemID.BABY_MOLE),
GHOULS("Ghouls", ItemID.ZOMBIE_HEAD),
GIANT_MOLE("Giant Mole", ItemID.BABY_MOLE),
GOBLINS("Goblins", ItemID.ENSOULED_GOBLIN_HEAD),
GREATER_DEMONS("Greater demons", ItemID.GREATER_DEMON_MASK),
GREEN_DRAGONS("Green dragons", ItemID.GREEN_DRAGON_MASK, "Baby green dragon"),
@@ -104,16 +105,15 @@ enum Task
HILL_GIANTS("Hill giants", ItemID.ENSOULED_GIANT_HEAD),
HOBGOBLINS("Hobgoblins", ItemID.HOBGOBLIN_GUARD),
HYDRAS("Hydras", ItemID.HYDRA),
ICEFIENDS("Icefiends", ItemID.ICE_DIAMOND),
ICE_GIANTS("Ice giants", ItemID.ICE_DIAMOND),
ICE_WARRIORS("Ice warriors", ItemID.MITHRIL_FULL_HELM_T),
ICEFIENDS("Icefiends", ItemID.ICE_DIAMOND),
INFERNAL_MAGES("Infernal mages", ItemID.INFERNAL_MAGE, "Malevolent mage"),
IRON_DRAGONS("Iron dragons", ItemID.IRON_DRAGON_MASK),
JAD("TzTok-Jad", ItemID.TZREKJAD, 25250),
JELLIES("Jellies", ItemID.JELLY, "Jelly"),
JUNGLE_HORROR("Jungle horrors", ItemID.ENSOULED_HORROR_HEAD),
KALPHITE("Kalphite", ItemID.KALPHITE_SOLDIER),
MAMMOTHS("Mammoths", ItemID.ATTACKER_HORN, "Mammoth"),
KALPHITE_QUEEN("Kalphite Queen", ItemID.KALPHITE_PRINCESS),
KILLERWATTS("Killerwatts", ItemID.KILLERWATT),
KING_BLACK_DRAGON("King Black Dragon", ItemID.PRINCE_BLACK_DRAGON),
@@ -121,10 +121,12 @@ enum Task
KREEARRA("Kree'arra", ItemID.PET_KREEARRA),
KRIL_TSUTSAROTH("K'ril Tsutsaroth", ItemID.PET_KRIL_TSUTSAROTH),
KURASK("Kurask", ItemID.KURASK),
ROGUES("Rogues", ItemID.ROGUE_MASK, "Rogue"),
LAVA_DRAGONS("Lava Dragons", ItemID.LAVA_SCALE, "Lava dragon"),
LESSER_DEMONS("Lesser demons", ItemID.LESSER_DEMON_MASK),
LIZARDS("Lizards", ItemID.DESERT_LIZARD, "Desert lizard", "Sulphur lizard", "Small lizard", "Lizard"),
LIZARDMEN("Lizardmen", ItemID.LIZARDMAN_FANG, "Lizardman"),
LIZARDS("Lizards", ItemID.DESERT_LIZARD, "Desert lizard", "Sulphur lizard", "Small lizard", "Lizard"),
MAGIC_AXES("Magic axes", ItemID.IRON_BATTLEAXE, "Magic axe"),
MAMMOTHS("Mammoths", ItemID.ATTACKER_HORN, "Mammoth"),
MINIONS_OF_SCABARAS("Minions of scabaras", ItemID.GOLDEN_SCARAB, "Scarab swarm", "Locust rider", "Scarab mage"),
MINOTAURS("Minotaurs", ItemID.ENSOULED_MINOTAUR_HEAD),
MITHRIL_DRAGONS("Mithril dragons", ItemID.MITHRIL_DRAGON_MASK),
@@ -136,16 +138,16 @@ enum Task
NECHRYAEL("Nechryael", ItemID.NECHRYAEL, "Nechryarch"),
OGRES("Ogres", ItemID.ENSOULED_OGRE_HEAD),
OTHERWORLDLY_BEING("Otherworldly beings", ItemID.GHOSTLY_HOOD),
PIRATES("Pirates", ItemID.PIRATE_HAT, "Pirate"),
PYREFIENDS("Pyrefiends", ItemID.PYREFIEND, "Flaming pyrelord"),
RATS("Rats", ItemID.RATS_TAIL),
RED_DRAGONS("Red dragons", ItemID.BABY_RED_DRAGON, "Baby red dragon"),
REVENANTS("Revenants", ItemID.BRACELET_OF_ETHEREUM, "Revenant imp", "Revenant goblin", "Revenant pyrefiend", "Revenant hobgoblin", "Revenant cyclops", "Revenant hellhound", "Revenant demon", "Revenant ork", "Revenant dark beast", "Revenant knight", "Revenant dragon"),
ROCKSLUGS("Rockslugs", ItemID.ROCKSLUG, 4, ItemID.BAG_OF_SALT),
ROGUES("Rogues", ItemID.ROGUE_MASK, "Rogue"),
RUNE_DRAGONS("Rune dragons", ItemID.RUNE_DRAGON_MASK),
SCORPIA("Scorpia", ItemID.SCORPIAS_OFFSPRING),
CHAOS_DRUIDS("Chaos druids", ItemID.ELDER_CHAOS_HOOD, "Elder Chaos druid", "Chaos druid"),
BANDITS("Bandits", ItemID.BANDIT, "Bandit"),
MAGIC_AXES("Magic axes", ItemID.IRON_BATTLEAXE, "Magic axe"),
SARACHNIS("Sarachnis", ItemID.SRARACHA),
SCORPIA("Scorpia", ItemID.SCORPIAS_OFFSPRING),
SCORPIONS("Scorpions", ItemID.ENSOULED_SCORPION_HEAD),
SEA_SNAKES("Sea snakes", ItemID.SNAKE_CORPSE),
SHADES("Shades", ItemID.SHADE_ROBE_TOP, "Loar Shadow", "Loar Shade", "Phrin Shadow", "Phrin Shade", "Riyl Shadow", "Riyl Shade", "Asyn Shadow", "Asyn Shade", "Fiyr Shadow", "Fiyr Shade"),
@@ -176,8 +178,8 @@ enum Task
WYRMS("Wyrms", ItemID.WYRM),
ZILYANA("Commander Zilyana", ItemID.PET_ZILYANA),
ZOMBIES("Zombies", ItemID.ZOMBIE_HEAD, "Undead"),
ZULRAH("Zulrah", ItemID.PET_SNAKELING),
ZUK("TzKal-Zuk", ItemID.TZREKZUK, 101890);
ZUK("TzKal-Zuk", ItemID.TZREKZUK, 101890),
ZULRAH("Zulrah", ItemID.PET_SNAKELING);
//</editor-fold>
private static final Map<String, Task> tasks;