putting new npcs in seperated files

some scripting and fixes

6 files changed, 53 insertions, 22 deletions

diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt
index cfc82780..d3e2c8b2 100644
--- a/npc/042-1/_import.txt
+++ b/npc/042-1/_import.txt
@@ -2,4 +2,7 @@
 map: 042-1.gat
 npc: npc/042-1/_mobs.txt
 npc: npc/042-1/_warps.txt
-npc: npc/042-1/testnpcs.txt
+npc: npc/042-1/hasan.txt
+npc: npc/042-1/kaan.txt
+npc: npc/042-1/malik.txt
+npc: npc/042-1/valon.txt
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
new file mode 100644
index 00000000..c689213a
--- /dev/null
+++ b/npc/042-1/hasan.txt
@@ -0,0 +1,4 @@
+042-1.gat,110,74,0	script	Hasan	189,{
+//block the way to town
+end;
+}
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
new file mode 100644
index 00000000..9b002362
--- /dev/null
+++ b/npc/042-1/kaan.txt
@@ -0,0 +1,16 @@
+042-1.gat,105,72,0	script	Kaan	160,{
+
+	mes "[Young Man]";
+	mes "\"You're the person Tanisha brought here, right?";
+	mes "My name is Kaan, I'm her brother.\"";
+	next;
+	mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\"";
+	next;
+	mes "Kaan grins mischievous";
+	mes "[Kaan]";
+	mes "\"She hates maggots.\"";
+	next;
+	set kaan, 1;
+	close;
+end;
+}
diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt
new file mode 100644
index 00000000..59358aec
--- /dev/null
+++ b/npc/042-1/malik.txt
@@ -0,0 +1,10 @@
+042-1.gat,105,60,0	script	Malik	162,{
+
+	mes "reset?";
+	menu
+		"yes",-,
+		"no",L_Close;
+	set tutorial, 0;
+L_Close:
+	close;
+}
diff --git a/npc/042-1/testnpcs.txt b/npc/042-1/testnpcs.txt
deleted file mode 100644
index 6e785576..00000000
--- a/npc/042-1/testnpcs.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-//TODO: put npcs in different files and give names
-
-042-1.gat,18,80,0	script	Man	156,{
-	mes "reset?";
-	menu
-		"yes",-,
-		"no",L_Close;
-	set tutorial, 0;
-L_Close:
-	close;
-
-}
-042-1.gat,105,60,0	script	SomeGuy	162,{
-end;
-}
-042-1.gat,105,72,0	script	YoungMan	160,{
-end;
-}
-042-1.gat,110,74,0	script	ManWithShabbyClothes	189,{
-end;
-}
diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt
new file mode 100644
index 00000000..0e6a65c0
--- /dev/null
+++ b/npc/042-1/valon.txt
@@ -0,0 +1,19 @@
+042-1.gat,17,82,0	script	Valon	156,2,1{
+
+	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;
+OnTouch:
+	warp "042-1.gat", 17, 78;
+	mes "[Valon]";
+	mes "\"The desert is merciless.";
+	mes "I can't let you leave like this.\"";
+	close;
+}