Add several changes from 2018 which had been excluded by accident =/

3 files changed, 23 insertions, 21 deletions

diff --git a/npc/006-1/miriam.txt b/npc/006-1/miriam.txt
index 58242451..fdbbdf1c 100644
--- a/npc/006-1/miriam.txt
+++ b/npc/006-1/miriam.txt
@@ -11,8 +11,8 @@
     if (QUEST_MIRIAM == 2) goto L_Ask2;
     if (QUEST_MIRIAM == 3) goto L_Teach;
     if (QUEST_MIRIAM == 4) goto L_testoffer;
-    if (QUEST_MIRIAM_run != 0) goto L_checktime;
-    if (QUEST_MIRIAM_start != 0) goto L_wasting;
+    if (QUEST_MIRIAM_run < 0) goto L_checktime;
+    if (QUEST_MIRIAM_run > 0) goto L_wasting;
     if (QUEST_MIRIAM == 5) goto L_testoffer;
     goto L_Intro;
 
@@ -221,8 +221,7 @@ L_LetsDoThis:
     warp "032-1",55,21;
     npctalk strnpcinfo(0), "Run " +strcharinfo(0)+ ", run!";
     QUEST_MIRIAM = 5;
-    QUEST_MIRIAM_start = gettimetick(2);
-    QUEST_MIRIAM_cheat = 0;
+    QUEST_MIRIAM_run = gettimetick(2);
     end;
 
 L_Naked:
@@ -260,8 +259,8 @@ L_close:
 L_warning:
     mes "[Miriam]";
     mes "\"I know very well what you tried to do. I will not teach you the speed skill if you keep trying this kind of trick!\"";
-    next;
-    goto L_testoffer;
+    QUEST_MIRIAM_run = 0;
+    close;
 
 L_stretch:
     mes "[Miriam]";
@@ -274,22 +273,31 @@ L_wasting:
     mes "\"Don't waste your time talking to me! RUN and talk to Pachua!\"";
     close;
 
+L_expired:
+    mes "[Miriam]";
+    mes "\"You could not reach Pachua in time. Try again some other time.\"";
+    QUEST_MIRIAM_run = 0;
+    close;
+
 L_checktime:
-    if (QUEST_MIRIAM_cheat != 0)
+    @miriam_run_secs = 0 - (QUEST_MIRIAM_run);
+    if (@miriam_run_secs == 1)
         goto L_warning;
-    if (QUEST_MIRIAM_run <= 210)
+    if (@miriam_run_secs <= 10)
+        goto L_expired;
+    if (@miriam_run_secs <= 210)
         goto L_Goodjob;
     goto L_tryagain;
 
 L_tryagain:
     mes "[Miriam]";
-    mes "\"You needed " + QUEST_MIRIAM_run + " seconds to reach Pachua. It is not enough.\"";
+    mes "\"You needed " + @miriam_run_secs + " seconds to reach Pachua. It is not enough.\"";
     QUEST_MIRIAM_run = 0;
     close;
 
 L_Goodjob:
     mes "[Miriam]";
-    mes "\"Great job! You needed " + QUEST_MIRIAM_run + " seconds to reach Pachua. Very impressive for a person like you.\"";
+    mes "\"Great job! You needed " + @miriam_run_secs + " seconds to reach Pachua. Very impressive for a person like you.\"";
     next;
     mes "\"Now I need you to relax. Do NOT move. This teaching process can be painful sometimes.\"";
     next;
@@ -299,20 +307,17 @@ L_Goodjob:
     close2;
     warp "032-1",55,22;
     // free all used player variables. This can be done, since there is a conditional on the speedskill at the beginning.
-    QUEST_MIRIAM_start = 0;
     QUEST_MIRIAM_run = 0;
     QUEST_MIRIAM = 0;
     message strcharinfo(0), "[You gain 2500 experience points]";
     message strcharinfo(0), "[You learned Speed Skill]";
     updateskill SKILL_SPEED, 1;
     getexp 2500, 0;
-    set QUEST_MIRIAM_cheat, 0; // reset just in case it is still set.
     close;
 
 L_fast:
     mes "[Miriam]";
     mes "\"I hope you make a good use of your new skill... Take care!\"";
-    set QUEST_MIRIAM_cheat, 0; // reset just in case it is still set.
     close;
 
 }
diff --git a/npc/006-1/pachua.txt b/npc/006-1/pachua.txt
index 4d3c2be1..f62d8c04 100644
--- a/npc/006-1/pachua.txt
+++ b/npc/006-1/pachua.txt
@@ -8,8 +8,8 @@
     @LEATHER_PATCH_PRICE = 300;
     @wants_leather_patch = QUEST_Forestbow_state & NIBBLE_4_MASK;
 
-    if (QUEST_MIRIAM_cheat != 0) goto L_Warp2_cheat;
-    if (QUEST_MIRIAM_start != 0) goto L_smoke;
+    if (QUEST_MIRIAM_run == -1) goto L_Warp2_cheat;
+    if (QUEST_MIRIAM_run) goto L_smoke;
     goto L_Begin;
 
 L_Begin:
@@ -228,13 +228,10 @@ L_TooMany:
 
 L_smoke:
     message strcharinfo(0), "Pachua quickly inhales from his pipe and releases a ring of smoke towards the sky!";
-    QUEST_MIRIAM_run = gettimetick(2) - QUEST_MIRIAM_start;
-    QUEST_MIRIAM_start = 0;
+    callfunc "MiriamGoal";
     end;
 
 L_Warp2_cheat:
-    if (@warp_cheat == 1) goto L_Begin;
     message strcharinfo(0), "Pachua releases a ring of smoke towards the sky! But, by the look on his face, you can tell he is suspicious about your methods...";
-    @warp_cheat = 1;
     end;
 }
diff --git a/npc/006-1/spirit.txt b/npc/006-1/spirit.txt
index 4bbcb14a..896033fc 100644
--- a/npc/006-1/spirit.txt
+++ b/npc/006-1/spirit.txt
@@ -281,12 +281,12 @@ S_Update_Var:
     return;
 }
 
-006-1,63,79,0	script	#EarthImp0#_M	NPC400,{
+006-1,67,68,0	script	#EarthImp0#_M	NPC400,{
     callfunc "EarthImpTouch";
     close;
 }
 
-006-1,64,79,0	script	#EarthImp1#_M	NPC400,{
+006-1,68,68,0	script	#EarthImp1#_M	NPC400,{
     callfunc "EarthImpTouch";
     close;
 }