Add Simon, Wyaras Apprentice, and his Potion shop along with updating (not fixing, really) his potions

4 files changed, 92 insertions, 16 deletions

diff --git a/db/constants.conf b/db/constants.conf
index c9fcf425..5f6bd8ab 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4086,6 +4086,7 @@ constants_db: {
     NPC_SABINE:             184
     NPC_MIKHAIL:            185
     NPC_TROUPE_LEADER:      186
+    NPC_SIMON:              187
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0dd35a51..753dc25a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1294,8 +1294,8 @@ item_db: (
     AegisName: "SmallHealing"
     Name: "Small Healing Potion"
     Type: "IT_HEALING"
-    Buy: 2500
-    Sell: 300
+    Buy: 500
+    Sell: 45
     Weight: 32
     Atk: 0
     Matk: 0
@@ -1311,8 +1311,8 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 200;
-        @max = 300;
+        @min = 300;
+        @max = 500;
         @delay = 3;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1323,8 +1323,8 @@ item_db: (
     AegisName: "MediumHealing"
     Name: "Medium Healing Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 650
+    Buy: 850
+    Sell: 75
     Weight: 64
     Atk: 0
     Matk: 0
@@ -1340,8 +1340,8 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 400;
-        @max = 600;
+        @min = 500;
+        @max = 800;
         @delay = 4;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1352,8 +1352,8 @@ item_db: (
     AegisName: "LargeHealing"
     Name: "Large Healing Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1250
+    Buy: 2480
+    Sell: 350
     Weight: 128
     Atk: 0
     Matk: 0
@@ -1381,8 +1381,8 @@ item_db: (
     AegisName: "SmallMana"
     Name: "Small Mana Potion"
     Type: "IT_HEALING"
-    Buy: 2000
-    Sell: 250
+    Buy: 750
+    Sell: 65
     Weight: 32
     Atk: 0
     Matk: 0
@@ -1406,8 +1406,8 @@ item_db: (
     AegisName: "MediumMana"
     Name: "Medium Mana Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 600
+    Buy: 1650
+    Sell: 205
     Weight: 64
     Atk: 0
     Matk: 0
@@ -1431,8 +1431,8 @@ item_db: (
     AegisName: "LargeMana"
     Name: "Large Mana Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1500
+    Buy: 3240
+    Sell: 340
     Weight: 128
     Atk: 0
     Matk: 0
diff --git a/npc/008-2-7/shop.txt b/npc/008-2-7/shop.txt
new file mode 100644
index 00000000..30989eb3
--- /dev/null
+++ b/npc/008-2-7/shop.txt
@@ -0,0 +1,36 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Micksha
+//    Reid
+//    toams
+// Description:
+//    Simons Potion Shop.
+
+008-2-7,30,26,0	trader	#Invisible008-2-7	NPC_HIDDEN,{
+
+OnInit:
+    tradertype(NST_MARKET);
+
+    sellitem SmallHealing, -1, 10;
+    sellitem MediumHealing, -1, 5;
+    sellitem SmallMana, -1, 10;
+    sellitem MediumMana, -1, 5;
+    sellitem ConcPotion, -1, 3;
+    sellitem IronPotion, -1, 3;
+
+    .sex = G_OTHER;
+    .distance = 2;
+    end;
+
+OnClock0000:
+OnClock0800:
+OnClock1600:
+    restoreshopitem SmallHealing, 10;
+    restoreshopitem MediumHealing, 5;
+    restoreshopitem SmallMana, 10;
+    restoreshopitem MediumMana, 5;
+    restoreshopitem ConcPotion, 3;
+    restoreshopitem IronPotion, 3;
+    end;
+}
diff --git a/npc/008-2-7/simon.txt b/npc/008-2-7/simon.txt
new file mode 100644
index 00000000..1b4ae071
--- /dev/null
+++ b/npc/008-2-7/simon.txt
@@ -0,0 +1,39 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Simon, Wyaras Apprentice.
+// THIS IS A PLACEHOLDER!
+
+008-2-7,30,26,0	script	Simon	NPC_SIMON,{
+    speech
+        l("Hi, I am Simon."),
+        l("I am Wyaras apprentice, helping her with selling her potions."),
+        l("I would prefer becoming a real Sorcerer one time. *sighs*");
+
+    switch (select(l("Potions? That sounds useful. What do you have?"),
+                   l("Thats your problem, really."),
+                   l("Becoming a Sorcerer? I want that too!")))
+    {
+    case 1:
+        closeclientdialog;
+        shop "#Invisible008-2-7";
+        close;
+    case 2:
+        speech S_FIRST_BLANK_LINE,
+        l("Leave me alone.");
+        close;
+    case 3:
+        speech S_FIRST_BLANK_LINE,
+        l("It needs so much training, but Wyara only leaves me here, standing and selling something instead of teaching me.");
+        close;
+    }
+
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}