fix(content): reorganized configs + some small fixes

data/src/pack/inv.pack

@@ -141,4 +141,3 @@
 140=trail_puzzleinv
 141=trail_rewardinv
 142=duelarrows
-143=shrimp_and_parrot

data/src/scripts/_unpack/all.inv

@@ -3,21 +3,6 @@ size=40
 stackall=yes
 protect=no
 
-[fishrestaurant]
-size=1
-
-[silvershop]
-size=1
-
-[gemshop3]
-size=1
-
-[spiceshop]
-size=1
-
-[furstall]
-size=1
-
 [trail_puzzleinv]
 scope=temp
 size=25

data/src/scripts/areas/area_alkharid/configs/alkharid.inv

@@ -1,17 +1,15 @@
-[skirtshop]
-// https://classic.runescape.wiki/w/Ranael%27s_Plateskirt_Shop
-// https://storage.googleapis.com/tannerdino/images/rsal5.gif (full stocks)
+[scimitarshop]
+// https://classic.runescape.wiki/w/Zeke%27s_Scimitar_Shop
+// https://web.archive.org/web/20040928001706im_/http://runevillage.com/images/rsal2.gif
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_plateskirt,5,100
-stock2=iron_plateskirt,3,400
-stock3=steel_plateskirt,2,900
-stock4=black_plateskirt,1,1200
-stock5=mithril_plateskirt,1,2000
-stock6=adamant_plateskirt,1,13000
+stock1=bronze_scimitar,5,100
+stock2=iron_scimitar,3,200
+stock3=steel_scimitar,2,600
+stock4=mithril_scimitar,1,4000
 
 [legsshop]
 // https://classic.runescape.wiki/w/Louie%27s_Legs
@@ -28,6 +26,36 @@ stock4=black_platelegs,1,1200
 stock5=mithril_platelegs,1,2000
 stock6=adamant_platelegs,1,13000
 
+[generalshop3]
+// https://classic.runescape.wiki/w/Al_Kharid_General_Store
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=pot_empty,3,100
+stock2=jug_empty,2,100
+stock3=shears,2,100
+stock4=bucket_empty,2,100
+stock5=tinderbox,2,100
+stock6=chisel,2,100
+stock7=hammer,5,100
+
+[skirtshop]
+// https://classic.runescape.wiki/w/Ranael%27s_Plateskirt_Shop
+// https://storage.googleapis.com/tannerdino/images/rsal5.gif (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bronze_plateskirt,5,100
+stock2=iron_plateskirt,3,400
+stock3=steel_plateskirt,2,900
+stock4=black_plateskirt,1,1200
+stock5=mithril_plateskirt,1,2000
+stock6=adamant_plateskirt,1,13000
+
 [gemshop2]
 // https://classic.runescape.wiki/w/Al_Kharid_gem_stall
 // https://storage.googleapis.com/tannerdino/images/AlKharid2.png
@@ -45,36 +73,6 @@ stock6=emerald,1,35000
 stock7=ruby,0,2000
 stock8=diamond,0,4000
 
-[scimitarshop]
-// https://classic.runescape.wiki/w/Zeke%27s_Scimitar_Shop
-// https://web.archive.org/web/20040928001706im_/http://runevillage.com/images/rsal2.gif
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bronze_scimitar,5,100
-stock2=iron_scimitar,3,200
-stock3=steel_scimitar,2,600
-stock4=mithril_scimitar,1,4000
-
-[generalshop3]
-// https://classic.runescape.wiki/w/Al_Kharid_General_Store
-// recheck
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=jug_empty,2,100
-stock3=shears,2,100
-stock4=bucket_empty,2,100
-stock5=tinderbox,2,100
-stock6=chisel,2,100
-stock7=hammer,5,100
-// recheck
-
 [craftingshop2]
 // https://classic.runescape.wiki/w/Dommik%27s_Crafting_Equipment_Shop
 // https://storage.googleapis.com/tannerdino/images/AlKharid4.png (full stocks)

