Multiple regions npc and spawn adjustments 1

data/activity/event/random/surprise_exam/surprise_exam.npcs.toml

@@ -8,6 +8,7 @@ examine = "If the mummy is at school, where are the kids?"
 
 [mr_mordau]
 id = 6117
+interacts = false
 examine = "Professor of Unnatural History."
 
 [zombie_surprise_exam]

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

@@ -47,13 +47,12 @@ spawns = [
   { id = "banker_falador", x = 2948, y = 3366, direction = "NORTH" },
   { id = "banker_falador", x = 2949, y = 3366, direction = "NORTH" },
   { id = "duck_swim", x = 2992, y = 3383 },
-  { id = "duck_swim", x = 2977, y = 3357 },
   { id = "duck_swim", x = 2981, y = 3358 },
+  { id = "duck_swim", x = 2972, y = 3360 },
   { id = "duck_grey_walk", x = 2990, y = 3379 },
   { id = "drake", x = 2993, y = 3386 },
   { id = "duck_grey_swim", x = 2989, y = 3384 },
   { id = "duck_grey_swim", x = 2992, y = 3384 },
-  { id = "duck_grey_swim", x = 2978, y = 3356 },
   { id = "duck_grey_swim", x = 3982, y = 3357 },
   { id = "chicken", x = 2966, y = 3346 },
   { id = "sir_vyvin", x = 2983, y = 3335, level = 2 },
@@ -64,15 +63,15 @@ spawns = [
   { id = "doric", x = 2952, y = 3451 },
   { id = "musician_falador", x = 2967, y = 3412, direction = "SOUTH" },
 # 12083
-  { id = "cow_calf", x = 3031, y = 3312 },
-  { id = "cow_calf", x = 3042, y = 3312 },
-  { id = "cow_calf", x = 3029, y = 3309 },
-  { id = "cow_default", x = 3025, y = 3307 },
-  { id = "cow_default", x = 3029, y = 3305 },
-  { id = "cow_default", x = 3033, y = 3305 },
-  { id = "cow_default", x = 3037, y = 3306 },
+  { id = "cow_calf", x = 3031, y = 3311 },
+  { id = "cow_calf", x = 3042, y = 3311 },
+  { id = "cow_calf", x = 3027, y = 3308 },
+  { id = "cow_default", x = 3026, y = 3307 },
+  { id = "cow_default", x = 3029, y = 3301 },
+  { id = "cow_default", x = 3030, y = 3305 },
+  { id = "cow_default", x = 3034, y = 3306 },
   { id = "cow_brown", x = 3040, y = 3311 },
-  { id = "cow_brown", x = 3030, y = 3300 },
+  { id = "cow_brown", x = 3031, y = 3301 },
   { id = "cow_light_spots", x = 3029, y = 3311 },
   { id = "rat", x = 3015, y = 3295 },
   { id = "rat", x = 3019, y = 3296 },
@@ -98,30 +97,27 @@ spawns = [
   { id = "captain_korasi_falador_2", x = 2999, y = 3374, members = true },
   { id = "jessika_falador_2", x = 2999, y = 3373, members = true },
   { id = "idria", x = 2990, y = 3340, members = true },
-  { id = "cow_light_spots", x = 3029, y = 3312, members = true },
   { id = "highwayman_sinclair_mansion", x = 2988, y = 3419 },
   { id = "sir_tiffy_cashien", x = 2997, y = 3373 },
   { id = "sarah", x = 3038, y = 3292, members = true },
   { id = "sheepdog", x = 3035, y = 3295 },
-  { id = "rooster_falador", x = 3018, y = 3287, members = true },
-  { id = "chicken_falador", x = 3022, y = 3284, members = true },
-  { id = "chicken_falador", x = 3026, y = 3286, members = true },
+  { id = "rooster_falador", x = 3014, y = 3292, members = true },
+  { id = "chicken_falador", x = 3027, y = 3288, members = true },
   { id = "chicken_falador", x = 3029, y = 3286, members = true },
-  { id = "chicken_falador_2", x = 3022, y = 3287, members = true },
-  { id = "chicken_falador_2", x = 3023, y = 3285, members = true },
-  { id = "chicken_falador_2", x = 3023, y = 3289, members = true },
   { id = "chicken_falador_2", x = 3031, y = 3286, members = true },
-  { id = "chicken_falador_3", x = 3019, y = 3287 },
-  { id = "chicken_falador_3", x = 3031, y = 3288 },
+  { id = "chicken_falador_2", x = 3019,y = 3285, members = true },
+  { id = "chicken_falador_3", x = 3016, y = 3287, members = true },
+  { id = "chicken_falador_3", x = 3031, y = 3288, members = true },
+  { id = "chicken_falador", x = 3018, y = 3283, members = true },
+  { id = "chicken_falador", x = 3016, y = 3294, members = true },
+  { id = "chicken_falador_2", x = 3018, y = 3289 , members = true},
+  { id = "chicken_falador_2", x = 3018, y = 3295 , members = true},
   { id = "elstan", x = 3053, y = 3308 },
   { id = "heskel", x = 3001, y = 3373 },
   { id = "mysterious_ghost_falador", x = 3053, y = 3378, level = 1, members = true },
   { id = "frog_falador", x = 2918, y = 3319 },
   { id = "duck_grey_swim", x = 2968, y = 3359 },
-  { id = "duck_grey_swim", x = 2974, y = 3359 },
   { id = "duck_grey_swim", x = 2976, y = 3359 },
-  { id = "duck_grey_swim", x = 2979, y = 3359 },
-  { id = "duck_grey_swim", x = 3020, y = 3284 },
   { id = "fire_wizard", x = 3003, y = 3266 },
   { id = "water_wizard", x = 3000, y = 3266 },
   { id = "earth_wizard", x = 3003, y = 3268 },
@@ -192,7 +188,6 @@ spawns = [
   { id = "sir_renitee", x = 2981, y = 3341, level = 1, direction = "WEST", members = true },
   { id = "garden_supplier", x = 3014, y = 3382 },
   { id = "ambassador_spanfipple_falador", x = 2984, y = 3342, level = 1 },
-  { id = "duck_swim", x = 3019, y = 3284 },
   { id = "rat", x = 3019, y = 3289 },
   { id = "rat", x = 3023, y = 3291 },
   { id = "wilfred_falador", x = 2959, y = 3415, members = true },
@@ -204,9 +199,6 @@ spawns = [
   { id = "sylas_falador", x = 2912, y = 3379, members = true },
   { id = "sir_amik_varze_falador", x = 2960, y = 3336, level = 2 },
   { id = "ducklings", x = 2975, y = 3359 },
-  { id = "ducklings", x = 2977, y = 3359 },
-  { id = "ducklings", x = 2980, y = 3359 },
-  { id = "ducklings", x = 2982, y = 3358 },
   { id = "town_crier_falador", x = 2952, y = 3380, members = true },
   { id = "party_pete", x = 3052, y = 3373 },
   { id = "megan_falador", x = 3043, y = 3373, level = 1 },
@@ -232,11 +224,12 @@ spawns = [
   { id = "baby_squirrel_grey", x = 2955, y = 3276, members = true },
   { id = "baby_squirrel_orange", x = 2947, y = 3265, members = true },
   { id = "highwayman_falador", x = 3049, y = 3276 },
+  { id = "highwayman_falador", x = 3009, y = 3280 },
+  { id = "highwayman_falador", x = 3007, y = 3273 },
   { id = "tool_leprechaun_miscellania", x = 3056, y = 3310 },
   { id = "tool_leprechaun_rimmington", x = 3004, y = 3376, members = true },
   { id = "assistant_falador", x = 2996, y = 3451 },
   { id = "brother_bordiss_falador", x = 2996, y = 3450, members = true },
-  { id = "cow_default", x = 3027, y = 3307 },
   { id = "hazelmere_falador", x = 2997, y = 3341, members = true },
   { id = "ghommal_falador", x = 2994, y = 3343, members = true },
   { id = "harrallak_menarous_falador", x = 2995, y = 3343, members = true },
@@ -268,9 +261,12 @@ spawns = [
   { id = "guard_falador_8", x = 2964, y = 3396 },
   { id = "guard_falador_8", x = 2965, y = 3398 },
   { id = "guard_falador_8", x = 2967, y = 3396 },
-  { id = "dog", x = 3022, y = 3288 },
+  { id = "dog", x = 3014, y = 3294 },
   { id = "gadrin", x = 3021, y = 3339 },
-  { id = "pig_2", x = 3017, y = 3307, members = true },
+  { id = "pig_3", x = 3015, y = 3307, members = true },
+  { id = "pig_4", x = 3017, y = 3309, members = true },
+  { id = "piglet_4", x = 3017, y = 3307, members = true },
+  { id = "piglet_5", x = 3017, y = 3304, members = true },
   # White Knights' Castle
   { id = "white_knight", x = 2956, y = 3337 },
   { id = "white_knight", x = 2962, y = 3338 },

data/area/asgarnia/falador/falador.npcs.toml

@@ -144,24 +144,43 @@ examine = "He rules the, er, roost."
 
 [chicken_falador]
 id = 2313
+clone = "chicken"
 drop_table = "chicken"
 combat_def = "chicken"
 hitpoints = 30
 
 [chicken_falador_2]
 id = 2314
+clone = "chicken"
 drop_table = "chicken"
 combat_def = "chicken"
 hitpoints = 30
 
 [chicken_falador_3]
 id = 2315
+clone = "chicken"
 categories = ["birds"]
 examine = "Yep. Definitely a chicken."
 drop_table = "chicken"
 combat_def = "chicken"
 hitpoints = 30
 
+[pig_3]
+id = 2316
+examine = "Swine."
+
+[pig_4]
+id = 2317
+examine = "Porker."
+
+[piglet_4]
+id = 2318
+examine = "Hog."
+
+[piglet_5]
+id = 2319
+examine = "I shall call him, Mini Pig."
+
 [elstan]
 id = 2323
 north_patch = "farming_veg_patch_falador_nw"
@@ -382,6 +401,7 @@ examine = "A dwarf who looks after the mining guild."
 
 [swan_falador]
 id = 3296
+collision = "sea"
 examine = "A graceful bird."
 
 [zandar_horfyre_falador]

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

@@ -25,7 +25,7 @@ spawns = [
   { id = "goblin_staff_2_green", x = 2954, y = 3491 },
   { id = "goblin_mohawk_staff_green", x = 2954, y = 3503 },
   { id = "goblin_mohawk_staff_green", x = 2951, y = 3497 },
-  { id = "goblin_mohawk_staff_green", x = 2955, y = 3496, level = 2 },
+  { id = "goblin_mohawk_staff_green", x = 2955, y = 3497, level = 2 },
   { id = "black_bear", x = 2959, y = 3471 },
   { id = "black_bear", x = 2974, y = 3470 },
   { id = "monk_of_zamorak_goblin_village", x = 2939, y = 3516, level = 1 },
@@ -42,9 +42,9 @@ spawns = [
   { id = "goblin_shield_battleaxe_green", x = 2951, y = 3510, members = true },
   { id = "goblin_shield_warhammer_green", x = 2957, y = 3507, members = true },
   { id = "goblin_staff_2_green", x = 2956, y = 3499 },
-  { id = "goblin_mohawk_staff_green", x = 2950, y = 3496 },
+  { id = "goblin_mohawk_staff_green", x = 2950, y = 3498 },
   { id = "goblin_mohawk_staff_green", x = 2951, y = 3496 },
-  { id = "goblin_mohawk_staff_green", x = 2955, y = 3495, level = 2 },
+  { id = "goblin_mohawk_staff_green", x = 2954, y = 3496, level = 2 },
   { id = "general_bentnoze_goblin_village", x = 2958, y = 3513, members = true },
   { id = "general_wartface_goblin_village", x = 2957, y = 3513 },
   { id = "grubfoot_goblin_village", x = 2955, y = 3512, members = true },

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

@@ -19,24 +19,22 @@ id = 446
 clone = "giant_rat_lumbridge_swamp"
 drop_table = "giant_rat"
 combat_def = "giant_rat"
-hitpoints = 50
+hitpoints = 53
 att = 2
 str = 3
 def = 2
 max_hit_stab = 10
-hunt_mode = "cowardly"
 
 [giant_rat_mudskipper_point_2]
 id = 4924
 clone = "giant_rat_lumbridge_swamp"
 drop_table = "giant_rat"
 combat_def = "giant_rat"
-hitpoints = 50
+hitpoints = 53
 att = 2
 str = 3
 def = 2
 max_hit_stab = 10
-hunt_mode = "cowardly"
 
 [mogre]
 id = 114

data/area/kandarin/ardougne/sewers/ardougne_sewers.npcs.toml

@@ -62,22 +62,20 @@ id = 4922
 clone = "giant_rat_lumbridge_swamp"
 drop_table = "giant_rat"
 combat_def = "giant_rat"
-hitpoints = 50
+hitpoints = 53
 att = 2
 str = 3
 def = 2
 max_hit_stab = 10
-hunt_mode = "cowardly"
 
 [giant_rat_ardounge_sewer_stubby]
 id = 4923
 clone = "giant_rat_lumbridge_swamp"
 drop_table = "giant_rat"
 combat_def = "giant_rat"
-hitpoints = 50
+hitpoints = 53
 att = 2
 str = 3
 def = 2
 max_hit_stab = 10
-hunt_mode = "cowardly"
 

data/area/kandarin/tree_gnome_stronghold/grand_tree/grand_tree_tunnels.npc-spawns.toml

@@ -22,12 +22,12 @@ spawns = [
   { id = "rat", x = 2489, y = 9866, members = true },
   { id = "rat", x = 2488, y = 9861, members = true },
   { id = "giant_rat_brimhaven", x = 2450, y = 9912, members = true },
-  { id = "giant_rat_wilderness", x = 2450, y = 9903, members = true },
+  { id = "giant_rat_dark_injured", x = 2450, y = 9903, members = true },
   { id = "giant_rat", x = 2456, y = 9910, members = true },
   { id = "giant_rat_brimhaven", x = 2464, y = 9908, members = true },
-  { id = "giant_rat_wilderness", x = 2482, y = 9914, members = true },
+  { id = "giant_rat_dark_injured", x = 2482, y = 9914, members = true },
   { id = "giant_rat", x = 2488, y = 9912, members = true },
   { id = "giant_rat_brimhaven", x = 2477, y = 9896, members = true },
   { id = "giant_rat", x = 2483, y = 9888, members = true },
-  { id = "giant_rat_wilderness", x = 2466, y = 9881, members = true },
+  { id = "giant_rat_dark_injured", x = 2466, y = 9881, members = true },
 ]

data/area/misthalin/draynor/draynor.item-spawns.toml

@@ -2,9 +2,10 @@ spawns = [
 # 12338
   { id = "cheese", x = 3083, y = 3260, delay = 100 },
   { id = "tomato", x = 3085, y = 3261, delay = 100 },
+# 12339
+    { id = "logs", x = 3089, y = 3265, delay = 100 },
+    { id = "logs", x = 3089, y = 3266, delay = 100 },
 # 12340
-  { id = "logs", x = 3089, y = 3365, delay = 100 },
-  { id = "logs", x = 3089, y = 3366, delay = 100 },
   { id = "poison", x = 3100, y = 3364, delay = 100 },
   { id = "shears", x = 3126, y = 3358, delay = 6 },
   { id = "spade", x = 3121, y = 3361, delay = 100 },

data/area/misthalin/draynor/draynor.npc-spawns.toml

@@ -86,7 +86,7 @@ spawns = [
   { id = "fortunato", x = 3085, y = 3250 },
   { id = "wise_old_man_2", x = 3088, y = 3255, members = true },
   { id = "gull_draynor", x = 3085, y = 3219, members = true },
-  { id = "gull_draynor_2", x = 3079, y = 3229, members = true },
+  { id = "gull_draynor_2", x = 3081, y = 3234, members = true },
   { id = "rat", x = 3101, y = 3355 },
   { id = "ava", x = 3093, y = 3357, members = true },
   { id = "scout_draynor", x = 3072, y = 3336, members = true },
@@ -99,7 +99,8 @@ spawns = [
   { id = "norman", x = 3111, y = 3219 },
   { id = "babe", x = 3112, y = 3220 },
   { id = "shady_stranger", x = 3080, y = 3240, members = true },
-  { id = "shady_stranger", x = 3099, y = 3263, members = true },
+  { id = "shady_stranger", x = 3103, y = 3259, members = true },
+  { id = "shady_stranger_2", x = 3077, y = 3255, members = true },
   { id = "suspicious_outsider", x = 3097, y = 3253, members = true },
   { id = "witch", x = 3099, y = 3370, members = true },
 ]

data/area/misthalin/draynor/draynor.npcs.toml

@@ -162,9 +162,13 @@ examine = "He looks as if he could do with a sip of Amontillado."
 
 [gull_draynor]
 id = 450
+collision = "sky"
+examine = "A sea bird."
 
 [gull_draynor_2]
 id = 451
+collision = "sky"
+examine = "A sea bird."
 
 [town_crier_draynor]
 id = 6136
@@ -183,15 +187,27 @@ examine = "A feisty cat."
 
 [norman]
 id = 8203
+examine = "A strong ox, no bones about it."
 
 [babe]
 id = 8204
+examine = "How can an ox without lungs sneeze like that?"
 
 [shady_stranger]
 id = 8339
 hitpoints = 300
 combat_def = "man"
 max_hit_crush = 60
+respawn_delay = 66
+examine = "He seems to be trying to watch everyone at once."
+drop_table = "shady_stranger"
+
+[shady_stranger_2]
+id = 8435
+hitpoints = 350
+combat_def = "man"
+max_hit_crush = 60
+respawn_delay = 66
 examine = "He seems to be trying to watch everyone at once."
 drop_table = "shady_stranger"
 
@@ -200,6 +216,7 @@ id = 8436
 hitpoints = 440
 combat_def = "man"
 max_hit_crush = 60
+respawn_delay = 66
 examine = "Haven't seen his sort around here before; what's he doing here?"
 drop_table = "suspicious_outsider"