update_shoplist.sh and other updates

4 files changed, 300 insertions, 49 deletions

diff --git a/config/create_shoplist.sh b/config/create_shoplist.sh
index caa934e..3a39bb4 100755
--- a/config/create_shoplist.sh
+++ b/config/create_shoplist.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+# this script creates a new shoplist and does not keep current values
+
 ITEM_DB_DIR=""
 SHOP_LIST="shoplist.txt"
 
-SORT_MODE="2"
+SORT_MODE="1"
 # 0 = no sort
 # 1 = sort by id
 # 2 = sort by item name
diff --git a/config/shoplist_id.txt b/config/shoplist_id.txt
index e9141c2..3bef36a 100644
--- a/config/shoplist_id.txt
+++ b/config/shoplist_id.txt
@@ -2,7 +2,7 @@
 502 0 0 0 0 CactusPotion
 503 0 0 0 0 CasinoCoins
 504 0 0 0 0 DecorCandy
-505 0 0 0 0 MaggotSlime
+505 0 0 0 0 InsectSlime
 506 0 0 0 0 CandyCane
 507 0 0 0 0 ScorpionStinger
 508 0 0 0 0 XmasCake
@@ -15,7 +15,7 @@
 515 0 0 0 0 PurplePresentBox
 516 0 0 0 0 BluePresentBox
 517 0 0 0 0 RedScorpionStinger
-518 0 0 0 0 BugLeg
+518 0 0 0 0 InsectLeg
 519 0 0 0 0 CherryCake
 520 0 0 0 0 EasterEgg
 521 0 0 0 0 Dagger
@@ -59,7 +59,7 @@
 559 0 0 0 0 OrangeHint
 560 0 0 0 0 GrayHint
 561 0 0 0 0 Sabre
-562 0 0 0 0 ChickenLeg
+562 0 0 0 0 BirdLeg
 563 0 0 0 0 WinterGloves
 564 0 0 0 0 Turtleneck
 565 0 0 0 0 PinkPetal
@@ -71,7 +71,7 @@
 571 0 0 0 0 Setzer
 572 0 0 0 0 Scimitar
 573 0 0 0 0 Falchion
-574 0 0 0 0 Scorpion
+574 0 0 0 0 ScorpionKing
 575 0 0 0 0 DesertBow
 576 0 0 0 0 Beheader
 577 0 0 0 0 BoneDarts
@@ -87,11 +87,14 @@
 587 0 0 0 0 Sword
 588 0 0 0 0 BastardSword
 589 0 0 0 0 Toothbrush
+590 0 0 0 0 DragonSword
 591 0 0 0 0 LongSword
 594 0 0 0 0 Spear
+596 0 0 0 0 Pike
 601 0 0 0 0 SteelShield
 602 0 0 0 0 WoodenShield
 603 0 0 0 0 LeatherShield
+609 0 0 0 0 ImperialBow
 610 0 0 0 0 JeansShorts
 611 0 0 0 0 WhiteFur
 612 0 0 0 0 CaveSnakeLamp
@@ -243,7 +246,6 @@
 758 0 0 0 0 WoodenStaff
 759 0 0 0 0 PaladinsHelmet
 760 0 0 0 0 OverlordsHelmet
-761 0 0 0 0 DesertHelmet
 762 0 0 0 0 TerraniteArrow
 763 0 0 0 0 TerraniteOre
 764 0 0 0 0 SailorHat
@@ -279,7 +281,6 @@
 794 0 0 0 0 BromenalGloves
 795 0 0 0 0 BromenalHelmet
 796 0 0 0 0 BromenalLegs
-797 0 0 0 0 BromenalShield
 798 0 0 0 0 SorcererRed
 799 0 0 0 0 MylarinDust
 800 0 0 0 0 BowlerHatBrown
@@ -388,6 +389,11 @@
 904 0 0 0 0 SlingBullet
 905 0 0 0 0 BucketHat
 906 0 0 0 0 KidBook
+907 0 0 0 0 FloydBook
+908 0 0 0 0 GMAmulet
+909 0 0 0 0 LeprechaunHead
+910 0 0 0 0 Rainerang
+1170 0 0 0 0 SweetTooth
 1171 0 0 0 0 Wand
 1172 0 0 0 0 SilkPants
 1173 0 0 0 0 TamOShanter
@@ -433,8 +439,8 @@
 1219 0 0 0 0 MoubootaurHead
 1220 0 0 0 0 BunchOfParsley
 1221 0 0 0 0 SkullMask
+1226 0 0 0 0 SilverBell
 1227 0 0 0 0 EnchantersAmulet
-1228 0 0 0 0 LightCrystal
 1229 0 0 0 0 CaramelApple
 1233 0 0 0 0 FakeFangs
 1234 0 0 0 0 RedOrnament
@@ -460,7 +466,7 @@
 1255 0 0 0 0 RabbitEars
 1256 0 0 0 0 EggshellHat
 1257 0 0 0 0 FlawedLens
-1258 0 0 0 0 Honey
+1258 0 0 0 0 GlutenFreeHoney
 1275 0 0 0 0 ReadingGlasses
 1276 0 0 0 0 OperaMask
 1277 0 0 0 0 JesterMask
@@ -859,18 +865,7 @@
 5109 0 0 0 0 SorcererWhite
 5110 0 0 0 0 Bloodstone
 5111 0 0 0 0 BrainStem
-5112 0 0 0 0 CryptKey
-5113 0 0 0 0 Ectoplasm
-5114 0 0 0 0 Urn
 5115 0 0 0 0 VampireBatWing
