From 2c0bdecb9f52ed3f82663ca7f0a93f0936971c57 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 7 Sep 2015 04:46:32 +0200
Subject: Move edouard to #29.
---
npc/001-1/_import.txt | 1 -
npc/001-1/edouard.txt | 26 --------------------------
npc/001-2-29/_import.txt | 1 +
npc/001-2-29/edouard.txt | 26 ++++++++++++++++++++++++++
4 files changed, 27 insertions(+), 27 deletions(-)
delete mode 100644 npc/001-1/edouard.txt
create mode 100644 npc/001-2-29/edouard.txt
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 69685a36..bc76ba54 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -8,7 +8,6 @@ npc: npc/001-1/carmie.txt
npc: npc/001-1/chelios.txt
npc: npc/001-1/cookiemaster.txt
npc: npc/001-1/doors.txt
-npc: npc/001-1/edouard.txt
npc: npc/001-1/elmo.txt
npc: npc/001-1/enora.txt
npc: npc/001-1/eugene.txt
diff --git a/npc/001-1/edouard.txt b/npc/001-1/edouard.txt
deleted file mode 100644
index a3992601..00000000
--- a/npc/001-1/edouard.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Evol scripts.
-// Authors:
-// Reid
-// Description:
-// Barber of Aemil, should be placed on the 29th indoor but it's still a WIP
-
-001-1,133,87,0 script Edouard#001-2-29 NPC_EDOUARD,{
- mesn;
- mesq lg("Hello dear, what do you want today?");
- next;
-
- callfunc "Barber";
-
- mesn;
- mesq l("Bye bye!");
-
- goto L_Close;
-
-L_Close:
- close;
-
-OnInit:
- setnpcsex G_MALE;
- setnpcdistance 2;
- end;
-}
diff --git a/npc/001-2-29/_import.txt b/npc/001-2-29/_import.txt
index ace7371e..c6cca273 100644
--- a/npc/001-2-29/_import.txt
+++ b/npc/001-2-29/_import.txt
@@ -1,3 +1,4 @@
// Map 001-2-29
npc: npc/001-2-29/_warps.txt
+npc: npc/001-2-29/edouard.txt
npc: npc/001-2-29/mapflags.txt
diff --git a/npc/001-2-29/edouard.txt b/npc/001-2-29/edouard.txt
new file mode 100644
index 00000000..8aa8b279
--- /dev/null
+++ b/npc/001-2-29/edouard.txt
@@ -0,0 +1,26 @@
+// Evol scripts.
+// Authors:
+// Reid
+// Description:
+// Barber of Aemil, should be placed on the 29th indoor but it's still a WIP
+
+001-2-29,37,31,0 script Edouard#001-2-29 NPC_EDOUARD,{
+ mesn;
+ mesq lg("Hello dear, what do you want today?");
+ next;
+
+ callfunc "Barber";
+
+ mesn;
+ mesq l("Bye bye!");
+
+ goto L_Close;
+
+L_Close:
+ close;
+
+OnInit:
+ setnpcsex G_MALE;
+ setnpcdistance 2;
+ end;
+}
--
cgit v1.2.3-70-g09d2