One More Try at the shopsv2014.11.18.3

19 files changed, 32 insertions, 33 deletions

diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
index c5b046b0..6205f79a 100644
--- a/world/map/npc/001-1/merchant.txt
+++ b/world/map/npc/001-1/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-001-1.gat,38,50,0|shop|Neko|101,CactusDrink:*-1,CactusPotion:*-1,Beer:*-1,ChickenLeg:*-2
+001-1.gat,38,50,0|shop|Neko|101,CactusDrink:*50,CactusPotion:*70,Beer:*175,ChickenLeg:*500
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index 9e499b32..ad0b625b 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -40,7 +40,7 @@ L_End:
     close;
 }
 
-001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*-1
+001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*10
 
 001-2.gat,28,63,0|script|BlackJack|107
 {
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index 1e3f843a..9d71508d 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -1,3 +1,3 @@
 // Bartender
 
-001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer:*-1,Cake:*-1,CherryCake:*-1
+001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer:*175,Cake:*30,CherryCake:*100
diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt
index 7d3d1343..c67441c2 100644
--- a/world/map/npc/002-3/merchant.txt
+++ b/world/map/npc/002-3/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*-1,MinerGloves:*-1,ShortBow:*-1,Arrow:*-1,LeatherShield:*-1
+002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*800,MinerGloves:*3000,ShortBow:*800,Arrow:*2,LeatherShield:*2000
diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt
index 81b9521c..f84f2690 100644
--- a/world/map/npc/006-2/shops.txt
+++ b/world/map/npc/006-2/shops.txt
@@ -2,4 +2,4 @@
 // Toy Sabre - 10mil, Cap - 20mil, High Priest Crown - 30mil, Monster Skull Helmet - 30mil
 006-2.gat,81,36,0|shop|Reathe|179,ToySabre:*10000000,Cap:*20000000,HighPriestCrown:*30000000,MonsterSkullHelmet:*30000000
 
-006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*-1,CactusPotion:*-1,BottleOfWater:*-1,RoastedMaggot:*-1
+006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*50,CactusPotion:*70,BottleOfWater:*200,RoastedMaggot:*110
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 64af7607..d0da9413 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -6,7 +6,7 @@
 
 // Bartender
 // sells beer, cake and steak
-009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*-1,Cake:*-1,Steak:*-1
+009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*175,Cake:*30,Steak:*275
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
@@ -20,12 +20,12 @@
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0|shop|Apprentice|120,Arrow:*-1,IronArrow:*-1,Bow:*1000,ShortBow:*3000
+009-2.gat,97,24,0|shop|Apprentice|120,Arrow:*2,IronArrow:*4,Bow:*1000,ShortBow:*3000
 
 // Potion Shop
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
-009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*-1,CactusPotion:*-1,IronPotion:*-1,ConcentrationPotion:*-1,SlowPoisonPotion:*-1
+009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500,SlowPoisonPotion:*500
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*-1,BottleOfWater:*-1,CottonShirt:*-1,CottonShorts:*-1,Boots:*-1,SerfHat:*-1,CottonHeadband:*-1,CottonGloves:*-1
+009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*300,BottleOfWater:*200,CottonShirt:*300,CottonShorts:*1000,Boots:*2000,SerfHat:*500,CottonHeadband:*3000,CottonGloves:*2000
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index 0ae2ffe0..aab0b36b 100644
--- a/world/map/npc/009-7/shops.txt
+++ b/world/map/npc/009-7/shops.txt
@@ -1,3 +1,3 @@
-009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*-1,IronPotion:*-1,ConcentrationPotion:*-1,SmallManaElixir:*2400,BottleOfWater:*-1,Milk:*-1
+009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*175,IronPotion:*500,ConcentrationPotion:*500,SmallManaElixir:*2400,BottleOfWater:*200,Milk:*300
 
-009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*-1,PickledBeets:*5000,ChickenLeg:*-1,Steak:*-1,Beer:*180
+009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*110,PickledBeets:*5000,ChickenLeg:*250,Steak:*275,Beer:*180
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index abec829d..364adf8c 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -536,13 +536,13 @@ L_Close:
 }
 
 
