Merge pull request #245 from mekolat/prices-fix

fix shop prices

25 files changed, 46 insertions, 58 deletions

diff --git a/world/map/db/item_db_foot.txt b/world/map/db/item_db_foot.txt
index e86be1c2..5d0537dc 100644
--- a/world/map/db/item_db_foot.txt
+++ b/world/map/db/item_db_foot.txt
@@ -1,6 +1,6 @@
 // Name and Label MUST NOT exceed 23 characters (as marked)
 //ID,   Name___________________,        Label__________________,            Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   {UseScript},                                                            {EquipScript}
-528,    Boots,                          Boots,                              5,      8000,       500,        80,         0,      2,      0,      -2,     0,      2,      64,         0,      0,      0,      {},                                                                     {}
+528,    Boots,                          Boots,                              5,      2000,       500,        80,         0,      2,      0,      -2,     0,      2,      64,         0,      0,      0,      {},                                                                     {}
 655,    FurBoots,                       Fur Boots,                          5,      5000,       600,        50,         0,      3,      0,      -3,     0,      2,      64,         0,      0,      0,      {},                                                                     {}
 734,    BlackBoots,                     Black Boots,                        5,      20000,      3000,       25,         0,      3,      0,      -10,    0,      2,      64,         0,      0,      0,      {},                                                                     {}
 735,    CottonBoots,                    Cotton Boots,                       5,      2000,       500,        10,         0,      1,      0,      1,      0,      2,      64,         0,      0,      0,      {},                                                                     {}
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 922ea4b3..a82e68b7 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -27,14 +27,14 @@
 644,    BlackCowboyHat,                 Black Cowboy Hat,                   5,      1800,       900,        30,         0,      6,      0,      -12,    0,      2,      256,        0,      0,      0,      {},                                                                     {}
 646,    Crown,                          Crown,                              5,      5000,       1000,       240,        0,      4,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 647,    DevelopersCap,                  Developer's Cap,                    5,      2000,       500,        20,         0,      5,      0,      5,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
-654,    Cap,                            Cap,                                5,      2000,       500,        20,         0,      5,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
+654,    Cap,                            Cap,                                5,      4000000,    500,        20,         0,      5,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 656,    SerfHat,                        Serf Hat,                           5,      500,        100,        20,         0,      2,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 675,    GraduationCap,                  Graduation Cap,                     5,      1000,       250,        20,         0,      2,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 678,    NohMask,                        Noh Mask,                           5,      7000,       1000,       18,         0,      3,      0,      1,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 679,    DemonMask,                      Demon Mask,                         5,      10000,      5000,       23,         0,      3,      0,      5,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 //ID,   Name___________________,        Label__________________,            Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   {UseScript},                                                            {EquipScript}
-721,    HighPriestCrown,                High Priest Crown,                  5,      20000,      5000,       400,        0,      4,      0,      20,     0,      2,      256,        0,      0,      0,      {},                                                                     {bonus bMaxSP, 20;}
-722,    MonsterSkullHelmet,             Monster Skull Helmet,               5,      15000,      3000,       250,        0,      7,      0,      10,     0,      2,      256,        0,      0,      0,      {},                                                                     {bonus bMdef, 20;}
+721,    HighPriestCrown,                High Priest Crown,                  5,      6000000,    5000,       400,        0,      4,      0,      20,     0,      2,      256,        0,      0,      0,      {},                                                                     {bonus bMaxSP, 20;}
+722,    MonsterSkullHelmet,             Monster Skull Helmet,               5,      6000000,    3000,       250,        0,      7,      0,      10,     0,      2,      256,        0,      0,      0,      {},                                                                     {bonus bMdef, 20;}
 723,    DesertHat,                      Desert Hat,                         5,      2400,       600,        20,         0,      3,      0,      -1,     0,      2,      256,        0,      0,      0,      {},                                                                     {}
 724,    CottonHeadband,                 Cotton Headband,                    5,      3000,       500,        5,          0,      2,      0,      0,      0,      2,      256,        0,      0,      0,      {},                                                                     {}
 725,    GMCap,                          GM Cap,                             5,      2000,       500,        20,         0,      5,      0,      5,      0,      2,      256,        0,      0,      0,      {},                                                                     {callfunc "RestrictedItem";}