-5116 0 0 0 0 WraithHorn
-5117 0 0 0 0 AstralCube
-5118 0 0 0 0 RunestoneA
-5119 0 0 0 0 RunestoneL
-5120 0 0 0 0 RunestoneN
-5121 0 0 0 0 RunestoneT
-5122 0 0 0 0 RunestoneW
-5123 0 0 0 0 QuillOfBinding
 5124 0 0 0 0 BloodInk
 5125 0 0 0 0 UnderworldKey
 5126 0 0 0 0 MTJarofOwnBlood
@@ -888,6 +883,11 @@
 5138 0 0 0 0 OrangeContributor
 5139 0 0 0 0 PurpleContributor
 5140 0 0 0 0 DarkGreenContributor
+5141 0 0 0 0 AlizarinScroll
+5142 0 0 0 0 CobaltScroll
+5143 0 0 0 0 GambogeScroll
+5144 0 0 0 0 MauveScroll
+5145 0 0 0 0 JoyplimScroll
 5200 0 0 0 0 PointyWitchHat
 5201 0 0 0 0 Pipe
 5202 0 0 0 0 PilotHat
@@ -914,7 +914,6 @@
 5226 0 0 0 0 GroovyHat
 5227 0 0 0 0 JazzyHat
 5228 0 0 0 0 ChicSantaHat
-5229 0 0 0 0 ScentedCandleHelmet
 5230 0 0 0 0 AnniversaryHat
 5231 0 0 0 0 RedPresentHat
 5232 0 0 0 0 GreenPresentHat
@@ -936,7 +935,7 @@
 5248 0 0 0 0 OrangeShades
 5249 0 0 0 0 PurpleShades
 5250 0 0 0 0 DarkGreenShades
-5251 0 0 0 0 WumpusEgg
+5251 0 0 0 0 Tomato
 5252 0 0 0 0 GuardianWings
 5253 0 0 0 0 MageRing
 5254 0 0 0 0 SaviorArmor
@@ -953,7 +952,97 @@
 5265 0 0 0 0 LoveLetter
 5266 0 0 0 0 CloverHat
 5267 0 0 0 0 AssassinMask
-5268 0 0 0 0 AssassinRing
-5269 0 0 0 0 AssassinAmulet
 5270 0 0 0 0 ManaPearl
-5279 0 0 0 0 Carrot
+5279 0 0 0 0 LegendaryCarrot
+5280 0 0 0 0 LeprechaunHat
+5281 0 0 0 0 PartyHatR
+5282 0 0 0 0 PartyHatG
+5283 0 0 0 0 PartyHatB
+5284 0 0 0 0 Flintlock
+5285 0 0 0 0 DragonShield
+5286 0 0 0 0 RedArmor
+5287 0 0 0 0 HMCPirateHat
+5288 0 0 0 0 Naftalin
+5289 0 0 0 0 ArmorBreaker
+5290 0 0 0 0 SilverArrow
+5291 0 0 0 0 ThornArrow
+5292 0 0 0 0 SilverOre
+5294 0 0 0 0 CrazyRum
+5295 0 0 0 0 PinkFlowerSeed
+5297 0 0 0 0 GoldenTooth
+5299 0 0 0 0 RedSaviorArmor
+5300 0 0 0 0 GreenSaviorArmor
+5301 0 0 0 0 DarkBlueSaviorArmor
+5302 0 0 0 0 YellowSaviorArmor
+5303 0 0 0 0 LightBlueSaviorArmor
+5304 0 0 0 0 PinkSaviorArmor
+5305 0 0 0 0 BlackSaviorArmor
+5306 0 0 0 0 OrangeSaviorArmor
+5307 0 0 0 0 PurpleSaviorArmor
+5308 0 0 0 0 DarkGreenSaviorArmor
+5309 0 0 0 0 ManaDust
+5310 0 0 0 0 EnlighteningElixir
+5311 0 0 0 0 ShadowHerb
+5312 0 0 0 0 Honey
+5314 0 0 0 0 GoldOre
+5316 0 0 0 0 BromenalOre
+5318 0 0 0 0 BromenalDroplet
+5320 0 0 0 0 BlackChainmailShirt
+5321 0 0 0 0 BlackLightPlatemail
+5322 0 0 0 0 BlackWarlordPlate
+5323 0 0 0 0 BlackWarlordBoots
+5324 0 0 0 0 BlackWarlordHelmet
+5325 0 0 0 0 BlackInfantryHelmet
+5326 0 0 0 0 BlackCrusadeHelmet
+5327 0 0 0 0 CopperOre
+5329 0 0 0 0 IronShovel
+5330 0 0 0 0 ShadowScroll
+5331 0 0 0 0 YellowApple
+5332 0 0 0 0 Charcoal
+5333 0 0 0 0 Bread
+5334 0 0 0 0 Fungus
+5335 0 0 0 0 Cheese
+5336 0 0 0 0 LettuceLeaf
+5337 0 0 0 0 Piberries
+5338 0 0 0 0 Croconut
+5339 0 0 0 0 HalfCroconut
+5340 0 0 0 0 DeliciousCookie
+5341 0 0 0 0 Manana
+5342 0 0 0 0 Carrot
+5343 0 0 0 0 PumpkinJuice
+5344 0 0 0 0 ChocolateBiscuit
+5345 0 0 0 0 ChocolateBunny
+5346 0 0 0 0 Potatoz
+5347 0 0 0 0 RipePumpkin
+5348 0 0 0 0 FruitSalad
+5349 0 0 0 0 DuckEgg
+5350 0 0 0 0 Dragonfruit
+5351 0 0 0 0 PirateTreasureMap
+5352 0 0 0 0 DungeonMap
+5353 0 0 0 0 TreasureMap
+5354 0 0 0 0 RubberDucky
+5355 0 0 0 0 TortugaShellFragment
+5356 0 0 0 0 TortugaShell
+5357 0 0 0 0 RattoTail
+5358 0 0 0 0 RattoTeeth
+5359 0 0 0 0 SilverKey
+5360 0 0 0 0 MushroomSpores
+5361 0 0 0 0 Snowflake
+5362 0 0 0 0 BeeStinger
+5363 0 0 0 0 Flour
+5364 0 0 0 0 ButterButterfly
+5365 0 0 0 0 DuckFeather
+5366 0 0 0 0 CrocClaw
+5367 0 0 0 0 ScorpionClaw
+5368 0 0 0 0 RedScorpionClaw
+5369 0 0 0 0 BlackScorpionClaw
+5370 0 0 0 0 GoldenScorpionClaw
+5371 0 0 0 0 DragonScales
+5372 0 0 0 0 DragonHorn
+5373 0 0 0 0 JunglefowlEgg
+5374 0 0 0 0 KingChonkyBirbEgg
+5375 0 0 0 0 JunglefowlFeather
+5376 0 0 0 0 KingChonkyBirbFeather
+5377 0 0 0 0 Honeycomb
+5378 0 0 0 0 Beeswax
+5379 0 0 0 0 Sauerkraut
diff --git a/config/shoplist_name.txt b/config/shoplist_name.txt
index 80e3244..72e6c1f 100644
--- a/config/shoplist_name.txt
+++ b/config/shoplist_name.txt
@@ -2,6 +2,7 @@
 5211 0 0 0 0 ActivatedSulphur
 5238 0 0 0 0 AFKCap
 683 0 0 0 0 AlizarinHerb
