From 74baec811df3dff3e6433440fe1029e7227fd534 Mon Sep 17 00:00:00 2001
From: Micksha <ms-shaman@gmx.de>
Date: Mon, 3 Feb 2020 20:35:37 +0000
Subject: Arrival in Argaes

---
 db/constants.conf        |  2 ++
 db/re/item_db.conf       | 24 ++++++++++++++++++++++++
 npc/008-1-1/_import.txt  |  1 +
 npc/008-1-1/morcant.txt  | 20 ++++++++++++++++++++
 npc/008-2-32/_import.txt |  1 +
 npc/008-2-32/thamas.txt  | 20 ++++++++++++++++++++
 6 files changed, 68 insertions(+)
 create mode 100644 npc/008-1-1/morcant.txt
 create mode 100644 npc/008-2-32/thamas.txt

diff --git a/db/constants.conf b/db/constants.conf
index 1dcca8cb..51b1c215 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4040,6 +4040,8 @@ constants_db: {
     NPC_MIKHAIL:            185
     NPC_TROUPE_LEADER:      186
     NPC_SIMON:              187
+    NPC_MORCANT:            188
+    NPC_THAMAS:             189
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 59a870b1..1b89a6d8 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1170,6 +1170,20 @@ item_db: (
         dispbottom l("Yuck! I won't drink this!");
     ">
 },
+{
+    Id: 614
+    AegisName: "SailorStew"
+    Name: "Sailor's Stew"
+    Type: "IT_USABLE"
+    Buy: 50000
+    Sell: 10
+    Weight: 650
+    Delay: 1000
+    Script: <"
+        sc_start SC_ATTHASTE_POTION1, 80000, 300; // These are totally placeholders. We want STR + 10 and VIT + 5 and max. HP + 2000 for three minutes.
+        sc_start SC_INCHITRATE, 80000, 300;
+    ">
+},
 
 // Generic
 {
@@ -1781,6 +1795,16 @@ item_db: (
     Weight: 10
     Slots: 0
 },
+{
+    Id: 806
+    AegisName: "EmptyBowl"
+    Name: "Empty Bowl"
+    Type: "IT_ETC"
+    Buy: 50000
+    Sell: 5000
+    Weight: 150
+    Slots: 0
+},
 // Necklaces
 {
     Id: 1000
diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt
index be748cf8..119610cc 100644
--- a/npc/008-1-1/_import.txt
+++ b/npc/008-1-1/_import.txt
@@ -4,3 +4,4 @@
 "npc/008-1-1/_warps.txt",
 "npc/008-1-1/galimatia.txt",
 "npc/008-1-1/koga.txt",
+"npc/008-1-1/morcant.txt",
diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt
new file mode 100644
index 00000000..0167353f
--- /dev/null
+++ b/npc/008-1-1/morcant.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Galmatia the beekeeper.
+// THIS IS A PLACEHOLDER!
+
+008-1-1,58,57,0	script	Morcant	NPC_MORCANT,{
+    speech
+        l("Hello."),
+        l("My name is Morcant. I am a Captain, a bit bored since this harbor is not frequented much."),
+        l("I would like to offer you food and tell you stories, but.. have you ever heard of WildX? I won't need to say more, do I?");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-32/_import.txt b/npc/008-2-32/_import.txt
index c9137dc7..ba8aa591 100644
--- a/npc/008-2-32/_import.txt
+++ b/npc/008-2-32/_import.txt
@@ -1,3 +1,4 @@
 // Map 008-2-32: Merchant House
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-2-32/_warps.txt",
+"npc/008-2-32/thamas.txt",
diff --git a/npc/008-2-32/thamas.txt b/npc/008-2-32/thamas.txt
new file mode 100644
index 00000000..88b48968
--- /dev/null
+++ b/npc/008-2-32/thamas.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Thamas the soldier.
+// THIS IS A PLACEHOLDER!
+
+008-2-32,36,31,0	script	Thamas	NPC_THAMAS,{
+    speech
+        l("Hi there."),
+        l("I am a legion soldier who never talks much, until Jesusalva or WildX puts words in my mouth."),
+        lg("Until then, let me be quiet. Talk to you later.");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
-- 
cgit v1.2.3-70-g09d2