-010-2.gat,24,27,0|shop|Bartender|112,Beer:*-1,IronPotion:*-1,ConcentrationPotion:*-1
+010-2.gat,24,27,0|shop|Bartender|112,Beer:*175,IronPotion:*500,ConcentrationPotion:*500
 
-010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*-1,RoastedMaggot:*-1,OrangeCupcake:*-1,ChickenLeg:*-1,Steak:*-1
+010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*100,RoastedMaggot:*110,OrangeCupcake:*600,ChickenLeg:*250,Steak:*275
 
-010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*-1,IronArrow:*-1,LeatherShield:*-1
+010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*20000,IronArrow:*4,LeatherShield:*2000
 
-010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts:*-1,FancyHat:*-1,SilkHeadband:*-1,CottonSkirt:*-1,Boots:*-1,CottonBoots:*-1
+010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts:*1000,FancyHat:*1600,SilkHeadband:*5000,CottonSkirt:*1000,Boots:*8000,CottonBoots:*2000
 
 010-2.gat,75,68,0|script|Basil|107
 {
diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index e0876fb0..4aa94d9d 100644
--- a/world/map/npc/011-1/shops.txt
+++ b/world/map/npc/011-1/shops.txt
@@ -5,4 +5,4 @@
 //#################################################################################
 
 // Shop
-011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*-1,RedApple:*-1,Orange:*-1
+011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*20,RedApple:*25,Orange:*40
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index a5cd9cfe..c7468111 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -1,6 +1,6 @@
 //
 
-012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose:*-1,PinkRose:*-1,YellowRose:*-1,WhiteRose:*-1,OrangeRose:*-1,DarkRedRose:*-1,RedTulip:*-1,PinkTulip:*-1,YellowTulip:*-1,WhiteTulip:*-1,OrangeTulip:*-1
+012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose:*80,PinkRose:*80,YellowRose:*80,WhiteRose:*80,OrangeRose:*80,DarkRedRose:*80,RedTulip:*80,PinkTulip:*80,YellowTulip:*80,WhiteTulip:*80,OrangeTulip:*80
 
 012-1.gat,36,99,0|script|Blossom|163
 {
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index 4bdf1401..2ce823b6 100644
--- a/world/map/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
@@ -14,9 +14,9 @@
     close;
 }
 // Weapons shop
-020-2.gat,25,65,0|shop|Bracco|135,IronArrow:*-1,ShortBow:*-1,Dagger:*-1,LeatherShield:*-1
+020-2.gat,25,65,0|shop|Bracco|135,IronArrow:*4,ShortBow:*8000,Dagger:*1000,LeatherShield:*2000
 // Potions shop
-020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*-1,CactusPotion:*-1,IronPotion:*-1,ConcentrationPotion:*-1
+020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500
 
 // INN
 020-2.gat,111,23,0|script|Kane|120
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 8631b0ef..20dc49d5 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -1,6 +1,6 @@
 // Outside the bakery
 
-021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*-1,ChocolateCake:*-1,OrangeCake:*-1,AppleCake:*-1,CherryCake:*-1
+021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,CherryCake:*100
 
 021-1.gat,108,102,0|script|Itka|114
 {
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 67a9db73..3211b2b8 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,7 +3,7 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*-1,CottonShorts:*-1,CottonBoots:*-1,CottonHeadband:*-1
+021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*300,CottonShorts:*1000,CottonBoots:*2000,CottonHeadband:*3000
 
 021-1.gat,129,40,0|script|Well|400
 {
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index efd47e17..acde18f2 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -129,7 +129,7 @@ L_End:
 }
 
 // The cashier
-021-2.gat,89,21,0|shop|Drabur|112,WhiteCake:*-1,ChocolateCake:*-1,OrangeCake:*-1,AppleCake:*-1,Cake:*-1,CherryCake:*-1,OrangeCupcake:*-3,Milk:*-5,XmasCake:*-1
+021-2.gat,89,21,0|shop|Drabur|112,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70
 
 // Stockroom boy
 021-2.gat,133,21,0|script|Iormo|160
diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt
index b43d86af..5dba8331 100644
--- a/world/map/npc/021-2/forge_shops.txt
+++ b/world/map/npc/021-2/forge_shops.txt
@@ -1,4 +1,4 @@
 // Forge Shops
 
-021-2.gat,77,134,0|shop|Gungnir|311,SlingShot:*-1,SlingBullet:*-1,ShortBow:*-1,Arrow:*-1,IronArrow:*-3
-021-2.gat,71,133,0|shop|Mjolnir|377,Knife:*-1,SharpKnife:*-1,Dagger:*-1,LeatherShirt:*-2,LeatherShield:*-2
+021-2.gat,77,134,0|shop|Gungnir|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*2,IronArrow:*4
+021-2.gat,71,133,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 0e13f9d9..f1ab846a 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -7,10 +7,10 @@
 // banker: function
 
 
-027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*-1,LadyFingers:*-1,JellAhh:*-1,Snapple:*-1
-027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*-1,GutBuster:*-1,BloodWine:*-1
-027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*-1,ShockSweet:*-1
-027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*-1,CactusPotion:*-1,BugLeg:*-1,SmallMushroom:*-1,IronPotion:*-1,ConcentrationPotion:*-1,HardSpike:*-1,DarkCrystal:*-1,Root:*-1,WispPowder:*-1,SpectrePowder:*-1,PoltergeistPowder:*-1
+027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*100,LadyFingers:*70,JellAhh:*80,Snapple:*110
+027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*80,GutBuster:*100,BloodWine:*150
+027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*50,ShockSweet:*1000
+027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*50,CactusPotion:*70,BugLeg:*100,SmallMushroom:*125,IronPotion:*500,ConcentrationPotion:*500,HardSpike:*40,DarkCrystal:*1000,Root:*500,WispPowder:*700,SpectrePowder:*700,PoltergeistPowder:*700
 
 027-2.gat,106,22,0|script|Edwin|309
 {
diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt
index abd03be3..6ab193a5 100644
--- a/world/map/npc/035-2/shops.txt
+++ b/world/map/npc/035-2/shops.txt
@@ -1,6 +1,6 @@
 //
 
-035-2.gat,23,38,0|shop|Cooky|213,Beer:*-1,Orange:*-1,CasinoCoins:*-1
+035-2.gat,23,38,0|shop|Cooky|213,Beer:*175,Orange:*40,CasinoCoins:*10
 
 035-2.gat,23,35,0|script|Bunkmaster Phict|212
 {
diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt
index 5642ed15..cbb7c84e 100644
--- a/world/map/npc/036-2/shops.txt
+++ b/world/map/npc/036-2/shops.txt
@@ -1,7 +1,7 @@
 //
 
-036-2.gat,23,38,0|shop|Chef Armand|211,Beer:*-1,Steak:*-2,CasinoCoins:*-1
-036-2.gat,35,22,0|shop|Gunney|138,Arrow:*-2,IronArrow:*-2
+036-2.gat,23,38,0|shop|Chef Armand|211,Beer:*175,Steak:*550,CasinoCoins:*10
+036-2.gat,35,22,0|shop|Gunney|138,Arrow:*4,IronArrow:*8
 
 036-2.gat,23,35,0|script|Bunkmaster Daban|212
 {
diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt
index e9d050f1..ee28555b 100644
--- a/world/map/npc/068-2/latoy.txt
+++ b/world/map/npc/068-2/latoy.txt
@@ -1,8 +1,7 @@
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
 
-// Shop: DesertShirt:*-1,SilkRobe:*-5,SerfHat:*-1,DesertHat:*-4
-068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*-1,SilkRobe:*-5,SerfHat:*-1,DesertHat:*-4
+068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*2000,SilkRobe:*40000,SerfHat:*500,DesertHat:*9600
 
 068-2.gat,92,83,0|script|Latoy|106
 {