+5141 0 0 0 0 AlizarinScroll
 1183 0 0 0 0 AmberChristmasSweater
 4007 0 0 0 0 Amethyst
 824 0 0 0 0 AmethystPowder
@@ -16,15 +17,13 @@
 551 0 0 0 0 AquaHint
 1237 0 0 0 0 AquaOrnament
 5222 0 0 0 0 AquaTicket
+5289 0 0 0 0 ArmorBreaker
 1199 0 0 0 0 Arrow
-5269 0 0 0 0 AssassinAmulet
 757 0 0 0 0 AssassinBoots
 756 0 0 0 0 AssassinGloves
 5267 0 0 0 0 AssassinMask
 731 0 0 0 0 AssassinPants
-5268 0 0 0 0 AssassinRing
 755 0 0 0 0 AssassinShirt
-5117 0 0 0 0 AstralCube
 5239 0 0 0 0 Aureole
 1175 0 0 0 0 AutumnMask
 549 0 0 0 0 Axe
@@ -38,14 +37,18 @@
 753 0 0 0 0 BatWing
 890 0 0 0 0 BeanieCopter
 539 0 0 0 0 Beer
+5362 0 0 0 0 BeeStinger
+5378 0 0 0 0 Beeswax
 788 0 0 0 0 BeetleJuice
 576 0 0 0 0 Beheader
 1245 0 0 0 0 BentNeedle
 1196 0 0 0 0 Beret
+562 0 0 0 0 BirdLeg
 2266 0 0 0 0 BlackBeret
 734 0 0 0 0 BlackBoots
 2216 0 0 0 0 BlackBowlerHat
 2236 0 0 0 0 BlackBowlerHatBrown
+5320 0 0 0 0 BlackChainmailShirt
 5137 0 0 0 0 BlackContributor
 2156 0 0 0 0 BlackCottonBoots
 2256 0 0 0 0 BlackCottonCloth
@@ -56,14 +59,19 @@
 2106 0 0 0 0 BlackCottonSkirt
 2186 0 0 0 0 BlackCottonTrousers
 644 0 0 0 0 BlackCowboyHat
+5326 0 0 0 0 BlackCrusadeHelmet
 2136 0 0 0 0 BlackDesertHat
 696 0 0 0 0 BlackDye
 650 0 0 0 0 BlackEvokersRobeBlue
 2246 0 0 0 0 BlackFineDress
+5325 0 0 0 0 BlackInfantryHelmet
+5321 0 0 0 0 BlackLightPlatemail
 2176 0 0 0 0 BlackMiniskirt
 4034 0 0 0 0 BlackPearl
 2196 0 0 0 0 BlackRabbitEars
 666 0 0 0 0 BlackRose
+5305 0 0 0 0 BlackSaviorArmor
+5369 0 0 0 0 BlackScorpionClaw
 709 0 0 0 0 BlackScorpionStinger
 5247 0 0 0 0 BlackShades
 2126 0 0 0 0 BlackShortTankTop
@@ -83,6 +91,9 @@
 2096 0 0 0 0 BlackTankTop
 2076 0 0 0 0 BlackTurtleneck
 2066 0 0 0 0 BlackVNeckSweater
+5323 0 0 0 0 BlackWarlordBoots
+5324 0 0 0 0 BlackWarlordHelmet
+5322 0 0 0 0 BlackWarlordPlate
 2206 0 0 0 0 BlackWizardHat
 652 0 0 0 0 BlackWizardRobe
 2270 0 0 0 0 BlinkingEvil
