Skip to content

Commit f72767b

Browse files
GregHibGregHib
authored
Add all slayer masters (#907)
* Convert turael to use enums * Add most slayer master task data * Update slayer categories * Comment out unreachable slayer tasks * Fix jellies slayer task * Formatting
1 parent 38bd9da commit f72767b

47 files changed

Lines changed: 1079 additions & 449 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npc-spawns.toml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
spawns = [
2-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon", x = 1287, y = 4488, members = true },
3-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon", x = 1320, y = 4489, members = true },
4-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon", x = 1330, y = 4528, members = true },
5-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_2", x = 1298, y = 4531, members = true },
6-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_2", x = 1299, y = 4486, members = true },
7-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_2", x = 1332, y = 4519, members = true },
8-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_3", x = 1304, y = 4494, members = true },
9-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_3", x = 1305, y = 4523, members = true },
10-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_3", x = 1322, y = 4520, members = true },
11-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_4", x = 1309, y = 4486, members = true },
12-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_4", x = 1312, y = 4517, members = true },
13-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_4", x = 1312, y = 4532, members = true },
14-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_5", x = 1292, y = 4496 },
15-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_5", x = 1318, y = 4497 },
16-
{ id = "frost_dragon_asgarnian_ice_resource_dungeon_5", x = 1321, y = 4533 },
2+
{ id = "frost_dragon", x = 1287, y = 4488, members = true },
3+
{ id = "frost_dragon", x = 1320, y = 4489, members = true },
4+
{ id = "frost_dragon", x = 1330, y = 4528, members = true },
5+
{ id = "frost_dragon_2", x = 1298, y = 4531, members = true },
6+
{ id = "frost_dragon_2", x = 1299, y = 4486, members = true },
7+
{ id = "frost_dragon_2", x = 1332, y = 4519, members = true },
8+
{ id = "frost_dragon_3", x = 1304, y = 4494, members = true },
9+
{ id = "frost_dragon_3", x = 1305, y = 4523, members = true },
10+
{ id = "frost_dragon_3", x = 1322, y = 4520, members = true },
11+
{ id = "frost_dragon_4", x = 1309, y = 4486, members = true },
12+
{ id = "frost_dragon_4", x = 1312, y = 4517, members = true },
13+
{ id = "frost_dragon_4", x = 1312, y = 4532, members = true },
14+
{ id = "frost_dragon_5", x = 1292, y = 4496 },
15+
{ id = "frost_dragon_5", x = 1318, y = 4497 },
16+
{ id = "frost_dragon_5", x = 1321, y = 4533 },
1717
]

‎data/area/asgarnia/mudskipper_point/asgarnian_ice_dungeon/resource_dungeon/asgarnian_ice_resource_dungeon.npcs.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
[frost_dragon_asgarnian_ice_resource_dungeon]
1+
[frost_dragon]
22
id = 11633
33

4-
[frost_dragon_asgarnian_ice_resource_dungeon_2]
4+
[frost_dragon_2]
55
id = 11634
66

7-
[frost_dragon_asgarnian_ice_resource_dungeon_3]
7+
[frost_dragon_3]
88
id = 11635
99

10-
[frost_dragon_asgarnian_ice_resource_dungeon_4]
10+
[frost_dragon_4]
1111
id = 11636
1212

13-
[frost_dragon_asgarnian_ice_resource_dungeon_5]
13+
[frost_dragon_5]
1414
id = 51
1515
categories = ["dragons"]
1616
examine = "A dragon covered in frost and ice."

‎data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ max_hit_melee = 80
3232
attack_bonus = 22
3333
hunt_mode = "cowardly"
3434
slayer_xp = 48.0
35-
categories = ["mogres"]
36-
categories = ["ogres"]
35+
categories = ["mogres", "ogres"]
3736
drop_table = "mogre"
3837
examine = "An angry Ogre in a funny hat."
3938

‎data/area/fremennik_province/rellekka/fremennik_dungeon/fremennik_dungeon.npc-spawns.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
spawns = [
2-
{ id = "kurask_fremennik_dungeon", x = 2694, y = 9995 },
3-
{ id = "kurask_fremennik_dungeon", x = 2698, y = 9992 },
4-
{ id = "kurask_fremennik_dungeon", x = 2699, y = 10001 },
5-
{ id = "kurask_fremennik_dungeon", x = 2701, y = 9996 },
6-
{ id = "kurask_fremennik_dungeon_2", x = 2694, y = 9999, members = true },
2+
{ id = "kurask", x = 2694, y = 9995 },
3+
{ id = "kurask", x = 2698, y = 9992 },
4+
{ id = "kurask", x = 2699, y = 10001 },
5+
{ id = "kurask", x = 2701, y = 9996 },
6+
{ id = "kurask_2", x = 2694, y = 9999, members = true },
77
{ id = "basilisk", x = 2738, y = 10008 },
88
{ id = "basilisk", x = 2740, y = 10003 },
99
{ id = "basilisk", x = 2740, y = 10014 },

‎data/area/kandarin/ancient_cavern/ancient_cavern.npc-spawns.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ spawns = [
3939
{ id = "enraged_barbarian_spirit", x = 1751, y = 5331 },
4040
{ id = "enraged_barbarian_spirit", x = 1775, y = 5324 },
4141
{ id = "berserk_barbarian_spirit", x = 1779, y = 5325 },
42-
{ id = "kuradal_dragon_forge", x = 1738, y = 5312, level = 1, members = true },
42+
{ id = "kuradal", x = 1738, y = 5312, level = 1, members = true },
4343
{ id = "gargoyle_ancient_cavern", x = 1733, y = 5312, level = 1, members = true },
4444
]

‎data/area/kandarin/ancient_cavern/dragon_forge/dragon_forge.npc-spawns.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
spawns = [
2-
{ id = "kuradal_dragon_forge", x = 1688, y = 5287, level = 1, members = true },
2+
{ id = "kuradal", x = 1688, y = 5287, level = 1, members = true },
33
{ id = "abyssal_demon_dragon_forge", x = 1683, y = 5288, level = 1, members = true },
44
]

‎data/area/kandarin/ancient_cavern/dragon_forge/dragon_forge.npcs.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[kuradal_dragon_forge]
1+
[kuradal]
22
id = 9085
33
examine = "She looks incredibly strong."
44

‎data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npc-spawns.toml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
spawns = [
2-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2693, y = 9776 },
3-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2697, y = 9773 },
4-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2697, y = 9779 },
5-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2700, y = 9770 },
6-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2700, y = 9774 },
7-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2700, y = 9777 },
8-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2701, y = 9781 },
9-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2703, y = 9770 },
10-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2703, y = 9774 },
11-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2703, y = 9779 },
12-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2705, y = 9757 },
13-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2705, y = 9760 },
14-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2705, y = 9766 },
15-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2706, y = 9753 },
16-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2706, y = 9763 },
17-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2706, y = 9772 },
18-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2707, y = 9756 },
19-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2707, y = 9761 },
20-
{ id = "shadow_warrior_legends_guild_dungeon", x = 2708, y = 9758 },
2+
{ id = "shadow_warrior", x = 2693, y = 9776 },
3+
{ id = "shadow_warrior", x = 2697, y = 9773 },
4+
{ id = "shadow_warrior", x = 2697, y = 9779 },
5+
{ id = "shadow_warrior", x = 2700, y = 9770 },
6+
{ id = "shadow_warrior", x = 2700, y = 9774 },
7+
{ id = "shadow_warrior", x = 2700, y = 9777 },
8+
{ id = "shadow_warrior", x = 2701, y = 9781 },
9+
{ id = "shadow_warrior", x = 2703, y = 9770 },
10+
{ id = "shadow_warrior", x = 2703, y = 9774 },
11+
{ id = "shadow_warrior", x = 2703, y = 9779 },
12+
{ id = "shadow_warrior", x = 2705, y = 9757 },
13+
{ id = "shadow_warrior", x = 2705, y = 9760 },
14+
{ id = "shadow_warrior", x = 2705, y = 9766 },
15+
{ id = "shadow_warrior", x = 2706, y = 9753 },
16+
{ id = "shadow_warrior", x = 2706, y = 9763 },
17+
{ id = "shadow_warrior", x = 2706, y = 9772 },
18+
{ id = "shadow_warrior", x = 2707, y = 9756 },
19+
{ id = "shadow_warrior", x = 2707, y = 9761 },
20+
{ id = "shadow_warrior", x = 2708, y = 9758 },
2121
]

‎data/area/kandarin/legends_guild/dungeon/legends_guild_dungeon.npcs.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[shadow_warrior_legends_guild_dungeon]
1+
[shadow_warrior]
22
id = 158
33
hitpoints = 670
44
att = 36

‎data/area/karamja/shilo_village/shilo_village.npcs.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ clone = "undead_one_shilo_village_2"
8383
[lapalok_shilo_village]
8484
id = 8483
8585

86-
[lapalok_shilo_village_2]
86+
[duradel]
8787
id = 8466
8888

8989
[lapalok_shilo_village_3]

0 commit comments

Comments
 (0)