Add Henry's Quest

9 files changed, 110 insertions, 8 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 61c0f6bfe..3353f0bfb 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1848,6 +1848,7 @@ constants_db: {
 	NPC_MANATREE:  			273
 	NPC_TRAP_B:             274
 	NPC_TRAP_ONLINE_B:      275
+	NPC_HENRY:              276
 
 	// TMW-BR Non Animated NPCs
 	NPC_SHOPPAKEP:          301
@@ -1966,6 +1967,8 @@ constants_db: {
 	NPC_FEMALE:             802
 	NPC_ELF:                803
 	NPC_ELF_F:              804
+	NPC_SAVIOR:             805
+	NPC_SAVIOR_F:           806
 	NPC_ORC:                820
 	NPC_ORC_F:              821
 	NPC_RAIJIN:             822
diff --git a/db/quest_db.conf b/db/quest_db.conf
index b3d5a64a1..6f76748b9 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -383,6 +383,10 @@ quest_db: (
 	Id: 120
 	Name: "NivalisQuest_Mede"
 },
+{
+	Id: 121
+	Name: "NivalisQuest_Henry"
+},
 
 // ID 131 to 150: Frostia Quests
 {
diff --git a/npc/020-4/_import.txt b/npc/020-4/_import.txt
index 15c48c3bd..aef7c4458 100644
--- a/npc/020-4/_import.txt
+++ b/npc/020-4/_import.txt
@@ -3,3 +3,4 @@
 "npc/020-4/_warps.txt",
 "npc/020-4/baktar.txt",
 "npc/020-4/gambler.txt",
+"npc/020-4/henry.txt",
diff --git a/npc/020-4/henry.txt b/npc/020-4/henry.txt
new file mode 100644
index 000000000..8fee40d4a
--- /dev/null
+++ b/npc/020-4/henry.txt
@@ -0,0 +1,83 @@
+// TMW2 Script.
+// Author:
+//    Jesusalva
+// Description:
+//    Questmaker Handbook 14.0
+
+020-4,24,38,0	script	Henry	NPC_HENRY,{
+    function newQuest;
+    function checkQuest;
+    if (BaseLevel < 70)
+        end;
+    .@q=getq(NivalisQuest_Henry);
+    switch (.@q) {
+    case 0:
+        newQuest(); break;
+    case 1:
+        checkQuest(); break;
+    default:
+        npctalk3 l("*whistles*");
+    }
+    close;
+
+function newQuest {
+    mesn;
+    mesq l("Hey, psst! Come over here!");
+    next;
+    mesn;
+    mesq l("I need a favor! For certain... reasons... I ran out of poison! And For certain... reasons... I am in dire need of them!");
+    next;
+    mesn;
+    mesq l("So if you bring me %d %s, I'll pay you awesomely! Whaddaya say?!", 24, getitemlink(NymphPoison));
+    next;
+    select
+        l("Sure, I'll be right back."),
+        l("Erm, for certain... reasons... I cannot help you right now!");
+    mes "";
+    if (@menu == 2) {
+        closeclientdialog;
+        return;
+    }
+    mesn;
+    mesq l("Thanks, I knew I could count on you!");
+    setq NivalisQuest_Henry, 1;
+    return;
+}
+
+function checkQuest {
+    mesn;
+    mesq l("Did you brought me the %d/%d %s?", countitem(NymphPoison), 24, getitemlink(NymphPoison));
+    select
+        l("Yes, here!"),
+        l("Sorry, I'll be back.");
+    mes "";
+    if (@menu == 2) {
+        closeclientdialog;
+        return;
+    }
+    if (countitem(NymphPoison) < 24) {
+        mesn;
+        mesq l("Ooh, many thanks! Lemme just grab something for you...");
+        next;
+        mesc l("%s stabs you to the chest!", l("Henry")), 1;
+        mesn;
+        mesq l("Foolish kid, thinking they can fool me, Henry S., from all the people...!");
+        die();
+        return;
+    }
+    delitem NymphPoison, 24;
+    Mobpt+=10000;
+    getexp 100000, 0;
+    setq NivalisQuest_Henry, 2;
+    mesn;
+    mesq l("Hehehe... Thanks. Here, take these %s Monster Points... This exchange has never happened.", fnum(10000));
+    return;
+}
+
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/023-4/_import.txt b/npc/023-4/_import.txt
index 5b4de2d7b..ebd1020e0 100644
--- a/npc/023-4/_import.txt
+++ b/npc/023-4/_import.txt
@@ -1,5 +1,6 @@
 // Map 023-4: Ice Caves
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/023-4/023-4_blackbox.txt",
+"npc/023-4/_mobs.txt",
 "npc/023-4/_warps.txt",
 "npc/023-4/traps.txt",
diff --git a/npc/023-4/_mobs.txt b/npc/023-4/_mobs.txt
new file mode 100644
index 000000000..df036b060
--- /dev/null
+++ b/npc/023-4/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 023-4: Ice Caves mobs
+023-4,44,44,25,24	monster	Ice Maggot	1012,27,30000,30000
+023-4,61,62,6,5	monster	Copper Slime Mother	1238,1,30000,30000
+023-4,62,28,6,6	monster	White Slime Mother	1242,1,30000,30000
+023-4,58,44,6,26	monster	JackO	1120,2,30000,15000
diff --git a/npc/031-0/_mobs.txt b/npc/031-0/_mobs.txt
index 47d8432fb..b62a9272d 100644
--- a/npc/031-0/_mobs.txt
+++ b/npc/031-0/_mobs.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 031-0: Aethyr mobs
-031-0,95,82,91,101	monster	Ice Maggot	1012,24,30000,30000
-031-0,118,59,36,33	monster	Moggun	1070,6,30000,30000
-031-0,58,53,44,35	monster	Water Fairy	1184,4,30000,30000
-031-0,104,120,30,30	monster	Santa Slime	1096,4,30000,30000
-031-0,46,34,5,5	monster	Wolvern	1037,1,30000,30000
+031-0,95,82,91,101	monster	Ice Maggot	1012,32,30000,30000
+031-0,118,59,36,33	monster	Moggun	1070,8,30000,30000
+031-0,58,53,44,35	monster	Water Fairy	1184,8,30000,30000
+031-0,104,120,30,30	monster	Santa Slime	1096,6,30000,30000
+031-0,46,34,5,5	monster	Wolvern	1037,2,10000,10000
 031-0,91,112,10,7	monster	Archant	1026,2,30000,30000
diff --git a/npc/031-1/_mobs.txt b/npc/031-1/_mobs.txt
index 22567edca..61c846ddb 100644
--- a/npc/031-1/_mobs.txt
+++ b/npc/031-1/_mobs.txt
@@ -2,7 +2,7 @@
 // Map 031-1: Aethyr mobs
 031-1,56,62,52,44	monster	Pollet	1219,24,90000,30000
 031-1,68,82,43,23	monster	Iced Fluffy	1041,13,60000,30000
-031-1,89,40,15,16	monster	White Slime	1094,2,90000,30000
-031-1,24,59,10,44	monster	Wind Fairy	1185,1,75000,30000
+031-1,89,40,15,16	monster	White Slime	1094,6,90000,30000
+031-1,24,59,10,44	monster	Wind Fairy	1185,4,75000,30000
 031-1,56,48,29,23	monster	Santa Slime	1096,7,30000,30000
 031-1,24,23,3,4	monster	Whirly Bird	1232,1,300000,300000
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 28d0a2d9c..8fbde066d 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -415,8 +415,12 @@ function	script	reputation	{
         if (getq(NivalisQuest_BlueSagePagefinder) >= 1)
             .@nr=.@nr+1;
 
+        // Nivalis Henry Quest (+1 rep)
+        if (getq(NivalisQuest_Henry) >= 2)
+            .@nr=.@nr+1;
+
         // NIVALIS Magical Forumula
-        .@nr=.@nr*100/6;
+        .@nr=.@nr*100/7;