@@ -123,20 +134,22 @@
 4030 0 0 0 0 BowlerHat
 800 0 0 0 0 BowlerHatBrown
 5111 0 0 0 0 BrainStem
+5333 0 0 0 0 Bread
 834 0 0 0 0 BrokenDoll
 833 0 0 0 0 BrokenFourLeafAmulet
 792 0 0 0 0 BromenalBoots
 793 0 0 0 0 BromenalChest
+5318 0 0 0 0 BromenalDroplet
 830 0 0 0 0 BromenalFourLeafAmulet
 794 0 0 0 0 BromenalGloves
 795 0 0 0 0 BromenalHelmet
 796 0 0 0 0 BromenalLegs
-797 0 0 0 0 BromenalShield
+5316 0 0 0 0 BromenalOre
 905 0 0 0 0 BucketHat
-518 0 0 0 0 BugLeg
 877 0 0 0 0 BullHelmet
 1220 0 0 0 0 BunchOfParsley
 1214 0 0 0 0 BunnyEars
+5364 0 0 0 0 ButterButterfly
 501 0 0 0 0 CactusDrink
 502 0 0 0 0 CactusPotion
 513 0 0 0 0 Cake
@@ -149,7 +162,7 @@
 1229 0 0 0 0 CaramelApple
 5237 0 0 0 0 CaramelCandy
 5204 0 0 0 0 CarbonGasMask
-5279 0 0 0 0 Carrot
+5342 0 0 0 0 Carrot
 1174 0 0 0 0 CashiersShade
 503 0 0 0 0 CasinoCoins
 1217 0 0 0 0 CatEars
@@ -157,12 +170,15 @@
 612 0 0 0 0 CaveSnakeLamp
 713 0 0 0 0 CaveSnakeTongue
 625 0 0 0 0 ChainmailShirt
+5332 0 0 0 0 Charcoal
+5335 0 0 0 0 Cheese
 4033 0 0 0 0 ChefHat
 1252 0 0 0 0 Cherry
 519 0 0 0 0 CherryCake
-562 0 0 0 0 ChickenLeg
 5228 0 0 0 0 ChicSantaHat
 509 0 0 0 0 ChocolateBar
+5344 0 0 0 0 ChocolateBiscuit
+5345 0 0 0 0 ChocolateBunny
 737 0 0 0 0 ChocolateCake
 805 0 0 0 0 ChocolateMouboo
 633 0 0 0 0 ChristmasElfHat
@@ -172,9 +188,11 @@
 5266 0 0 0 0 CloverHat
 4001 0 0 0 0 Coal
 681 0 0 0 0 CobaltHerb
+5142 0 0 0 0 CobaltScroll
 526 0 0 0 0 CoinBag
 568 0 0 0 0 ConcentrationPotion
 1178 0 0 0 0 Contributor
+5327 0 0 0 0 CopperOre
 735 0 0 0 0 CottonBoots
 660 0 0 0 0 CottonCloth
 741 0 0 0 0 CottonGloves
@@ -184,11 +202,13 @@
 632 0 0 0 0 CottonSkirt
 648 0 0 0 0 CottonTrousers
 838 0 0 0 0 CranberryLollipop
+5294 0 0 0 0 CrazyRum
 581 0 0 0 0 CrescentRod
+5366 0 0 0 0 CrocClaw
+5338 0 0 0 0 Croconut
 646 0 0 0 0 Crown
 829 0 0 0 0 CrozeniteFourLeafAmulet
 639 0 0 0 0 CrusadeHelmet
-5112 0 0 0 0 CryptKey
 521 0 0 0 0 Dagger
 2262 0 0 0 0 DarkBlueBeret
 2212 0 0 0 0 DarkBlueBowlerHat
@@ -207,6 +227,7 @@
 2242 0 0 0 0 DarkBlueFineDress
 2172 0 0 0 0 DarkBlueMiniskirt
 2192 0 0 0 0 DarkBlueRabbitEars
+5301 0 0 0 0 DarkBlueSaviorArmor
 5243 0 0 0 0 DarkBlueShades
 2122 0 0 0 0 DarkBlueShortTankTop
 2082 0 0 0 0 DarkBlueSilkRobe
@@ -247,6 +268,7 @@
 2249 0 0 0 0 DarkGreenFineDress
 2179 0 0 0 0 DarkGreenMiniskirt
 2199 0 0 0 0 DarkGreenRabbitEars
+5308 0 0 0 0 DarkGreenSaviorArmor
 5250 0 0 0 0 DarkGreenShades
 2129 0 0 0 0 DarkGreenShortTankTop
 2089 0 0 0 0 DarkGreenSilkRobe
@@ -270,10 +292,10 @@
 663 0 0 0 0 DarkRedRose
 1244 0 0 0 0 DarkTalisman
 504 0 0 0 0 DecorCandy
+5340 0 0 0 0 DeliciousCookie
 679 0 0 0 0 DemonMask
 575 0 0 0 0 DesertBow
 723 0 0 0 0 DesertHat
-761 0 0 0 0 DesertHelmet
 546 0 0 0 0 DesertShirt
 647 0 0 0 0 DevelopersCap
 4002 0 0 0 0 Diamond
@@ -282,11 +304,18 @@
 744 0 0 0 0 DilutedConcentrationPot
 778 0 0 0 0 DiseasedHeart
 853 0 0 0 0 Doll
+5350 0 0 0 0 Dragonfruit
+5372 0 0 0 0 DragonHorn
+5371 0 0 0 0 DragonScales
+5285 0 0 0 0 DragonShield
+590 0 0 0 0 DragonSword
 732 0 0 0 0 DruidTreeBranch
