Merge branch 'Micksha/serverdata-Gumicommit' into 'Gumicommit'

Rename bartender to barron and add a shop

See merge request Micksha/serverdata!2

4 files changed, 59 insertions, 21 deletions

diff --git a/npc/008-2-2/_import.txt b/npc/008-2-2/_import.txt
index 55e479c0..34d628f7 100644
--- a/npc/008-2-2/_import.txt
+++ b/npc/008-2-2/_import.txt
@@ -1,10 +1,11 @@
 // Map 008-2-2: The Rusty Pick
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-2-2/_warps.txt",
-"npc/008-2-2/bartender.txt",
+"npc/008-2-2/barron.txt",
 "npc/008-2-2/kfahr.txt",
 "npc/008-2-2/ledmitz.txt",
 "npc/008-2-2/mapflags.txt",
 "npc/008-2-2/melania.txt",
 "npc/008-2-2/melinda.txt",
 "npc/008-2-2/note.txt",
+"npc/008-2-2/shop.txt",
diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt
new file mode 100644
index 00000000..48ad1120
--- /dev/null
+++ b/npc/008-2-2/barron.txt
@@ -0,0 +1,32 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Barron, the bartender of the Rusty Pick.
+
+008-2-2,43,28,0	script	Barron#008-2-2	NPC_GENERAL_STORE,{
+speech S_LAST_NEXT, 
+    l("Hi!"),
+    l("I am the bartender here, can I provide you with some delicious beverage?"),
+    l("Or you can take seat and ask Melinda if you need something.");
+    
+    switch (select(l("What beverages do you have?"),
+                   l("I'll ask Melinda later")))
+    {
+        case 1:
+        closeclientdialog;
+        shop "#Invisible008-2-2";
+        close;
+    case 2:
+        speech S_FIRST_BLANK_LINE,
+        l("Make sure to tip her, it will brighten up her day.");
+        close;
+    }
+        
+
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-2/bartender.txt b/npc/008-2-2/bartender.txt
deleted file mode 100644
index eb3b9393..00000000
--- a/npc/008-2-2/bartender.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Evol scripts.
-// Author:
-//    Micksha
-// Description:
-//    Bartender of the Rusty Pick.
-// THIS IS A PLACEHOLDER!
-
-008-2-2,43,28,0	script	Bartender#008-1	NPC_GENERAL_STORE,{
-    speech
-        l("Hi!"),
-        l("I am the Bartender here, the name doesnt matter at all.");
-        lg("If you need something, please ask this beautiful girl on my right. (She needs the tip).");
-
-    close;
-
-OnInit:
-    .sex = G_MALE;
-    .distance = 2;
-    end;
-}
diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt
new file mode 100644
index 00000000..823e62c8
--- /dev/null
+++ b/npc/008-2-2/shop.txt
@@ -0,0 +1,25 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Reid
+// Description:
+//    Inn hidden shop.
+
+008-2-2,40,30,0	trader	#Invisible008-2-2	NPC_HIDDEN,{
+
+OnInit:
+    tradertype(NST_MARKET);
+
+    sellitem Beer, -1, 50;
+
+    .sex = G_OTHER;
+    .distance = 10;
+    end;
+
+OnClock0000:
+    restoreshopitem Beer, 20;
+OnClock0800:
+    restoreshopitem Beer, 20;
+OnClock1600:
+    restoreshopitem Beer, 20;
+}