6 files changed, 27 insertions, 10 deletions
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index d9e43067..492ddf7d 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -3,5 +3,7 @@
 map: 006-1.gat
 npc: npc/006-1/_mobs.txt
 npc: npc/006-1/_warps.txt
+npc: npc/006-1/mapflags.txt
 npc: npc/006-1/mika.txt
 npc: npc/006-1/pachua.txt
+npc: npc/006-1/traveler.txt
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index add0e4b2..2be20ab5 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -34,3 +34,9 @@
 006-1.gat,28,21|warp|To Snake Desert|-1,-1,005-1.gat,172,101
 006-1.gat,29,20|warp|To Snake Desert|-1,-1,005-1.gat,172,101
 006-1.gat,30,19|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,33,85|warp|To Pachua's Village|-1,-1,006-2.gat,58,43
+006-1.gat,23,85|warp|To Pachua's Village|-1,-1,006-2.gat,48,43
+006-1.gat,23,100|warp|To Pachua's Village|-1,-1,006-2.gat,67,64
+006-1.gat,21,108|warp|To Pachua's Village|-1,-1,006-2.gat,65,72
+006-1.gat,37,26|warp|To Desert Mountains|-1,-1,006-1.gat,37,23
+006-1.gat,37,24|warp|To Desert Mountains|-1,-1,006-1.gat,37,27
diff --git a/world/map/npc/006-1/mapflags.txt b/world/map/npc/006-1/mapflags.txt
new file mode 100644
index 00000000..85c94b9f
--- /dev/null
+++ b/world/map/npc/006-1/mapflags.txt
@@ -0,0 +1 @@
+006-1.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt
index 2b5c7401..d7ba11bc 100644
--- a/world/map/npc/006-1/mika.txt
+++ b/world/map/npc/006-1/mika.txt
@@ -1,4 +1,4 @@
-006-1.gat,39,27,0|script|Mika|114,
+006-1.gat,39,22,0|script|Mika|114,
 {
     mes "[Mika]";
     mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index 9ed34c06..43681d84 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -1,14 +1,11 @@
-006-1.gat,23,100,0|script|Pachua|143,
+006-1.gat,24,113,0|script|Pachua|143,
 {
-    set @LEATHER_PATCH_PRICE, 300;
-// @wants_leather_patch is used as boolean
-    set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
-
-    if ((gettime(5) >= $@xmas2011_start_day) && (gettime(5) < $@xmas2011_reward_start_day) && (gettime(6) == 12) && (gettime(7) == $@xmas2011_year))
-        set @wants_leather_patch, @wants_leather_patch | (xmas11 & $@xmas11_talkedToChief);
+    setarray $@npc_loc, 24, 113, 4;
+    callfunc "PCtoNPCRange";
+    if (@npc_check)
+        goto L_Close;
 
-    set $@xmas2011_start_day, 10;
-    set $@xmas2011_reward_start_day, 25;
+    set @LEATHER_PATCH_PRICE, 300;
 
     if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
     if (QUEST_MIRIAM_start != 0) goto L_smoke;
diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt
new file mode 100644
index 00000000..f19885c3
--- /dev/null
+++ b/world/map/npc/006-1/traveler.txt
@@ -0,0 +1,11 @@
+// This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+// Author: Wombat, wushin
+// cost depending on level and adapted to new scripting guidelines: Jenalya
+
+006-1.gat,25,95,0|script|Rhutan the Traveler|103,
+{
+    set @NpcName$, "Rhutan";
+    set @NpcTravelBit, $@pachua_bit;
+    callfunc "Traveler";
+    end;
+}