Skip to content

Commit 9f182da

Browse files
M1krofinIlwyd
authored andcommitted
Sheep shearer miniquest and other little things (GregHib#800)
* Added sheep shearer miniquest * Added Ram animations + sound * Added Chicken laying eggs mechanic Added Super large egg and one normal egg to freds farm * Added Milk seller dialoque * Bank cleanup with wool and spotless
1 parent 67e71c7 commit 9f182da

File tree

24 files changed

+918
-170
lines changed

24 files changed

+918
-170
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,16 @@ spawns = [
250250
{ id = "cyrisus_falador", x = 2997, y = 3340, members = true },
251251
{ id = "karma_the_chameleon", x = 3054, y = 3371, members = true },
252252
{ id = "sir_vant_falador", x = 2960, y = 3350, members = true },
253-
{ id = "sheep_black", x = 2893, y = 3324 },
254-
{ id = "sheep_black", x = 2895, y = 3323 },
255-
{ id = "sheep_black", x = 2895, y = 3326 },
256-
{ id = "sheep_black", x = 2897, y = 3324 },
257-
{ id = "sheep_black", x = 2899, y = 3326 },
258-
{ id = "sheep_black", x = 2900, y = 3324 },
259-
{ id = "sheep_black", x = 2902, y = 3326 },
260-
{ id = "sheep_black", x = 2905, y = 3324 },
261-
{ id = "sheep_black", x = 2907, y = 3326 },
262-
{ id = "sheep_black", x = 2908, y = 3324 },
253+
{ id = "black_sheep", x = 2893, y = 3324 },
254+
{ id = "black_sheep", x = 2895, y = 3323 },
255+
{ id = "black_sheep", x = 2895, y = 3326 },
256+
{ id = "black_sheep", x = 2897, y = 3324 },
257+
{ id = "black_sheep", x = 2899, y = 3326 },
258+
{ id = "black_sheep", x = 2900, y = 3324 },
259+
{ id = "black_sheep", x = 2902, y = 3326 },
260+
{ id = "black_sheep", x = 2905, y = 3324 },
261+
{ id = "black_sheep", x = 2907, y = 3326 },
262+
{ id = "black_sheep", x = 2908, y = 3324 },
263263
{ id = "guard_falador_8", x = 3006, y = 3321 },
264264
{ id = "guard_falador_8", x = 3006, y = 3323 },
265265
{ id = "guard_falador_8", x = 3007, y = 3323 },
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
spawns = [
22
# 12595
3-
{ id = "empty_pot", x = 3167, y = 3310, delay = 100 },
4-
{ id = "egg", x = 3187, y = 3276, delay = 30 },
5-
{ id = "egg", x = 3191, y = 3277, delay = 30 },
6-
{ id = "egg", x = 3185, y = 3278, delay = 30 },
7-
{ id = "shears", x = 3192, y = 3272, delay = 6 },
8-
{ id = "shears", x = 3152, y = 3306, delay = 6 },
3+
{ id = "empty_pot", x = 3167, y = 3310, delay = 100 },
4+
{ id = "egg", x = 3186, y = 3277, delay = 30 },
5+
{ id = "super_large_egg", x = 3191, y = 3276, delay = 100},
6+
{ id = "shears", x = 3192, y = 3272, delay = 6 },
7+
{ id = "shears", x = 3152, y = 3306, delay = 6 },
98
]
Lines changed: 59 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,61 @@
11
spawns = [
2-
# 12595
3-
{ id = "millie_miller", x = 3169, y = 3306 },
4-
{ id = "sheep", x = 3197, y = 3272 },
5-
{ id = "sheep", x = 3197, y = 3265 },
6-
{ id = "sheep_2", x = 3197, y = 3269 },
7-
{ id = "sheep_penguin", x = 3199, y = 3267 },
8-
{ id = "sheep_light_5", x = 3195, y = 3272 },
9-
{ id = "sheep_light_6", x = 3194, y = 3267 },
10-
{ id = "sheep_black", x = 3195, y = 3275 },
11-
{ id = "cow_calf_2", x = 3166, y = 3321 },
12-
{ id = "cow_calf_3", x = 3181, y = 3315 },
13-
{ id = "cow_2", x = 3154, y = 3325 },
14-
{ id = "cow_2", x = 3197, y = 3320 },
15-
{ id = "cow_brown_2", x = 3160, y = 3318 },
16-
{ id = "cow_light_spots_2", x = 3173, y = 3323 },
17-
{ id = "chicken", x = 3186, y = 3279 },
18-
{ id = "chicken", x = 3189, y = 3278 },
19-
{ id = "duck_swim", x = 3169, y = 3270 },
20-
{ id = "duck_grey_walk", x = 3169, y = 3274 },
21-
{ id = "drake", x = 3166, y = 3273 },
22-
{ id = "drake", x = 3170, y = 3275 },
23-
{ id = "duck_grey_swim", x = 3170, y = 3270 },
24-
{ id = "duckling", x = 3172, y = 3271 },
25-
{ id = "duckling", x = 3173, y = 3271 },
26-
{ id = "goblin_light_grey_bald", x = 3172, y = 3311 },
27-
{ id = "goblin_light_grey_bald", x = 3145, y = 3303 },
28-
{ id = "goblin_light_grey_bald", x = 3147, y = 3302 },
29-
{ id = "goblin_light_grey_bald", x = 3150, y = 3302 },
30-
{ id = "goblin_light_grey_bald", x = 3144, y = 3300 },
31-
{ id = "goblin_light_grey_bald", x = 3148, y = 3296 },
32-
{ id = "goblin_light_grey_bald", x = 3190, y = 3296 },
33-
{ id = "goblin_light_grey_bald", x = 3142, y = 3294 },
34-
{ id = "goblin_light_grey_bald", x = 3160, y = 3289 },
35-
{ id = "goblin_light_grey_bald", x = 3190, y = 3283 },
36-
{ id = "goblin_turquoise_topless_mohawk", x = 3147, y = 3308 },
37-
{ id = "goblin_turquoise_topless_mohawk", x = 3145, y = 3305 },
38-
{ id = "goblin_turquoise_topless_mohawk", x = 3165, y = 3288 },
39-
{ id = "goblin_turquoise_topless_mohawk", x = 3183, y = 3284 },
40-
{ id = "goblin_light_brown_bald", x = 3154, y = 3309 },
41-
{ id = "goblin_light_brown_bald", x = 3189, y = 3300 },
42-
{ id = "goblin_light_brown_bald", x = 3142, y = 3297 },
43-
{ id = "goblin_light_brown_bald", x = 3146, y = 3298 },
44-
{ id = "goblin_light_brown_bald", x = 3156, y = 3293 },
45-
{ id = "goblin_light_brown_bald", x = 3165, y = 3292 },
46-
{ id = "goblin_light_brown_bald", x = 3188, y = 3290 },
47-
{ id = "goblin_light_brown_bald", x = 3175, y = 3286 },
48-
{ id = "goblin_light_brown_bald", x = 3185, y = 3285 },
49-
{ id = "goblin_light_brown_bald", x = 3197, y = 3280 },
50-
{ id = "goblin_light_grey_helmet", x = 3145, y = 3310 },
51-
{ id = "goblin_light_grey_helmet", x = 3161, y = 3307 },
52-
{ id = "goblin_light_grey_helmet", x = 3141, y = 3304 },
53-
{ id = "goblin_light_grey_helmet", x = 3142, y = 3302 },
54-
{ id = "goblin_light_grey_helmet", x = 3146, y = 3302 },
55-
{ id = "goblin_light_grey_helmet", x = 3137, y = 3297 },
56-
{ id = "goblin_light_grey_helmet", x = 3137, y = 3287 },
57-
{ id = "goblin_light_grey_helmet", x = 3170, y = 3286 },
58-
{ id = "goblin_light_grey_helmet", x = 3180, y = 3286 },
59-
{ id = "goblin_light_grey_helmet", x = 3169, y = 3283 },
60-
{ id = "goblin_light_grey_helmet", x = 3185, y = 3282 },
61-
{ id = "goblin_light_grey_hat", x = 3165, y = 3299 },
62-
{ id = "goblin_light_grey_hat", x = 3167, y = 3289 },
63-
{ id = "goblin_light_grey_hat", x = 3163, y = 3286 },
64-
{ id = "goblin_light_grey_hat", x = 3162, y = 3277 },
65-
{ id = "goblin_light_brown_mohawk", x = 3151, y = 3305 },
66-
{ id = "goblin_light_brown_mohawk", x = 3148, y = 3300 },
67-
{ id = "goblin_light_brown_mohawk", x = 3146, y = 3296 },
68-
{ id = "goblin_light_brown_mohawk", x = 3185, y = 3307 },
69-
{ id = "goblin_light_brown_mohawk", x = 3167, y = 3295 },
70-
{ id = "goblin_light_brown_mohawk", x = 3162, y = 3287 },
71-
{ id = "goblin_light_brown_mohawk", x = 3189, y = 3281 },
72-
{ id = "goblin_light_topless_spiked", x = 3149, y = 3310 },
73-
{ id = "goblin_light_topless_spiked", x = 3144, y = 3308 },
74-
{ id = "goblin_light_topless_spiked", x = 3144, y = 3299 },
75-
{ id = "goblin_light_topless_spiked", x = 3145, y = 3294 },
76-
{ id = "goblin_light_topless_spiked", x = 3167, y = 3289 },
77-
{ id = "hay_bales", x = 3142, y = 3303, members = true },
78-
{ id = "zenevivia", x = 3143, y = 3302, members = true },
79-
{ id = "hay_bale", x = 3138, y = 3303, level = 1, members = true },
80-
{ id = "hay_bale", x = 3139, y = 3301, level = 1, members = true },
81-
{ id = "hay_bale", x = 3139, y = 3305, level = 1, members = true },
82-
{ id = "hay_bale", x = 3140, y = 3300, level = 1, members = true },
83-
{ id = "hay_bale", x = 3140, y = 3303, level = 1, members = true },
84-
{ id = "hay_bale", x = 3140, y = 3306, level = 1, members = true },
85-
{ id = "hay_bale", x = 3141, y = 3299, level = 1, members = true },
86-
{ id = "hay_bale", x = 3141, y = 3300, level = 1, members = true },
87-
{ id = "hay_bale", x = 3141, y = 3302, level = 1, members = true },
88-
{ id = "hay_bale", x = 3141, y = 3303, level = 1, members = true },
89-
{ id = "hay_bale", x = 3141, y = 3306, level = 1, members = true },
90-
{ id = "ram_freds_farm", x = 3197, y = 3290, members = true },
91-
{ id = "ram_freds_farm_2", x = 3196, y = 3293, members = true },
92-
{ id = "ram_freds_farm_3", x = 3199, y = 3288, members = true },
93-
{ id = "sheep_2", x = 3191, y = 3294, members = true },
94-
{ id = "beefy_bill", x = 3180, y = 3320 },
95-
{ id = "duck_grey_swim", x = 3143, y = 3275 },
96-
{ id = "duckling", x = 3142, y = 3273 },
97-
{ id = "duckling", x = 3145, y = 3270 },
98-
{ id = "sheep_penguin", x = 3196, y = 3296 },
99-
{ id = "sheep", x = 3188, y = 3291 },
100-
{ id = "sheep", x = 3194, y = 3295 },
101-
{ id = "duck_swim", x = 3144, y = 3269 },
102-
{ id = "lil_lamb", x = 3188, y = 3293 },
103-
{ id = "black_lamb", x = 3190, y = 3290 },
104-
{ id = "sheep_light_2", x = 3191, y = 3292, members = true },
105-
{ id = "larry_farmer", x = 3185, y = 3292, members = true },
106-
{ id = "ducklings", x = 3143, y = 3271 },
107-
{ id = "duck_grey_walk", x = 3137, y = 3274, members = true },
108-
{ id = "duck_grey_walk", x = 3150, y = 3274, members = true },
109-
{ id = "drake", x = 3141, y = 3266 },
110-
{ id = "drake", x = 3146, y = 3279 },
111-
{ id = "farmer", x = 3193, y = 3323 },
112-
{ id = "sheep_black", x = 3187, y = 3292 },
113-
{ id = "sheep_black", x = 3198, y = 3293 },
2+
# 12595
3+
{ id = "fred_the_farmer_lumbridge", x = 3189, y = 3273 },
4+
{ id = "millie_miller", x = 3169, y = 3306 },
5+
{ id = "sheep", x = 3197, y = 3272 },
6+
{ id = "sheep", x = 3197, y = 3265 },
7+
{ id = "sheep_2", x = 3197, y = 3269 },
8+
{ id = "sheep_penguin", x = 3199, y = 3267 },
9+
{ id = "sheep_light_5", x = 3195, y = 3272 },
10+
{ id = "sheep_light_6", x = 3194, y = 3267 },
11+
{ id = "black_sheep", x = 3195, y = 3275 },
12+
{ id = "cow_calf_2", x = 3166, y = 3321 },
13+
{ id = "cow_calf_3", x = 3181, y = 3315 },
14+
{ id = "cow_2", x = 3154, y = 3325 },
15+
{ id = "cow_2", x = 3197, y = 3320 },
16+
{ id = "cow_brown_2", x = 3160, y = 3318 },
17+
{ id = "cow_light_spots_2", x = 3173, y = 3323 },
18+
{ id = "chicken", x = 3185, y = 3278 },
19+
{ id = "chicken", x = 3189, y = 3278 },
20+
{ id = "chicken_brown", x = 3191, y = 3277},
21+
{ id = "chicken_brown", x = 3190, y = 3278 },
22+
{ id = "chicken_brown", x = 3187, y = 3278},
23+
{ id = "duck_swim", x = 3169, y = 3270 },
24+
{ id = "duck_grey_walk", x = 3169, y = 3274 },
25+
{ id = "drake", x = 3166, y = 3273 },
26+
{ id = "drake", x = 3170, y = 3275 },
27+
{ id = "duck_grey_swim", x = 3170, y = 3270 },
28+
{ id = "duckling", x = 3172, y = 3271 },
29+
{ id = "duckling", x = 3173, y = 3271 },
30+
{ id = "hay_bales", x = 3142, y = 3303, members = true },
31+
{ id = "zenevivia", x = 3143, y = 3302, members = true },
32+
{ id = "hay_bale", x = 3138, y = 3303, level = 1, members = true },
33+
{ id = "hay_bale", x = 3139, y = 3301, level = 1, members = true },
34+
{ id = "hay_bale", x = 3139, y = 3305, level = 1, members = true },
35+
{ id = "hay_bale", x = 3140, y = 3300, level = 1, members = true },
36+
{ id = "hay_bale", x = 3140, y = 3303, level = 1, members = true },
37+
{ id = "hay_bale", x = 3140, y = 3306, level = 1, members = true },
38+
{ id = "hay_bale", x = 3141, y = 3299, level = 1, members = true },
39+
{ id = "hay_bale", x = 3141, y = 3300, level = 1, members = true },
40+
{ id = "hay_bale", x = 3141, y = 3302, level = 1, members = true },
41+
{ id = "hay_bale", x = 3141, y = 3303, level = 1, members = true },
42+
{ id = "hay_bale", x = 3141, y = 3306, level = 1, members = true },
43+
{ id = "ram_freds_farm", x = 3196, y = 3275 },
44+
{ id = "ram_freds_farm", x = 3209, y = 3262 },
45+
{ id = "ram_freds_farm_2", x = 3199, y = 3270 },
46+
{ id = "ram_freds_farm_3", x = 3195, y = 3265 },
47+
{ id = "beefy_bill", x = 3180, y = 3320 },
48+
{ id = "duck_grey_swim", x = 3143, y = 3275 },
49+
{ id = "duckling", x = 3142, y = 3273 },
50+
{ id = "duckling", x = 3145, y = 3270 },
51+
{ id = "duck_swim", x = 3144, y = 3269 },
52+
{ id = "black_lamb", x = 3208, y = 3260 },
53+
{ id = "larry_farmer", x = 3185, y = 3292, members = true },
54+
{ id = "ducklings", x = 3143, y = 3271 },
55+
{ id = "duck_grey_walk", x = 3137, y = 3274, members = true },
56+
{ id = "duck_grey_walk", x = 3150, y = 3274, members = true },
57+
{ id = "drake", x = 3141, y = 3266 },
58+
{ id = "drake", x = 3146, y = 3279 },
59+
{ id = "farmer", x = 3193, y = 3323 },
60+
{ id = "milk_seller", x = 3189, y = 3293},
11461
]

data/area/misthalin/lumbridge/freds_farm/freds_farm.npcs.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,22 @@ id = 11629
1010
[ram_freds_farm]
1111
id = 12369
1212
drop_table = "ram"
13+
respawn_delay = 45
14+
combat_anims = "ram"
15+
combat_sounds = "ram"
16+
hitpoints = 80
17+
categories = ["rams"]
18+
examine = "White and shaggy."
1319

1420
[ram_freds_farm_2]
1521
id = 12370
1622
drop_table = "ram"
23+
clone = "ram_freds_farm"
1724

1825
[ram_freds_farm_3]
1926
id = 12371
2027
drop_table = "ram"
28+
clone = "ram_freds_farm"
2129

2230
[beefy_bill]
2331
id = 246
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[ram_death]
2+
id = 5336
3+
4+
[ram_defend]
5+
id = 5337
6+
7+
[ram_attack]
8+
id = 5338
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[ram_attack]
2+
id = 757
3+
4+
[ram_death]
5+
id = 758
6+
7+
[ram_defend]
8+
id = 759

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spawns = [
88
{ id = "sheep", x = 3197, y = 3261 },
99
{ id = "sheep_2", x = 3193, y = 3262 },
1010
{ id = "sheep_light_5", x = 3197, y = 3263 },
11-
{ id = "sheep_black", x = 3195, y = 3263 },
11+
{ id = "black_sheep", x = 3195, y = 3263 },
1212
{ id = "hank", x = 3195, y = 3254 },
1313
{ id = "giant_spider", x = 3165, y = 3249 },
1414
{ id = "giant_spider", x = 3167, y = 3247 },
@@ -87,7 +87,7 @@ spawns = [
8787
{ id = "sheep", x = 3203, y = 3262 },
8888
{ id = "sheep_2", x = 3204, y = 3261 },
8989
{ id = "sheep_2", x = 3210, y = 3262 },
90-
{ id = "sheep_black", x = 3207, y = 3262 },
90+
{ id = "black_sheep", x = 3207, y = 3262 },
9191
{ id = "duck_swim", x = 3259, y = 3212 },
9292
{ id = "duck_swim", x = 3248, y = 3220 },
9393
{ id = "duck_swim", x = 3247, y = 3221 },
@@ -230,16 +230,15 @@ spawns = [
230230
{ id = "sheep_light_5", x = 3202, y = 3271 },
231231
{ id = "sheep_light_6", x = 3210, y = 3274 },
232232
{ id = "sheep_light_2", x = 3205, y = 3266 },
233-
{ id = "sheep_black", x = 3208, y = 3272 },
234-
{ id = "sheep_black", x = 3208, y = 3267 },
235-
{ id = "sheep_black", x = 3201, y = 3271 },
233+
{ id = "black_sheep", x = 3208, y = 3272 },
234+
{ id = "black_sheep", x = 3208, y = 3267 },
235+
{ id = "black_sheep", x = 3201, y = 3271 },
236236
{ id = "crow", x = 3258, y = 3318 },
237237
{ id = "crow_2", x = 3260, y = 3317 },
238238
{ id = "crow_3", x = 3258, y = 3315 },
239239
{ id = "crow_4", x = 3208, y = 3300 },
240240
{ id = "crow_5", x = 3209, y = 3299 },
241241
{ id = "goblin_light_grey_bald", x = 3217, y = 3278 },
242-
{ id = "goblin_turquoise_topless_mohawk", x = 3215, y = 3276 },
243242
{ id = "gillie_groats", x = 3254, y = 3274 },
244243
{ id = "chief_thief_robin_lumbridge", x = 3212, y = 3208, members = true },
245244
{ id = "farmer_lumbridge", x = 3233, y = 3308 },
@@ -257,15 +256,12 @@ spawns = [
257256
{ id = "duck_swim", x = 3218, y = 3287 },
258257
{ id = "duck_swim", x = 3223, y = 3281 },
259258
{ id = "rat", x = 3206, y = 3203 },
260-
{ id = "sheep_light_5", x = 3200, y = 3291, members = true },
261-
{ id = "sheep_light_6", x = 3201, y = 3296, members = true },
262259
{ id = "nastroth_lumbridge", x = 3223, y = 3212 },
263260
{ id = "farmer", x = 3227, y = 3292 },
264261
{ id = "imp", x = 3214, y = 3281 },
265262
{ id = "imp", x = 3240, y = 3307 },
266263
{ id = "tool_leprechaun_lumbridge", x = 3231, y = 3320, direction = "SOUTH" },
267264
{ id = "wheelbarrow_lumbridge", x = 3231, y = 3321, direction = "SOUTH" },
268-
{ id = "fred_the_farmer_lumbridge", x = 3206, y = 3290 },
269265
{ id = "xenia", x = 3244, y = 3198 },
270266
{ id = "chicken", x = 2454, y = 4477 },
271267
{ id = "chicken", x = 2554, y = 3563 },
@@ -275,14 +271,6 @@ spawns = [
275271
{ id = "chicken", x = 2846, y = 3374 },
276272
{ id = "chicken", x = 2850, y = 3368 },
277273
{ id = "chicken", x = 2852, y = 3370 },
278-
{ id = "chicken", x = 3205, y = 3285 },
279-
{ id = "chicken", x = 3206, y = 3285 },
280-
{ id = "chicken", x = 3208, y = 3286 },
281-
{ id = "chicken", x = 3210, y = 3285 },
282-
{ id = "chicken_brown", x = 3204, y = 3286 },
283-
{ id = "chicken_brown", x = 3205, y = 3286 },
284-
{ id = "chicken_brown", x = 3208, y = 3285 },
285-
{ id = "chicken_brown", x = 3210, y = 3286 },
286274
{ id = "chicken_brown", x = 3225, y = 3300 },
287275
{ id = "chicken_brown", x = 3228, y = 3297 },
288276
{ id = "chicken_brown", x = 3228, y = 3299 },

data/area/misthalin/lumbridge/lumbridge.npcs.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ examine = "Looks after your Farming tools."
270270

271271
[fred_the_farmer_lumbridge]
272272
id = 758
273+
categories = ["human"]
273274
examine = "A well-fed farmer."
274275

275276
[fayeth]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[the_thing_reveal]
2+
id = 3570
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[shearing_white_sheep]
2+
id = 2275
3+
4+
[shearing_black_sheep]
5+
id = 2276

0 commit comments

Comments
 (0)