+5349 0 0 0 0 DuckEgg
+5365 0 0 0 0 DuckFeather
+5352 0 0 0 0 DungeonMap
 848 0 0 0 0 Earmuffs
 802 0 0 0 0 EasterBasket
 520 0 0 0 0 EasterEgg
-5113 0 0 0 0 Ectoplasm
 1256 0 0 0 0 EggshellHat
 854 0 0 0 0 ElfNightcap
 4004 0 0 0 0 Emerald
@@ -294,6 +323,7 @@
 4010 0 0 0 0 EmeraldRing
 540 0 0 0 0 EmptyBottle
 1227 0 0 0 0 EnchantersAmulet
+5310 0 0 0 0 EnlighteningElixir
 5205 0 0 0 0 EskimoHat
 621 0 0 0 0 Eyepatch
 634 0 0 0 0 FaceMask
@@ -305,17 +335,25 @@
 870 0 0 0 0 FineDress
 1257 0 0 0 0 FlawedLens
 4041 0 0 0 0 FlightTalisman
+5284 0 0 0 0 Flintlock
+5363 0 0 0 0 Flour
+907 0 0 0 0 FloydBook
 752 0 0 0 0 FluffyHat
 782 0 0 0 0 ForestArmor
 545 0 0 0 0 ForestBow
 742 0 0 0 0 FourLeafClover
 5215 0 0 0 0 FreeRangeMoss
 4024 0 0 0 0 FrozenYetiTear
+5348 0 0 0 0 FruitSalad
+5334 0 0 0 0 Fungus
 1184 0 0 0 0 FunkyChristmasSweater
 628 0 0 0 0 FunkyHat
 655 0 0 0 0 FurBoots
 682 0 0 0 0 GambogeHerb
+5143 0 0 0 0 GambogeScroll
 512 0 0 0 0 GingerBreadMan
+1258 0 0 0 0 GlutenFreeHoney
+908 0 0 0 0 GMAmulet
 725 0 0 0 0 GMCap
 726 0 0 0 0 GMRobe
 1279 0 0 0 0 GoblinMask
@@ -324,8 +362,11 @@
 832 0 0 0 0 GoldenFourLeafAmulet
 645 0 0 0 0 GoldenPlatemail
 5257 0 0 0 0 GoldenPVPCap
+5370 0 0 0 0 GoldenScorpionClaw
 706 0 0 0 0 GoldenScorpionStinger
+5297 0 0 0 0 GoldenTooth
 659 0 0 0 0 GoldenWarlordPlate
+5314 0 0 0 0 GoldOre
 5220 0 0 0 0 GoldTicket
 675 0 0 0 0 GraduationCap
 839 0 0 0 0 GrapeLollipop
@@ -361,6 +402,7 @@
 5232 0 0 0 0 GreenPresentHat
 2191 0 0 0 0 GreenRabbitEars
 846 0 0 0 0 GreenRedStripedWrap
+5300 0 0 0 0 GreenSaviorArmor
 5242 0 0 0 0 GreenShades
 2121 0 0 0 0 GreenShortTankTop
 2081 0 0 0 0 GreenSilkRobe
@@ -390,6 +432,7 @@
 789 0 0 0 0 GutBuster
 769 0 0 0 0 GuyFawkesMask
 548 0 0 0 0 Halberd
+5339 0 0 0 0 HalfCroconut
 613 0 0 0 0 HardSpike
 1247 0 0 0 0 HeartGlasses
 677 0 0 0 0 HeartNecklace
@@ -397,17 +440,23 @@
 875 0 0 0 0 HeartOfLazurite
 721 0 0 0 0 HighPriestCrown
 808 0 0 0 0 HitchhikersTowel
-1258 0 0 0 0 Honey
+5287 0 0 0 0 HMCPirateHat
+5312 0 0 0 0 Honey
+5377 0 0 0 0 Honeycomb
 835 0 0 0 0 HyvernStinger
 4026 0 0 0 0 IceCube
 862 0 0 0 0 IcedWater
 867 0 0 0 0 IceGladius
+609 0 0 0 0 ImperialBow
 638 0 0 0 0 InfantryHelmet
+518 0 0 0 0 InsectLeg
+505 0 0 0 0 InsectSlime
 529 0 0 0 0 IronArrow
 4015 0 0 0 0 IronIngot
 640 0 0 0 0 IronOre
 567 0 0 0 0 IronPotion
 704 0 0 0 0 IronPowder
+5329 0 0 0 0 IronShovel
 727 0 0 0 0 Iten
 584 0 0 0 0 Jackal
 3000 0 0 0 0 JackOLantern
@@ -421,7 +470,12 @@
 804 0 0 0 0 JellyBeans
 3009 0 0 0 0 JellySkull
 1277 0 0 0 0 JesterMask
+5145 0 0 0 0 JoyplimScroll
+5373 0 0 0 0 JunglefowlEgg
+5375 0 0 0 0 JunglefowlFeather
 906 0 0 0 0 KidBook
+5374 0 0 0 0 KingChonkyBirbEgg
+5376 0 0 0 0 KingChonkyBirbFeather
 1201 0 0 0 0 Knife
 637 0 0 0 0 KnightsHelmet
 856 0 0 0 0 KnitCap
@@ -442,6 +496,10 @@
 523 0 0 0 0 LeatherShirt
 866 0 0 0 0 LeatherSuitcase
 857 0 0 0 0 LeatherTrousers
