summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-09-07 04:46:32 +0200
committerReid <reidyaro@gmail.com>2015-09-07 04:46:52 +0200
commit2c0bdecb9f52ed3f82663ca7f0a93f0936971c57 (patch)
treecdc17e6b2fe02f842af9a1faa05d0b092c8cdf5f
parenta7594ed99fefabf323876f5afedf11316822947a (diff)
downloadserverdata-2c0bdecb9f52ed3f82663ca7f0a93f0936971c57.tar.gz
serverdata-2c0bdecb9f52ed3f82663ca7f0a93f0936971c57.tar.bz2
serverdata-2c0bdecb9f52ed3f82663ca7f0a93f0936971c57.tar.xz
serverdata-2c0bdecb9f52ed3f82663ca7f0a93f0936971c57.zip
Move edouard to #29.
-rw-r--r--npc/001-1/_import.txt1
-rw-r--r--npc/001-2-29/_import.txt1
-rw-r--r--npc/001-2-29/edouard.txt (renamed from npc/001-1/edouard.txt)2
3 files changed, 2 insertions, 2 deletions
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-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-1/edouard.txt b/npc/001-2-29/edouard.txt
index a3992601..8aa8b279 100644
--- a/npc/001-1/edouard.txt
+++ b/npc/001-2-29/edouard.txt
@@ -4,7 +4,7 @@
// 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,{
+001-2-29,37,31,0 script Edouard#001-2-29 NPC_EDOUARD,{
mesn;
mesq lg("Hello dear, what do you want today?");
next;