summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-12-24 03:50:24 +0100
committerReid <reidyaro@gmail.com>2015-12-24 03:50:24 +0100
commit559b170d11451819a5e50bcb32d7a1fac1d13fa7 (patch)
treeffc62b370d3256122db3400ca3c91ee61db181f1 /npc
parent4ae7a2bfbbae9657b7965f462275284e86f25f25 (diff)
downloadserverdata-559b170d11451819a5e50bcb32d7a1fac1d13fa7.tar.gz
serverdata-559b170d11451819a5e50bcb32d7a1fac1d13fa7.tar.bz2
serverdata-559b170d11451819a5e50bcb32d7a1fac1d13fa7.tar.xz
serverdata-559b170d11451819a5e50bcb32d7a1fac1d13fa7.zip
Move Q'Anon to 001-2-39.
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/_import.txt2
-rw-r--r--npc/001-2-39/_import.txt1
-rw-r--r--npc/001-2-39/qanon.txt (renamed from npc/001-1/qanon.txt)2
3 files changed, 2 insertions, 3 deletions
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 59a7891c..a4b413b9 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -14,11 +14,9 @@ npc: npc/001-1/eugene.txt
npc: npc/001-1/harbours.txt
npc: npc/001-1/juscare.txt
npc: npc/001-1/katja.txt
-npc: npc/001-1/lozerk.txt
npc: npc/001-1/merlin.txt
npc: npc/001-1/nalkri.txt
npc: npc/001-1/panels.txt
-npc: npc/001-1/qanon.txt
npc: npc/001-1/qonan.txt
npc: npc/001-1/taree.txt
npc: npc/001-1/treeleaf.txt
diff --git a/npc/001-2-39/_import.txt b/npc/001-2-39/_import.txt
index 3401bbd1..4d5c17f2 100644
--- a/npc/001-2-39/_import.txt
+++ b/npc/001-2-39/_import.txt
@@ -1,3 +1,4 @@
// Map 001-2-39
npc: npc/001-2-39/_warps.txt
+npc: npc/001-2-39/qanon.txt
npc: npc/001-2-39/mapflags.txt
diff --git a/npc/001-1/qanon.txt b/npc/001-2-39/qanon.txt
index 3d3f5010..8db87332 100644
--- a/npc/001-1/qanon.txt
+++ b/npc/001-2-39/qanon.txt
@@ -4,7 +4,7 @@
// Description:
// Artis's Legion of Aemil leader.
-001-1,51,46,0 script Q'Anon NPC_Q_ANON,{
+001-2-39,34,41,0 script Q'Anon NPC_Q_ANON,{
mesn;
mesq l("It's been a while boy.");