+5279 0 0 0 0 LegendaryCarrot
+5280 0 0 0 0 LeprechaunHat
+909 0 0 0 0 LeprechaunHead
+5336 0 0 0 0 LettuceLeaf
 730 0 0 0 0 Lifestone
 2264 0 0 0 0 LightBlueBeret
 2214 0 0 0 0 LightBlueBowlerHat
@@ -460,6 +518,7 @@
 2244 0 0 0 0 LightBlueFineDress
 2174 0 0 0 0 LightBlueMiniskirt
 2194 0 0 0 0 LightBlueRabbitEars
+5303 0 0 0 0 LightBlueSaviorArmor
 5245 0 0 0 0 LightBlueShades
 2124 0 0 0 0 LightBlueShortTankTop
 2084 0 0 0 0 LightBlueSilkRobe
@@ -478,7 +537,6 @@
 2074 0 0 0 0 LightBlueTurtleneck
 2064 0 0 0 0 LightBlueVNeckSweater
 2204 0 0 0 0 LightBlueWizardHat
-1228 0 0 0 0 LightCrystal
 626 0 0 0 0 LightPlatemail
 818 0 0 0 0 LimeHitchhikersTowel
 872 0 0 0 0 LockPicks
@@ -488,12 +546,14 @@
 552 0 0 0 0 MagentaHint
 1239 0 0 0 0 MagentaOrnament
 5253 0 0 0 0 MageRing
-505 0 0 0 0 MaggotSlime
 888 0 0 0 0 MagicGMTopHat
+5309 0 0 0 0 ManaDust
+5341 0 0 0 0 Manana
 5270 0 0 0 0 ManaPearl
 705 0 0 0 0 ManaPotion
 3007 0 0 0 0 Marshmallow
 680 0 0 0 0 MauveHerb
+5144 0 0 0 0 MauveScroll
 686 0 0 0 0 MediumHealingPotion
 827 0 0 0 0 MediumManaElixir
 527 0 0 0 0 Milk
@@ -514,7 +574,9 @@
 5126 0 0 0 0 MTJarofOwnBlood
 889 0 0 0 0 MurdererCrown
 629 0 0 0 0 MushHat
+5360 0 0 0 0 MushroomSpores
 799 0 0 0 0 MylarinDust
+5288 0 0 0 0 Naftalin
 678 0 0 0 0 NohMask
 1190 0 0 0 0 NutcrackerHat
 849 0 0 0 0 OpenPresentBox
@@ -545,6 +607,7 @@
 2197 0 0 0 0 OrangeRabbitEars
 667 0 0 0 0 OrangeRose
 901 0 0 0 0 OrangeRoseHat
+5306 0 0 0 0 OrangeSaviorArmor
 5248 0 0 0 0 OrangeShades
 2127 0 0 0 0 OrangeShortTankTop
 2087 0 0 0 0 OrangeSilkRobe
@@ -569,10 +632,15 @@
 759 0 0 0 0 PaladinsHelmet
 4032 0 0 0 0 PanHat
 1218 0 0 0 0 PaperBag
+5283 0 0 0 0 PartyHatB
+5282 0 0 0 0 PartyHatG
+5281 0 0 0 0 PartyHatR
 1250 0 0 0 0 Pear
 700 0 0 0 0 Pearl
 5130 0 0 0 0 Phylactery
+5337 0 0 0 0 Piberries
 4035 0 0 0 0 PickledBeets
+596 0 0 0 0 Pike
 701 0 0 0 0 PileOfAsh
 5202 0 0 0 0 PilotHat
 614 0 0 0 0 PinkAntenna
@@ -593,6 +661,7 @@
 695 0 0 0 0 PinkDye
 1212 0 0 0 0 PinkEasterEgg
 2245 0 0 0 0 PinkFineDress
+5295 0 0 0 0 PinkFlowerSeed
 816 0 0 0 0 PinkHitchhikersTowel
 751 0 0 0 0 PinkieHat
 801 0 0 0 0 PinkieHelmet
@@ -601,6 +670,7 @@
 2195 0 0 0 0 PinkRabbitEars
 664 0 0 0 0 PinkRose
 899 0 0 0 0 PinkRoseHat
+5304 0 0 0 0 PinkSaviorArmor
 5246 0 0 0 0 PinkShades
 2125 0 0 0 0 PinkShortTankTop
 2085 0 0 0 0 PinkSilkRobe
@@ -623,13 +693,16 @@
 2205 0 0 0 0 PinkWizardHat
 5201 0 0 0 0 Pipe
 617 0 0 0 0 PirateHat
+5351 0 0 0 0 PirateTreasureMap
 783 0 0 0 0 PlatynaRedDress
 1251 0 0 0 0 Plum
 847 0 0 0 0 PlushMouboo
 5200 0 0 0 0 PointyWitchHat
 1189 0 0 0 0 PollettEgg
 774 0 0 0 0 PoltergeistPowder
+5346 0 0 0 0 Potatoz
 615 0 0 0 0 PumpkinHelmet
+5343 0 0 0 0 PumpkinJuice
 3011 0 0 0 0 PumpkinSeeds
 733 0 0 0 0 PurificationPotion
 2268 0 0 0 0 PurpleBeret
@@ -652,6 +725,7 @@
 2178 0 0 0 0 PurpleMiniskirt
 515 0 0 0 0 PurplePresentBox
 2198 0 0 0 0 PurpleRabbitEars
+5307 0 0 0 0 PurpleSaviorArmor
 5249 0 0 0 0 PurpleShades
 2128 0 0 0 0 PurpleShortTankTop
 2088 0 0 0 0 PurpleSilkRobe
