Add all furnaces and fishing spots

data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.areas.toml

@@ -0,0 +1,3 @@
+[living_rock_caverns_fishing_area]
+x = [3584, 3710]
+y = [5056, 5182]

data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml

@@ -14,10 +14,12 @@ examine = "What are these things?"
 
 [cavefish_shoal]
 id = 8841
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_cavefish"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [rocktail_shoal]
 id = 8842
+fishing_bait = { items = ["fishing_rod"], bait = { living_minerals = ["raw_rocktail"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [living_rock_caverns_controller]

data/area/asgarnia/entrana/entrana.areas.toml

@@ -2,4 +2,12 @@
 x = [2783,2879]
 y = [3328,3391]
 tags = ["penguin_area"]
-hint = "where no weapons may go."
+hint = "where no weapons may go."
+
+[entrana_dock_fishing_area]
+x = [ 2875, 2879 ]
+y = [ 3331, 3342 ]
+
+[entrana_river_fishing_area]
+x = [ 2840, 2850 ]
+y = [ 3356, 3361 ]

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

@@ -19,10 +19,10 @@ spawns = [
   { id = "fishing_spot_entrana", x = 2842, y = 3359, members = true },
   { id = "fishing_spot_entrana", x = 2845, y = 3356, members = true },
   { id = "fishing_spot_entrana", x = 2849, y = 3361, members = true },
-  { id = "fishing_spot_entrana_2", x = 2875, y = 3342, members = true },
-  { id = "fishing_spot_entrana_2", x = 2876, y = 3331, members = true },
-  { id = "fishing_spot_entrana_2", x = 2877, y = 3331, members = true },
-  { id = "fishing_spot_entrana_2", x = 2877, y = 3342, members = true },
+  { id = "fishing_spot_entrana_net", x = 2875, y = 3342, members = true },
+  { id = "fishing_spot_entrana_net", x = 2876, y = 3331, members = true },
+  { id = "fishing_spot_entrana_net", x = 2877, y = 3331, members = true },
+  { id = "fishing_spot_entrana_net", x = 2877, y = 3342, members = true },
   { id = "fritz_the_glassblower", x = 2831, y = 3350, members = true },
   { id = "auguste_entrana", x = 2808, y = 3355 },
   { id = "frincos", x = 2808, y = 3342 },

data/area/asgarnia/entrana/entrana.npcs.toml

@@ -38,9 +38,13 @@ examine = "Mazion seems to be covered in sand."
 
 [fishing_spot_entrana]
 id = 318
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
-[fishing_spot_entrana_2]
+[fishing_spot_entrana_net]
 id = 319
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fritz_the_glassblower]
 id = 4909

data/area/asgarnia/falador/falador.objs.toml

@@ -21,3 +21,7 @@ examine = "A tunnel leading under the wall."
 [cooking_range_falador]
 id = 2728
 examine = "Ideal for cooking on."
+
+[spinning_wheel_falador]
+id = 2644
+examine = "Used for spinning thread."

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

@@ -13,6 +13,8 @@ id = 2727
 
 [fishing_spot_mudskipper_point]
 id = 325
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [giant_rat_mudskipper_point]
 id = 446

data/area/asgarnia/taverley/dungeon/taverley_dungeon.areas.toml

@@ -0,0 +1,3 @@
+[taverley_dungeon_fishing_area]
+x = [2878, 2901]
+y = [9761, 9766]

data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml

@@ -13,6 +13,7 @@ examine = "A dusty old suit of armour."
 
 [fishing_spot_taverley_dungeon]
 id = 800
+fishing_bait = { items = ["oily_fishing_rod"], bait = { fishing_bait = ["raw_lava_eel"] } }
 examine = "It looks like there might be eels swimming in the lava."
 
 [kharid_scorpion_taverley_dungeon]

data/area/fremennik_province/fremennik_isles/jatizso/jatizso.areas.toml

@@ -0,0 +1,3 @@
+[jatizso_fishing_area]
+x = [2401, 2424]
+y = [3778, 3791]

data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npc-spawns.toml

@@ -4,11 +4,11 @@ spawns = [
   { id = "fishing_spot_jatizso", x = 2414, y = 3783, members = true },
   { id = "fishing_spot_jatizso", x = 2419, y = 3789, members = true },
   { id = "fishing_spot_jatizso", x = 2424, y = 3782, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2403, y = 3778, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2409, y = 3780, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2409, y = 3783, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2419, y = 3783, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2422, y = 3789, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2403, y = 3778, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2409, y = 3780, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2409, y = 3783, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2419, y = 3783, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2422, y = 3789, members = true },
   { id = "king_gjuki_sorvott_iv", x = 2407, y = 3802 },
   { id = "hrh_hrafn", x = 2408, y = 3802, members = true },
   { id = "thorkel_silkbeard", x = 2409, y = 3804, members = true },

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

@@ -1,8 +1,21 @@
 [fishing_spot_jatizso]
 id = 5470
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
-[fishing_spot_jatizso_2]
+[fishing_spot_jatizso_big_net]
 id = 5471
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [king_gjuki_sorvott_iv]
 id = 5478

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

@@ -5,3 +5,11 @@ examine = "An open bank chest."
 [cooking_range_neitiznot]
 id = 21302
 examine = "Cook your food here."
+
+[furnace_clay_forge_neitiznot]
+id = 21303
+examine = "For smelting metal."
+
+[spinning_wheel_neitiznot]
+id = 21304
+examine = "Used for spinning thread."

data/area/fremennik_province/rellekka/rellekka.areas.toml

@@ -14,3 +14,20 @@ hint = "between Fremennik and barbarians."
 x = [2792, 2794]
 y = [3611, 3613]
 tags = ["teleport"]
+
+[rellekka_small_net_fishing_area]
+x = [2633, 2633]
+y = [3687, 3694]
+
+[rellekka_cage_fishing_area]
+x = [2639, 2642]
+y = [3694, 3699]
+
+[rellekka_big_net_fishing_area]
+x = [2641, 2648]
+y = [3708, 3711]
+
+[rellekka_south_fishing_area]
+x = [2675, 2693]
+y = [3592, 3598]
+

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

@@ -141,14 +141,14 @@ spawns = [
   { id = "fishing_spot_rellekka", x = 2633, y = 3687, members = true },
   { id = "fishing_spot_rellekka", x = 2633, y = 3690, members = true },
   { id = "fishing_spot_rellekka", x = 2633, y = 3693, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2639, y = 3695, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2639, y = 3699, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2642, y = 3695, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2642, y = 3699, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2642, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2645, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2648, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2648, y = 3711, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2639, y = 3695, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2639, y = 3699, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2642, y = 3695, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2642, y = 3699, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2642, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2645, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2648, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2648, y = 3711, members = true },
   { id = "svidi", x = 2714, y = 3672 },
   { id = "rhonen", x = 2666, y = 3530, members = true },
   { id = "jarvald_rellekka", x = 2621, y = 3683, members = true },

data/area/fremennik_province/rellekka/rellekka.npcs.toml

@@ -248,12 +248,27 @@ examine = "Fearsome predator found only in the Fremennik Province, renowned for
 
 [fishing_spot_rellekka]
 id = 1331
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
-[fishing_spot_rellekka_2]
+[fishing_spot_rellekka_cage]
 id = 1332
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
-[fishing_spot_rellekka_3]
+[fishing_spot_rellekka_big_net]
 id = 1333
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [rhonen]
 id = 2334
@@ -314,9 +329,11 @@ id = 7575
 
 [fishing_spot_rellekka_4]
 id = 7862
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [fishing_spot_rellekka_5]
 id = 7863
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [larry_rellekka_2]
 id = 8694

data/area/fremennik_province/rellekka/rellekka.objs.toml

@@ -25,3 +25,16 @@ id = 4276
 [fire_rellekka]
 id = 4265
 examine = "Toasty."
+
+[furnace_rellekka]
+id = 4304
+examine = "A hot furnace."
+
+[spinning_wheel_rellekka]
+id = 4309
+examine = "Used for spinning thread."
+
+[potters_wheel_rellekka]
+id = 4310
+examine = "Used for fashioning clay items."
+

data/area/kandarin/ape_atoll/ape_atoll.areas.toml

@@ -14,3 +14,11 @@ hint = "where monkeys rule."
 x = [3008, 3071]
 y = [5440, 5503]
 tags = ["multi_combat"]
+
+[ape_atoll_east_fishing_area]
+x = [2771, 2780]
+y = [2733, 2741]
+
+[ape_atoll_west_fishing_area]
+x = [2693, 2700]
+y = [2702, 2715]

data/area/kandarin/ape_atoll/ape_atoll.npcs.toml

@@ -46,9 +46,31 @@ id = 13240
 
 [fishing_spot_ape_atoll]
 id = 1405
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [fishing_spot_ape_atoll_2]
 id = 1406
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [garkor]
 id = 1411

data/area/kandarin/ardougne/ardougne.areas.toml

@@ -26,8 +26,8 @@ tags = ["penguin_area"]
 hint = "near the coast, east of Ardougne."
 
 [north_ardougne]
-x = [2368,2368,2687,2687,2431,2431]
-y = [3328,3391,3391,3340,3340,3328]
+x = [2368, 2368, 2687, 2687, 2431, 2431]
+y = [3328, 3391, 3391, 3340, 3340, 3328]
 tags = ["penguin_area"]
 hint = "north of Ardougne."
 
@@ -38,7 +38,11 @@ tags = ["penguin_area"]
 hint = "west of Ardougne, in the hills."
 
 [south_ardougne]
-x = [2432,2432,2368,2368,2432,2432,2687,2687]
-y = [3072,3136,3136,3199,3199,3263,3263,3072]
+x = [2432, 2432, 2368, 2368, 2432, 2432, 2687, 2687]
+y = [3072, 3136, 3136, 3199, 3199, 3263, 3263, 3072]
 tags = ["penguin_area"]
 hint = "south of Ardougne."
+
+[ardounge_fishing_area]
+x = [2561, 2568]
+y = [3365, 3374]

data/area/kandarin/ardougne/east_ardougne.npcs.toml

@@ -172,6 +172,8 @@ examine = "A holy man."
 
 [fishing_spot_ardougne]
 id = 311
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [guard_ardougne]
 id = 32

data/area/kandarin/ardougne/east_ardougne.objs.toml

@@ -166,3 +166,7 @@ examine = "Ideal for cooking on."
 [cooking_range_ardougne]
 id = 34565
 examine = "An appliance used for cooking."
+
+[potters_wheel_ardougne]
+id = 34801
+examine = "Used for fashioning clay items."

data/area/kandarin/ardougne/witchaven/witchaven.objs.toml

@@ -0,0 +1,3 @@
+[spinning_wheel_witchaven]
+id = 8748
+examine = "Used for spinning thread."

data/area/kandarin/barbarian_outpost/barbarian_outpost.areas.toml

@@ -12,4 +12,8 @@ tags = ["teleport"]
 x = [2380,2380,2496,2496,2623,2623]
 y = [3520,3550,3551,3596,3597,3520]
 tags = ["penguin_area"]
-hint = "near the Barbarian Outpost."
+hint = "near the Barbarian Outpost."
+
+[barbarian_outpost_fishing_area]
+x = [2498, 2516]
+y = [3547, 3575]

data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml

@@ -13,6 +13,8 @@ examine = "He maintains this agility course."
 
 [fishing_spot_barbarian_outpost]
 id = 2724
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [barbarian_barbarian_outpost]
 id = 3246

data/area/kandarin/baxtorian_falls/baxtorian_falls.areas.toml

@@ -0,0 +1,7 @@
+[baxtorian_water_falls_fishing_area]
+x = [2502, 2508]
+y = [3420, 3422]
+
+[baxtorian_falls_fishing_area]
+x = [2527, 2537]
+y = [3403, 3412]

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

@@ -16,12 +16,12 @@ spawns = [
   { id = "gerald_baxtorian_falls", x = 2528, y = 3414 },
   { id = "almera_baxtorian_falls", x = 2522, y = 3498 },
   { id = "hudon_baxtorian_falls", x = 2511, y = 3484 },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2508, y = 3421, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2527, y = 3412, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2530, y = 3412, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2532, y = 3411, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2534, y = 3403, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2537, y = 3406, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2508, y = 3421, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2527, y = 3412, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2530, y = 3412, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2532, y = 3411, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2534, y = 3403, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2537, y = 3406, members = true },
   { id = "guard_baxtorian_falls", x = 2554, y = 3472 },
   { id = "guard_baxtorian_falls_2", x = 2554, y = 3476 },
   { id = "fire_giant_spikes", x = 1233, y = 4566 },

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

@@ -28,8 +28,10 @@ examine = "Nice hair."
 id = 305
 examine = "Looks young."
 
-[fishing_spot_baxtorian_falls_2]
+[fishing_spot_baxtorian_falls_lure]
 id = 310
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [guard_baxtorian_falls]
 id = 4259