summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-12-26 21:00:43 +0100
committerReid <reidyaro@gmail.com>2015-12-26 21:00:43 +0100
commit671b284efb662c698807d553e9382d4ec1d73859 (patch)
tree62ab29f0c86c0b4f306294c050d47d1f52a66b78 /npc
parentf98ff3eab99f4376dbd9f5132eeedfd9a6e2d200 (diff)
downloadserverdata-671b284efb662c698807d553e9382d4ec1d73859.tar.gz
serverdata-671b284efb662c698807d553e9382d4ec1d73859.tar.bz2
serverdata-671b284efb662c698807d553e9382d4ec1d73859.tar.xz
serverdata-671b284efb662c698807d553e9382d4ec1d73859.zip
Move Trozz to #40.
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/_import.txt1
-rw-r--r--npc/001-2-40/_import.txt2
-rw-r--r--npc/001-2-40/trozz.txt (renamed from npc/001-1/trozz.txt)2
3 files changed, 3 insertions, 2 deletions
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index a4b413b9..7689838b 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -20,7 +20,6 @@ npc: npc/001-1/panels.txt
npc: npc/001-1/qonan.txt
npc: npc/001-1/taree.txt
npc: npc/001-1/treeleaf.txt
-npc: npc/001-1/trozz.txt
npc: npc/001-1/xilaxa.txt
npc: npc/001-1/trees.txt
npc: npc/001-1/pious.txt
diff --git a/npc/001-2-40/_import.txt b/npc/001-2-40/_import.txt
index 83c6ee1a..9814ff04 100644
--- a/npc/001-2-40/_import.txt
+++ b/npc/001-2-40/_import.txt
@@ -1,3 +1,5 @@
// Map 001-2-40
npc: npc/001-2-40/_warps.txt
npc: npc/001-2-40/mapflags.txt
+npc: npc/001-2-40/trozz.txt
+
diff --git a/npc/001-1/trozz.txt b/npc/001-2-40/trozz.txt
index c16c6fb7..df76c26f 100644
--- a/npc/001-1/trozz.txt
+++ b/npc/001-2-40/trozz.txt
@@ -4,7 +4,7 @@
// Description:
// Chief of the Legion of Aemil of the city of Artis.
-001-1,56,45,0 script Trozz#001-1 NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{
+001-2-40,36,46,0 script Trozz#001-2-40 NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{
mesn;
mesq l("Hi.");