data/src/scripts/areas/area_ardougne_east/configs/ardougne_east.inv

@@ -1,25 +1,16 @@
-[spicestall]
-// https://classic.runescape.wiki/w/Spices_Stall
-// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne4.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=spicespot,1,100
-
-[ardougnegemstall]
-// https://classic.runescape.wiki/w/Gems_Stall
-// https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne7.jpg
+[topshop]
+// https://classic.runescape.wiki/w/Zenesha%27s_Plate_Mail_Top_Shop
+// https://web.archive.org/web/20120207054639im_/http://runehq.com/images/cityguides/Ardougne_East/platebodyshop.png (full stocks)
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=sapphire,2,15000
-stock2=emerald,1,35000
-stock3=ruby,1,60000
-stock4=diamond,0,4000
+stock1=bronze_platebody,3,100
+stock2=iron_platebody,1,200
+stock3=steel_platebody,1,400
+stock4=black_platebody,1,3000
+stock5=mithril_platebody,1,3000
 
 [bakery]
 // https://classic.runescape.wiki/w/Bakers_Stall
@@ -34,31 +25,9 @@ stock1=bread,10,100
 stock2=cake,3,800
 stock3=chocolate_slice,8,200
 // stock4=chocolate_bar,7,200
+//TODO Try to find out when the Chocolate bar was added to the store.
 
-// [ardougne_baker_east]
-// https://oldschool.runescape.wiki/w/Ardougne_Baker%27s_Stall. (Trivia)
-// scope=shared
-// size=40
-// restock=yes
-// stackall=yes
-// allstock=no
-// stock1=bread,10,150
-// stock2=cake,3,1000
-// stock3=chocolate_slice,6,400
-// stock4=chocolate_bar,9,250
-
-[furshop]
-// https://classic.runescape.wiki/w/Fur_Stall
-// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne3.jpg
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bear_fur,3,100
-stock2=grey_wolf_fur,3,100
-
-[silverstall]
+[silvershop]
 // https://classic.runescape.wiki/w/Silver_Stall
 // https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne9.jpg (full stocks)
 scope=shared
@@ -69,20 +38,19 @@ allstock=no
 stock1=nostringstar,2,100
 stock2=silver_ore,1,2000
 stock3=silver_bar,1,1000
+//This information has been confirmed via rsproxy
+//that some accounts are using the ardougne silver merchant shop id 55 or 72
+//depending on something x that I don't know.
+//ID 72 is used at least by new characters who haven't done anything in the game yet.
 
-[topshop]
-// https://classic.runescape.wiki/w/Zenesha%27s_Plate_Mail_Top_Shop
-// https://web.archive.org/web/20120207054639im_/http://runehq.com/images/cityguides/Ardougne_East/platebodyshop.png (full stocks)
+[gemshop3]
+// https://oldschool.runescape.wiki/w/Unused_shops
 scope=shared
-size=40
+size=8
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_platebody,3,100
-stock2=iron_platebody,1,200
-stock3=steel_platebody,1,400
-stock4=black_platebody,1,3000
-stock5=mithril_platebody,1,3000
+//unused
 
 [adventurershop]
 // empty vials could be a default stock of 300
@@ -102,4 +70,91 @@ stock6=tinderbox,2,100
 stock7=ball_of_wool,30,100
 stock8=bronze_arrow,500,10
 stock9=rope,20,100
