Merge branch 'mifritscher/tulimshar-shops'

2 files changed, 73 insertions, 12 deletions

diff --git a/npc/020-1/inar.txt b/npc/020-1/inar.txt
index 0611eeb6..2954bcaf 100644
--- a/npc/020-1/inar.txt
+++ b/npc/020-1/inar.txt
@@ -1,19 +1,47 @@
 // Evol scripts.
 // Author:
-//    Micksha
+//    Micksha (mifritscher gave him some food ;-) )
 // Description:
 //    Inar, a saleswoman in Tulimshar Market.
 // THIS IS A PLACEHOLDER!
 
 020-1,212,171,0	script	Inar	NPC_SABINE,{
-    speech
-        l("Hi there."),
-        l("You wonder why here are so many idle market stalls, right?"),
-        l("This is due to lazyness of Micksha to prepare placeholders."),
-		l("So, see you later when we have something to sell here.");
+    if (shopcount(Manana) <= 0 && shopcount(Blueberries) <= 0
+        && shopcount(Fungus) <= 0 && shopcount(Carrot) <= 0) {
+
+        speech
+            l("Hi there."),
+            l("Sorry, we are sold out for today."),
+            lg("Come back later.");
+
+    } else {
+        speech
+            l("Hi there."),
+            l("We got new supplies of food and drinks! And everybode else is on holiday it seems - perhaps in Mickshaland?"),
+            l("But for me, selling is holiday - so I'm always here! Feel free to take a look!");
+        next;
+
+        closeclientdialog;
+        shop .name$;
+    }
+
     close;
 
 OnInit:
     .distance = 4;
+    tradertype(NST_MARKET);
+
+    // Blueberries are still placeholders
+    sellitem Manana, -1, 500+rand2(100);
+//    sellitem Blueberries, -1, 2000+rand2(500);
+    sellitem Fungus, -1, 800+rand2(200);
+    sellitem Carrot, -1, 600+rand2(100);
+    end;
+
+OnClock0002:
+    restoreshopitem Manana, 500+rand2(100);
+//    restoreshopitem Blueberries, 2000+rand2(500);
+    restoreshopitem Fungus, 800+rand2(200);
+    restoreshopitem Carrot, 600+rand2(100);
     end;
 }
diff --git a/npc/020-1/neko.txt b/npc/020-1/neko.txt
index 92460cf7..d4c38dd3 100644
--- a/npc/020-1/neko.txt
+++ b/npc/020-1/neko.txt
@@ -1,19 +1,52 @@
 // Evol scripts.
 // Author:
-//    Micksha
+//    Micksha (mifritscher gave him some food ;-) )
 // Description:
 //    Neko, the Trader in Legion area in Tulimshar.
 // THIS IS A PLACEHOLDER!
 
 020-1,278,99,0	script	Neko	NPC_DESERT_HAT_MAN,{
-    speech
-        l("Hi there."),
-        l("I am out of stock, unfortunately."),
-        l("What do you mean to look at my wares?!"),
-		l("My collection of random stuff is not for sale! Go away!");
+    if (shopcount(Blueberries) <= 0 && shopcount(BottleOfWater) <= 0
+        && shopcount(Tentacles) <= 0 && shopcount(CommonCarp) <= 0
+        && shopcount(Aquada) <= 0 && shopcount(Curshroom) <= 0) {
+
+        speech
+            l("Hi there."),
+            l("Sorry, we are sold out for today."),
+            lg("Come back later.");
+
+    } else {
+        speech
+            l("Hi there."),
+            l("We got new supplies of food and drinks!");
+
+        next;
+
+        closeclientdialog;
+        shop .name$;
+    }
+
     close;
 
 OnInit:
     .distance = 4;
+    tradertype(NST_MARKET);
+
+// Blueberries are still placeholders
+//    sellitem Blueberries, -1, 2000+rand2(500);
+    sellitem BottleOfWater, -1, 200+rand2(50);
+    sellitem CommonCarp, -1, 400+rand2(50);
+    sellitem Tentacles, -1, 1000+rand2(100);
+    sellitem Aquada, -1, 800+rand2(200);
+    sellitem Curshroom, -1, 1500+rand2(400);
+    end;
+
+OnClock0002:
+//    restoreshopitem Blueberries, 2000+rand2(500);
+    restoreshopitem BottleOfWater, 200+rand2(50);
+    restoreshopitem CommonCarp, 400+rand2(50);
+    restoreshopitem Tentacles, 1000+rand2(100);
+    restoreshopitem Aquada, 800+rand2(200);
+    restoreshopitem Curshroom, 1500+rand2(400);
     end;
 }