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

2 files changed, 45 insertions, 3 deletions

diff --git a/npc/029-2/morgan.txt b/npc/029-2/morgan.txt
index 5c12dfc3..bd45df7e 100644
--- a/npc/029-2/morgan.txt
+++ b/npc/029-2/morgan.txt
@@ -110,4 +110,17 @@ L_close:
     close;
 }
 
-029-2,113,59,0	shop	Zitoni	NPC103,501:25,502:35,825:50,826:100
+029-2,113,59,0	script	Zitoni	NPC103,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem CactusDrink;
+    sellitem CactusPotion;
+    sellitem TinyManaElixir, 50;
+    sellitem SmallManaElixir, 100;
+    .distance = 5;
+    end;
+}
diff --git a/npc/029-2/two_arms.txt b/npc/029-2/two_arms.txt
index 48dec1cb..f01cf644 100644
--- a/npc/029-2/two_arms.txt
+++ b/npc/029-2/two_arms.txt
@@ -1,3 +1,32 @@
 
-029-2,99,25,0	shop	Rosen	NPC311,903:50,904:0,530:8000,1199:2,529:2
-029-2,112,24,0	shop	Toichi	NPC377,1201:25,522:50,521:500,523:1000,603:1000
+029-2,99,25,0	script	Rosen	NPC311,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem SlingShot;
+    sellitem SlingBullet;
+    sellitem ShortBow;
+    sellitem Arrow, 2;
+    sellitem IronArrow;
+    .distance = 5;
+    end;
+}
+
+029-2,112,24,0	script	Toichi	NPC377,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem Knife;
+    sellitem SharpKnife;
+    sellitem Dagger;
+    sellitem LeatherShirt;
+    sellitem LeatherShield;
+    .distance = 5;
+    end;
+}