Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata

Conflicts:
	db/const.txt
	npc/022-1_Tulimshar/_import.txt
	npc/_import.txt

2 files changed, 16 insertions, 7 deletions

diff --git a/npc/022-1/_import.txt b/npc/022-1/_import.txt
index f0e9cc73..8f72cbc0 100644
--- a/npc/022-1/_import.txt
+++ b/npc/022-1/_import.txt
@@ -1,9 +1,9 @@
-// Map 022-1: Tulimshar
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 022-1.gat
-npc: npc/022-1/_mobs.txt
-npc: npc/022-1/_warps.txt
-npc: npc/022-1/dock.txt
-npc: npc/022-1/elanore.txt
-npc: npc/022-1/ferry_master.txt
-npc: npc/022-1/mapflags.txt
+npc: npc/022-1_Tulimshar/_mobs.txt
+npc: npc/022-1_Tulimshar/_warps.txt
+npc: npc/022-1_Tulimshar/dock.txt
+npc: npc/022-1_Tulimshar/elanore.txt
+npc: npc/022-1_Tulimshar/ferry_master.txt
+npc: npc/022-1_Tulimshar/mapflags.txt
+npc: npc/022-1_Tulimshar/tutorial.txt
diff --git a/npc/022-1/tutorial.txt b/npc/022-1/tutorial.txt
new file mode 100644
index 00000000..a0166921
--- /dev/null
+++ b/npc/022-1/tutorial.txt
@@ -0,0 +1,9 @@
+// This file is part of the Tutorial
+// Author: Jenalya
+// if you enter the tutorial area, it is set to be already done
+
+022-1.gat,19,37,0	script	#tutorial	127,0,2{
+	set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
+	warp "042-1.gat", 114, 76;
+	end;
+}