Add more slayer monsters and braindeath island

data/area/kharidian_desert/kalphite_hive/kalphite.combat.toml

@@ -2,14 +2,14 @@
 attack_speed = 4
 retreat_range = 8
 defend_anim = "kalphite_defend"
-defend_sound = "kalphite_defend"
+defend_sound = "insect_defend"
 death_anim = "kalphite_death"
-death_sound = "kalphite_death"
+death_sound = "insect_death"
 
 [kalphite_worker.melee]
 range = 1
 anim = "kalphite_attack"
-target_sound = "kalphite_attack"
+target_sound = "insect_attack"
 target_hit = { offense = "crush", max = 30 }
 
 [kalphite_guardian]

data/area/kharidian_desert/kalphite_hive/kalphite.sounds.toml

@@ -1,10 +1,10 @@
-[kalphite_attack]
+[insect_attack]
 id = 537
 
-[kalphite_death]
+[insect_death]
 id = 538
 
-[kalphite_defend]
+[insect_defend]
 id = 539
 
 [kalphite_queen_attack]

data/area/misthalin/draynor/draynor.teles.toml

@@ -64,4 +64,9 @@ delta = { x = -35, y = 6421 }
 [133]
 option = "Climb-down"
 tile = { x = 3092, y = 3362 }
-delta = { x = 25, y = 6392 }
+delta = { x = 25, y = 6392 }
+
+[portal_home]
+option = "Enter"
+tile = { x = 2678, y = 5214, level = 2 }
+to = { x = 3110, y = 3363, level = 2 }

data/area/misthalin/draynor/manor/draynor_manor.objs.toml

@@ -0,0 +1,19 @@
+[draynor_manor_door_sign_closed]
+id = 47421
+examine = "A large double door."
+
+[draynor_manor_door_sign_opened]
+id = 47423
+examine = "A large double door."
+
+[draynor_manor_door_opened]
+id = 47425
+examine = "A large double door."
+
+[draynor_manor_door_closed]
+id = 47424
+examine = "A large double door."
+
+[portal_home]
+id = 11356
+examine = "A gateway back to Gielinor."

data/area/morytania/braindeath_island/braindeath_island.anims.toml

@@ -0,0 +1,17 @@
+[spider_large_defend]
+id = 5320
+
+[spider_large_attack]
+id = 5319
+
+[spider_large_death]
+id = 5321
+
+[zombie_pirate_defend]
+id = 5653
+
+[zombie_pirate_attack]
+id = 5651
+
+[zombie_pirate_death]
+id = 5654

data/area/morytania/braindeath_island/braindeath_island.combat.toml

@@ -0,0 +1,36 @@
+[fever_spider]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "spider_large_defend"
+defend_sound = "insect_defend"
+death_anim = "spider_large_death"
+death_sound = "insect_death"
+
+[fever_spider.melee]
+condition = "slayer_gloves"
+range = 1
+anim = "spider_large_attack"
+target_sound = "insect_attack"
+target_hit = { offense = "stab", max = 70 }
+
+[fever_spider.disease]
+condition = "no_slayer_gloves"
+range = 1
+anim = "spider_large_attack"
+target_sound = "insect_attack"
+impact_regardless = true
+impact_disease = 80
+
+[zombie_pirate]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "zombie_pirate_defend"
+defend_sound = "zombie_pirate_defend"
+death_anim = "zombie_pirate_death"
+death_sound = "zombie_pirate_death"
+
+[zombie_pirate.melee]
+range = 1
+anim = "zombie_pirate_attack"
+target_sound = "zombie_pirate_attack"
+target_hit = { offense = "crush", max = 60 }

data/area/morytania/braindeath_island/braindeath_island.npcs.toml

@@ -17,34 +17,40 @@ id = 2830
 
 [zombie_protester]
 id = 2831
+hunt_mode = "spotted"
 
 [zombie_protester_2]
 id = 2832
+hunt_mode = "spotted"
 
 [zombie_protester_3]
 id = 2833
+hunt_mode = "spotted"
 
 [zombie_protester_4]
 id = 2834
+hunt_mode = "spotted"
 
 [zombie_protester_5]
 id = 2835
+hunt_mode = "spotted"
 
 [zombie_protester_6]
 id = 2836
+hunt_mode = "spotted"
 
 [zombie_pirate]
 id = 2837
 hitpoints = 520
 att = 49
 str = 50
 def = 50
-style = "crush"
-max_hit_melee = 60
+combat_def = "zombie_pirate"
 hunt_mode = "cowardly"
 slayer_xp = 52.0
 categories = ["zombies"]
 respawn_delay = 50
+drop_table = "pirate"
 examine = "An undead sea scoundrel."
 
 [zombie_pirate_2]
