Refactor [Pickaxe] Quest, register a new pre-requisite,

allowing an alt path is planned (with Caelum)

2 files changed, 22 insertions, 3 deletions

diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt
index fb63a4c14..af1f9df3d 100644
--- a/npc/007-1/dracoula.txt
+++ b/npc/007-1/dracoula.txt
@@ -124,11 +124,17 @@ L_Mana:
 L_Miner:
     mes "";
     mesn;
-    mesq l("You should ask Tycoon.");
+    mesq l("You should ask %s.", b(l("Tycoon")));
     next;
     mesn;
     mesq l("He is the Miners leader.");
-    compareandsetq MineQuest_Pickaxe, 0, 1;
+    if (getq(MineQuest_Dracoula)) {
+        compareandsetq MineQuest_Pickaxe, 0, 1;
+    } else {
+        next;
+        mesn;
+        mesq l("I can vouch for you, but only if you help me first!");
+    }
     next;
     goto L_Menu;
 
diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt
index 48f23c348..38b5ae20c 100644
--- a/npc/007-1/tycoon.txt
+++ b/npc/007-1/tycoon.txt
@@ -60,7 +60,7 @@ L_Menu:
     mesn strcharinfo(0);
     menu
         rif(getq(MineQuest_Tycoon) < 15, l("I am a brave adventurer! How can I help you?")),           L_Purge,
-        rif(getq(MineQuest_Pickaxe) == 1, l("Can I become a miner?")), L_Miner,
+        rif(getq(MineQuest_Pickaxe) < 2, l("Can I become a miner?")), L_Miner,
         l("What does miners do in cave?"),             L_CaveMiner,
         l("Can you give me a tip?"),                   L_Tip,
         l("Are you a terranite?"),                     L_Terranite,
@@ -165,6 +165,19 @@ L_NoLevel:
 
 
 L_Miner:
+    if (!getq(MineQuest_Pickaxe)) {
+        mesn;
+        mesq l("Sorry pal, but only if another miner vouches for you.");
+        next;
+        if (getq(MineQuest_Tycoon) >= 9) {
+            mesn;
+            mesq l("I'm not neutral, so my vouch have no effect.");
+            next;
+        }
+        goto L_Menu;
+    }
+
+    // Configure Price
     .@price=800;
     if (getq(MineQuest_Tycoon) >= 9)
         .@price-=200;