@@ -677,16 +751,19 @@
 1194 0 0 0 0 PurpleWrap
 5255 0 0 0 0 PVPCap
 5256 0 0 0 0 PVPCoin
-5123 0 0 0 0 QuillOfBinding
 1255 0 0 0 0 RabbitEars
 881 0 0 0 0 RaggedShorts
+910 0 0 0 0 Rainerang
 1203 0 0 0 0 RangerHat
+5357 0 0 0 0 RattoTail
+5358 0 0 0 0 RattoTeeth
 5217 0 0 0 0 RawAir
 569 0 0 0 0 RawLog
 4040 0 0 0 0 RawTalisman
 1275 0 0 0 0 ReadingGlasses
 3002 0 0 0 0 RealisticBrain
 535 0 0 0 0 RedApple
+5286 0 0 0 0 RedArmor
 2260 0 0 0 0 RedBeret
 2210 0 0 0 0 RedBowlerHat
 2230 0 0 0 0 RedBowlerHatBrown
@@ -718,6 +795,8 @@
 661 0 0 0 0 RedRose
 897 0 0 0 0 RedRoseHat
 4039 0 0 0 0 RedSaddleRug
+5299 0 0 0 0 RedSaviorArmor
+5368 0 0 0 0 RedScorpionClaw
 517 0 0 0 0 RedScorpionStinger
 5241 0 0 0 0 RedShades
 2120 0 0 0 0 RedShortTankTop
@@ -742,20 +821,17 @@
 2060 0 0 0 0 RedVNeckSweater
 2200 0 0 0 0 RedWizardHat
 806 0 0 0 0 ReedBundle
+5347 0 0 0 0 RipePumpkin
 4036 0 0 0 0 RoastedAcorn
 533 0 0 0 0 RoastedMaggot
 579 0 0 0 0 RockKnife
 740 0 0 0 0 Root
 777 0 0 0 0 RottenRags
 3001 0 0 0 0 RubberBat
+5354 0 0 0 0 RubberDucky
 4003 0 0 0 0 Ruby
 820 0 0 0 0 RubyPowder
 4009 0 0 0 0 RubyRing
-5118 0 0 0 0 RunestoneA
-5119 0 0 0 0 RunestoneL
-5120 0 0 0 0 RunestoneN
-5121 0 0 0 0 RunestoneT
-5122 0 0 0 0 RunestoneW
 561 0 0 0 0 Sabre
 764 0 0 0 0 SailorHat
 578 0 0 0 0 SandCutter
@@ -766,17 +842,20 @@
 4005 0 0 0 0 Sapphire
 822 0 0 0 0 SapphirePowder
 4011 0 0 0 0 SapphireRing
+5379 0 0 0 0 Sauerkraut
 5254 0 0 0 0 SaviorArmor
 585 0 0 0 0 ScarabArmlet
-5229 0 0 0 0 ScentedCandleHelmet
 572 0 0 0 0 Scimitar
 1280 0 0 0 0 Scissors
-574 0 0 0 0 Scorpion
+5367 0 0 0 0 ScorpionClaw
+574 0 0 0 0 ScorpionKing
 507 0 0 0 0 ScorpionStinger
 623 0 0 0 0 Scythe
 871 0 0 0 0 SealedSoul
 656 0 0 0 0 SerfHat
 571 0 0 0 0 Setzer
+5311 0 0 0 0 ShadowHerb
+5330 0 0 0 0 ShadowScroll
 522 0 0 0 0 SharpKnife
 1281 0 0 0 0 ShockSweet
 530 0 0 0 0 ShortBow
@@ -789,8 +868,12 @@
 1172 0 0 0 0 SilkPants
 720 0 0 0 0 SilkRobe
 891 0 0 0 0 SilkSheet
+5290 0 0 0 0 SilverArrow
+1226 0 0 0 0 SilverBell
 831 0 0 0 0 SilverFourLeafAmulet
+5359 0 0 0 0 SilverKey
 863 0 0 0 0 SilverMirror
+5292 0 0 0 0 SilverOre
 4014 0 0 0 0 SimpleRing
 1197 0 0 0 0 SkeletonCharm
 776 0 0 0 0 Skull
@@ -807,6 +890,7 @@
 710 0 0 0 0 SnakeTongue
 787 0 0 0 0 Snapple
 5260 0 0 0 0 Snowball
+5361 0 0 0 0 Snowflake
 1242 0 0 0 0 SnowGoggles
 5261 0 0 0 0 SnowLauncher
 1241 0 0 0 0 SnowmanSnowGlobe
@@ -835,6 +919,7 @@
 1249 0 0 0 0 StrangeCoin
 703 0 0 0 0 SulphurPowder
 855 0 0 0 0 Sunglasses
+1170 0 0 0 0 SweetTooth
 587 0 0 0 0 Sword
 1173 0 0 0 0 TamOShanter
 688 0 0 0 0 TankTop
@@ -847,9 +932,11 @@
 766 0 0 0 0 TerraniteHelmet
 768 0 0 0 0 TerraniteLegs
 763 0 0 0 0 TerraniteOre
+5291 0 0 0 0 ThornArrow
 684 0 0 0 0 TinyHealingPotion
 825 0 0 0 0 TinyManaElixir
 5235 0 0 0 0 TMWBirthdayGift
+5251 0 0 0 0 Tomato
 3004 0 0 0 0 Tongue
 3006 0 0 0 0 TonoriDelight
 589 0 0 0 0 Toothbrush
