Skip to content

Commit c5f18dd

Browse files
authored
npc spawn fixes (#766)
1 parent 13a7c32 commit c5f18dd

File tree

19 files changed

+311
-269
lines changed

19 files changed

+311
-269
lines changed
Lines changed: 16 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
11
spawns = [
2-
# Black Knights' Base
3-
{ id = "black_knight", x = 2891, y = 9693 },
4-
{ id = "black_knight_1", x = 2891, y = 9701 },
5-
{ id = "black_knight", x = 2892, y = 9678 },
6-
{ id = "black_knight_1", x = 2892, y = 9682 },
7-
{ id = "black_knight_1", x = 2892, y = 9696 },
8-
{ id = "black_knight_1", x = 2892, y = 9710 },
9-
{ id = "black_knight", x = 2893, y = 9702 },
10-
{ id = "black_knight", x = 2895, y = 9711 },
11-
{ id = "black_knight", x = 2897, y = 9675 },
12-
{ id = "black_knight_1", x = 2898, y = 9688 },
13-
{ id = "black_knight", x = 2899, y = 9682 },
14-
{ id = "black_knight", x = 2899, y = 9705 },
15-
{ id = "black_knight_1", x = 2899, y = 9709 },
16-
{ id = "black_knight", x = 2900, y = 9678 },
17-
{ id = "black_knight_1", x = 2900, y = 9701 },
18-
{ id = "black_knight", x = 2901, y = 9711 },
19-
{ id = "black_knight", x = 2902, y = 9693 },
20-
{ id = "black_knight", x = 2904, y = 9690 },
21-
{ id = "black_knight_1", x = 2905, y = 9692 },
22-
{ id = "black_knight", x = 2906, y = 9673 },
23-
{ id = "black_knight_1", x = 2906, y = 9687 },
24-
{ id = "black_knight", x = 2906, y = 9706 },
25-
{ id = "black_knight_1", x = 2907, y = 9676 },
26-
{ id = "black_knight_1", x = 2907, y = 9711 },
27-
{ id = "black_knight", x = 2908, y = 9694 },
28-
{ id = "black_knight", x = 2908, y = 9702 },
29-
{ id = "black_knight", x = 2910, y = 9691 },
30-
{ id = "black_knight_1", x = 2911, y = 9677 },
31-
{ id = "black_knight", x = 2912, y = 9682 },
32-
{ id = "black_knight", x = 2912, y = 9688 },
33-
{ id = "black_knight_1", x = 2913, y = 9694 },
34-
{ id = "black_knight_1", x = 2915, y = 9703 },
35-
{ id = "black_knight", x = 2915, y = 9710 },
36-
{ id = "black_knight", x = 2916, y = 9677 },
37-
{ id = "black_knight", x = 2916, y = 9692 },
38-
{ id = "black_knight_1", x = 2917, y = 9682 },
39-
{ id = "black_knight_1", x = 2917, y = 9695 },
40-
{ id = "black_knight", x = 2919, y = 9679 },
41-
{ id = "black_knight", x = 2920, y = 9703 },
42-
{ id = "black_knight_1", x = 2921, y = 9708 },
43-
{ id = "black_knight_1", x = 2923, y = 9710 },
44-
{ id = "black_knight_1", x = 2939, y = 9812 },
45-
{ id = "black_knight_1", x = 2943, y = 9801 },
46-
{ id = "jailer_black_knights_base", x = 2933, y = 9693 },
47-
{ id = "captain_gilroy", x = 2915, y = 9674, members = true },
48-
{ id = "lord_daquarius", x = 2892, y = 9680, members = true },
49-
{ id = "black_knight_void_stares_back", x = 2913, y = 9674, members = true },
50-
]
2+
{ id = "black_knight", x = 3023, y = 3517 },
3+
{ id = "black_knight", x = 3029, y = 3517 },
4+
{ id = "black_knight", x = 3022, y = 3513 },
5+
{ id = "black_knight", x = 3028, y = 3514 },
6+
{ id = "black_knight", x = 3027, y = 3512 },
7+
{ id = "black_knight", x = 3032, y = 3503},
8+
{ id = "black_knight", x = 3030, y = 3502 },
9+
{ id = "black_knight", x = 3031, y = 3502 },
10+
{ id = "black_knight", x = 3015, y = 3515, level = 1 },
11+
{ id = "black_knight", x = 3023, y = 3516, level = 1 },
12+
{ id = "black_knight", x = 3023, y = 3512, level = 1 },
13+
{ id = "black_knight", x = 3024, y = 3510, level = 1 },
14+
{ id = "black_knight", x = 3014, y = 3516, level = 2 },
15+
{ id = "black_knight", x = 3023, y = 3514, level = 2 },
16+
{ id = "black_knight", x = 3026, y = 3507, level = 2 },
17+
]
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
spawns = [
2+
# Black Knights' Base
3+
{ id = "black_knight", x = 2891, y = 9693 },
4+
{ id = "black_knight_1", x = 2891, y = 9701 },
5+
{ id = "black_knight", x = 2892, y = 9678 },
6+
{ id = "black_knight_1", x = 2892, y = 9682 },
7+
{ id = "black_knight_1", x = 2892, y = 9696 },
8+
{ id = "black_knight_1", x = 2892, y = 9710 },
9+
{ id = "black_knight", x = 2893, y = 9702 },
10+
{ id = "black_knight", x = 2895, y = 9711 },
11+
{ id = "black_knight", x = 2897, y = 9675 },
12+
{ id = "black_knight_1", x = 2898, y = 9688 },
13+
{ id = "black_knight", x = 2899, y = 9682 },
14+
{ id = "black_knight", x = 2899, y = 9705 },
15+
{ id = "black_knight_1", x = 2899, y = 9709 },
16+
{ id = "black_knight", x = 2900, y = 9678 },
17+
{ id = "black_knight_1", x = 2900, y = 9701 },
18+
{ id = "black_knight", x = 2901, y = 9711 },
19+
{ id = "black_knight", x = 2902, y = 9693 },
20+
{ id = "black_knight", x = 2904, y = 9690 },
21+
{ id = "black_knight_1", x = 2905, y = 9692 },
22+
{ id = "black_knight", x = 2906, y = 9673 },
23+
{ id = "black_knight_1", x = 2906, y = 9687 },
24+
{ id = "black_knight", x = 2906, y = 9706 },
25+
{ id = "black_knight_1", x = 2907, y = 9676 },
26+
{ id = "black_knight_1", x = 2907, y = 9711 },
27+
{ id = "black_knight", x = 2908, y = 9694 },
28+
{ id = "black_knight", x = 2908, y = 9702 },
29+
{ id = "black_knight", x = 2910, y = 9691 },
30+
{ id = "black_knight_1", x = 2911, y = 9677 },
31+
{ id = "black_knight", x = 2912, y = 9682 },
32+
{ id = "black_knight", x = 2912, y = 9688 },
33+
{ id = "black_knight_1", x = 2913, y = 9694 },
34+
{ id = "black_knight_1", x = 2915, y = 9703 },
35+
{ id = "black_knight", x = 2915, y = 9710 },
36+
{ id = "black_knight", x = 2916, y = 9677 },
37+
{ id = "black_knight", x = 2916, y = 9692 },
38+
{ id = "black_knight_1", x = 2917, y = 9682 },
39+
{ id = "black_knight_1", x = 2917, y = 9695 },
40+
{ id = "black_knight", x = 2919, y = 9679 },
41+
{ id = "black_knight", x = 2920, y = 9703 },
42+
{ id = "black_knight_1", x = 2921, y = 9708 },
43+
{ id = "black_knight_1", x = 2923, y = 9710 },
44+
{ id = "black_knight_1", x = 2939, y = 9812 },
45+
{ id = "black_knight_1", x = 2943, y = 9801 },
46+
{ id = "jailer_black_knights_base", x = 2933, y = 9693 },
47+
{ id = "captain_gilroy", x = 2915, y = 9674, members = true },
48+
{ id = "lord_daquarius", x = 2892, y = 9680, members = true },
49+
{ id = "black_knight_void_stares_back", x = 2913, y = 9674, members = true },
50+
]

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spawns = [
1919
{ id = "hobgoblin_armed", x = 2675, y = 3731, members = true },
2020
{ id = "hobgoblin_armed", x = 2684, y = 3730, members = true },
2121
# 11064
22-
{ id = "musician_mountain_camp", x = 2760, y = 3645, direction = "SOUTH", members = true },
22+
{ id = "musician_mountain_camp", x = 2760, y = 3644, direction = "SOUTH", members = true },
2323
{ id = "rooster_rellekka", x = 2680, y = 3662 },
2424
{ id = "olaf_the_bard", x = 2673, y = 3683 },
2525
{ id = "lalli_rellekka", x = 2770, y = 3622 },
@@ -48,7 +48,7 @@ spawns = [
4848
{ id = "town_guard_rellekka", x = 2660, y = 3646 },
4949
{ id = "town_guard_rellekka_2", x = 2663, y = 3646, members = true },
5050
{ id = "thora_the_barkeep", x = 2662, y = 3673 },
51-
{ id = "fisherman_rellekka", x = 2641, y = 3699 },
51+
{ id = "fisherman_rellekka", x = 2641, y = 3699, direction = "NORTH" },
5252
{ id = "skulgrimen", x = 2663, y = 3694 },
5353
{ id = "sailor_rellekka", x = 2629, y = 3693 },
5454
{ id = "agnar_rellekka", x = 2642, y = 3677 },
@@ -189,9 +189,8 @@ spawns = [
189189
{ id = "fishing_spot_rellekka_5", x = 2690, y = 3598, members = true },
190190
{ id = "fishing_spot_rellekka_5", x = 2692, y = 3598, members = true },
191191
{ id = "larry_rellekka_2", x = 2707, y = 3734, members = true },
192-
{ id = "musician_mountain_camp", x = 2760, y = 3644 },
193192
{ id = "unicorn", x = 2718, y = 3610 },
194193
{ id = "unicorn", x = 2741, y = 3605 },
195-
{ id = "lokar_searunner", x = 2621, y = 3694 },
194+
{ id = "lokar_searunner", x = 2621, y = 3688 },
196195
{ id = "fish_monger", x = 2646, y = 3676 },
197196
]

data/area/kandarin/ardougne/east_ardougne.npc-spawns.toml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,21 @@ spawns = [
5353
{ id = "penguin_miscellania", x = 2592, y = 3269 },
5454
{ id = "penguin_miscellania", x = 2594, y = 3271 },
5555
{ id = "penguin_miscellania", x = 2596, y = 3269 },
56-
{ id = "monkey_ardougne", x = 2600, y = 3276, members = true },
57-
{ id = "monkey_ardougne", x = 2601, y = 3276, members = true },
58-
{ id = "monkey_ardougne", x = 2601, y = 3278, members = true },
56+
{ id = "monkey_brown", x = 2603, y = 3281, members = true },
57+
{ id = "monkey_brown", x = 2600, y = 3279, members = true },
58+
{ id = "monkey_brown", x = 2603, y = 3279, members = true },
59+
{ id = "monkey_brown", x = 2604, y = 3277, members = true },
60+
{ id = "monkey_brown", x = 2600, y = 3275, members = true },
5961
{ id = "monkey_ardougne", x = 2602, y = 3282, members = true },
6062
{ id = "monkey_ardougne", x = 2605, y = 3281, members = true },
63+
{ id = "monkey_ardougne", x = 2605, y = 3280, members = true },
6164
{ id = "monkey_ardougne", x = 2606, y = 3280, members = true },
65+
{ id = "monkey_ardougne", x = 2602, y = 3279, members = true },
66+
{ id = "monkey_ardougne", x = 2601, y = 3278, members = true },
67+
{ id = "monkey_ardougne", x = 2601, y = 3277, members = true },
68+
{ id = "monkey_ardougne", x = 2601, y = 3276, members = true },
69+
{ id = "monkey_ardougne", x = 2600, y = 3276, members = true },
70+
{ id = "monkey_ardougne", x = 2604, y = 3276, members = true },
6271
{ id = "monkey_minder_ardougne", x = 2595, y = 3277 },
6372
{ id = "warrior_woman", x = 2584, y = 3305 },
6473
{ id = "warrior_woman", x = 2585, y = 3289 },
@@ -97,16 +106,16 @@ spawns = [
97106
{ id = "hero", x = 2630, y = 3288 },
98107
{ id = "hero", x = 2647, y = 3306 },
99108
{ id = "hero", x = 2667, y = 3315 },
100-
{ id = "master_farmer", x = 2619, y = 3354, members = true },
109+
{ id = "master_farmer", x = 2636, y = 3364, members = true },
101110
{ id = "paladin_2", x = 2653, y = 3315, members = true },
102111
{ id = "paladin_2", x = 2657, y = 3307, members = true },
103112
{ id = "knight_of_ardougne", x = 2582, y = 3297 },
104113
{ id = "knight_of_ardougne", x = 2652, y = 3318 },
105114
{ id = "knight_of_ardougne", x = 2653, y = 3300 },
106115
{ id = "knight_of_ardougne", x = 2669, y = 3298 },
107116
{ id = "knight_of_ardougne", x = 2671, y = 3313 },
108-
{ id = "richard_ardougne", x = 2645, y = 3360, members = true },
109-
{ id = "kragen_ardougne", x = 2660, y = 3374, members = true },
117+
{ id = "richard_ardougne", x = 2646, y = 3364, members = true },
118+
{ id = "kragen_ardougne", x = 2668, y = 3374, members = true },
110119
{ id = "man_ardougne", x = 2614, y = 3318 },
111120
{ id = "man_ardougne", x = 2621, y = 3293 },
112121
{ id = "woman_ardougne", x = 2612, y = 3316 },
@@ -136,7 +145,7 @@ spawns = [
136145
{ id = "sick_looking_sheep_4", x = 2610, y = 3385, members = true },
137146
{ id = "sick_looking_sheep_4", x = 2611, y = 3384, members = true },
138147
{ id = "sick_looking_sheep_4", x = 2612, y = 3385, members = true },
139-
{ id = "tools_leprechaun", x = 2660, y = 3376 },
148+
{ id = "tools_leprechaun", x = 2671, y = 3368 },
140149
{ id = "priest_ardougne", x = 2616, y = 3308 },
141150
{ id = "fishing_spot_ardougne", x = 2561, y = 3374, members = true },
142151
{ id = "fishing_spot_ardougne", x = 2566, y = 3370, members = true },
@@ -184,8 +193,8 @@ spawns = [
184193
{ id = "town_crier_ardougne", x = 2665, y = 3311, members = true },
185194
{ id = "wizard_cromperty_ardougne", x = 2683, y = 3326, members = true },
186195
{ id = "penguin_keeper_ardougne", x = 2598, y = 3272 },
187-
{ id = "farmer", x = 2617, y = 3355 },
188-
{ id = "farmer", x = 2621, y = 3355 },
196+
{ id = "farmer", x = 2645, y = 3367 },
197+
{ id = "farmer", x = 2652, y = 3351 },
189198
{ id = "alrena", x = 2573, y = 3333, members = true },
190199
{ id = "tool_leprechaun_ardougne", x = 2632, y = 3313, members = true },
191200
{ id = "zookeeper_2", x = 2619, y = 3279 },

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
spawns = [
22
# 11062
3-
{ id = "man_camelot", x = 2784, y = 3463, members = true },
43
{ id = "ice_giant", x = 2809, y = 3506, level = 2 },
54
{ id = "merlin_camelot_castle", x = 2767, y = 3499, level = 1, members = true },
65
{ id = "sir_lancelot_camelot_castle", x = 2759, y = 3515, level = 1 },
@@ -11,8 +10,6 @@ spawns = [
1110
{ id = "sir_pelleas_camelot_castle", x = 2761, y = 3503, level = 1 },
1211
{ id = "sir_lucan_camelot_castle", x = 2754, y = 3515 },
1312
{ id = "king_arthur_camelot_castle", x = 2764, y = 3515 },
14-
{ id = "tools_leprechaun", x = 2789, y = 3465 },
15-
{ id = "vestri_camelot_castle", x = 2805, y = 3462, members = true },
1613
{ id = "sir_palomedes_camelot_castle", x = 2754, y = 3509, members = true },
1714
{ id = "ice_giant_camelot_castle", x = 2805, y = 3514, level = 2 },
1815
{ id = "unicorn", x = 2785, y = 3461 },

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,10 @@ examine = "One of the Knights of the Round Table."
3636
id = 251
3737
examine = "Legendary King of the Britons."
3838

39-
[vestri_camelot_castle]
40-
id = 3679
41-
examine = "He looks short and grumpy."
42-
4339
[sir_palomedes_camelot_castle]
4440
id = 3787
4541

4642
[ice_giant_camelot_castle]
4743
id = 4686
4844
categories = ["ice_giants"]
49-
examine = "He's got icicles in his beard."
50-
51-
[man_camelot]
52-
id = 2324
45+
examine = "He's got icicles in his beard."

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,8 @@ spawns = [
4646
#7490
4747
{ id = "renegade_knight_keep_le_faye", x = 1901, y = 4271, level = 0, members = true },
4848
{ id = "renegade_knight_keep_le_faye", x = 1909, y = 4271, level = 0, members = true },
49+
50+
{ id = "tools_leprechaun", x = 2815, y = 3467 },
51+
{ id = "vestri", x = 2820, y = 3487, members = true },
52+
{ id = "dantaera", x = 2808, y = 3464, members = true },
4953
]

data/area/kandarin/catherby/catherby.npcs.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,11 @@ drop_table = "human"
9191
combat_anims = "human"
9292
respawn_delay = 50
9393
examine = "He isn't very friendly."
94+
95+
[vestri]
96+
id = 3679
97+
examine = "He looks short and grumpy."
98+
99+
[dantaera]
100+
id = 2324
101+
examine = "Perhaps this gardener might look after your crops for you."

data/area/karamja/karamja.npc-spawns.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spawns = [
1111
{ id = "snake", x = 2928, y = 2973, members = true },
1212
{ id = "snake", x = 2923, y = 2970, members = true },
1313
# 11567
14-
{ id = "captain_errdo_crashed", x = 2917, y = 3056, members = true },
14+
{ id = "captain_errdo_crashed", x = 2918, y = 3057, members = true },
1515
{ id = "jogre_ardougne", x = 2896, y = 2945 },
1616
{ id = "jogre_ardougne", x = 2918, y = 2963 },
1717
{ id = "jogre_ardougne", x = 2923, y = 2985 },
@@ -74,8 +74,6 @@ spawns = [
7474
{ id = "frog_karamja", x = 2919, y = 2977, level = 1, members = true },
7575
{ id = "frog_karamja", x = 2924, y = 2970, level = 1, members = true },
7676
{ id = "frog_karamja", x = 2893, y = 3004, level = 2, members = true },
77-
{ id = "captain_errdo", x = 2918, y = 3057, members = true },
78-
{ id = "captain_klemfoodle", x = 2970, y = 2973 },
7977
{ id = "jungle_forester", x = 2764, y = 2944 },
8078
{ id = "jungle_forester", x = 2798, y = 2944 },
8179
{ id = "jungle_forester_2", x = 2759, y = 2944 },

data/area/karamja/ship_yard/karamja_ship_yard.npc-spawns.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
spawns = [
22
{ id = "trader_crewmember_grey", x = 3001, y = 3033, members = true },
33
{ id = "trader_crewmember_pink", x = 3001, y = 3034, members = true },
4-
{ id = "captain_klemfoodle", x = 2972, y = 2974, members = true },
4+
{ id = "captain_klemfoodle", x = 2970, y = 2973, members = true },
55
{ id = "shipyard_guard", x = 2944, y = 3040, members = true },
66
{ id = "glo_caranock_karamja_ship_yard", x = 2956, y = 3025 },
77
{ id = "gull_karamja_2", x = 2974, y = 3068 },

0 commit comments

Comments
 (0)