diff --git a/world/map/db/item_db_leg.txt b/world/map/db/item_db_leg.txt
index 95fb53b4..173b8f98 100644
--- a/world/map/db/item_db_leg.txt
+++ b/world/map/db/item_db_leg.txt
@@ -11,7 +11,7 @@
 796,    BromenalLegs,                   Bromenal Legs,                      5,      2000,       1000,       150,        0,      6,      0,      -12,    0,      2,      1,          0,      0,      0,      {},                                                                     {}
 857,    LeatherTrousers,                Leather Trousers,                   5,      1000,       500,        25,         0,      5,      0,      -4,     0,      2,      1,          0,      0,      0,      {},                                                                     {bonus bHit, 2;}
 881,    RaggedShorts,                   Ragged Shorts,                      5,      60,         1,          7,          0,      1,      0,      -2,     0,      2,      1,          0,      1,      0,      {},                                                                     {}
-1172,   SilkPants,                      Silk Pants,                         5,      5000,       750,        10,         0,      2,      0,      0,      0,      2,      1,          0,      1,      0,      {},                                                                     {}
+1172,   SilkPants,                      Silk Pants,                         5,      20000,      750,        10,         0,      2,      0,      0,      0,      2,      1,          0,      1,      0,      {},                                                                     {}
 //ID,   Name___________________,        Label__________________,            Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   {UseScript},                                                            {EquipScript}
 2100,   RedCottonSkirt,                 Red Cotton Skirt,                   5,      1000,       500,        20,         0,      4,      0,      -8,     0,      2,      1,          0,      1,      0,      {},                                                                     {}
 2101,   GreenCottonSkirt,               Green Cotton Skirt,                 5,      1000,       500,        20,         0,      4,      0,      -8,     0,      2,      1,          0,      1,      0,      {},                                                                     {}
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index f3b77bc9..b589f249 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -18,4 +18,4 @@
 4011,   SapphireRing,                   Sapphire Ring,                      5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {bonus bInt, 1;}
 4012,   TopazRing,                      Topaz Ring,                         5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {bonus bAgi, 1;}
 4013,   AmethystRing,                   Amethyst Ring,                      5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {bonus bDex, 1;}
-4014,   SimpleRing,                     Simple Ring,                        5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {}
+4014,   SimpleRing,                     Simple Ring,                        5,      100000,     2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {}
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index a16425f8..0a36f27d 100644
--- a/world/map/db/item_db_weapon.txt
+++ b/world/map/db/item_db_weapon.txt
@@ -3,7 +3,7 @@
 521,    Dagger,                         Dagger,                             4,      1000,       500,        200,        15,     0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
 522,    SharpKnife,                     Sharp Knife,                        4,      100,        50,         150,        10,     0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
 529,    IronArrow,                      Iron Arrow,                         10,     4,          2,          1,          40,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
