ZONE the map areas, so there's no penalty.

....and a few measures against a certain GM we all love. :inGame__4:

5 files changed, 15 insertions, 1 deletions

diff --git a/npc/001-6/_import.txt b/npc/001-6/_import.txt
index 5520b7f3a..9adfa790d 100644
--- a/npc/001-6/_import.txt
+++ b/npc/001-6/_import.txt
@@ -1,4 +1,5 @@
 // Map 001-6: Cave Of Trials
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/001-6/_mobs.txt",
+"npc/001-6/mapflags.txt",
 "npc/001-6/warp.txt",
diff --git a/npc/001-6/mapflags.txt b/npc/001-6/mapflags.txt
new file mode 100644
index 000000000..c6904baa8
--- /dev/null
+++ b/npc/001-6/mapflags.txt
@@ -0,0 +1 @@
+001-6	mapflag	zone	MMO
diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
index 0e293d096..ab3bfba19 100644
--- a/npc/003-1-1/yetiking.txt
+++ b/npc/003-1-1/yetiking.txt
@@ -11,6 +11,8 @@
 
 003-1-1,94,21,0	script	#YetiKingSummon	NPC_SUMMONING_CIRC,{
     .@q=getq(HurnscaldQuest_Celestia);
+    if (.@q > 1 && .@q < 99)
+        setq HurnscaldQuest_Celestia, 1;
     if (.@q == 1 && !.inUse) goto L_Summon;
     end;
 
@@ -47,6 +49,10 @@ OnTimer5000:
 // You can only talk to him with SummonTalk. Only one player will summon.
 OnSummonTalk:
     .@q=getq(HurnscaldQuest_Celestia);
+    // If you had to return, erase quest progress
+    if (.@q > 1 && .@q < 99)
+        setq HurnscaldQuest_Celestia, 1;
+
     if (.@q != 1)
         end;
     mesn "Dah Yeti King!!";
@@ -92,7 +98,11 @@ OnSummonTalk:
     close;
 
 OnWarper:
-    mes col("Warp to the Cave Of Trials? You still get EXP penalty if you die, beware!",9);
+    // If you had to return, erase quest progress
+    if (.@q > 2 && .@q < 99)
+        setq HurnscaldQuest_Celestia, 2;
+
+    mes col("Warp to the Cave Of Trials? There is no EXP penalty, but if you die, you need to start everything again!",9);
     if (askyesno() == ASK_YES) {
         warp "001-6", 27, 180;
     }
diff --git a/npc/soren/_import.txt b/npc/soren/_import.txt
index 0a24001fb..583102538 100644
--- a/npc/soren/_import.txt
+++ b/npc/soren/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/soren/_mobs.txt",
 "npc/soren/_warps.txt",
+"npc/soren/mapflags.txt",
diff --git a/npc/soren/mapflags.txt b/npc/soren/mapflags.txt
new file mode 100644
index 000000000..f38cb43db
--- /dev/null
+++ b/npc/soren/mapflags.txt
@@ -0,0 +1 @@
+soren	mapflag	zone	MMO