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

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

1 files changed, 38 insertions, 0 deletions

diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt
new file mode 100644
index 00000000..6ca6ff6a
--- /dev/null
+++ b/npc/042-1/valon.txt
@@ -0,0 +1,38 @@
+// This file is part of the Tutorial
+// Author: Jenalya
+
+042-1.gat,17,82,0	script	Valon	156,1,0{
+
+	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
+
+	mes "[Valon]";
+	mes "\"Hello!";
+	mes "You're looking for adventures, right?\"";
+	next;
+	mes "\"But you shouldn't underestimate this desert, it is dangerous.\"";
+	next;
+	mes "\"It's crawling with scorpions, and the heat has overcome men tougher than you are.\"";
+	next;
+	mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\"";
+	close;
+
+L_Tut_Done:
+	mes "[Valon]";
+	mes "\"Hello!";
+	mes "You're an adventurer, right?\"";
+	next;
+	mes "\"Be careful in the desert.\"";
+	close;
+
+OnTouch:
+	if (FLAGS & FLAG_TUTORIAL_DONE)
+		goto L_Tut;
+	warp "042-1.gat", 17, 81;
+	mes "[Valon]";
+	mes "\"The desert is merciless.";
+	mes "I can't let you leave like this.\"";
+	close;
+L_Tut:
+	warp "041-1.gat", 33, 8;
+	end;
+}