diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index 9315c35f1..489c1d369 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -433,7 +433,7 @@ }, { "npc_id": "133", - "loc_data": "{3079,3618,0,0,7}-{3070,3629,0,0,3}-{3073,3634,0,0,6}-{3088,3636,0,0,3}-{3092,3637,0,0,2}-{3073,3636,0,0,0}-{3070,3657,0,0,5}-{3109,3634,0,0,2}-{3114,3628,0,0,1}-{3107,3626,0,0,2}-{3118,3639,0,0,5}-{3119,3627,0,0,3}-{3119,3604,0,0,1}-{3136,3612,0,0,5}-{3124,3586,0,0,0}" + "loc_data": "{2730,3660,0,1,7}-{2709,3672,0,1,7}-{3079,3618,0,0,7}-{3070,3629,0,0,3}-{3073,3634,0,0,6}-{3088,3636,0,0,3}-{3092,3637,0,0,2}-{3073,3636,0,0,0}-{3070,3657,0,0,5}-{3109,3634,0,0,2}-{3114,3628,0,0,1}-{3107,3626,0,0,2}-{3118,3639,0,0,5}-{3119,3627,0,0,3}-{3119,3604,0,0,1}-{3136,3612,0,0,5}-{3124,3586,0,0,0}" }, { "npc_id": "134", @@ -7295,6 +7295,10 @@ "npc_id": "5111", "loc_data": "{2569,3083,0,1,1}" }, + { + "npc_id": "5112", + "loc_data": "{2712,3833,1,1,1}" + }, { "npc_id": "5113", "loc_data": "{2525,2916,0,1,5}" @@ -10822,7 +10826,11 @@ { "npc_id": "4885", "loc_data": "{2705,3287,0,1,1}-{2716,3287,0,1,1}-{2732,3282,0,1,1}" - }, + }, + { + "npc_id": "7780", + "loc_data": "{3358,2993,0,1,0}" + }, { "npc_id": "4887", "loc_data": "{2738,3303,0,1,1}-{2723,3274,0,1,1}" diff --git a/Server/data/configs/shops.json b/Server/data/configs/shops.json index 4963ac841..4a56b12ba 100644 --- a/Server/data/configs/shops.json +++ b/Server/data/configs/shops.json @@ -1404,7 +1404,7 @@ "stock": "{2323,1,100}-{2325,1,100}-{2327,1,100}-{7178,1,100}-{7188,1,100}-{7198,1,100}" }, { - "npcs": "70,1598,1596,1597,1599,8274,8275,8276,8277,8273,8271,8270,2253", + "npcs": "70,1598,1596,1597,1599,8274,8275,8276,8277,8273,8271,8270,2253,7780", "high_alch": "0", "currency": "995", "general_store": "false", diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/Master.java b/Server/src/main/java/core/game/node/entity/skill/slayer/Master.java index 9d1ee2c12..b4b3dd2e4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/Master.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/Master.java @@ -16,201 +16,249 @@ import java.util.List; public enum Master { TURAEL(8273, 0, 0, new int[]{15, 50}, new int[]{0, 0, 0}, new Task(Tasks.BANSHEE, 8), - new Task(Tasks.CRAWLING_HAND, 8), - new Task(Tasks.SKELETONS, 7), - new Task(Tasks.WOLVES, 7), - new Task(Tasks.GOBLINS, 7), - new Task(Tasks.DOG, 7), - new Task(Tasks.CAVE_SLIMES, 8), - new Task(Tasks.KALPHITES, 6), - new Task(Tasks.ICE_FIENDS, 8), - new Task(Tasks.MINOTAURS, 7), - new Task(Tasks.CAVE_CRAWLERS, 8), - new Task(Tasks.GHOSTS, 7), - new Task(Tasks.BEARS, 7), new Task(Tasks.BATS, 7), - new Task(Tasks.ZOMBIES, 7), - new Task(Tasks.SCORPIONS, 7), - new Task(Tasks.CAVE_BUG, 8), - new Task(Tasks.DESERT_LIZARDS, 8), - new Task(Tasks.DWARF, 7), - new Task(Tasks.SPIDERS, 6), new Task(Tasks.BIRDS, 6), - new Task(Tasks.COWS, 8), - new Task(Tasks.MONKEYS, 6), - new Task(Tasks.RATS, 7)), - MAZCHNA(8274, 20, 0, new int[]{30, 70}, new int[]{2, 5, 15}, - new Task(Tasks.VAMPIRES, 6), - new Task(Tasks.GHOULS, 7), - new Task(Tasks.BANSHEE, 8), - new Task(Tasks.CRAWLING_HAND, 8), - new Task(Tasks.SKELETONS, 7), - //MOGRES -> new Task(Tasks2.Mogres, 8), - new Task(Tasks.PYREFIENDS, 8), - //KILLERWATTS -> new Task(Tasks2.KILLERWATTS, 6), - new Task(Tasks.SHADE,8), - new Task(Tasks.COCKATRICES, 8), - new Task(Tasks.HILL_GIANTS,7), - new Task(Tasks.ROCK_SLUGS,8), - new Task(Tasks.DESERT_LIZARDS, 8), - new Task(Tasks.CAVE_SLIMES, 8), - new Task(Tasks.HOBGOBLINS, 7), - new Task(Tasks.WOLVES, 7), - new Task(Tasks.DOG,7), - new Task(Tasks.FLESH_CRAWLERS,7), - new Task(Tasks.CATABLEPONS,8), - //WALL BEASTS -> new Task(Tasks2.WALL_BEASTS,7), - new Task(Tasks.KALPHITES,6), + new Task(Tasks.BEARS, 7), + new Task(Tasks.CAVE_BUG, 8), new Task(Tasks.CAVE_CRAWLERS, 8), - new Task(Tasks.GHOSTS,7), - new Task(Tasks.BEARS,6), - new Task(Tasks.EARTH_WARRIORS,6), - new Task(Tasks.ZOMBIES,7), - new Task(Tasks.ICE_WARRIOR, 7), - new Task(Tasks.CAVE_BUG,8), + new Task(Tasks.CAVE_SLIMES, 8), + new Task(Tasks.COWS, 8), + new Task(Tasks.CRAWLING_HAND, 8), + new Task(Tasks.DOG, 7), + new Task(Tasks.DWARF, 7), + new Task(Tasks.GHOSTS, 7), + new Task(Tasks.GOBLINS, 7), + new Task(Tasks.ICE_FIENDS, 8), + new Task(Tasks.KALPHITES, 6), + new Task(Tasks.DESERT_LIZARDS, 8), + new Task(Tasks.MINOTAURS, 7), + new Task(Tasks.MONKEYS, 6), + new Task(Tasks.RATS, 7), + new Task(Tasks.SCORPIONS, 7), + new Task(Tasks.SKELETONS, 7), + new Task(Tasks.SPIDERS, 6), + new Task(Tasks.WOLVES, 7), + new Task(Tasks.ZOMBIES, 7)), + + MAZCHNA(8274, 20, 0, new int[]{30, 70}, new int[]{2, 5, 15}, + new Task(Tasks.BANSHEE, 8), new Task(Tasks.BATS,7), - new Task(Tasks.SCORPIONS,7)), - VANNAKA(1597, 40, 0, new int[]{30, 80}, new int[]{4, 20, 60}, - new Task(Tasks.HARPIE_BUG_SWARMS,8), - // SHADOW WARRIORS -> new Task(Tasks2.SHADOW_WARRIORS, 8), - new Task(Tasks.BLOODVELDS,8), - new Task(Tasks.DUST_DEVILS,8), - new Task(Tasks.ABERRANT_SPECTRES, 8), - new Task(Tasks.JUNGLE_HORRORS, 8), - new Task(Tasks.TUROTHS, 8), - new Task(Tasks.JELLIES,8), - new Task(Tasks.INFERNAL_MAGES,8), - new Task(Tasks.BASILISKS,8), - new Task(Tasks.PYREFIENDS,8), + new Task(Tasks.BEARS,6), + new Task(Tasks.CATABLEPONS,8), + new Task(Tasks.CAVE_BUG,8), + new Task(Tasks.CAVE_CRAWLERS, 8), + new Task(Tasks.CAVE_SLIMES, 8), + new Task(Tasks.COCKATRICES, 8), + new Task(Tasks.CRAWLING_HAND, 8), + new Task(Tasks.DESERT_LIZARDS, 8), + new Task(Tasks.DOG,7), + new Task(Tasks.EARTH_WARRIORS,6), + new Task(Tasks.FLESH_CRAWLERS,7), + new Task(Tasks.GHOSTS,7), + new Task(Tasks.GHOULS, 7), + new Task(Tasks.HILL_GIANTS,7), + new Task(Tasks.HOBGOBLINS, 7), + new Task(Tasks.ICE_WARRIOR, 7), + new Task(Tasks.KALPHITES,6), + //new Task(Tasks.KILLERWATTS, 6), + //new Task(Tasks.MOGRES, 8), + new Task(Tasks.PYREFIENDS, 8), + new Task(Tasks.ROCK_SLUGS,8), + new Task(Tasks.SCORPIONS,7), new Task(Tasks.SHADE,8), + new Task(Tasks.SKELETONS, 7), + new Task(Tasks.VAMPIRES, 6), + //new Task(Tasks.WALL_BEASTS,7), + new Task(Tasks.WOLVES, 7), + new Task(Tasks.ZOMBIES,7)), + + VANNAKA(1597, 40, 0, new int[]{30, 80}, new int[]{4, 20, 60}, + new Task(Tasks.ABERRANT_SPECTRES, 8), + new Task(Tasks.ABYSSAL_DEMONS, 5), + new Task(Tasks.ANKOU,7), + new Task(Tasks.BANSHEE,6), + new Task(Tasks.BASILISKS,8), + new Task(Tasks.BLOODVELDS,8), + new Task(Tasks.BLUE_DRAGONS,7), + new Task(Tasks.BRINE_RATS,7), + new Task(Tasks.BRONZE_DRAGONS,7), + new Task(Tasks.CAVE_BUG,7), + new Task(Tasks.CAVE_CRAWLERS,7), + new Task(Tasks.CAVE_SLIMES,7), new Task(Tasks.COCKATRICES,8), + new Task(Tasks.CRAWLING_HAND,6), + new Task(Tasks.CROCODILES,6), + new Task(Tasks.DAGANNOTHS, 7), + new Task(Tasks.DUST_DEVILS,8), + new Task(Tasks.EARTH_WARRIORS,6), + new Task(Tasks.ELVES, 7), + //new Task(Tasks.FEVER_SPIDERS,7), + new Task(Tasks.FIRE_GIANTS,7), + new Task(Tasks.GARGOYLES, 5), + new Task(Tasks.GHOULS,7), + new Task(Tasks.GREEN_DRAGON,6), + new Task(Tasks.HARPIE_BUG_SWARMS,8), + new Task(Tasks.HELLHOUNDS,7), + new Task(Tasks.HILL_GIANTS,7), + new Task(Tasks.HOBGOBLINS,7), + new Task(Tasks.ICE_GIANTS,7), + new Task(Tasks.ICE_WARRIOR,7), + new Task(Tasks.INFERNAL_MAGES,8), + new Task(Tasks.JELLIES,8), + new Task(Tasks.JUNGLE_HORRORS, 8), + new Task(Tasks.KALPHITES,7), + //new Task(Tasks.KILLERWATTS,6), + new Task(Tasks.KURASKS,7), + new Task(Tasks.DESERT_LIZARDS,7), + new Task(Tasks.LESSER_DEMONS,7), + //new Task(Tasks.MOGRES,7), + //new Task(Tasks.MOLANISKS,7), + new Task(Tasks.MOSS_GIANTS,7), + new Task(Tasks.NECHRYAELS, 5), + new Task(Tasks.OGRES,7), new Task(Tasks.OTHERWORDLY_BEING,8), + new Task(Tasks.PYREFIENDS,8), + new Task(Tasks.ROCK_SLUGS,7), + new Task(Tasks.SHADE,8), + //new Task(Tasks.SEA_SNAKES,6), + //new Task(Tasks.SHADOW_WARRIORS, 8), new Task(Tasks.SPIRTUAL_MAGES,3), new Task(Tasks.SPIRTUAL_RANGERS, 3), new Task(Tasks.SPIRTUAL_WARRIORS,3), - new Task(Tasks.DAGANNOTHS, 7), - //ELVES -> new Task(Tasks2.ELVES, 7), - new Task(Tasks.WEREWOLFS,7), - new Task(Tasks.KURASKS,7), - new Task(Tasks.KALPHITES,7), - new Task(Tasks.FIRE_GIANTS,7), - new Task(Tasks.OGRES,7), - new Task(Tasks.MOSS_GIANTS,7), + //new Task(Tasks.TERROR_DOGS,6), new Task(Tasks.TROLLS,7), - new Task(Tasks.HELLHOUNDS,7), - new Task(Tasks.BRONZE_DRAGONS,7), - new Task(Tasks.BLUE_DRAGONS,7), - new Task(Tasks.LESSER_DEMONS,7), - new Task(Tasks.ANKOU,7), - new Task(Tasks.ICE_GIANTS,7), - new Task(Tasks.BRINE_RATS,7), - //FEVER SPIDERS -> new Task(Tasks2.FEVER_SPIDERS,7), + new Task(Tasks.TUROTHS, 8), new Task(Tasks.VAMPIRES,7), - //MOLANISKS -> new Task(Tasks2.MOLANISKS,7), - //MOGRES -> new Task(Tasks2.MOGRES,7), - new Task(Tasks.ICE_WARRIOR,7), - new Task(Tasks.GHOULS,7), - new Task(Tasks.DESERT_LIZARDS,7), - new Task(Tasks.ROCK_SLUGS,7), - new Task(Tasks.CAVE_SLIMES,7), - new Task(Tasks.CAVE_CRAWLERS,7), - new Task(Tasks.CAVE_BUG,7), - new Task(Tasks.HILL_GIANTS,7), - new Task(Tasks.HOBGOBLINS,7), - //KILLERWATTS -> new Task(Tasks2.KILLERWATTS,6), - new Task(Tasks.CROCODILES,6), - //SEA SNAKES -> new Task(Tasks2.SEA_SNAKES,6), - //TERROR DOGS -> new Task(Tasks2.TERROR_DOGS,6), - new Task(Tasks.GREEN_DRAGON,6), - //WALL BEAST -> new Task(Tasks2.WALL_BEAST,6), - new Task(Tasks.EARTH_WARRIORS,6), - new Task(Tasks.BANSHEE,6), - new Task(Tasks.CRAWLING_HAND,6), - new Task(Tasks.GARGOYLES, 5), - new Task(Tasks.NECHRYAELS, 5), - new Task(Tasks.ABYSSAL_DEMONS, 5)), + //new Task(Tasks.WALL_BEAST,6), + new Task(Tasks.WEREWOLFS,7)), CHAELDAR(1598, 70, 0, new int[]{110, 170}, new int[]{10, 50, 150}, + new Task(Tasks.ABERRANT_SPECTRES,8), new Task(Tasks.ABYSSAL_DEMONS,12), - new Task(Tasks.IRON_DRAGONS,12), - new Task(Tasks.NECHRYAELS, 12), - new Task(Tasks.KURASKS, 12), + new Task(Tasks.AVIANSIES,9), + new Task(Tasks.BANSHEE, 5), + new Task(Tasks.BASILISKS,7), + new Task(Tasks.BLACK_DEMONS,10), + new Task(Tasks.BLOODVELDS,8), + new Task(Tasks.BLUE_DRAGONS,8), + new Task(Tasks.BRINE_RATS,7), + new Task(Tasks.BRONZE_DRAGONS,11), + new Task(Tasks.CAVE_CRAWLERS, 5), + new Task(Tasks.CAVE_HORRORS,10), + new Task(Tasks.CAVE_SLIMES,6), + new Task(Tasks.COCKATRICES,6), + new Task(Tasks.DAGANNOTHS,11), + new Task(Tasks.DUST_DEVILS,9), + new Task(Tasks.ELVES,8), + //new Task(Tasks.FEVER_SPIDERS,7), new Task(Tasks.FIRE_GIANTS, 12), + new Task(Tasks.GARGOYLES,11), + new Task(Tasks.GREATER_DEMONS,9), + new Task(Tasks.HARPIE_BUG_SWARMS,6), + new Task(Tasks.HELLHOUNDS,9), + new Task(Tasks.INFERNAL_MAGES,7), + new Task(Tasks.IRON_DRAGONS,12), + new Task(Tasks.JELLIES, 10), + new Task(Tasks.JUNGLE_HORRORS,10), + new Task(Tasks.KALPHITES,11), + new Task(Tasks.KURASKS, 12), + new Task(Tasks.LESSER_DEMONS,9), + new Task(Tasks.DESERT_LIZARDS, 5), + //new Task(Tasks.MOGRES,6), + //new Task(Tasks.MOLANISKS,6), + //new Task(Tasks.MUTATED_ZYGOMITES,7), + new Task(Tasks.NECHRYAELS, 12), + new Task(Tasks.PYREFIENDS,6), + new Task(Tasks.ROCK_SLUGS, 5), + //new Task(Tasks.SHADOW_WARRIORS,8), + new Task(Tasks.SKELETAL_WYVERN,7), new Task(Tasks.SPIRTUAL_WARRIORS,4), new Task(Tasks.SPIRTUAL_RANGERS,4), new Task(Tasks.SPIRTUAL_MAGES,4), - new Task(Tasks.GARGOYLES,11), - new Task(Tasks.KALPHITES,11), - new Task(Tasks.DAGANNOTHS,11), - new Task(Tasks.BRONZE_DRAGONS,11), - new Task(Tasks.TROLLS,11), - new Task(Tasks.JUNGLE_HORRORS,10), - new Task(Tasks.BLACK_DEMONS,10), - new Task(Tasks.TUROTHS, 10), - new Task(Tasks.CAVE_HORRORS,10), - new Task(Tasks.JELLIES, 10), - new Task(Tasks.AVIANSIES,9), new Task(Tasks.STEEL_DRAGONS,9), - new Task(Tasks.LESSER_DEMONS,9), - new Task(Tasks.GREATER_DEMONS,9), - new Task(Tasks.HELLHOUNDS,9), - new Task(Tasks.DUST_DEVILS,9), - new Task(Tasks.BLUE_DRAGONS,8), - //ELVES -> new Task(Tasks2.ELVES,8), - new Task(Tasks.ABERRANT_SPECTRES,8), - //SHADOW WARRIORS -> new Task(Tasks2.SHADOW_WARRIORS,8), - new Task(Tasks.BLOODVELDS,8), - new Task(Tasks.SKELETAL_WYVERN,7), - //MUTATED ZYGOMITE -> new Task(Tasks2.MUTATED_ZYGOMITES,7), - new Task(Tasks.INFERNAL_MAGES,7), - new Task(Tasks.BRINE_RATS,7), - //FEVER SPIDERS -> new Task(Tasks2.FEVER_SPIDERS,7), - new Task(Tasks.BASILISKS,7), - //WALL BEASTS -> new Task(Tasks2.WALL_BEASTS,6), - //MOLANISKS -> new Task(Tasks2.MOLANISKS,6), - //MOGRES -> new Task(Tasks2.MOGRES,6), - new Task(Tasks.PYREFIENDS,6), - new Task(Tasks.HARPIE_BUG_SWARMS,6), - new Task(Tasks.COCKATRICES,6), - new Task(Tasks.CAVE_SLIMES,6), - new Task(Tasks.DESERT_LIZARDS, 5), - new Task(Tasks.ROCK_SLUGS, 5), - new Task(Tasks.BANSHEE, 5), - new Task(Tasks.CAVE_CRAWLERS, 5)), - DURADEL(8275, 100, 50, new int[]{50, 199}, new int[]{15, 75, 225}, - new Task(Tasks.ABYSSAL_DEMONS,12), - new Task(Tasks.DARK_BEASTS,11), - new Task(Tasks.TZHAAR, 10), + new Task(Tasks.TROLLS,11), + new Task(Tasks.TUROTHS, 10)), + //new Task(Tasks.WALL_BEASTS,6), + + SUMONA(7780, 90, 35, new int[]{50, 185}, new int[]{12, 60, 180}, + new Task(Tasks.ABERRANT_SPECTRES, 15), + new Task(Tasks.ABYSSAL_DEMONS, 10), + new Task(Tasks.AVIANSIES, 7), + new Task(Tasks.BANSHEE, 15), + new Task(Tasks.BASILISKS, 15), + new Task(Tasks.BLACK_DEMONS, 10), + new Task(Tasks.BLOODVELDS, 10), + new Task(Tasks.BLUE_DRAGONS, 5), + new Task(Tasks.CAVE_CRAWLERS, 15), + new Task(Tasks.CAVE_HORRORS, 15), + new Task(Tasks.CROCODILES, 4), + new Task(Tasks.DAGANNOTHS, 10), + new Task(Tasks.DESERT_LIZARDS, 4), + new Task(Tasks.DUST_DEVILS, 15), + new Task(Tasks.ELVES, 10), + new Task(Tasks.FIRE_GIANTS, 10), + new Task(Tasks.GARGOYLES, 10), + new Task(Tasks.GREATER_DEMONS, 10), new Task(Tasks.HELLHOUNDS, 10), - new Task(Tasks.KALPHITES,9), - new Task(Tasks.NECHRYAELS,9), - new Task(Tasks.MITHRIL_DRAGON,9), - new Task(Tasks.BLACK_DRAGONS,9), - new Task(Tasks.GREATER_DEMONS,9), - new Task(Tasks.DAGANNOTHS,9), - new Task(Tasks.GARGOYLES,8), - new Task(Tasks.BLACK_DEMONS,8), - //RED DRAGONS new Task(Tasks2.RED_DRAGONS,8), - new Task(Tasks.BLOODVELDS,8), + new Task(Tasks.IRON_DRAGONS, 7), + new Task(Tasks.KALPHITES, 10), + new Task(Tasks.KURASKS, 15), + new Task(Tasks.NECHRYAELS, 10), + // newTask(Tasks.RED_DRAGON, 5), + new Task(Tasks.SCORPIONS, 4), + new Task(Tasks.SPIRTUAL_MAGES, 10), + new Task(Tasks.SPIRTUAL_WARRIORS, 10), + // new Task(Tasks.TERROR_DOGS, 10), + new Task(Tasks.TROLLS, 10), + new Task(Tasks.TUROTHS, 15), + new Task(Tasks.VAMPIRES, 10)), + //new Task(Tasks.WARPED_TORTOISE, 15)), + + DURADEL(8275, 100, 50, new int[]{50, 199}, new int[]{15, 75, 225}, + new Task(Tasks.ABERRANT_SPECTRES,7), + new Task(Tasks.ABYSSAL_DEMONS,12), + new Task(Tasks.ANKOU,5), new Task(Tasks.AVIANSIES,8), - //SUQAHS new Task(Tasks2.SUQAHS,8), - new Task(Tasks.ABERRANT_SPECTRES,7), - new Task(Tasks.STEEL_DRAGONS,7), + new Task(Tasks.BLACK_DEMONS,8), + new Task(Tasks.BLACK_DRAGONS,9), + new Task(Tasks.BLOODVELDS,8), + new Task(Tasks.BLUE_DRAGONS,4), + new Task(Tasks.CAVE_HORRORS,4), + new Task(Tasks.DAGANNOTHS,9), + new Task(Tasks.DARK_BEASTS,11), + new Task(Tasks.DUST_DEVILS,5), + new Task(Tasks.ELVES,4), + new Task(Tasks.FIRE_GIANTS,7), + new Task(Tasks.GARGOYLES,8), + new Task(Tasks.GREATER_DEMONS,9), + new Task(Tasks.HELLHOUNDS, 10), + new Task(Tasks.IRON_DRAGONS,5), + new Task(Tasks.KALPHITES,9), + new Task(Tasks.KURASKS,4), + new Task(Tasks.MITHRIL_DRAGON,9), + new Task(Tasks.NECHRYAELS,9), + //new Task(Tasks.RED_DRAGONS,8), + new Task(Tasks.SKELETAL_WYVERN,7), new Task(Tasks.SPIRTUAL_MAGES,2), new Task(Tasks.SPIRTUAL_RANGERS,2), new Task(Tasks.SPIRTUAL_WARRIORS,2), - new Task(Tasks.SKELETAL_WYVERN,7), - new Task(Tasks.FIRE_GIANTS,7), + new Task(Tasks.STEEL_DRAGONS,7), + //new Task(Tasks.SUQAHS,8), new Task(Tasks.TROLLS,6), - new Task(Tasks.IRON_DRAGONS,5), - new Task(Tasks.ANKOU,5), - new Task(Tasks.DUST_DEVILS,5), - new Task(Tasks.KURASKS,4), - new Task(Tasks.CAVE_HORRORS,4), - new Task(Tasks.BLUE_DRAGONS,4), - //ELVES new Task(Tasks2.ELVES,4), - //ZYGOMITES new Task(Tasks2.MUTATED_ZYGOMITES,2), + new Task(Tasks.TZHAAR, 10), + new Task(Tasks.VAMPIRES,8), + // new Task(Tasks.WARPED_TERRORBIRD,8), new Task(Tasks.WATERFIENDS,2)); + //new Task(Tasks.MUTATED_ZYGOMITES,2), + //Boss Tasks below this point - Crash + //new Task(Tasks.JAD, 1), + //new Task(Tasks.COMMANDER_ZILYANA,1), + //new Task(Tasks.CHAOS_ELEMENTAL, 1), + //new Task(Tasks.GENERAL_GRARDOOR,1), + //new Task(Tasks.GIANT_MOLE,1), + //new Task(Tasks.KING_BLACK_DRAGON,1), + //new Task(Tasks.KRIL_TSUTSAROTH,1), + //new Task(Tasks.KREE_ARRA,1)); private static HashMap idMap = new HashMap<>(); diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java index 265913b22..ca6965183 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java @@ -709,7 +709,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin { @Override public int[] getIds() { - return new int[]{70, 1598, 1596, 1597, 1599, 8275, 8273, 8274, 8649}; + return new int[]{70, 1598, 1596, 1597, 1599, 7780, 8275, 8273, 8274, 8649}; } private JSONObject getStoreFile() { diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java b/Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java index bce735086..5b9c22017 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java @@ -43,6 +43,7 @@ public enum Tasks { DUST_DEVILS(70, new int[] { 1624 }, new String[] { "Dust Devils use clouds of dust, sand, ash and whatever", "else they can inhale to blind and disorientate", "their victims." }, 65, false), DWARF(6, new int[] { 118, 120, 121, 382, 3219, 3220, 3221, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, 3294, 3295, 4316, 5880, 5881, 5882, 5883, 5884, 5885, 2130, 2131, 2132, 2133, 3276, 3277, 3278, 3279, 119, 2423 }, new String[] { "They are slightly resistant to Magic attacks, and", "are not recommended for low levels." }, 1, false), EARTH_WARRIORS(35, new int[] { 124 }, new String[] { "An Earth warrior is a monster made of earth which fights using melee." }, 1, false), + ELVES(70, new int[] { 1183, 1184, 2359, 2360, 2361, 2362, 7438, 7439, 7440, 7441 }, new String[]{"Elves are agile creatures."}, 1, false), FIRE_GIANTS(65, new int[] { 110, 1582, 1583, 1584, 1585, 1586, 7003, 7004 }, new String[] { "Like other giants, Fire Giants often wield large weapons", "learn to recognise what kind of weapon it is, and act accordingly." }, 1, false), FLESH_CRAWLERS(15, new int[] { 4389, 4390, 4391 }, new String[] { "Flesh crawlers are medium level monsters found on", "level 2 of the Stronghold of Security." }, 1, false), GARGOYLES(80, new int[] { 1610, 1611, 6389 }, new String[] { "Gargoyles are winged creatures of stone. You'll need to fight them to", "near death before breaking them apart with a rock hammer." }, 75, false),