@@ -857,15 +944,17 @@
 823 0 0 0 0 TopazPowder
 4012 0 0 0 0 TopazRing
 627 0 0 0 0 TopHat
+5356 0 0 0 0 TortugaShell
+5355 0 0 0 0 TortugaShellFragment
 749 0 0 0 0 Towel
 1215 0 0 0 0 ToySabre
 537 0 0 0 0 TreasureKey
+5353 0 0 0 0 TreasureMap
 564 0 0 0 0 Turtleneck
 779 0 0 0 0 UndeadEar
 780 0 0 0 0 UndeadEye
 5125 0 0 0 0 UnderworldKey
 5129 0 0 0 0 UnderworldMask
-5114 0 0 0 0 Urn
 5115 0 0 0 0 VampireBatWing
 5213 0 0 0 0 VeganWater
 624 0 0 0 0 VNeckSweater
@@ -899,10 +988,9 @@
 858 0 0 0 0 WolvernTooth
 602 0 0 0 0 WoodenShield
 758 0 0 0 0 WoodenStaff
-5116 0 0 0 0 WraithHorn
-5251 0 0 0 0 WumpusEgg
 508 0 0 0 0 XmasCake
 514 0 0 0 0 XmasCandyCane
+5331 0 0 0 0 YellowApple
 2263 0 0 0 0 YellowBeret
 2213 0 0 0 0 YellowBowlerHat
 2233 0 0 0 0 YellowBowlerHatBrown
@@ -931,6 +1019,7 @@
 2193 0 0 0 0 YellowRabbitEars
 665 0 0 0 0 YellowRose
 900 0 0 0 0 YellowRoseHat
+5302 0 0 0 0 YellowSaviorArmor
 5244 0 0 0 0 YellowShades
 2123 0 0 0 0 YellowShortTankTop
 2083 0 0 0 0 YellowSilkRobe
diff --git a/config/update_shoplist.sh b/config/update_shoplist.sh
new file mode 100755
index 0000000..ab42825
--- /dev/null
+++ b/config/update_shoplist.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# this script merges new items into an existing shoplist and keeps the current values
+
+ITEM_DB_DIR="/mnt/E/TMW/git.themanaworld.org/#HoraK-FDF/legacy/serverdata/world/map/db"
+SHOP_LIST="shoplist.txt"
+CURRENT_SHOP_LIST="shoplist.txt"
+
+SORT_MODE="1"
+# 0 = no sort
+# 1 = sort by id
+# 2 = sort by item name
+
+if [ ! -e "$ITEM_DB_DIR" ]; then
+ echo "warning the directory \""$ITEM_DB_DIR"\" does not exist ..."
+ echo "... exiting!"
+ exit 1
+fi
+
+if [ -e "$SHOP_LIST" ]; then
+ echo "warning the file "$SHOP_LIST" allready exists ..."
+ echo "... enter y/Y to overwrite it : "
+ read KEY
+ if [ ! $KEY = "y" ] && [ ! $KEY = "Y" ]; then
+  echo "... exiting!"
+  exit 0
+ fi
+fi
+
+NEW_ITEMS=`cat "$ITEM_DB_DIR"/item_db* | grep -o -E "^[1-9][0-9]*[,][ ]+[a-zA-Z]*[,]" | sed -r -e 's/[,][ ]*/ /g' -e 's/[ ]*$//g' -e 's/ / 0 0 0 0 /g'`
+OLD_ITEMS=`cat "$CURRENT_SHOP_LIST"`
+
+OLD_IFS=$IFS
+IFS=$'\n'
+
+FIRST_CYCLE=1
+
+for i in $NEW_ITEMS; do
+ ITEM_ID=`echo $i | cut -d ' ' -f 1`
+ IS_IN_OLD_ITEMS=`echo "$OLD_ITEMS" | grep -E "^"$ITEM_ID"[ ]"`
+ if [ ! "$IS_IN_OLD_ITEMS" = "" ]; then
+  # item_id  buy_amount buy_price sell_amount sell_price comment/itemname(optional)
+  BUY_AMOUNT=`echo "$IS_IN_OLD_ITEMS" | cut -d ' ' -f 2`
+  BUY_PRICE=`echo "$IS_IN_OLD_ITEMS" | cut -d ' ' -f 3`
+  SELL_AMOUNT=`echo "$IS_IN_OLD_ITEMS" | cut -d ' ' -f 4`
+  SELL_PRICE=`echo "$IS_IN_OLD_ITEMS" | cut -d ' ' -f 5`
+  ITEM_NAME=`echo "$i" | cut -d ' ' -f 6`
+  MERGED_ITEMS=""$MERGED_ITEMS""$ITEM_ID" "$BUY_AMOUNT" "$BUY_PRICE" "$SELL_AMOUNT" "$SELL_PRICE" "$ITEM_NAME""$'\n'
+ else
+  MERGED_ITEMS=""$MERGED_ITEMS""$i""$'\n'
+ fi
+done
+
+IFS=$OLD_IFS
+
+case $SORT_MODE in
+ 0)
+  echo -n "$MERGED_ITEMS" > "$SHOP_LIST"
+ ;;
+ 1)
+  echo -n "$MERGED_ITEMS" | sort -t " " -k 1 -g > "$SHOP_LIST"
+ ;;
+ 2)
+  echo -n "$MERGED_ITEMS" | sort -t " " -k 2 > "$SHOP_LIST"
+ ;;
+ *)
+  echo "wrong value for variable SORT_MODE!"
+  exit 1
+esac
+
+exit 0