@@ -73,11 +79,11 @@ hitpoints = 500
 att = 45
 str = 50
 def = 50
-style = "crush"
-max_hit_melee = 60
+combat_def = "zombie_pirate"
 slayer_xp = 50.0
 categories = ["zombies"]
 respawn_delay = 37
+drop_table = "pirate"
 examine = "He talks a good fight."
 
 [zombie_swab_2]

data/area/morytania/braindeath_island/braindeath_island.objs.toml

@@ -0,0 +1,11 @@
+[braindeath_island_wooden_stair_down]
+id = 10137
+
+[braindeath_island_wooden_stair_up]
+id = 10136
+
+[braindeath_island_ladder_up]
+id = 10167
+
+[braindeath_island_ladder_down]
+id = 10168

data/area/morytania/braindeath_island/braindeath_island.sounds.toml

@@ -0,0 +1,8 @@
+[zombie_pirate_defend]
+id = 926
+
+[zombie_pirate_attack]
+id = 924
+
+[zombie_pirate_death]
+id = 925

data/area/morytania/braindeath_island/braindeath_island.teles.toml

@@ -0,0 +1,69 @@
+[braindeath_island_wooden_stair_down]
+option = "Climb-down"
+tile = { x = 2152, y = 5109, level = 1 }
+to = { x = 2150, y = 5109 }
+
+[braindeath_island_wooden_stair_up]
+option = "Climb-up"
+tile = { x = 2151, y = 5109 }
+to = { x = 2153, y = 5108, level = 1 }
+
+[braindeath_island_wooden_stair_down]
+option = "Climb-down"
+tile = { x = 2163, y = 5088, level = 1 }
+to = { x = 2166, y = 5088 }
+
+[braindeath_island_wooden_stair_up]
+option = "Climb-up"
+tile = { x = 2163, y = 5088 }
+to = { x = 2163, y = 5089, level = 1 }
+
+[braindeath_island_wooden_stair_down]
+option = "Climb-down"
+tile = { x = 2149, y = 5088, level = 1 }
+to = { x = 2152, y = 5088 }
+
+[braindeath_island_wooden_stair_up]
+option = "Climb-up"
+tile = { x = 2149, y = 5088 }
+to = { x = 2149, y = 5089, level = 1 }
+
+[braindeath_island_wooden_stair_down]
+option = "Climb-down"
+tile = { x = 2137, y = 5088, level = 1 }
+to = { x = 2140, y = 5088 }
+
+[braindeath_island_wooden_stair_up]
+option = "Climb-up"
+tile = { x = 2137, y = 5088 }
+to = { x = 2137, y = 5089, level = 1 }
+
+[braindeath_island_wooden_stair_down]
+option = "Climb-down"
+tile = { x = 2129, y = 5095, level = 1 }
+to = { x = 2129, y = 5093 }
+
+[braindeath_island_wooden_stair_up]
+option = "Climb-up"
+tile = { x = 2129, y = 5094 }
+to = { x = 2130, y = 5096, level = 1 }
+
+[braindeath_island_ladder_up]
+option = "Climb-up"
+tile = { x = 2163, y = 5092, level = 1 }
+to = { x = 2162, y = 5092, level = 2 }
+
+[braindeath_island_ladder_down]
+option = "Climb-down"
+tile = { x = 2163, y = 5092, level = 2 }
+to = { x = 2162, y = 5092, level = 1 }
+
+[braindeath_island_ladder_up]
+option = "Climb-up"
+tile = { x = 2139, y = 5105 }
+to = { x = 2138, y = 5105, level = 1 }
+
+[braindeath_island_ladder_down]
+option = "Climb-down"
+tile = { x = 2139, y = 5105, level = 1 }
+to = { x = 2138, y = 5105 }

data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml

@@ -165,5 +165,15 @@ id = 1568
 
 [vampire]
 id = 1223
+hitpoints = 400
+att = 55
+str = 60
+def = 55
+magic = 40
+range = 1
+slayer_xp = 40.0
+combat_def = "vampyre"
+drop_table = "vampyre"
+categories = ["vampyres"]
 examine = "A feral vampyre. It looks really hungry!"
 

data/area/morytania/port_phasmatys/port_phasmatys.combat.toml

@@ -0,0 +1,13 @@
+[tortured_soul]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "human_defend"
+defend_sound = "ghost_defend"
+death_anim = "human_death"
+death_sound = "ghost_death"
+
+[tortured_soul.melee]
+range = 1
+anim = "unarmed_punch"
+target_sound = "ghost_attack2"
+target_hit = { offense = "crush", max = 70 }

data/area/morytania/port_phasmatys/port_phasmatys.npc-spawns.toml

