19 files changed, 70 insertions, 70 deletions
diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
index ea51d12e..c778038d 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:*1,CactusPotion:*1,Beer:*1,ChickenLeg:*2
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index 7648190b..2dea74a3 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -1,7 +1,7 @@
 // Casino
 
 // takes part in quest given by 021-2/kylian.txt
-001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1,
+001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
@@ -15,34 +15,34 @@ L_End:
     end;
 }
 
-001-2.gat,39,32,0|script|Valdo|117,
+001-2.gat,39,32,0|script|Valdo|117
 {
     mes "[Valdo the Worker]";
     mes "\"Please let me work. I'm really in a hurry!\"";
     close;
 }
 
-001-2.gat,37,65,0|script|Slots#1|400,
+001-2.gat,37,65,0|script|Slots#1|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,39,65,0|script|Slots#2|400,
+001-2.gat,39,65,0|script|Slots#2|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,41,65,0|script|Slots#3|400,
+001-2.gat,41,65,0|script|Slots#3|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins :-1
+001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*1
 
-001-2.gat,28,63,0|script|BlackJack|107,
+001-2.gat,28,63,0|script|BlackJack|107
 {
     mes "[Croupier]";
     mes "\"Would you like to play Black Jack?";
@@ -117,7 +117,7 @@ L_Close:
     close;
 }
 
