Changes: Price in item_db.txt, merchants Item ID changed to Name...

price changes to reflect Lora Tay's crafting and the price of cotton cloth
drops increased for cotton cloth
casino coins removed from merchants
several merchants changed to simple information scripts
price changes based on merchant sell value

13 files changed, 60 insertions, 25 deletions

diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
index a664e74a..6d20129e 100644
--- a/world/map/npc/001-1/merchant.txt
+++ b/world/map/npc/001-1/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000,735:-1
+001-1.gat,39,52,0	shop	Neko	101,CactusDrink :-1,CactusPotion :-1,Knife :-1,SharpKnife :-1,Dagger :-1,SerfHat :-1,CottonShirt :-1,LeatherShirt :-1,LeatherShield :-1,CottonHeadband :-1,CottonBoots :-1
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index cf4943a4..b4cb7bb0 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -21,7 +21,13 @@
 	close;
 }
 
-001-2.gat,32,67,0	shop	MoneyChanger	124,503:10
+001-2.gat,32,67,0	script	MoneyChanger	124,{
+	mes "[" + @npcname$ + "]";
+	mes "\"I used to exchange Casino Coins for cash, but the Wizard's Council shut me down.  Now the casino only runs off Casino Coins currently in circulation.\"";
+	next;
+	mes "\"I heard that many a gambler wandered onto the Beach to the South West and through to the Snake Desert to the South East.  If you want to find coins already in circulation, you might find some on the monsters there.\"";
+	close;
+}
 
 001-2.gat,28,63,0	script	BlackJack	107,{
 	mes "[Croupier]";
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index c70ad113..e33ae53c 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -1,6 +1,6 @@
 //
 
-001-2.gat,26,26,0	shop	InnKeeper	112,539:175,513:20,519
+001-2.gat,26,26,0	shop	InnKeeper	112,Beer :-1,Cake :-1,CherryCake :-1
 
 001-2.gat,103,26,0	script	Rebecca	118,{
 	set @npcname$, "Rebecca the Inn Keeper";
diff --git a/world/map/npc/002-1/merchant.txt b/world/map/npc/002-1/merchant.txt
index 8a84ae92..58f3ca06 100644
--- a/world/map/npc/002-1/merchant.txt
+++ b/world/map/npc/002-1/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-002-1.gat,19,99,0     shop    Ishyah        109,525:800,531:3000,530:8000,1199:3,603:-1
+002-1.gat,19,99,0     shop    Ishyah        109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt
index 12f37ca1..d8f08cc1 100644
--- a/world/map/npc/005-1/npcs.txt
+++ b/world/map/npc/005-1/npcs.txt
@@ -1,6 +1,6 @@
 //
 
-005-1.gat,69,76,0	shop	George	115,530:3000,1199:1,529:-1,539:175,562:500
+005-1.gat,69,76,0	shop	George	115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2
 
 005-1.gat,66,75,0	script	Kieron	132,{
     mes "[Kieron]";
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 733fa54f..3283c30b 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -18,12 +18,12 @@
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0	shop	Apprentice	120,1199:-1,529:-1,1200:1000,530:3000
+009-2.gat,97,24,0	shop	Apprentice	120,Arrow :-1,IronArrow :-1,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	127,501:50,502:70,567:500,568:500,750:500
+009-2.gat,123,22,0	shop	Potions#_M	127,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	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,741:-1
+009-2.gat,32,99,0	shop	General Store	112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index c1578d55..b1f73815 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -532,13 +532,13 @@ leave:
 }
 
 
-010-2.gat,24,27,0	shop	Bartender	112,539:175,567:500,568: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,519:100,533:150,534:90,562:500,676:200
+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,545:20000,529:-1,603:-1
+010-2.gat,85,41,0	shop	Blacksmith	146,ForestBow :-1,IronArrow :-1,LeatherShield :-1
 
-010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
+010-2.gat,65,41,0	shop	General Store	137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
 
 010-2.gat,75,68,0	script	Basil	107,{
 	set @npcname$, "Basil the Inn Keeper";
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index d2b40f0e..1954f29f 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -1 +1 @@
-011-1.gat,87,34,0	shop	Oscar	142,719:20,535:25,657:40
+011-1.gat,87,34,0	shop	Oscar	142,GreenApple :-1,RedApple :-1,Orange :-1
diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index e9616d8c..8fdf3cbe 100644
--- a/world/map/npc/011-1/shops.txt
+++ b/world/map/npc/011-1/shops.txt
@@ -6,4 +6,4 @@
 
 // Exotic Trader
 // Toy Sabre - 10mil, Cap - 20mil, High Priest Crown - 30mil, Monster Skull Helmet - 30mil
-011-1.gat,109,38,0	shop	Exotic Trader	179,1215:10000000,654:20000000,721:30000000,722:30000000
+011-1.gat,109,38,0	shop	Exotic Trader	179,ToySabre :10000000,Cap :20000000,HighPriestCrown :30000000,MonsterSkullHelmet :30000000
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index b29e5542..f7bd8703 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -1,3 +1,3 @@
 //
 
-012-1.gat,36,99,0   shop    Blossom 163,661:100,664:100,665:50,662:100,667:50,663:100,671:75,673:25,669:75,672:25,674:25
+012-1.gat,36,99,0   shop    Blossom 163,RedRose :-1,PinkRose :-1,YellowRose :-1,WhiteRose :-1,OrangeRose :-1,DarkRedRose :-1,RedTulip :-1,PinkTulip :-1,YellowTulip :-1,WhiteTulip :-1,OrangeTulip :-1
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index cc796b55..edeaa73c 100644
--- a/world/map/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
@@ -1,11 +1,21 @@
 // Snow town shops
 
-// Clothes shop
-020-2.gat,75,28,0	shop	Taylor	137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,741:-1
+// About the Area NPC
+020-2.gat,75,28,0	script	Taylor	137,{
+	mes "[" + @npcname$ + "]";
+	mes "\"While it can be dangerous up here in Kaizei, I take comfort that Nivalis is not surrounded by the Yeti like Thermin is.  What a weird town.\"";
+	next;
+	mes "\"Around Christmas time, this place gets crazy, but most of the time Nivalis serves as a hub for adventurers and tourists that come to Kaizei.\"";
+	next;
+	mes "\"There caves around here can prove to be dangerous, be careful around here and bring friends if you should go into them..otherwise, it might spell your end.\"";
+	next;
+	mes "\"Well, pleasant journeys and I hope I haven't been too much of a bother.  Good chatting with you.\"";
+	close;
+}
 // Weapons shop
-020-2.gat,25,65,0	shop	Bracco	135,1201:50,521:1000,522:100,529:3,530:-1
+020-2.gat,25,65,0	shop	Bracco	135,IronArrow :-1, Shortbow :-1, Dagger :-1, LeatherShield :-1
 // Potions shop
-020-2.gat,75,24,0	shop	Mede	103,501:50,502:70,567:500,568:500
+020-2.gat,75,24,0	shop	Mede	103,CactusDrink :-1,CactusPotion :-1,Iron Potion :-1,ConcentrationPotion :-1
 
 // INN
 020-2.gat,111,23,0	script	Kane	120,{
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 4fc3c481..9a736720 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -6,7 +6,17 @@
 021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
 
 // Some general stuff
-021-1.gat,128,36,0	shop	Imec	162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6
+021-1.gat,128,36,0	script	Imec	162,{
+	set @npcname$, "Imec";
+	mes "[" + @npcname$ + "]";
+	mes "\"The Wizard's Council shut down my shop!\"";
+	next;
+	mes "\"They said I was selling illegal things, but what's so illegal about poison?\"";
+	next;
+	mes "\"Anyways, I hope to get a merchant's permit again...One of these days..\"";
+	close;
+}
+
 
 // A snobby store that won't sell to the player
 021-1.gat,138,29,0	script	Latoy	106,{
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index a90d4301..7a48a60e 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -7,11 +7,20 @@
 // banker: function
 
 
-027-2.gat,75,22,0	shop	Chef	300,784:-1,785:-1,786:-1,787:-1
-027-2.gat,90,36,0	shop	Estrilda	301,788:-1,789:-1,790:-1
-027-2.gat,93,22,0	shop	Umfrey	302,1282:-1,1281:-1
-027-2.gat,56,99,0	shop	Leofwin	304,501:-1,502:-1,518:100,566:2000,567:-1,568:-1,613:500,631:1000,740:-1,772:-1,773:-1,774:-1
-027-2.gat,106,22,0	shop	Edwin	309,784:-1,785:-1,786:-1,787:-1,788:-1,789:-1,790:-1
+027-2.gat,75,22,0	shop	Chef	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,{
+	set @npcname$, "Edwin";
+
+	mes "[" + @npcname$ + "]";
+	mes "\"This place is always busy.\"";
+	next;
+	mes  "\"Be careful about bumping into the patrons, they might not take it kindly if you spill their drink.\"";
+	close;
+}
 
 // Inn
 027-2.gat,107,39,0	script	Barbara Grey	320,{