@@ -24,14 +24,14 @@ spawns = [
   { id = "ghost_villager_port_phasmatys", x = 3675, y = 3496, members = true },
   { id = "ghost_villager_port_phasmatys", x = 3679, y = 3474, members = true },
   { id = "ghost_villager_port_phasmatys", x = 3684, y = 3485, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3648, y = 3472, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3649, y = 3503, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3654, y = 3536, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3657, y = 3534, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3666, y = 3529, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3668, y = 3537, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3672, y = 3520, members = true },
-  { id = "tortured_soul_port_phasmatys", x = 3673, y = 3528, members = true },
+  { id = "tortured_soul", x = 3648, y = 3472, members = true },
+  { id = "tortured_soul", x = 3649, y = 3503, members = true },
+  { id = "tortured_soul", x = 3654, y = 3536, members = true },
+  { id = "tortured_soul", x = 3657, y = 3534, members = true },
+  { id = "tortured_soul", x = 3666, y = 3529, members = true },
+  { id = "tortured_soul", x = 3668, y = 3537, members = true },
+  { id = "tortured_soul", x = 3672, y = 3520, members = true },
+  { id = "tortured_soul", x = 3673, y = 3528, members = true },
   { id = "ghost_shopkeeper_port_phasmatys", x = 3658, y = 3477, members = true },
   { id = "ghost_innkeeper_port_phasmatys", x = 3681, y = 3496, members = true },
   { id = "ghost_banker_port_phasmatys", x = 3687, y = 3464 },
@@ -52,7 +52,7 @@ spawns = [
   { id = "ghost_guard_port_phasmatys", x = 3652, y = 3487, direction = "WEST", members = true },
   { id = "ghost_guard_port_phasmatys", x = 3658, y = 3508, direction = "NORTH", members = true },
   { id = "ghost_guard_port_phasmatys", x = 3661, y = 3508, direction = "NORTH", members = true },
-  { id = "pirate_pete_port_phasmatys", x = 3680, y = 3537, members = true },
+  { id = "pirate_pete", x = 3680, y = 3537, members = true },
   { id = "melina_port_phasmatys", x = 3674, y = 3484, members = true },
   { id = "droalak_port_phasmatys", x = 3657, y = 3469, members = true },
   { id = "bill_teach_port_phasmatys", x = 3713, y = 3497, level = 1, members = true },

data/area/morytania/port_phasmatys/port_phasmatys.npcs.toml

@@ -26,14 +26,13 @@ examine = "A master bowman."
 id = 1697
 examine = "A spooky ghost villager."
 
-[tortured_soul_port_phasmatys]
+[tortured_soul]
 id = 1698
 hitpoints = 510
 att = 52
 str = 62
 def = 38
-style = "crush"
-max_hit_melee = 70
+combat_def = "tortured_soul"
 slayer_xp = 51.0
 categories = ["ghosts"]
 respawn_delay = 50
@@ -68,7 +67,7 @@ id = 1705
 id = 1706
 examine = "This ghost guards the gates of Port Phasmatys."
 
-[pirate_pete_port_phasmatys]
+[pirate_pete]
 id = 2825
 examine = "A shifty-looking character."
 

data/area/morytania/port_phasmatys/port_phasmatys.sounds.toml

@@ -0,0 +1,2 @@
+[cudgel]
+id = 1842

data/area/realm/killerwatt_plane/killerwatt_plane.anims.toml

@@ -1,11 +1,11 @@
 [killerwatt_death]
-id = 3162
+id = 11939
 
 [killerwatt_attack]
-id = 3163
+id = 11937
 
 [killerwatt_ranged_attack]
-id = 3164
+id = 11936
 
 [killerwatt_defend]
-id = 3165
+id = 11938

data/area/realm/killerwatt_plane/killerwatt_plane.combat.toml

@@ -16,10 +16,15 @@ target_hit = { offense = "stab", max = 60 }
 condition = "insulated"
 range = 10
 anim = "killerwatt_attack"
+projectile = "wind_strike" # TODO proper gfx?
+impact_gfx = "wind_strike_impact"
 target_sound = "killerwatt_attack"
 target_hit = { offense = "range", defence = "magic", max = 80 }
 
 [killerwatt.range_uninsulated]
 condition = "not_insulated"
 clone = "killerwatt.range"
+target_sound = "killerwatt_electrocutes"
+target_gfx = "electric_shock"
+target_anim = "electric_shock"
 target_hit = { offense = "range", defence = "magic", max = 150 }

data/area/realm/killerwatt_plane/killerwatt_plane.gfx.toml

@@ -0,0 +1,2 @@
+[electric_shock]
+id = 560