summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-09 02:48:03 +0100
committerReid <reidyaro@gmail.com>2012-01-09 02:48:03 +0100
commit3dfef59b67b5e07a29e823cac0536ffad59e2fd1 (patch)
tree15d40682228d11a095f1688294bb88e24a4772eb /npc
parent405497181f9ac2bf60a68dbb38d222fbf0a018e8 (diff)
parent7f837fd0c5ff9c57ab37446824259cc0afc3bd6a (diff)
downloadserverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.gz
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.bz2
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.xz
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.zip
Merge branch 'master' of gitorious.org:evol/serverdata-beta
Diffstat (limited to 'npc')
-rw-r--r--npc/000-0/_import.txt3
-rw-r--r--npc/000-2-2/_import.txt1
-rw-r--r--npc/000-2-2/mapflags.txt1
3 files changed, 4 insertions, 1 deletions
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt
index 79a1d1ec..77b7ed1c 100644
--- a/npc/000-0/_import.txt
+++ b/npc/000-0/_import.txt
@@ -1,4 +1,5 @@
map: 000-0.gat
npc: npc/000-0/_mobs.txt
npc: npc/000-0/_warps.txt
-npc: npc/000-0/sailors.txt \ No newline at end of file
+npc: npc/000-0/mapflags.txt
+npc: npc/000-0/sailors.txt
diff --git a/npc/000-2-2/_import.txt b/npc/000-2-2/_import.txt
index cf2e566a..9cef91a1 100644
--- a/npc/000-2-2/_import.txt
+++ b/npc/000-2-2/_import.txt
@@ -2,3 +2,4 @@ map: 000-2-2.gat
npc: npc/000-2-2/_mobs.txt
npc: npc/000-2-2/_warps.txt
npc: npc/000-2-2/doors.txt
+npc: npc/000-2-2/mapflags.txt
diff --git a/npc/000-2-2/mapflags.txt b/npc/000-2-2/mapflags.txt
new file mode 100644
index 00000000..94dd619e
--- /dev/null
+++ b/npc/000-2-2/mapflags.txt
@@ -0,0 +1 @@
+000-2-2.gat mapflag nosave 000-2-1,61,36