3 files changed, 89 insertions, 8 deletions

diff --git a/world/map/npc/013-2/_import.txt b/world/map/npc/013-2/_import.txt
index 3e3d0325..c6460e0e 100644
--- a/world/map/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
@@ -4,5 +4,6 @@ map: 013-2.gat
 npc: npc/013-2/_mobs.txt
 npc: npc/013-2/_warps.txt
 npc: npc/013-2/apprentice.txt
+npc: npc/013-2/mapflags.txt
 npc: npc/013-2/notes.txt
 npc: npc/013-2/wizard.txt
diff --git a/world/map/npc/013-2/mapflags.txt b/world/map/npc/013-2/mapflags.txt
new file mode 100644
index 00000000..e032acab
--- /dev/null
+++ b/world/map/npc/013-2/mapflags.txt
@@ -0,0 +1 @@
+013-2.gat|mapflag|resave|013-1,126,99
diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index f0aee204..2f569334 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -34,7 +34,7 @@
     close;
 }
 
-// Warp to north-eastern woods
+// Warp to wood clearings
 013-2.gat,25,23,0|script|Spell#wiz1|400,
 {
     mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\"";
@@ -43,28 +43,67 @@
     next;
     mes "The spell fulfills its inevitable purpose...";
     next;
+    set @dest, rand(BaseLevel);
+    if (@dest < 10)
+        goto L_PlaceOne;
+    if ((@dest >= 10) && (@dest <= 50))
+        goto L_PlaceTwo;
+    goto L_PlaceThree;
+
+L_PlaceOne:
     warp "013-1.gat",128,28;
+    goto L_Close;
+
+L_PlaceTwo:
+    warp "016-1.gat",62,89;
+    goto L_Close;
+
+L_PlaceThree:
+    warp "014-1.gat",33,35;
+    goto L_Close;
+
+L_Close:
+    set @dest, 0;
     close;
 }
 
-// Warp to Indian in south-eastern desert
+// Warp to desert
 013-2.gat,27,24,0|script|Spell#wiz2|400,
 {
-    mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\"";
+    mes "You read: \"You must not fear, for it is the mind-killer. That and sharp pointy things.\"";
     next;
     mes "You feel the floor disappear below your feet...";
     next;
+    set @dest, rand(BaseLevel);
+    if (@dest < 10)
+        goto L_PlaceOne;
+    if ((@dest >= 10) && (@dest <= 50))
+        goto L_PlaceTwo;
+    goto L_PlaceThree;
+
+L_PlaceOne:
+    warp "006-1.gat",125,111;
+    goto L_Close;
+
+L_PlaceTwo:
+    warp "032-1.gat",77,22;
+    goto L_Close;
+
+L_PlaceThree:
     warp "006-1.gat",33,93;
     if (QUEST_MIRIAM_start != 0) goto L_cheat;
-    close;
+    goto L_Close;
 
 // If you try to use the notes to warp to pachua the quest will fail.
-
 L_cheat:
     set QUEST_MIRIAM_cheat, 1;
     set QUEST_MIRIAM_run, gettimetick(2) - QUEST_MIRIAM_start;
     set QUEST_MIRIAM_start, 0;
     message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
+    goto L_Close;
+
+L_Close:
+    set @dest, 0;
     close;
 }
 
@@ -99,25 +138,65 @@ L_Close:
     close;
 }
 
-// Warp to Dimond
+// Warp to Inns
 013-2.gat,27,27,0|script|Spell#wiz4|400,
 {
     mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\"";
     next;
     mes "The world around you slowly dissolves...";
     next;
+    set @dest, rand(BaseLevel);
+    if (@dest < 10)
+        goto L_PlaceOne;
+    if ((@dest >= 10) && (@dest <= 50))
+        goto L_PlaceTwo;
+    goto L_PlaceThree;
+
+L_PlaceOne:
+    warp "030-2.gat",88,24;
+    goto L_Close;
+
+L_PlaceTwo:
+    warp "001-2.gat",30,29;
+    goto L_Close;
+
+L_PlaceThree:
     warp "010-2.gat",34,42;
+    goto L_Close;
+
+L_Close:
+    set @dest, 0;
     close;
 }
 
-// Warp to mines level 2
+// Warp to mines 
 013-2.gat,26,28,0|script|Spell#wiz5|400,
 {
     mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\"";
     next;
     mes "For a moment everything turns black...";
     next;
-    warp "013-3.gat",127,70;
+    set @dest, rand(BaseLevel);
+    if (@dest < 10)
+        goto L_PlaceOne;
+    if ((@dest >= 10) && (@dest <= 50))
+        goto L_PlaceTwo;
+    goto L_PlaceThree;
+
+L_PlaceOne:
+    warp "012-4.gat",431,36;
+    goto L_Close;
+
+L_PlaceTwo:
+    warp "013-3.gat",134,54;
+    goto L_Close;
+
+L_PlaceThree:
+    warp "013-3.gat",178,67;
+    goto L_Close;
+
+L_Close:
+    set @dest, 0;
     close;
 }