-001-2.gat,22,69,0|script|Roulette|107,
+001-2.gat,22,69,0|script|Roulette|107
 {
     mes "[Croupier]";
     mes "\"Good evening monsieur...";
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index 00db7c93..46707cf3 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:*1,Cake:*1,CherryCake:*1
diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt
index 3eb2f426..905eec7d 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:*1,MinerGloves:*1,ShortBow:*1,Arrow:*1,LeatherShield:*1
diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt
index b7e8d85a..d6fff45d 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:*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:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index bcf512b5..1b3ed2ca 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -6,11 +6,11 @@
 
 // Bartender
 // sells beer, cake and steak
-009-2.gat,65,49,0|shop|Barkeeper|112,539:-1,513:-1,676:-1
+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
-009-2.gat,50,48,0|script|Receptionist#inn|108,
+009-2.gat,50,48,0|script|Receptionist#inn|108
 {
     set @npcname$, "Receptionist";
     set @cost, 100;
@@ -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:*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|400,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1
+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 :-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:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1
diff --git a/world/map/npc/009-7/npcs.txt b/world/map/npc/009-7/npcs.txt
index 72a4e9f8..cdeb6d84 100644
--- a/world/map/npc/009-7/npcs.txt
+++ b/world/map/npc/009-7/npcs.txt
@@ -1,4 +1,4 @@
-009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0,
+009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0
 {
     mes "What is the password?";
     menu
@@ -15,6 +15,6 @@ L_Close:
     close;
 }
 
-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:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*2400,BottleOfWater:*1,Milk:*1
 
-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:*1,PickledBeets:*5000,ChickenLeg:*1,Steak:*1,Beer:*180
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 6f158c65..94c3f494 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -1,6 +1,6 @@
 //
 
-010-2.gat,34,38,0|script|Dimond|165,
+010-2.gat,34,38,0|script|Dimond|165
 {
     mes "[Dimond]";
     mes "\"Welcome to Dimond's Cove!\"";
@@ -12,7 +12,7 @@
     close;
 }
 
-010-2.gat,35,35,0|script|Shannon|193,
+010-2.gat,35,35,0|script|Shannon|193
 {
     set @month, 1;
     set @start_day, 24;
@@ -458,7 +458,7 @@ L_Close:
     close;
 }
 
-010-2.gat,27,30,0|script|Bar Rules|400,
+010-2.gat,27,30,0|script|Bar Rules|400
 {
     mes "Dimonds Cove Bar Rules";
     next;
@@ -478,28 +478,28 @@ L_Close:
     close;
 }
 
-010-2.gat,71,38,0|script|Store Policy#1|400,
+010-2.gat,71,38,0|script|Store Policy#1|400
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,77,38,0|script|Store Policy#2|400,
+010-2.gat,77,38,0|script|Store Policy#2|400
 {
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,36,30,0|script|Directions|400,
+010-2.gat,36,30,0|script|Directions|400
 {
     mes "This way to the Dimonds Cove Inn.";
     mes "Five star accommodation for the weary traveler!";
     close;
 }
 
-010-2.gat,80,32,0|script|Dimonds Cove 1|400,
+010-2.gat,80,32,0|script|Dimonds Cove 1|400
 {
     mes "The Story of Dimonds Cove";
     next;
@@ -519,7 +519,7 @@ L_Close:
     close;
 }
 
-010-2.gat,85,32,0|script|Dimonds Cove 2|400,
+010-2.gat,85,32,0|script|Dimonds Cove 2|400
 {
     mes "List of Events at Dimonds Cove";
     mes "January 2008 - Construction of Dimonds Cove.";
@@ -527,7 +527,7 @@ L_Close:
 }
 
 
-010-2.gat,71,30,0|script|Inn|400,
+010-2.gat,71,30,0|script|Inn|400
 {
     mes "Welcome to the Dimonds Cove Inn";
     mes "Rooms are 200 gp a night.";
@@ -536,15 +536,15 @@ 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:*1,IronPotion:*1,ConcentrationPotion:*1
 
-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:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1
 
-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:*1,IronArrow:*1,LeatherShield:*1
 
-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:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1
 
-010-2.gat,75,68,0|script|Basil|107,
+010-2.gat,75,68,0|script|Basil|107
 {
     set @npcname$, "Basil the Inn Keeper";
     set @cost, 200;
diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index 2fd115b8..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 :-1,RedApple :-1,Orange :-1
+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 a47e3274..fb29a68a 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -1,8 +1,8 @@
 //
 
-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:*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,
+012-1.gat,36,99,0|script|Blossom|163
 {
     mes "[Blossom]";
     mes "\"Hello, would you like to buy some flowers?\"";
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index 08f2b531..1f43ebaa 100644
--- a/world/map/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
@@ -1,7 +1,7 @@
 // Snow town shops
 
 // About the Area NPC
-020-2.gat,75,28,0|script|Taylor|137,
+020-2.gat,75,28,0|script|Taylor|137
 {
     mes "[Taylor]";
     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.\"";
@@ -14,12 +14,12 @@
     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:*1,ShortBow:*1,Dagger:*1,LeatherShield:*1
 // 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:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1
 
 // INN
-020-2.gat,111,23,0|script|Kane|120,
+020-2.gat,111,23,0|script|Kane|120
 {
     set @npcname$, "Kane the Inn Keeper";
     set @cost, 100;
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 46337613..2bb932da 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -1,8 +1,8 @@
 // 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:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,CherryCake:*1
 
-021-1.gat,108,102,0|script|Itka|114,
+021-1.gat,108,102,0|script|Itka|114
 {
     mes "[Itka]";
     mes "\"This bakery is the best!\"";
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 81a05a20..db6dea50 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,16 +3,16 @@
 // 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:*1,CottonShorts:*1,CottonBoots:*1,CottonHeadband:*1
 
-021-1.gat,129,40,0|script|Well|400,
+021-1.gat,129,40,0|script|Well|400
 {
     callfunc "WaterBottle";
     end;
 }
 
 // An officer (for security)
-021-1.gat,128,37,0|script|Officer|150,
+021-1.gat,128,37,0|script|Officer|150
 {
     mes "[Officer]";
     mes "I'm here for extra security for this market.";
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 9a494a7a..0dd303f1 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -1,7 +1,7 @@
 // The bakery
 
 // The chef
-021-2.gat,95,21,0|script|Riskim|148,
+021-2.gat,95,21,0|script|Riskim|148
 {
     mes "[Riskim]";
     mes "";
@@ -120,7 +120,7 @@ L_End:
 }
 
 // Server
-021-2.gat,82,23,0|script|Sara|108,
+021-2.gat,82,23,0|script|Sara|108
 {
     mes "[Sara]";
     mes "";
@@ -129,10 +129,10 @@ 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:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*3,Milk:*5,XmasCake:*1
 
 // Stockroom boy
-021-2.gat,133,21,0|script|Iormo|160,
+021-2.gat,133,21,0|script|Iormo|160
 {
     mes "[Iormo]";
     mes "";
@@ -141,7 +141,7 @@ L_End:
 }
 
 // An old couple eating at the bakery
-021-2.gat,71,22,0|script|Rynoh|159,
+021-2.gat,71,22,0|script|Rynoh|159
 {
     mes "[Rynoh]";
     mes "";
@@ -149,7 +149,7 @@ L_End:
     close;
 }
 
-021-2.gat,73,22,0|script|Ontas|154,
+021-2.gat,73,22,0|script|Ontas|154
 {
     mes "[Ontas]";
     mes "";
diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt
index 2ffa556b..608ce082 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:*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
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index 2a829ec1..c51ca747 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -7,12 +7,12 @@
 // 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:*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,
+027-2.gat,106,22,0|script|Edwin|309
 {
     set @npcname$, "Edwin";
 
@@ -24,7 +24,7 @@
 }
 
 // Inn
-027-2.gat,107,39,0|script|Barbara Grey|320,
+027-2.gat,107,39,0|script|Barbara Grey|320
 {
     set @npcname$, "Barbara Grey";
     set @cost, 1000;
@@ -38,7 +38,7 @@
 }
 
 // Bank and Storage
-027-2.gat,88,22,0|script|J.P. Morbid|321,
+027-2.gat,88,22,0|script|J.P. Morbid|321
 {
     callfunc "ClearVariables";
     set @npcname$, "J.P. Morbid";
diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt
index ddf0f09c..7d7d656a 100644
--- a/world/map/npc/035-2/shops.txt
+++ b/world/map/npc/035-2/shops.txt
@@ -1,8 +1,8 @@
 //
 
-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:*1,Orange:*1,CasinoCoins:*1
 
-035-2.gat,23,35,0|script|Bunkmaster Phict|212,
+035-2.gat,23,35,0|script|Bunkmaster Phict|212
 {
     set @npcname$, "Bunkmaster Phict";
     set @cost, 100;
diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt
index b25d0a46..4d60d6cf 100644
--- a/world/map/npc/036-2/shops.txt
+++ b/world/map/npc/036-2/shops.txt
@@ -1,9 +1,9 @@
 //
 
-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:*1,Steak:*2,CasinoCoins:*1
+036-2.gat,35,22,0|shop|Gunney|138,Arrow:*2,IronArrow:*2
 
-036-2.gat,23,35,0|script|Bunkmaster Daban|212,
+036-2.gat,23,35,0|script|Bunkmaster Daban|212
 {
     set @npcname$, "Bunkmaster Daban";
     set @cost, 100;
diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt
index 9031979f..13225bac 100644
--- a/world/map/npc/068-2/latoy.txt
+++ b/world/map/npc/068-2/latoy.txt
@@ -1,10 +1,10 @@
 // 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
+// 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|script|Latoy|106,
+068-2.gat,92,83,0|script|Latoy|106
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);