-stock10=papyrus,50,1000
+stock10=papyrus,50,1000
+
+[spiceshop]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=1
+restock=yes
+stackall=yes
+allstock=no
+stock1=spicespot,1,100
+//unused
+
+[furshop]
+// https://classic.runescape.wiki/w/Fur_Stall
+// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne3.jpg
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bear_fur,3,100
+stock2=grey_wolf_fur,3,100
+
+[silverstall]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=nostringstar,2,100
+stock2=silver_ore,1,2000
+stock3=silver_bar,1,1000
+//This information has been confirmed via rsproxy
+//that some accounts are using the ardougne silver merchant shop id 55 or 72
+//depending on something x that I don't know.
+//ID 72 is used at least by new characters who haven't done anything in the game yet.
+
+[ardougnegemstall]
+// https://classic.runescape.wiki/w/Gems_Stall
+// https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne7.jpg
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=sapphire,2,15000
+stock2=emerald,1,35000
+stock3=ruby,1,60000
+stock4=diamond,0,4000
+//This store uses 2025 in the osrs side ID 429.
+
+[spicestall]
+// https://classic.runescape.wiki/w/Spices_Stall
+// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne4.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=spicespot,1,100
+//stock2=knife,1,2
+//stock3=garlic,2,5
+//TODO Try to find out when the knife and garlic was added to the store.
+
+[furstall]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=2
+restock=yes
+stackall=yes
+allstock=no
+stock1=bear_fur,3,100
+stock2=grey_wolf_fur,3,100
+//unused
+
+//inv_346 Added in a hidden update on December 5, 2005??.
+//[bakery2]
+// https://oldschool.runescape.wiki/w/Ardougne_Baker%27s_Stall. (Trivia)
+//scope=shared
+//size=40
+//restock=yes
+//stackall=yes
+//allstock=no
+//stock1=bread,10,150
+//stock2=cake,3,1000
+//stock3=chocolate_slice,6,400
+//stock4=chocolate_bar,9,250

data/src/scripts/areas/area_ardougne_east/configs/legends_guild/legends_guild.inv

@@ -25,4 +25,4 @@ stock2=dusty_key,5,100
 stock3=silverlight,4,100
 stock3=melzarkey,3,300
 stock4=dragonshield_b,1,500
-stock5=cape_of_legends,3,500
+stock5=cape_of_legends,3,500

data/src/scripts/areas/area_brimhaven/configs/brimhaven.inv

@@ -1,3 +1,18 @@
+[fishrestaurant]
+// https://classic.runescape.wiki/w/The_Shrimp_and_Parrot
+// https://storage.googleapis.com/tannerdino/images/brimhaven7.jpg
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=herring,5,900
+stock2=cod,5,1100
+stock3=tuna,5,2300
+stock4=lobster,3,2600
+stock5=swordfish,2,2900
+
 [amuletshop]
 // https://oldschool.runescape.wiki/w/Davon%27s_Amulet_Store.#Default
 // https://storage.googleapis.com/tannerdino/images/brimhaven6.jpg
@@ -12,17 +27,18 @@ stock3=amulet_of_defence,0,200
 stock4=amulet_of_strength,0,200
 stock5=amulet_of_power,0,200
 
-// todo: real inv name? surely this should exist right?
-[shrimp_and_parrot]
+//inv_157 released 14 September 2004.
+// [karamja_fishrestaurant]
 // https://classic.runescape.wiki/w/The_Shrimp_and_Parrot
 // https://storage.googleapis.com/tannerdino/images/brimhaven7.jpg
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=herring,5,900
-stock2=cod,5,1100
-stock3=tuna,5,2300
-stock4=lobster,3,2600
-stock5=swordfish,2,2900
+//scope=shared
+//size=40
+//restock=yes
+//stackall=yes
+//allstock=no
+//stock1=herring,5,900
+//stock2=cod,5,1100
+//stock3=tuna,5,2300
+//stock4=lobster,3,2600
+//stock5=swordfish,2,2900
+//stock6=tbwt_cooked_karambwan,3,900

data/src/scripts/areas/area_brimhaven/configs/brimhaven.npc

@@ -52,7 +52,7 @@ head2=model_79_idk_head
 hitpoints=7
 param=damagetype,^crush_style
 category=shop_keeper
-param=owned_shop,shrimp_and_parrot
+param=owned_shop,fishrestaurant
 param=shop_sell_multiplier,1300
 param=shop_buy_multiplier,750
 param=shop_delta,30