-530,    ShortBow,                       Short Bow,                          4,      8000,       2000,       600,        50,     0,      5,      0,      0,      2,      34,         1,      4,      11,     {},                                                                     {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
+530,    ShortBow,                       Short Bow,                          4,      2000,       2000,       600,        50,     0,      5,      0,      0,      2,      34,         1,      4,      11,     {},                                                                     {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
 536,    ShortSword,                     Short Sword,                        4,      8000,       4000,       2000,       100,    0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
 545,    ForestBow,                      Forest Bow,                         4,      20000,      5000,       1200,       70,     0,      5,      0,      0,      2,      34,         1,      0,      11,     {},                                                                     {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
 547,    Bardiche,                       Bardiche,                           4,      20,         10,         10,         0,      100,    1,      -200,   0,      2,      2,          0,      0,      1,      {},                                                                     {callfunc "UnreleasedItem";}
@@ -56,8 +56,8 @@
 903,    SlingShot,                      Sling Shot,                         4,      500,        50,         10,         5,      0,      3,      0,      0,      2,      34,         1,      1,      11,     {},                                                                     {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
 904,    SlingBullet,                    Sling Bullet,                       10,     1,          0,          1,          3,      0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
 906,    KidBook,                        Kid Book,                           4,      10000,      5000,       100,        1,      0,      3,      0,      0,      2,      34,         1,      1,      1,      {},                                                                     {}
-1199,   Arrow,                          Arrow,                              10,     2,          1,          1,          20,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
+1199,   Arrow,                          Arrow,                              10,     1,          1,          1,          20,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
 1200,   Bow,                            Bow,                                4,      1000,       500,        20,         20,     0,      5,      0,      0,      2,      34,         1,      4,      11,     {},                                                                     {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
 1201,   Knife,                          Knife,                              4,      50,         25,         120,        5,      0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
-1215,   ToySabre,                       Toy Sabre,                          4,      50,         25,         1,          1,      0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
+1215,   ToySabre,                       Toy Sabre,                          4,      2000000,    25,         1,          1,      0,      1,      0,      0,      2,      2,          1,      1,      1,      {},                                                                     {}
 1282,   BoneArrows,                     Bone Arrows,                        10,     50,         20,         0,          55,     0,      0,      0,      0,      2,      32768,      0,      0,      0,      {},                                                                     {bonus bCritical, 1;set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
diff --git a/world/map/npc/001-1/north_shops.txt b/world/map/npc/001-1/north_shops.txt
index a207ccaf..592e351c 100644
--- a/world/map/npc/001-1/north_shops.txt
+++ b/world/map/npc/001-1/north_shops.txt
@@ -1,6 +1,6 @@
 // Northern shopping plaza
-001-1.gat,106,105,0|shop|Neko|101,TonoriDelight:*50,CactusDrink:*50,CactusPotion:*70,RoastedMaggot:*110,Beer:*175,ChickenLeg:*500
-001-1.gat,111,108,0|shop|Inar|108,CottonShirt:*300,SerfHat:*500,CottonShorts:*1000,CottonBoots:*2000,DesertShirt:*2000,CottonHeadband:*3000,DesertHat:*9600
+001-1.gat,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2
+001-1.gat,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4
 001-1.gat,48,79,0|script|Well|400
 {
     callfunc "WaterBottle";
diff --git a/world/map/npc/001-2/forge_shops.txt b/world/map/npc/001-2/forge_shops.txt
index 5f2ab3ba..f98d7265 100644
--- a/world/map/npc/001-2/forge_shops.txt
+++ b/world/map/npc/001-2/forge_shops.txt
@@ -1,4 +1,4 @@
 // Forge Shops
 
-001-2.gat,30,60,0|shop|Gungnir|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
-001-2.gat,25,59,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
+001-2.gat,30,60,0|shop|Gungnir|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:1,IronArrow:*1
+001-2.gat,25,59,0|shop|Mjolnir|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1
diff --git a/world/map/npc/002-2/bakery.txt b/world/map/npc/002-2/bakery.txt
index b97c41c1..e5328723 100644
--- a/world/map/npc/002-2/bakery.txt
+++ b/world/map/npc/002-2/bakery.txt
@@ -129,7 +129,7 @@ L_End:
 }
 
 // The cashier
-002-2.gat,25,22,0|shop|Drabur|112,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70
+002-2.gat,25,22,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*1,Milk:*1,XmasCake:*1
 
 // Bus boy
 002-2.gat,21,28,0|script|Iormo|160
diff --git a/world/map/npc/002-2/casino.txt b/world/map/npc/002-2/casino.txt
index f4995662..d49313a6 100644
--- a/world/map/npc/002-2/casino.txt
+++ b/world/map/npc/002-2/casino.txt
@@ -40,7 +40,7 @@ L_End:
     close;
 }
 
-002-2.gat,78,56,0|shop|MoneyChanger|124,CasinoCoins:*10
+002-2.gat,78,56,0|shop|MoneyChanger|124,CasinoCoins:*1
 
 002-2.gat,75,60,0|script|BlackJack|107
 {
diff --git a/world/map/npc/002-2/inya.txt b/world/map/npc/002-2/inya.txt
index 322d0eb3..d05b19b4 100644
--- a/world/map/npc/002-2/inya.txt
+++ b/world/map/npc/002-2/inya.txt
@@ -1,13 +1,13 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
 
-002-2.gat,116,61,0|shop|#InyaShop|127,SimpleRing:*100000
+002-2.gat,116,61,0|shop|#InyaShop|127,SimpleRing:*1
 
 002-2.gat,116,61,0|script|Inya|106
 {
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings. I sell and make rings.\"";
-    next; 
+    next;
     mes "\"If you have a Simple Ring and a gem, I can set the gem in it for 100,000 gold pieces.\"";
     next;
     mes "\"Also, if you have a ring with gems on it, I can remove the gems and return the Simple Ring to you for 50,000 gold pieces.\"";
diff --git a/world/map/npc/002-2/latoy.txt b/world/map/npc/002-2/latoy.txt
index 23dba644..3e8701a2 100644
--- a/world/map/npc/002-2/latoy.txt
+++ b/world/map/npc/002-2/latoy.txt
@@ -1,7 +1,7 @@
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
 
-002-2.gat,86,93,0|shop|#LatoyShop|127,SilkHeadband:*20000,SilkGloves:*20000,SilkPants:*80000,SilkRobe:*40000
+002-2.gat,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4
 
 002-2.gat,86,93,0|script|Latoy|106
 {
diff --git a/world/map/npc/002-2/shops.txt b/world/map/npc/002-2/shops.txt
index 87986111..b1818d04 100644
--- a/world/map/npc/002-2/shops.txt
+++ b/world/map/npc/002-2/shops.txt
@@ -1,3 +1,3 @@
 // Bartender
 
-002-2.gat,68,25,0|shop|Bartender#Casino|112,Beer:*175,Cake:*30,CherryCake:*100
+002-2.gat,68,25,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1
diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt
index 21cab7c7..5285d7e5 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:*800,MinerGloves:*3000,ShortBow:*8000,Arrow:*2,LeatherShield:*2000
+002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*1,MinerGloves:*1,ShortBow:*4,Arrow:*2,LeatherShield:*1
diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt
index f84f2690..8f7331f8 100644
--- a/world/map/npc/006-2/shops.txt
+++ b/world/map/npc/006-2/shops.txt
@@ -1,5 +1,5 @@
 // Exotic Trader
 // 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,81,36,0|shop|Reathe|179,ToySabre:*5,Cap:*5,HighPriestCrown:*5,MonsterSkullHelmet:*5
 
-006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*50,CactusPotion:*70,BottleOfWater:*200,RoastedMaggot:*110
+006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 4d248819..e5375149 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,5 +1,5 @@
 // Nicholas' Apprentice and Armorsmith
-009-2.gat,183,57,0|shop|#PeterShop|127,Knife:*50,SharpKnife:*100,Dagger:*1000
+009-2.gat,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1
 
 009-2.gat,183,57,0|script|Peter|157
 {
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index e400c3ef..52508ce2 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -1,12 +1,5 @@
-//#################################################################################
-//#                                                                               #
-//# This script file contains all shops and other NPCs with important functions.  #
-//#                                                                               #
-//#################################################################################
-
 // Bartender
-// sells beer, cake and steak
-009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*175,Cake:*30,Steak:*275
+009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
@@ -19,13 +12,10 @@
 }
 
 // Archer Shop
-// sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*4,Bow:*1000,ShortBow:*3000
+009-2.gat,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2
 
 // 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:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500,SlowPoisonPotion:*500
+009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
 
 // General Store
-// Sells various things, many not sold elsewhere
-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
+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
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index aab0b36b..13dd0a4c 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:*175,IronPotion:*500,ConcentrationPotion:*500,SmallManaElixir:*2400,BottleOfWater:*200,Milk:*300
+009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1
 
-009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*110,PickledBeets:*5000,ChickenLeg:*250,Steak:*275,Beer:*180
+009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 364adf8c..c6766892 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:*175,IronPotion:*500,ConcentrationPotion:*500
+010-2.gat,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1
 
-010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*100,RoastedMaggot:*110,OrangeCupcake:*600,ChickenLeg:*250,Steak:*275
+010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1
 
-010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*20000,IronArrow:*4,LeatherShield:*2000
+010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*1,IronArrow:*1,LeatherShield:*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,65,41,0|shop|General Store#dimond|137,CottonShorts:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1
 
 010-2.gat,75,68,0|script|Basil|107
 {
@@ -551,4 +551,3 @@ L_Close:
     callfunc "Inn";
     end;
 }
-
diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index 4aa94d9d..48126fe2 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:*20,RedApple:*25,Orange:*40
+011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index c7468111..fb29a68a 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:*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|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|script|Blossom|163
 {
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index 2ce823b6..1c895902 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:*4,ShortBow:*8000,Dagger:*1000,LeatherShield:*2000
+020-2.gat,25,65,0|shop|Bracco|135,IronArrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1
 // Potions shop
-020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*50,CactusPotion:*70,IronPotion:*500,ConcentrationPotion:*500
+020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1
 
 // INN
 020-2.gat,111,23,0|script|Kane|120
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index f1ab846a..aed37d09 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:*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,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,106,22,0|script|Edwin|309
 {
@@ -45,4 +45,3 @@
     callfunc "Banker";
     close;
 }
-
diff --git a/world/map/npc/029-2/two_arms.txt b/world/map/npc/029-2/two_arms.txt
index 33b4b843..012527b6 100644
--- a/world/map/npc/029-2/two_arms.txt
+++ b/world/map/npc/029-2/two_arms.txt
@@ -1,4 +1,4 @@
 // Forge Shops
 
-029-2.gat,99,25,0|shop|Rosen|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
-029-2.gat,112,24,0|shop|Toichi|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
+029-2.gat,99,25,0|shop|Rosen|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:*2,IronArrow:*1
+029-2.gat,112,24,0|shop|Toichi|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1
diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt
index 6ab193a5..7d7d656a 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:*175,Orange:*40,CasinoCoins:*10
+035-2.gat,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,CasinoCoins:*1
 
 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 cbb7c84e..33dd286e 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:*175,Steak:*550,CasinoCoins:*10
-036-2.gat,35,22,0|shop|Gunney|138,Arrow:*4,IronArrow:*8
+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:*4,IronArrow:*2
 
 036-2.gat,23,35,0|script|Bunkmaster Daban|212
 {