Cleanup all shops. This makes CI passable! (At least in a real environment)

1 files changed, 57 insertions, 4 deletions

diff --git a/npc/010-2/dimonds.txt b/npc/010-2/dimonds.txt
index 6fcaa1f4..6d3c729c 100644
--- a/npc/010-2/dimonds.txt
+++ b/npc/010-2/dimonds.txt
@@ -526,13 +526,66 @@ L_close:
 }
 
 
-010-2,24,27,0	shop	Bartender	NPC112,539:87,567:250,568:250
+010-2,24,27,0	script	Bartender	NPC112,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem Beer;
+    sellitem IronPotion;
+    sellitem ConcentrationPotion;
+    .distance = 5;
+    end;
+}
+
+010-2,32,34,0	script	Waitress	NPC139,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem CherryCake;
+    sellitem RoastedMaggot;
+    sellitem OrangeCupcake;
+    sellitem ChickenLeg;
+    sellitem Steak;
+    .distance = 5;
+    end;
+}
+
+010-2,85,41,0	script	Blacksmith	NPC146,{
+    shop .name$;
+    goodbye;
+    close;
 
-010-2,32,34,0	shop	Waitress	NPC139,519:50,533:55,534:45,562:125,676:100
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem ForestBow;
+    sellitem IronArrow;
+    sellitem LeatherShield;
+    .distance = 5;
+    end;
+}
 
-010-2,85,41,0	shop	Blacksmith	NPC146,545:5000,529:2,603:1000
+010-2,65,41,0	script	General Store#dimond	NPC137,{
+    shop .name$;
+    goodbye;
+    close;
 
-010-2,65,41,0	shop	General Store#dimond	NPC137,586:500,524:800,544:2000,632:500,528:500,735:500
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem CottonShorts;
+    sellitem FancyHat;
+    sellitem SilkHeadband;
+    sellitem CottonSkirt;
+    sellitem Boots;
+    sellitem CottonBoots;
+    .distance = 5;
+    end;
+}
 
 010-2,75,68,0	script	Basil	NPC107,{
     @npcname$ = "Basil the Inn Keeper";