Add chaos tunnels

data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npc-spawns.toml

@@ -10,11 +10,11 @@ spawns = [
   { id = "ice_warrior_ice_queens_lair", x = 2867, y = 9948, members = true },
   { id = "ice_warrior_ice_queens_lair", x = 2867, y = 9951, members = true },
   { id = "ice_warrior_ice_queens_lair", x = 2868, y = 9950, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2884, y = 9959, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2890, y = 9950, members = true },
-  { id = "ice_giant_camelot_castle", x = 2880, y = 9927 },
-  { id = "ice_giant_camelot_castle", x = 2887, y = 9955 },
-  { id = "ice_giant_camelot_castle", x = 2891, y = 9941 },
+  { id = "ice_giant_light", x = 2884, y = 9959, members = true },
+  { id = "ice_giant_light", x = 2890, y = 9950, members = true },
+  { id = "ice_giant_light_hair", x = 2880, y = 9927 },
+  { id = "ice_giant_light_hair", x = 2887, y = 9955 },
+  { id = "ice_giant_light_hair", x = 2891, y = 9941 },
   { id = "ice_spider", x = 2819, y = 9950 },
   { id = "ice_spider", x = 2824, y = 9934 },
   { id = "ice_spider", x = 2827, y = 9925 },

data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml

@@ -1,9 +1,6 @@
 [ice_warrior_ice_queens_lair]
 id = 145
 
-[ice_giant_ice_queens_lair]
-id = 4685
-
 [ice_queen]
 id = 795
 hitpoints = 1040

data/area/asgarnia/white_wolf_mountain/white_wolf_mountain.npc-spawns.toml

@@ -20,8 +20,8 @@ spawns = [
   { id = "ice_warrior", x = 2850, y = 3512, members = true },
   { id = "captain_bleemadge", x = 2848, y = 3498, members = true },
   { id = "grimgnash", x = 2865, y = 3496, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2821, y = 3509, members = true },
-  { id = "ice_giant_camelot_castle", x = 2817, y = 3512, members = true },
-  { id = "ice_giant_camelot_castle", x = 2811, y = 3506, members = true },
+  { id = "ice_giant_light", x = 2821, y = 3509, members = true },
+  { id = "ice_giant_light_hair", x = 2817, y = 3512, members = true },
+  { id = "ice_giant_light_hair", x = 2811, y = 3506, members = true },
   { id = "ice_giant", x = 2804, y = 3507, members = true },
 ]

data/area/fremennik_province/fremennik_isles/fremennik_isle.drops.toml

@@ -4,6 +4,7 @@ drops = [
     { id = "big_bones" },
     { table = "ice_troll_female_secondary" },
     { table = "ice_troll_female_tertiary" },
+    { table = "ice_troll_charms" },
 ]
 
 [ice_troll_female_secondary]
@@ -44,6 +45,7 @@ drops = [
     { id = "big_bones" },
     { table = "ice_troll_male_secondary" },
     { table = "ice_troll_male_tertiary" },
+    { table = "ice_troll_charms" },
 ]
 
 [ice_troll_male_secondary]
@@ -134,4 +136,13 @@ drops = [
     { id = "arctic_pine_logs_noted", min = 2, max = 4, chance = 358 },
     { id = "long_bone", chance = 12 },
     { id = "curved_bone" },
+]
+
+[ice_troll_charms]
+roll = 1000
+drops = [
+    { id = "gold_charm", chance = 6 },
+    { id = "green_charm", chance = 6 },
+    { id = "crimson_charm", chance = 4 },
+    { id = "blue_charm", chance = 2 },
 ]

data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.anims.toml

@@ -6,3 +6,6 @@ id = 5783
 
 [yak_death]
 id = 5784
+
+[troll_attack]
+id = 284

data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.combat.toml

@@ -11,3 +11,32 @@ range = 1
 anim = "yak_attack"
 target_sound = "yak_attack"
 target_hit = { offense = "crush", max = 20 }
+
+[ice_troll]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "troll_defend"
+defend_sound = "ice_troll_defend"
+death_anim = "troll_death"
+death_sound = "troll_death"
+
+[ice_troll.melee]
+range = 1
+anim = "troll_attack"
+target_sound = "ice_troll_attack"
+target_hit = { offense = "crush", max = 170 }
+
+[ice_troll_female]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "troll_defend"
+defend_sound = "ice_troll_defend"
+death_anim = "troll_death"
+death_sound = "troll_death"
+
+[ice_troll_female.melee]
+range = 8
+anim = "thrower_troll_attack"
+sound = { id = "thrower_troll_attack", radius = 10 }
+projectile = "troll_rock"
+target_hit = { offense = "range", max = 170 }

data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml

@@ -60,8 +60,7 @@ hitpoints = 600
 att = 60
 str = 70
 def = 70
-style = "crush"
-max_hit_melee = 170
+combat_def = "ice_troll"
 attack_bonus = 60
 xp_bonus = 0.5
 hunt_mode = "cowardly"
@@ -76,8 +75,7 @@ hitpoints = 800
 att = 80
 str = 80
 def = 40
-style = "crush"
-max_hit_melee = 170
+combat_def = "ice_troll"
 attack_bonus = 60
 xp_bonus = 0.5
 hunt_mode = "cowardly"
@@ -92,13 +90,10 @@ hitpoints = 800
 att = 80
 str = 80
 def = 40
-style = "range"
-weapon_style = "thrown"
-ammo = "troll_rock"
-attack_range = 8
-max_hit_range = 170
+combat_def = "ice_troll_female"
 attack_bonus = 60
 xp_bonus = 0.5
+hunt_mode = "cowardly"
 slayer_xp = 84.0
 categories = ["trolls"]
 drop_table = "ice_troll_female"

data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.sounds.toml

@@ -6,3 +6,9 @@ id = 3379
 
 [yak_defend]
 id = 3380
+
+[ice_troll_defend]
+id = 849
+
+[ice_troll_attack]
+id = 2399

data/area/kandarin/arandar/arandar.npc-spawns.toml

@@ -1,10 +1,10 @@
 spawns = [
-  { id = "dire_wolf_isafdar", x = 2311, y = 3271 },
-  { id = "dire_wolf_isafdar", x = 2317, y = 3271 },
-  { id = "dire_wolf_isafdar", x = 2320, y = 3266 },
-  { id = "dire_wolf_isafdar", x = 2335, y = 3276 },
-  { id = "dire_wolf_isafdar", x = 2339, y = 3272 },
-  { id = "dire_wolf_isafdar", x = 2339, y = 3279 },
+  { id = "dire_wolf", x = 2311, y = 3271 },
+  { id = "dire_wolf", x = 2317, y = 3271 },
+  { id = "dire_wolf", x = 2320, y = 3266 },
+  { id = "dire_wolf", x = 2335, y = 3276 },
+  { id = "dire_wolf", x = 2339, y = 3272 },
+  { id = "dire_wolf", x = 2339, y = 3279 },
   { id = "deadly_red_spider", x = 2338, y = 3310 },
   { id = "deadly_red_spider", x = 2341, y = 3309 },
   { id = "deadly_red_spider", x = 2343, y = 3309 },

data/area/kandarin/arandar/arandar.npcs.toml

@@ -1,12 +1,13 @@
-[dire_wolf_isafdar]
+[dire_wolf]
 id = 1198
 hitpoints = 850
 att = 75
 str = 75
 def = 75
-style = "stab"
-max_hit_melee = 80
+combat_def = "white_wolf"
+max_hit_stab = 80
 hunt_mode = "cowardly"
+drop_table = "wolf_bones"
 slayer_xp = 85.0
 categories = ["wolves"]
 respawn_delay = 90

data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.combat.toml

@@ -17,3 +17,11 @@ projectile = "weaken"
 impact_gfx = "curse_impact"
 impact_sound = "curse_impact"
 impact_drain = { skill = "defence", multiplier = 0.05 }
+
+[shadow_spider]
+clone = "giant_spider"
+
+[shadow_spider.melee]
+clone = "giant_spider.melee"
+target_hit = { offense = "stab", max = 50 }
+impact_drain = { skill = "prayer", multiplier = 0.5 }

data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml

@@ -4,8 +4,7 @@ hitpoints = 550
 att = 44
 str = 42
 def = 44
-style = "stab"
-max_hit_melee = 50
+combat_def = "shadow_spider"
 hunt_mode = "cowardly"
 slayer_xp = 55.0
 categories = ["spiders"]

data/area/kandarin/camelot/castle/camelot_castle.npc-spawns.toml

@@ -11,6 +11,6 @@ spawns = [
   { id = "sir_lucan_camelot_castle", x = 2754, y = 3515 },
   { id = "king_arthur_camelot_castle", x = 2764, y = 3515 },
   { id = "sir_palomedes_camelot_castle", x = 2754, y = 3509, members = true },
-  { id = "ice_giant_camelot_castle", x = 2805, y = 3514, level = 2 },
+  { id = "ice_giant_light_hair", x = 2805, y = 3514, level = 2 },
   { id = "unicorn", x = 2785, y = 3461 },
 ]

data/area/kandarin/camelot/castle/camelot_castle.npcs.toml

@@ -39,11 +39,6 @@ examine = "Legendary King of the Britons."
 [sir_palomedes_camelot_castle]
 id = 3787
 
-[ice_giant_camelot_castle]
-id = 4686
-categories = ["ice_giants"]
-examine = "He's got icicles in his beard."
-
 [sir_bedivere]
 id = 6177
 hitpoints = 900

data/area/karamja/karamja.anims.toml

@@ -11,4 +11,13 @@ id = 1583
 id = 1584
 
 [harpie_bug_swarm_death]
-id = 1585
+id = 1585
+
+[giant_ant_attack]
+id = 7237
+
+[giant_ant_defend]
+id = 7239
+
+[giant_ant_death]
+id = 7238

data/area/karamja/karamja.combat.toml

@@ -26,3 +26,16 @@ anim = "shaikahan_attack"
 target_sound = "shaikahan_attack"
 target_hit = { offense = "slash", max = 90 }
 
+[giant_ant]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "giant_ant_defend"
+defend_sound = "giant_ant_defend"
+death_anim = "giant_ant_death"
+death_sound = "giant_ant_death"
+
+[giant_ant.melee]
+range = 1
+anim = "giant_ant_attack"
+target_sound = "giant_ant_attack"
+target_hit = { offense = "crush", max = 60 }

data/area/karamja/karamja.npcs.toml

@@ -107,10 +107,24 @@ examine = "I wouldn't want to be footing that bill."
 
 [giant_ant_worker]
 id = 6379
+hitpoints = 300
+# Made up stats
+att = 80
+str = 40
+def = 50
+combat_def = "giant_ant"
 examine = "I wonder how much he can lift."
 
 [giant_ant_soldier]
 id = 6380
+hitpoints = 540
+# Made up stats
+att = 140
+str = 70
+def = 50
+hunt_mode = "aggressive"
+combat_def = "giant_ant"
+max_hit_crush = 130
 examine = "Gi-ant-ant-ant-ant..."
 
 [giant_wasp]

data/area/karamja/karamja.sounds.toml

@@ -6,3 +6,12 @@ id = 2744
 
 [harpie_bug_swarm_defend]
 id = 2745
+
+[giant_ant_defend]
+id = 4212
+
+[giant_ant_death]
+id = 4229
+
+[giant_ant_attack]
+id = 4264

data/area/kharidian_desert/jaldraocht_pyramid/jaldraocht_pyramid.npc-spawns.toml

@@ -34,48 +34,48 @@ spawns = [
   { id = "mummy_2", x = 3255, y = 9301 },
   { id = "mummy_2", x = 3255, y = 9321 },
   { id = "mummy_2", x = 3261, y = 9331 },
-  { id = "mummy_3", x = 2771, y = 4947, level = 1 },
-  { id = "mummy_3", x = 2775, y = 4963, level = 1 },
-  { id = "mummy_3", x = 2781, y = 4948, level = 1 },
-  { id = "mummy_3", x = 2792, y = 4942, level = 1 },
-  { id = "mummy_3", x = 2798, y = 4954, level = 1 },
-  { id = "mummy_3", x = 2858, y = 4964, level = 2 },
-  { id = "mummy_3", x = 2926, y = 4965, level = 3 },
-  { id = "mummy_3", x = 3204, y = 9309 },
-  { id = "mummy_3", x = 3214, y = 9333 },
-  { id = "mummy_3", x = 3219, y = 9297 },
-  { id = "mummy_3", x = 3239, y = 9300 },
-  { id = "mummy_3", x = 3240, y = 9286 },
-  { id = "mummy_3", x = 3240, y = 9330 },
-  { id = "mummy_3", x = 3245, y = 9306 },
-  { id = "mummy_3", x = 3250, y = 9316 },
-  { id = "mummy_3", x = 3250, y = 9317 },
-  { id = "mummy_3", x = 3257, y = 9290 },
-  { id = "mummy_4", x = 2761, y = 4950, level = 1 },
-  { id = "mummy_4", x = 2765, y = 4938, level = 1 },
-  { id = "mummy_4", x = 2770, y = 4955, level = 1 },
-  { id = "mummy_4", x = 2772, y = 4940, level = 1 },
-  { id = "mummy_4", x = 2777, y = 4943, level = 1 },
-  { id = "mummy_4", x = 2782, y = 4967, level = 1 },
-  { id = "mummy_4", x = 2797, y = 4965, level = 1 },
-  { id = "mummy_4", x = 2799, y = 4937, level = 1 },
-  { id = "mummy_4", x = 2799, y = 4941, level = 1 },
-  { id = "mummy_4", x = 2807, y = 4968, level = 1 },
-  { id = "mummy_4", x = 2808, y = 4975, level = 1 },
-  { id = "mummy_4", x = 2809, y = 4953, level = 1 },
-  { id = "mummy_4", x = 2864, y = 4946, level = 2 },
-  { id = "mummy_4", x = 3202, y = 9283 },
-  { id = "mummy_4", x = 3206, y = 9333 },
-  { id = "mummy_4", x = 3209, y = 9299 },
-  { id = "mummy_4", x = 3219, y = 9301 },
-  { id = "mummy_4", x = 3226, y = 9285 },
-  { id = "mummy_4", x = 3227, y = 9303 },
-  { id = "mummy_4", x = 3228, y = 9293 },
-  { id = "mummy_4", x = 3229, y = 9333 },
-  { id = "mummy_4", x = 3237, y = 9293 },
-  { id = "mummy_4", x = 3246, y = 9321 },
-  { id = "mummy_4", x = 3256, y = 9296 },
-  { id = "mummy_4", x = 3260, y = 9285 },
-  { id = "mummy_4", x = 3262, y = 9317 },
+  { id = "mummy_female", x = 2771, y = 4947, level = 1 },
+  { id = "mummy_female", x = 2775, y = 4963, level = 1 },
+  { id = "mummy_female", x = 2781, y = 4948, level = 1 },
+  { id = "mummy_female", x = 2792, y = 4942, level = 1 },
+  { id = "mummy_female", x = 2798, y = 4954, level = 1 },
+  { id = "mummy_female", x = 2858, y = 4964, level = 2 },
+  { id = "mummy_female", x = 2926, y = 4965, level = 3 },
+  { id = "mummy_female", x = 3204, y = 9309 },
+  { id = "mummy_female", x = 3214, y = 9333 },
+  { id = "mummy_female", x = 3219, y = 9297 },
+  { id = "mummy_female", x = 3239, y = 9300 },
+  { id = "mummy_female", x = 3240, y = 9286 },
+  { id = "mummy_female", x = 3240, y = 9330 },
+  { id = "mummy_female", x = 3245, y = 9306 },
+  { id = "mummy_female", x = 3250, y = 9316 },
+  { id = "mummy_female", x = 3250, y = 9317 },
+  { id = "mummy_female", x = 3257, y = 9290 },
+  { id = "mummy_female_2", x = 2761, y = 4950, level = 1 },
+  { id = "mummy_female_2", x = 2765, y = 4938, level = 1 },
+  { id = "mummy_female_2", x = 2770, y = 4955, level = 1 },
+  { id = "mummy_female_2", x = 2772, y = 4940, level = 1 },
+  { id = "mummy_female_2", x = 2777, y = 4943, level = 1 },
+  { id = "mummy_female_2", x = 2782, y = 4967, level = 1 },
+  { id = "mummy_female_2", x = 2797, y = 4965, level = 1 },
+  { id = "mummy_female_2", x = 2799, y = 4937, level = 1 },
+  { id = "mummy_female_2", x = 2799, y = 4941, level = 1 },
+  { id = "mummy_female_2", x = 2807, y = 4968, level = 1 },
+  { id = "mummy_female_2", x = 2808, y = 4975, level = 1 },
+  { id = "mummy_female_2", x = 2809, y = 4953, level = 1 },
+  { id = "mummy_female_2", x = 2864, y = 4946, level = 2 },
+  { id = "mummy_female_2", x = 3202, y = 9283 },
+  { id = "mummy_female_2", x = 3206, y = 9333 },
+  { id = "mummy_female_2", x = 3209, y = 9299 },
+  { id = "mummy_female_2", x = 3219, y = 9301 },
+  { id = "mummy_female_2", x = 3226, y = 9285 },
+  { id = "mummy_female_2", x = 3227, y = 9303 },
+  { id = "mummy_female_2", x = 3228, y = 9293 },
+  { id = "mummy_female_2", x = 3229, y = 9333 },
+  { id = "mummy_female_2", x = 3237, y = 9293 },
+  { id = "mummy_female_2", x = 3246, y = 9321 },
+  { id = "mummy_female_2", x = 3256, y = 9296 },
+  { id = "mummy_female_2", x = 3260, y = 9285 },
+  { id = "mummy_female_2", x = 3262, y = 9317 },
   { id = "azzanadra_jaldraocht_pyramid", x = 3233, y = 9317, members = true },
 ]