732 files changed, 214 insertions, 88 deletions

diff --git a/.gitignore b/.gitignore
index fd10013f..767a7ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,4 @@
-*.class
-
-# Local configuration files
-conf/*_local.conf
-conf/eathena-monitor.conf
-conf/gm_account.txt
-conf/help.txt
-conf/magic.conf
-conf/motd.txt
-conf/spells-build
-
-# Build files
-eathena-monitor
-eathena.sh
-
-# Copied/linked server executables
-char-server
-login-server
-map-server
-
-# Tools executables
-tools/retab
-
 # Server files
 log/
 gm.log.*
 online.*
-save/*.tmp
-save/*.txt
-
-# Converter files
-tools/tmwcon/converter.jar
-tools/tmwcon/server-data
-tools/tmwcon/summary.txt
-tools/tmwcon/tmwdata
diff --git a/README.mv.txt b/README.mv.txt
new file mode 100644
index 00000000..adca1793
--- /dev/null
+++ b/README.mv.txt
@@ -0,0 +1,31 @@
+Changing stuff into subdirectories has several problems:
+1. There are files that are copied 
+2. You may need to change
+3. git submodules don't automatically work the way you think they should - you have to add a git hook manually. Unfortunately, there is no hook at all for git reset --hard (use git checkout -B instead)
+
+problem 2 will be solved (or at least ameliorated) by creating scripts in the root (which may conflict with existing names, but hey! I need your attention)
+problems 1 and 3 should be solved by running a script
+Stuff to do manually:
+* put login-server, char-server, map-server binaries in /usr/local/bin (or some other location callable from the scripts)
+Stuff to do later:
+* change the client-data submodule to track the main project and delete the testing repository for client data
+
+Stuff to do much later:
+* move login/ to the server repository
+* Store stuff in a well-known directory
+* create a 'make install' target
+* create /etc/init.d scripts and get packaged
+
+-o11c
+
+
+Useful commands:
+git submodule update            lose changes in submodule and reset to upstream
+git submodule update --merge    merge changes in submodule from upstream
+git submodule update --rebase   rebase local changes on top of upstream
+        (use this, for the same reason you should use git pull --rebase instead of just git pull - but remember that it's dangerous)
+git submodules sync             change the url of the submodule (when testing is deleted)
+git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org
+                                for people with push access: don't pull via ssh (which is slower anyway), required for submodules to work properly
+git checkout HEAD^ -B master    completely roll back the latest commit
+git reset HEAD^                 undo the last commit but keep changes
diff --git a/char-server b/char-server
new file mode 100755
index 00000000..9d6848f5
--- /dev/null
+++ b/char-server
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd world &&
+exec char-server
+
diff --git a/conf/eathena-monitor.conf.example b/conf/eathena-monitor.conf.example
deleted file mode 100644
index 70dcd2e5..00000000
--- a/conf/eathena-monitor.conf.example
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id: eathena-monitor.conf,v 1.0 2006/13/10 21:42:22 Platyna Exp $
-
-# By default the eathena-monitor looks for its config file in
-# $HOME/tmwserver/conf/, creates the log file in $HOME/tmwserver/log/.
-# You may use this file to adjust these settings if needed or use predefined 
-# defaults. Lines starting with hash mark or white space are ignored.
-
-# login_server=/home/athena/tmwserver/login-server
-# map_server=/home/athena/tmwserver/map-server
-# char_server=/home/athena/tmwserver/char-server
-# workdir=/home/athena/tmwserver
-# In seconds, default is 5.
-# interval=2
-# logfile=/home/athena/tmwserver/log/monitor.log
diff --git a/conf/lan_support.conf b/conf/lan_support.conf
deleted file mode 100644
index bfaec696..00000000
--- a/conf/lan_support.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-// Athena TXT version LAN configure file.
-// Support Client Connect to Local Area Network (LAN) IP Address Server.
-// put this fle into conf/ directory
-//
-// HOWTO:
-//   To use this file, the login-server, char-server and map-server must be on the same subnetwork
-//     (not necessary on the same computer). You can not use eAthena if you want to install the servers on 2 or more different LAN.
-//
-//   First of all: you must configure your router to forward your WAN IP (one or more) and port (default: 6900, 6121 and 5121)
-//     to the right concerned computer(s) (if default port, forward 6900 port to the (LAN IP) login-server, 6121 port to the (LAN IP) char-server, etc.).
-//   After, set in char_athena.conf and map_athena.conf files the WAN IP and the right ports that you use.
-//   Give to WAN people (client that are not on your LAN) your WAN IP to have an access to your server.
-//   At this point, all players outside your LAN can access to your server(s).
-//
-//   Now, you must parameter your LAN for the servers.
-//   Set the LAN IP of the char-server and the map-server in this file (lan_char_ip and lan_map_ip).
-//   Set the definition of your LAN in this file (subnet and subnetmask).
-//   When you load/start login-server and char-server, read what the server displays, and specially the section ---LAN CONFIGURATION---.
-//     If you see a warning or something not good, correct it.
-//   Now LAN client can access to your server.
-//
-//   NB: if you want that nobody of your LAN can access to your server, put 127.0.0.1 in IP and 255.255.255.255 for the mask.
-//       So only the localhost computer would access to your server.
-//   NB2: you can use LAN name if you have some instead of IP and/or mask.
-//   NB3: if you want set your server only for LAN people, set your LAN IP instead of the WAN IP, and set 127.0.0.1/255.255.255.255 for the LAN IP.
-//
-// HOW THAT WORKS:
-//   When someone tries to connect to your server(s), the login-server/char-server checks its IP with the LAN subnet (subnet and subnetmask parameters).
-//   If it matches, the login-server sends the LAN IP of the char-server (lan_char_ip); and char-server do same for map-server (lan_map_ip).
-//   If not, the login-server sends the WAN IP of the char-server that it have received (char_ip in char_athena.conf)
-//     and the char-server sends the WAN IP of the map-server that it have received (map_ip in map_athena.conf)
-
-// put here the LAN IP of your char-server
-lan_char_ip: 127.0.0.1
-
-// put here the LAN IP of your map-server
-lan_map_ip: 127.0.0.1
-
-// put here the Subnet mask of your LAN
-subnet: 127.0.0.1
-subnetmask: 255.255.255.255
diff --git a/login-server b/login-server
new file mode 100755
index 00000000..52180e50
--- /dev/null
+++ b/login-server
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd login &&
+exec login-server
+
diff --git a/login/conf/.gitignore b/login/conf/.gitignore
new file mode 100644
index 00000000..dcabf83f
--- /dev/null
+++ b/login/conf/.gitignore
@@ -0,0 +1,2 @@
+/*_local.conf
+/gm_account.txt
diff --git a/conf/gm_account.txt.example b/login/conf/gm_account.txt.example
index 912e1a09..912e1a09 100644
--- a/conf/gm_account.txt.example
+++ b/login/conf/gm_account.txt.example
diff --git a/conf/ladmin_athena.conf b/login/conf/ladmin_athena.conf
index 2a91a35b..2a91a35b 100644
--- a/conf/ladmin_athena.conf
+++ b/login/conf/ladmin_athena.conf
diff --git a/conf/ladmin_local.conf.example b/login/conf/ladmin_local.conf.example
index b3f88e8d..b3f88e8d 100644
--- a/conf/ladmin_local.conf.example
+++ b/login/conf/ladmin_local.conf.example
diff --git a/login/conf/lan_support.conf b/login/conf/lan_support.conf
new file mode 100644
index 00000000..2f49419c
--- /dev/null
+++ b/login/conf/lan_support.conf
@@ -0,0 +1,58 @@
+// Note: this file is used by both the char-server and the login-server
+
+// This file is necessary to connect to your server locally:
+// by using it's internal (LAN) IP address, or localhost (127.0.0.1)
+
+// The default version treats you LAN as localhost only,
+// which is fine if you have only one computer
+// You only need to change this file if you have a public server
+// AND want to connect from other machines in the LAN
+// (for an nonpublic server it would be best to leave localhost as LAN
+//  and treat the rest of your LAN as the WAN)
+
+// Note: if you set up this file to point to your real LAN, you will not
+// be able to do:
+//      mana --server localhost --port 6901
+// or   mana --server 127.0.0.1 --port 6901
+// because of the check_ip_flag: yes option
+// (which will become mandatory in the next release of the server)
+// instead do:
+//      mana --server 192.168.1.100 --port 6901
+// or maybe, depending on how your /etc/hosts and /etc/host.conf are setup,
+//      mana --server ben-desktop --port 6901
+// or   mana --server ben-desktop.local --port 6901
+
+// Note that only one IP is used, so you can't put different char servers
+// on different machines (unless you do some internal port-forwarding)
+
+
+// the IP LAN players should use to connect to the char-server
+lan_char_ip: 127.0.0.1
+// lan_char_ip: 192.168.1.100
+
+// the IP that LAN players should use to connect to the map-server
+lan_map_ip: 127.0.0.1
+// lan_map_ip: 192.168.1.100
+
+// put here the Subnet mask of your LAN
+// see output of ifconfig (Linux) or ipconfig (Windows)
+subnet: 127.0.0.1
+subnetmask: 255.255.255.255
+// subnetmask: 255.0.0.0
+
+
+// Common subnets (if you have a subnet that is not one of these,
+// you probably don't need to be reading this)
+
+// subnet: 10.0.0.0
+// subnetmask: 255.0.0.0
+
+// subnet: 172.16.0.0
+// subnetmask: 255.240.0.0
+
+// subnet: 192.168.0.0
+// subnetmask: 255.255.0.0
+
+// Many home routers only use a portion:
+// subnet: 192.168.1.0
+// subnetmask: 255.255.255.0
diff --git a/conf/login_athena.conf b/login/conf/login_athena.conf
index 8c724b69..7d0026d8 100644
--- a/conf/login_athena.conf
+++ b/login/conf/login_athena.conf
@@ -75,7 +75,7 @@ start_limited_time: -1
 // Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
 //       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
 //       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
-check_ip_flag: no
+check_ip_flag: yes
 
 // Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
 // (how to use 'allow' and 'deny' information)
diff --git a/conf/login_local.conf.example b/login/conf/login_local.conf.example
index 3c9a6cce..3c9a6cce 100644
--- a/conf/login_local.conf.example
+++ b/login/conf/login_local.conf.example
diff --git a/login/save/.gitignore b/login/save/.gitignore
new file mode 100644
index 00000000..7e1b0055
--- /dev/null
+++ b/login/save/.gitignore
@@ -0,0 +1 @@
+/account.txt
diff --git a/save/account.txt.example b/login/save/account.txt.example
index a842f60c..a842f60c 100644
--- a/save/account.txt.example
+++ b/login/save/account.txt.example
diff --git a/map-server b/map-server
new file mode 100755
index 00000000..0e870128
--- /dev/null
+++ b/map-server
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd world/map &&
+exec map-server
+
diff --git a/move-stuff.sh b/move-stuff.sh
new file mode 100755
index 00000000..551ec841
--- /dev/null
+++ b/move-stuff.sh
@@ -0,0 +1,32 @@
+mv online.html online.txt world/
+
+mv save/account.txt login/save/
+
+mv save/accreg.txt world/save/
+mv save/athena.txt world/save/
+mv save/storage.txt world/save/
+mv save/party.txt world/save/
+mv save/castle.txt world/save/
+mv save/guild.txt world/save/
+
+mv save/mapreg.txt world/map/save/
+
+rmdir save
+
+
+rm conf/eathena-monitor.conf
+
+mv conf/login_local.conf login/conf/
+mv conf/ladmin_local.conf login/conf/
+mv conf/gm_account.txt login/conf/
+
+mv conf/char_local.conf world/conf/
+
+mv conf/atcommand_local.conf world/map/conf/
+mv conf/battle_local.conf world/map/conf/
+mv conf/map_local.conf world/map/conf/
+mv conf/help.txt world/map/conf/
+mv conf/motd.txt world/map/conf/
+mv conf/magic.conf world/map/conf/
+mv conf/spells-build world/map/conf/
+rmdir conf
diff --git a/tools/tmwcon/.gitignore b/tools/tmwcon/.gitignore
new file mode 100644
index 00000000..c7da1337
--- /dev/null
+++ b/tools/tmwcon/.gitignore
@@ -0,0 +1,3 @@
+*.class
+/summary.txt
+/converter.jar
diff --git a/world/conf/.gitignore b/world/conf/.gitignore
new file mode 100644
index 00000000..2c43e911
--- /dev/null
+++ b/world/conf/.gitignore
@@ -0,0 +1 @@
+/*_local.conf
diff --git a/conf/char_athena.conf b/world/conf/char_athena.conf
index dd387fd2..a719a5be 100644
--- a/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -75,7 +75,9 @@ char_name_option: 1
 // Note: add 'space' between 2 others letters/symbols.
 // default: void.
 // char_name_letters: [ ] { } , . | - # @ ! ~ ` ; : " " ? / \ = + < >
-char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) : ; ' < > , . ? / ~ ` | \
+// Note: some characters are problematic:
+// : is used as a separator
+char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) ; ' < > , . ? / ~ ` | \
 
 // Filename of the file which receives the online players list in text
 online_txt_filename: online.txt
diff --git a/conf/char_local.conf.example b/world/conf/char_local.conf.example
index 1d55c977..1d55c977 100644
--- a/conf/char_local.conf.example
+++ b/world/conf/char_local.conf.example
diff --git a/conf/inter_athena.conf b/world/conf/inter_athena.conf
index 72a88bd9..72a88bd9 100644
--- a/conf/inter_athena.conf
+++ b/world/conf/inter_athena.conf
diff --git a/world/conf/lan_support.conf b/world/conf/lan_support.conf
new file mode 100644
index 00000000..2f49419c
--- /dev/null
+++ b/world/conf/lan_support.conf
@@ -0,0 +1,58 @@
+// Note: this file is used by both the char-server and the login-server
+
+// This file is necessary to connect to your server locally:
+// by using it's internal (LAN) IP address, or localhost (127.0.0.1)
+
+// The default version treats you LAN as localhost only,
+// which is fine if you have only one computer
+// You only need to change this file if you have a public server
+// AND want to connect from other machines in the LAN
+// (for an nonpublic server it would be best to leave localhost as LAN
+//  and treat the rest of your LAN as the WAN)
+
+// Note: if you set up this file to point to your real LAN, you will not
+// be able to do:
+//      mana --server localhost --port 6901
+// or   mana --server 127.0.0.1 --port 6901
+// because of the check_ip_flag: yes option
+// (which will become mandatory in the next release of the server)
+// instead do:
+//      mana --server 192.168.1.100 --port 6901
+// or maybe, depending on how your /etc/hosts and /etc/host.conf are setup,
+//      mana --server ben-desktop --port 6901
+// or   mana --server ben-desktop.local --port 6901
+
+// Note that only one IP is used, so you can't put different char servers
+// on different machines (unless you do some internal port-forwarding)
+
+
+// the IP LAN players should use to connect to the char-server
+lan_char_ip: 127.0.0.1
+// lan_char_ip: 192.168.1.100
+
+// the IP that LAN players should use to connect to the map-server
+lan_map_ip: 127.0.0.1
+// lan_map_ip: 192.168.1.100
+
+// put here the Subnet mask of your LAN
+// see output of ifconfig (Linux) or ipconfig (Windows)
+subnet: 127.0.0.1
+subnetmask: 255.255.255.255
+// subnetmask: 255.0.0.0
+
+
+// Common subnets (if you have a subnet that is not one of these,
+// you probably don't need to be reading this)
+
+// subnet: 10.0.0.0
+// subnetmask: 255.0.0.0
+
+// subnet: 172.16.0.0
+// subnetmask: 255.240.0.0
+
+// subnet: 192.168.0.0
+// subnetmask: 255.255.0.0
+
+// Many home routers only use a portion:
+// subnet: 192.168.1.0
+// subnetmask: 255.255.255.0
diff --git a/world/map/conf/.gitignore b/world/map/conf/.gitignore
new file mode 100644
index 00000000..e21c4275
--- /dev/null
+++ b/world/map/conf/.gitignore
@@ -0,0 +1,5 @@
+/*_local.conf
+/help.txt
+/magic.conf
+/motd.txt
+/spells-build
diff --git a/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf
index 82204f1a..82204f1a 100644
--- a/conf/atcommand_athena.conf
+++ b/world/map/conf/atcommand_athena.conf
diff --git a/conf/atcommand_local.conf.example b/world/map/conf/atcommand_local.conf.example
index 0e87addc..0e87addc 100644
--- a/conf/atcommand_local.conf.example
+++ b/world/map/conf/atcommand_local.conf.example
diff --git a/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 574938d6..574938d6 100644
--- a/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
diff --git a/conf/battle_local.conf.example b/world/map/conf/battle_local.conf.example
index c9ba222c..c9ba222c 100644
--- a/conf/battle_local.conf.example
+++ b/world/map/conf/battle_local.conf.example
diff --git a/conf/build-magic.sh b/world/map/conf/build-magic.sh
index 30ec35b8..30ec35b8 100755
--- a/conf/build-magic.sh
+++ b/world/map/conf/build-magic.sh
diff --git a/conf/grf-files.txt b/world/map/conf/grf-files.txt
index e69de29b..e69de29b 100644
--- a/conf/grf-files.txt
+++ b/world/map/conf/grf-files.txt
diff --git a/conf/help.txt.example b/world/map/conf/help.txt.example
index c12b1a89..c12b1a89 100644
--- a/conf/help.txt.example
+++ b/world/map/conf/help.txt.example
diff --git a/conf/magic.conf.template b/world/map/conf/magic.conf.template
index c8fd29df..c8fd29df 100644
--- a/conf/magic.conf.template
+++ b/world/map/conf/magic.conf.template
diff --git a/conf/map_athena.conf b/world/map/conf/map_athena.conf
index f03c0123..f03c0123 100644
--- a/conf/map_athena.conf
+++ b/world/map/conf/map_athena.conf
diff --git a/conf/map_local.conf.example b/world/map/conf/map_local.conf.example
index 0f09bf59..0f09bf59 100644
--- a/conf/map_local.conf.example
+++ b/world/map/conf/map_local.conf.example
diff --git a/conf/motd.txt.example b/world/map/conf/motd.txt.example
index f570494c..f570494c 100644
--- a/conf/motd.txt.example
+++ b/world/map/conf/motd.txt.example
diff --git a/conf/msg_athena.conf b/world/map/conf/msg_athena.conf
index 313d22b7..313d22b7 100644
--- a/conf/msg_athena.conf
+++ b/world/map/conf/msg_athena.conf
diff --git a/conf/script_athena.conf b/world/map/conf/script_athena.conf
index 21d4a6f4..21d4a6f4 100644
--- a/conf/script_athena.conf
+++ b/world/map/conf/script_athena.conf
diff --git a/conf/water.txt b/world/map/conf/water.txt
index 71f98470..71f98470 100644
--- a/conf/water.txt
+++ b/world/map/conf/water.txt
diff --git a/conf/water_height.txt b/world/map/conf/water_height.txt
index 9a89e29c..9a89e29c 100644
--- a/conf/water_height.txt
+++ b/world/map/conf/water_height.txt
diff --git a/data/001-1.wlk b/world/map/data/001-1.wlk
index ce25ead9..ce25ead9 100644
--- a/data/001-1.wlk
+++ b/world/map/data/001-1.wlk
diff --git a/data/001-2.wlk b/world/map/data/001-2.wlk
index 0a762e12..0a762e12 100644
--- a/data/001-2.wlk
+++ b/world/map/data/001-2.wlk
diff --git a/data/001-3.wlk b/world/map/data/001-3.wlk
index 4a9cd117..4a9cd117 100644
--- a/data/001-3.wlk
+++ b/world/map/data/001-3.wlk
diff --git a/data/001-4.wlk b/world/map/data/001-4.wlk
index e1311a6f..e1311a6f 100644
--- a/data/001-4.wlk
+++ b/world/map/data/001-4.wlk
diff --git a/data/002-1.wlk b/world/map/data/002-1.wlk
index 3fe7589b..3fe7589b 100644
--- a/data/002-1.wlk
+++ b/world/map/data/002-1.wlk
diff --git a/data/002-3.wlk b/world/map/data/002-3.wlk
index e26deef5..e26deef5 100644
--- a/data/002-3.wlk
+++ b/world/map/data/002-3.wlk
diff --git a/data/002-4.wlk b/world/map/data/002-4.wlk
index a9d3449b..a9d3449b 100644
--- a/data/002-4.wlk
+++ b/world/map/data/002-4.wlk
diff --git a/data/003-1.wlk b/world/map/data/003-1.wlk
index 810b4e67..810b4e67 100644
--- a/data/003-1.wlk
+++ b/world/map/data/003-1.wlk
diff --git a/data/003-2.wlk b/world/map/data/003-2.wlk
index 94bf28fb..94bf28fb 100644
--- a/data/003-2.wlk
+++ b/world/map/data/003-2.wlk
diff --git a/data/004-1.wlk b/world/map/data/004-1.wlk
index 435ee4a7..435ee4a7 100644
--- a/data/004-1.wlk
+++ b/world/map/data/004-1.wlk
diff --git a/data/004-2.wlk b/world/map/data/004-2.wlk
index 6248acc5..6248acc5 100644
--- a/data/004-2.wlk
+++ b/world/map/data/004-2.wlk
diff --git a/data/005-1.wlk b/world/map/data/005-1.wlk
index e5ff4e9c..e5ff4e9c 100644
--- a/data/005-1.wlk
+++ b/world/map/data/005-1.wlk
diff --git a/data/005-3.wlk b/world/map/data/005-3.wlk
index dd0e45bd..dd0e45bd 100644
--- a/data/005-3.wlk
+++ b/world/map/data/005-3.wlk
diff --git a/data/005-4.wlk b/world/map/data/005-4.wlk
index ebbe5d65..ebbe5d65 100644
--- a/data/005-4.wlk
+++ b/world/map/data/005-4.wlk
diff --git a/data/006-1.wlk b/world/map/data/006-1.wlk
index 680b6096..680b6096 100644
--- a/data/006-1.wlk
+++ b/world/map/data/006-1.wlk
diff --git a/data/006-3.wlk b/world/map/data/006-3.wlk
index d635df84..d635df84 100644
--- a/data/006-3.wlk
+++ b/world/map/data/006-3.wlk
diff --git a/data/007-1.wlk b/world/map/data/007-1.wlk
index 2f82a60d..2f82a60d 100644
--- a/data/007-1.wlk
+++ b/world/map/data/007-1.wlk
diff --git a/data/008-1.wlk b/world/map/data/008-1.wlk
index d2133397..d2133397 100644
--- a/data/008-1.wlk
+++ b/world/map/data/008-1.wlk
diff --git a/data/009-1.wlk b/world/map/data/009-1.wlk
index 0ec51666..0ec51666 100644
--- a/data/009-1.wlk
+++ b/world/map/data/009-1.wlk
diff --git a/data/009-2.wlk b/world/map/data/009-2.wlk
index 89b2dc55..89b2dc55 100644
--- a/data/009-2.wlk
+++ b/world/map/data/009-2.wlk
diff --git a/data/009-3.wlk b/world/map/data/009-3.wlk
index 1336606f..1336606f 100644
--- a/data/009-3.wlk
+++ b/world/map/data/009-3.wlk
diff --git a/data/009-4.wlk b/world/map/data/009-4.wlk
index cd1eb840..cd1eb840 100644
--- a/data/009-4.wlk
+++ b/world/map/data/009-4.wlk
diff --git a/data/010-1.wlk b/world/map/data/010-1.wlk
index 8ae55525..8ae55525 100644
--- a/data/010-1.wlk
+++ b/world/map/data/010-1.wlk
diff --git a/data/010-2.wlk b/world/map/data/010-2.wlk
index 880a6dfb..880a6dfb 100644
--- a/data/010-2.wlk
+++ b/world/map/data/010-2.wlk
diff --git a/data/011-1.wlk b/world/map/data/011-1.wlk
index 2fa117b4..2fa117b4 100644
--- a/data/011-1.wlk
+++ b/world/map/data/011-1.wlk
diff --git a/data/011-3.wlk b/world/map/data/011-3.wlk
index d85523c9..d85523c9 100644
--- a/data/011-3.wlk
+++ b/world/map/data/011-3.wlk
diff --git a/data/011-4.wlk b/world/map/data/011-4.wlk
index 82e32452..82e32452 100644
--- a/data/011-4.wlk
+++ b/world/map/data/011-4.wlk
diff --git a/data/011-5.wlk b/world/map/data/011-5.wlk
index c1da8d91..c1da8d91 100644
--- a/data/011-5.wlk
+++ b/world/map/data/011-5.wlk
diff --git a/data/011-6.wlk b/world/map/data/011-6.wlk
index d779ef55..d779ef55 100644
--- a/data/011-6.wlk
+++ b/world/map/data/011-6.wlk
diff --git a/data/012-1.wlk b/world/map/data/012-1.wlk
index c1b69913..c1b69913 100644
--- a/data/012-1.wlk
+++ b/world/map/data/012-1.wlk
diff --git a/data/012-3.wlk b/world/map/data/012-3.wlk
index 2067e6fe..2067e6fe 100644
--- a/data/012-3.wlk
+++ b/world/map/data/012-3.wlk
diff --git a/data/012-4.wlk b/world/map/data/012-4.wlk
index adb2ec0b..adb2ec0b 100644
--- a/data/012-4.wlk
+++ b/world/map/data/012-4.wlk
diff --git a/data/013-1.wlk b/world/map/data/013-1.wlk
index 0b00605a..0b00605a 100644
--- a/data/013-1.wlk
+++ b/world/map/data/013-1.wlk
diff --git a/data/013-2.wlk b/world/map/data/013-2.wlk
index c536fec6..c536fec6 100644
--- a/data/013-2.wlk
+++ b/world/map/data/013-2.wlk
diff --git a/data/013-3.wlk b/world/map/data/013-3.wlk
index d6047c07..d6047c07 100644
--- a/data/013-3.wlk
+++ b/world/map/data/013-3.wlk
diff --git a/data/014-1.wlk b/world/map/data/014-1.wlk
index 89c28768..89c28768 100644
--- a/data/014-1.wlk
+++ b/world/map/data/014-1.wlk
diff --git a/data/014-3.wlk b/world/map/data/014-3.wlk
index bfd8460b..bfd8460b 100644
--- a/data/014-3.wlk
+++ b/world/map/data/014-3.wlk
diff --git a/data/015-1.wlk b/world/map/data/015-1.wlk
index 792caa30..792caa30 100644
--- a/data/015-1.wlk
+++ b/world/map/data/015-1.wlk
diff --git a/data/015-3.wlk b/world/map/data/015-3.wlk
index 25ef46b1..25ef46b1 100644
--- a/data/015-3.wlk
+++ b/world/map/data/015-3.wlk
diff --git a/data/016-1.wlk b/world/map/data/016-1.wlk
index d0ce4bd0..d0ce4bd0 100644
--- a/data/016-1.wlk
+++ b/world/map/data/016-1.wlk
diff --git a/data/017-1.wlk b/world/map/data/017-1.wlk
index 4416b31c..4416b31c 100644
--- a/data/017-1.wlk
+++ b/world/map/data/017-1.wlk
diff --git a/data/017-2.wlk b/world/map/data/017-2.wlk
index b0132be0..b0132be0 100644
--- a/data/017-2.wlk
+++ b/world/map/data/017-2.wlk
diff --git a/data/017-9.wlk b/world/map/data/017-9.wlk
index 99a03867..99a03867 100644
--- a/data/017-9.wlk
+++ b/world/map/data/017-9.wlk
diff --git a/data/018-1.wlk b/world/map/data/018-1.wlk
index 761fa281..761fa281 100644
--- a/data/018-1.wlk
+++ b/world/map/data/018-1.wlk
diff --git a/data/018-2.wlk b/world/map/data/018-2.wlk
index 522bb73d..522bb73d 100644
--- a/data/018-2.wlk
+++ b/world/map/data/018-2.wlk
diff --git a/data/018-3.wlk b/world/map/data/018-3.wlk
index c5e2b82d..c5e2b82d 100644
--- a/data/018-3.wlk
+++ b/world/map/data/018-3.wlk
diff --git a/data/019-1.wlk b/world/map/data/019-1.wlk
index a77948ac..a77948ac 100644
--- a/data/019-1.wlk
+++ b/world/map/data/019-1.wlk
diff --git a/data/019-3.wlk b/world/map/data/019-3.wlk
index 71d28bce..71d28bce 100644
--- a/data/019-3.wlk
+++ b/world/map/data/019-3.wlk
diff --git a/data/020-1.wlk b/world/map/data/020-1.wlk
index 011f0d18..011f0d18 100644
--- a/data/020-1.wlk
+++ b/world/map/data/020-1.wlk
diff --git a/data/020-2.wlk b/world/map/data/020-2.wlk
index b51db172..b51db172 100644
--- a/data/020-2.wlk
+++ b/world/map/data/020-2.wlk
diff --git a/data/020-3.wlk b/world/map/data/020-3.wlk
index cfc2ad06..cfc2ad06 100644
--- a/data/020-3.wlk
+++ b/world/map/data/020-3.wlk
diff --git a/data/021-1.wlk b/world/map/data/021-1.wlk
index dc8c2cde..dc8c2cde 100644
--- a/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
diff --git a/data/021-2.wlk b/world/map/data/021-2.wlk
index 3fe682ff..3fe682ff 100644
--- a/data/021-2.wlk
+++ b/world/map/data/021-2.wlk
diff --git a/data/022-1.wlk b/world/map/data/022-1.wlk
index 01da8bf6..01da8bf6 100644
--- a/data/022-1.wlk
+++ b/world/map/data/022-1.wlk
diff --git a/data/024-1.wlk b/world/map/data/024-1.wlk
index 0948e9a9..0948e9a9 100644
--- a/data/024-1.wlk
+++ b/world/map/data/024-1.wlk
diff --git a/data/024-2.wlk b/world/map/data/024-2.wlk
index 74704a5f..74704a5f 100644
--- a/data/024-2.wlk
+++ b/world/map/data/024-2.wlk
diff --git a/data/025-1.wlk b/world/map/data/025-1.wlk
index 974cd224..974cd224 100644
--- a/data/025-1.wlk
+++ b/world/map/data/025-1.wlk
diff --git a/data/025-3.wlk b/world/map/data/025-3.wlk
index 85f1b94f..85f1b94f 100644
--- a/data/025-3.wlk
+++ b/world/map/data/025-3.wlk
diff --git a/data/025-4.wlk b/world/map/data/025-4.wlk
index 00b9fa66..00b9fa66 100644
--- a/data/025-4.wlk
+++ b/world/map/data/025-4.wlk
diff --git a/data/026-1.wlk b/world/map/data/026-1.wlk
index 55e16b8c..55e16b8c 100644
--- a/data/026-1.wlk
+++ b/world/map/data/026-1.wlk
diff --git a/data/027-1.wlk b/world/map/data/027-1.wlk
index 435168cc..435168cc 100644
--- a/data/027-1.wlk
+++ b/world/map/data/027-1.wlk
diff --git a/data/027-2.wlk b/world/map/data/027-2.wlk
index 0617e91f..0617e91f 100644
--- a/data/027-2.wlk
+++ b/world/map/data/027-2.wlk
diff --git a/data/027-3.wlk b/world/map/data/027-3.wlk
index 5e676641..5e676641 100644
--- a/data/027-3.wlk
+++ b/world/map/data/027-3.wlk
diff --git a/data/027-4.wlk b/world/map/data/027-4.wlk
index 2d0ec6c9..2d0ec6c9 100644
--- a/data/027-4.wlk
+++ b/world/map/data/027-4.wlk
diff --git a/data/028-1.wlk b/world/map/data/028-1.wlk
index 95c6b87c..95c6b87c 100644
--- a/data/028-1.wlk
+++ b/world/map/data/028-1.wlk
diff --git a/data/028-3.wlk b/world/map/data/028-3.wlk
index 67493a1a..67493a1a 100644
--- a/data/028-3.wlk
+++ b/world/map/data/028-3.wlk
diff --git a/data/029-1.wlk b/world/map/data/029-1.wlk
index deb8efa0..deb8efa0 100644
--- a/data/029-1.wlk
+++ b/world/map/data/029-1.wlk
diff --git a/data/029-3.wlk b/world/map/data/029-3.wlk
index 8a81c360..8a81c360 100644
--- a/data/029-3.wlk
+++ b/world/map/data/029-3.wlk
diff --git a/data/030-1.wlk b/world/map/data/030-1.wlk
index 40354a87..40354a87 100644
--- a/data/030-1.wlk
+++ b/world/map/data/030-1.wlk
diff --git a/data/031-1.wlk b/world/map/data/031-1.wlk
index 4341935a..4341935a 100644
--- a/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
diff --git a/data/031-2.wlk b/world/map/data/031-2.wlk
index 53043ac9..53043ac9 100644
--- a/data/031-2.wlk
+++ b/world/map/data/031-2.wlk
diff --git a/data/031-3.wlk b/world/map/data/031-3.wlk
index ae0279fa..ae0279fa 100644
--- a/data/031-3.wlk
+++ b/world/map/data/031-3.wlk
diff --git a/data/031-4.wlk b/world/map/data/031-4.wlk
index a9f2eb72..a9f2eb72 100644
--- a/data/031-4.wlk
+++ b/world/map/data/031-4.wlk
diff --git a/data/032-1.wlk b/world/map/data/032-1.wlk
index 045fe243..045fe243 100644
--- a/data/032-1.wlk
+++ b/world/map/data/032-1.wlk
diff --git a/data/032-3.wlk b/world/map/data/032-3.wlk
index 235ddaa1..235ddaa1 100644
--- a/data/032-3.wlk
+++ b/world/map/data/032-3.wlk
diff --git a/data/033-1.wlk b/world/map/data/033-1.wlk
index 6d1630bf..6d1630bf 100644
--- a/data/033-1.wlk
+++ b/world/map/data/033-1.wlk
diff --git a/data/034-1.wlk b/world/map/data/034-1.wlk
index eaaa8b5e..eaaa8b5e 100644
--- a/data/034-1.wlk
+++ b/world/map/data/034-1.wlk
diff --git a/data/041-1.wlk b/world/map/data/041-1.wlk
index df0ec560..df0ec560 100644
--- a/data/041-1.wlk
+++ b/world/map/data/041-1.wlk
diff --git a/data/042-1.wlk b/world/map/data/042-1.wlk
index 2a289545..2a289545 100644
--- a/data/042-1.wlk
+++ b/world/map/data/042-1.wlk
diff --git a/data/042-2.wlk b/world/map/data/042-2.wlk
index ca2d33e8..ca2d33e8 100644
--- a/data/042-2.wlk
+++ b/world/map/data/042-2.wlk
diff --git a/data/botcheck.wlk b/world/map/data/botcheck.wlk
index f25d3413..f25d3413 100644
--- a/data/botcheck.wlk
+++ b/world/map/data/botcheck.wlk
diff --git a/data/resnametable.txt b/world/map/data/resnametable.txt
index fa526488..fa526488 100644
--- a/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
diff --git a/db/attr_fix.txt b/world/map/db/attr_fix.txt
index 2bdbbd9d..2bdbbd9d 100644
--- a/db/attr_fix.txt
+++ b/world/map/db/attr_fix.txt
diff --git a/db/card_labels.txt b/world/map/db/card_labels.txt
index 361572c7..361572c7 100644
--- a/db/card_labels.txt
+++ b/world/map/db/card_labels.txt
diff --git a/db/const.txt b/world/map/db/const.txt
index f7b12451..f7b12451 100644
--- a/db/const.txt
+++ b/world/map/db/const.txt
diff --git a/db/exp.txt b/world/map/db/exp.txt
index d07c46b6..d07c46b6 100644
--- a/db/exp.txt
+++ b/world/map/db/exp.txt
diff --git a/db/exp2.txt b/world/map/db/exp2.txt
index b9cbfeb3..b9cbfeb3 100644
--- a/db/exp2.txt
+++ b/world/map/db/exp2.txt
diff --git a/db/item_bluebox.txt b/world/map/db/item_bluebox.txt
index 0932696e..0932696e 100644
--- a/db/item_bluebox.txt
+++ b/world/map/db/item_bluebox.txt
diff --git a/db/item_cardalbum.txt b/world/map/db/item_cardalbum.txt
index 4472147b..4472147b 100644
--- a/db/item_cardalbum.txt
+++ b/world/map/db/item_cardalbum.txt
diff --git a/db/item_db.txt b/world/map/db/item_db.txt
index 25dc27c7..25dc27c7 100644
--- a/db/item_db.txt
+++ b/world/map/db/item_db.txt
diff --git a/db/item_descriptions.txt b/world/map/db/item_descriptions.txt
index 14d2ed25..14d2ed25 100644
--- a/db/item_descriptions.txt
+++ b/world/map/db/item_descriptions.txt
diff --git a/db/item_giftbox.txt b/world/map/db/item_giftbox.txt
index 92ed47f5..92ed47f5 100644
--- a/db/item_giftbox.txt
+++ b/world/map/db/item_giftbox.txt
diff --git a/db/item_noequip.txt b/world/map/db/item_noequip.txt
index 5eb36973..5eb36973 100644
--- a/db/item_noequip.txt
+++ b/world/map/db/item_noequip.txt
diff --git a/db/item_scroll.txt b/world/map/db/item_scroll.txt
index 00b50386..00b50386 100644
--- a/db/item_scroll.txt
+++ b/world/map/db/item_scroll.txt
diff --git a/db/item_violetbox.txt b/world/map/db/item_violetbox.txt
index 88bde984..88bde984 100644
--- a/db/item_violetbox.txt
+++ b/world/map/db/item_violetbox.txt
diff --git a/db/job_db1.txt b/world/map/db/job_db1.txt
index 4278d78d..4278d78d 100644
--- a/db/job_db1.txt
+++ b/world/map/db/job_db1.txt
diff --git a/db/job_db2-2.txt b/world/map/db/job_db2-2.txt
index 629e4e2d..629e4e2d 100644
--- a/db/job_db2-2.txt
+++ b/world/map/db/job_db2-2.txt
diff --git a/db/job_db2.txt b/world/map/db/job_db2.txt
index f7e7d802..f7e7d802 100644
--- a/db/job_db2.txt
+++ b/world/map/db/job_db2.txt
diff --git a/db/mob_branch.txt b/world/map/db/mob_branch.txt
index 8a24428c..8a24428c 100644
--- a/db/mob_branch.txt
+++ b/world/map/db/mob_branch.txt
diff --git a/db/mob_db.txt b/world/map/db/mob_db.txt
index 95981838..95981838 100644
--- a/db/mob_db.txt
+++ b/world/map/db/mob_db.txt
diff --git a/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt
index 54f8c355..54f8c355 100644
--- a/db/mob_skill_db.txt
+++ b/world/map/db/mob_skill_db.txt
diff --git a/db/skill_db.txt b/world/map/db/skill_db.txt
index 91bf1405..91bf1405 100644
--- a/db/skill_db.txt
+++ b/world/map/db/skill_db.txt
diff --git a/db/skill_require_db.txt b/world/map/db/skill_require_db.txt
index 006310ce..006310ce 100644
--- a/db/skill_require_db.txt
+++ b/world/map/db/skill_require_db.txt
diff --git a/db/skill_tree.txt b/world/map/db/skill_tree.txt
index 51b14da3..51b14da3 100644
--- a/db/skill_tree.txt
+++ b/world/map/db/skill_tree.txt
diff --git a/db/statpoint.txt b/world/map/db/statpoint.txt
index b61780d4..b61780d4 100644
--- a/db/statpoint.txt
+++ b/world/map/db/statpoint.txt
diff --git a/news.php b/world/map/news.php
index 7ab51a9c..7ab51a9c 100644
--- a/news.php
+++ b/world/map/news.php
diff --git a/news.txt b/world/map/news.txt
index 277b55bc..277b55bc 100644
--- a/news.txt
+++ b/world/map/news.txt
diff --git a/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index b6c625ff..b6c625ff 100644
--- a/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
diff --git a/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index c8aa210f..c8aa210f 100644
--- a/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
diff --git a/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index d116051c..d116051c 100644
--- a/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
diff --git a/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt
index 445b0ebf..445b0ebf 100644
--- a/npc/001-1/banker.txt
+++ b/world/map/npc/001-1/banker.txt
diff --git a/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
index 502e5401..502e5401 100644
--- a/npc/001-1/barber.txt
+++ b/world/map/npc/001-1/barber.txt
diff --git a/npc/001-1/bard.txt b/world/map/npc/001-1/bard.txt
index 9de957e1..9de957e1 100644
--- a/npc/001-1/bard.txt
+++ b/world/map/npc/001-1/bard.txt
diff --git a/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index b93a0d4d..b93a0d4d 100644
--- a/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
diff --git a/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index a3827e43..a3827e43 100644
--- a/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
diff --git a/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 4ffb1ba5..4ffb1ba5 100644
--- a/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
diff --git a/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt
index 6131f0b4..6131f0b4 100644
--- a/npc/001-1/constable.txt
+++ b/world/map/npc/001-1/constable.txt
diff --git a/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 2d96ae6c..2d96ae6c 100644
--- a/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
diff --git a/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index 149f1e2f..149f1e2f 100644
--- a/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
diff --git a/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt
index 0deb42ae..0deb42ae 100644
--- a/npc/001-1/gossip.txt
+++ b/world/map/npc/001-1/gossip.txt
diff --git a/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 1cffa515..1cffa515 100644
--- a/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
diff --git a/npc/001-1/guide.txt b/world/map/npc/001-1/guide.txt
index be04e307..be04e307 100644
--- a/npc/001-1/guide.txt
+++ b/world/map/npc/001-1/guide.txt
diff --git a/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index f8f51f63..f8f51f63 100644
--- a/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
diff --git a/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt
index ba066398..ba066398 100644
--- a/npc/001-1/mapflags.txt
+++ b/world/map/npc/001-1/mapflags.txt
diff --git a/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
index a664e74a..a664e74a 100644
--- a/npc/001-1/merchant.txt
+++ b/world/map/npc/001-1/merchant.txt
diff --git a/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index 1db4d9d1..1db4d9d1 100644
--- a/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
diff --git a/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index 697dc38e..697dc38e 100644
--- a/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
diff --git a/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index 028b24c1..028b24c1 100644
--- a/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
diff --git a/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt
index dcef65c9..dcef65c9 100644
--- a/npc/001-1/sandra.txt
+++ b/world/map/npc/001-1/sandra.txt
diff --git a/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index 1371d334..1371d334 100644
--- a/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
diff --git a/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt
index 00208932..00208932 100644
--- a/npc/001-1/soul-menhir.txt
+++ b/world/map/npc/001-1/soul-menhir.txt
diff --git a/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index 064597e0..064597e0 100644
--- a/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
diff --git a/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
index 78ebba6a..78ebba6a 100644
--- a/npc/001-1/vincent.txt
+++ b/world/map/npc/001-1/vincent.txt
diff --git a/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index e318db9b..e318db9b 100644
--- a/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
diff --git a/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt
index 6ba5649e..6ba5649e 100644
--- a/npc/001-2/_mobs.txt
+++ b/world/map/npc/001-2/_mobs.txt
diff --git a/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index fcf625f1..fcf625f1 100644
--- a/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
diff --git a/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index cf4943a4..cf4943a4 100644
--- a/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
diff --git a/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index dda29b1e..dda29b1e 100644
--- a/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
diff --git a/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
index e495d93d..e495d93d 100644
--- a/npc/001-2/phaet.txt
+++ b/world/map/npc/001-2/phaet.txt
diff --git a/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index c70ad113..c70ad113 100644
--- a/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
diff --git a/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt
index e7b0486e..e7b0486e 100644
--- a/npc/001-2/troupe_leader.txt
+++ b/world/map/npc/001-2/troupe_leader.txt
diff --git a/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index a6b8b692..a6b8b692 100644
--- a/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
diff --git a/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index ae4b044f..ae4b044f 100644
--- a/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
diff --git a/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index adb7642a..adb7642a 100644
--- a/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
diff --git a/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index 5b42ca4f..5b42ca4f 100644
--- a/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
diff --git a/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
index 04e6b11d..04e6b11d 100644
--- a/npc/001-3/monsters.txt
+++ b/world/map/npc/001-3/monsters.txt
diff --git a/npc/001-3/pvpflag.txt b/world/map/npc/001-3/pvpflag.txt
index 73b6e556..73b6e556 100644
--- a/npc/001-3/pvpflag.txt
+++ b/world/map/npc/001-3/pvpflag.txt
diff --git a/npc/001-4/_import.txt b/world/map/npc/001-4/_import.txt
index aecdcb62..aecdcb62 100644
--- a/npc/001-4/_import.txt
+++ b/world/map/npc/001-4/_import.txt
diff --git a/npc/001-4/_mobs.txt b/world/map/npc/001-4/_mobs.txt
index 097896c8..097896c8 100644
--- a/npc/001-4/_mobs.txt
+++ b/world/map/npc/001-4/_mobs.txt
diff --git a/npc/001-4/_warps.txt b/world/map/npc/001-4/_warps.txt
index 7831e9a1..7831e9a1 100644
--- a/npc/001-4/_warps.txt
+++ b/world/map/npc/001-4/_warps.txt
diff --git a/npc/001-4/dedication.txt b/world/map/npc/001-4/dedication.txt
index 4b240b11..4b240b11 100644
--- a/npc/001-4/dedication.txt
+++ b/world/map/npc/001-4/dedication.txt
diff --git a/npc/001-4/omar.txt b/world/map/npc/001-4/omar.txt
index aedf1806..aedf1806 100644
--- a/npc/001-4/omar.txt
+++ b/world/map/npc/001-4/omar.txt
diff --git a/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index dfda9d8f..dfda9d8f 100644
--- a/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
diff --git a/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 9a9b39b5..9a9b39b5 100644
--- a/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
diff --git a/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index 85d404f6..85d404f6 100644
--- a/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
diff --git a/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index 0573482b..0573482b 100644
--- a/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
diff --git a/npc/002-1/merchant.txt b/world/map/npc/002-1/merchant.txt
index 8a84ae92..8a84ae92 100644
--- a/npc/002-1/merchant.txt
+++ b/world/map/npc/002-1/merchant.txt
diff --git a/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index bf5de510..bf5de510 100644
--- a/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
diff --git a/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 0b7e7426..0b7e7426 100644
--- a/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
diff --git a/npc/002-1/rogue.txt b/world/map/npc/002-1/rogue.txt
index e5afe354..e5afe354 100644
--- a/npc/002-1/rogue.txt
+++ b/world/map/npc/002-1/rogue.txt
diff --git a/npc/002-1/sandstorm_mine_barrier.txt b/world/map/npc/002-1/sandstorm_mine_barrier.txt
index 62abceac..62abceac 100644
--- a/npc/002-1/sandstorm_mine_barrier.txt
+++ b/world/map/npc/002-1/sandstorm_mine_barrier.txt
diff --git a/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 6c099b3a..6c099b3a 100644
--- a/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
diff --git a/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index c6568edf..c6568edf 100644
--- a/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
diff --git a/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index 26e1a3f1..26e1a3f1 100644
--- a/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
diff --git a/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 5b7ce47c..5b7ce47c 100644
--- a/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
diff --git a/npc/002-3/mine_triggerone.txt b/world/map/npc/002-3/mine_triggerone.txt
index d182609b..d182609b 100644
--- a/npc/002-3/mine_triggerone.txt
+++ b/world/map/npc/002-3/mine_triggerone.txt
diff --git a/npc/002-3/mine_triggerthree.txt b/world/map/npc/002-3/mine_triggerthree.txt
index 828eb594..828eb594 100644
--- a/npc/002-3/mine_triggerthree.txt
+++ b/world/map/npc/002-3/mine_triggerthree.txt
diff --git a/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-3/mine_triggertwo.txt
index 5d005620..5d005620 100644
--- a/npc/002-3/mine_triggertwo.txt
+++ b/world/map/npc/002-3/mine_triggertwo.txt
diff --git a/npc/002-3/naem.txt b/world/map/npc/002-3/naem.txt
index 5f0f9bd6..5f0f9bd6 100644
--- a/npc/002-3/naem.txt
+++ b/world/map/npc/002-3/naem.txt
diff --git a/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt
index 6eb56875..6eb56875 100644
--- a/npc/002-3/nathan.txt
+++ b/world/map/npc/002-3/nathan.txt
diff --git a/npc/002-3/underground_palace_barrier.txt b/world/map/npc/002-3/underground_palace_barrier.txt
index 34eeaf57..34eeaf57 100644
--- a/npc/002-3/underground_palace_barrier.txt
+++ b/world/map/npc/002-3/underground_palace_barrier.txt
diff --git a/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 46fac3a9..46fac3a9 100644
--- a/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
diff --git a/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index aa8d42a5..aa8d42a5 100644
--- a/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
diff --git a/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index ed406935..ed406935 100644
--- a/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
diff --git a/npc/002-4/chest.txt b/world/map/npc/002-4/chest.txt
index 542ce345..542ce345 100644
--- a/npc/002-4/chest.txt
+++ b/world/map/npc/002-4/chest.txt
diff --git a/npc/002-4/miners.txt b/world/map/npc/002-4/miners.txt
index 6e71461d..6e71461d 100644
--- a/npc/002-4/miners.txt
+++ b/world/map/npc/002-4/miners.txt
diff --git a/npc/003-1/_import.txt b/world/map/npc/003-1/_import.txt
index 02340ca2..02340ca2 100644
--- a/npc/003-1/_import.txt
+++ b/world/map/npc/003-1/_import.txt
diff --git a/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index 5aa53375..5aa53375 100644
--- a/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
diff --git a/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
index 09277f19..09277f19 100644
--- a/npc/003-1/_warps.txt
+++ b/world/map/npc/003-1/_warps.txt
diff --git a/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index 251f1b1c..251f1b1c 100644
--- a/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
diff --git a/npc/003-2/_import.txt b/world/map/npc/003-2/_import.txt
index 1e6e34cc..1e6e34cc 100644
--- a/npc/003-2/_import.txt
+++ b/world/map/npc/003-2/_import.txt
diff --git a/npc/003-2/_mobs.txt b/world/map/npc/003-2/_mobs.txt
index 1828e169..1828e169 100644
--- a/npc/003-2/_mobs.txt
+++ b/world/map/npc/003-2/_mobs.txt
diff --git a/npc/003-2/_warps.txt b/world/map/npc/003-2/_warps.txt
index e9f4bad9..e9f4bad9 100644
--- a/npc/003-2/_warps.txt
+++ b/world/map/npc/003-2/_warps.txt
diff --git a/npc/004-1/_import.txt b/world/map/npc/004-1/_import.txt
index 441b28ba..441b28ba 100644
--- a/npc/004-1/_import.txt
+++ b/world/map/npc/004-1/_import.txt
diff --git a/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
index 07f32beb..07f32beb 100644
--- a/npc/004-1/_mobs.txt
+++ b/world/map/npc/004-1/_mobs.txt
diff --git a/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
index eb232ec8..eb232ec8 100644
--- a/npc/004-1/_warps.txt
+++ b/world/map/npc/004-1/_warps.txt
diff --git a/npc/004-2/_import.txt b/world/map/npc/004-2/_import.txt
index 3efc4d70..3efc4d70 100644
--- a/npc/004-2/_import.txt
+++ b/world/map/npc/004-2/_import.txt
diff --git a/npc/004-2/_mobs.txt b/world/map/npc/004-2/_mobs.txt
index dd47ab77..dd47ab77 100644
--- a/npc/004-2/_mobs.txt
+++ b/world/map/npc/004-2/_mobs.txt
diff --git a/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt
index b69569d3..b69569d3 100644
--- a/npc/004-2/_warps.txt
+++ b/world/map/npc/004-2/_warps.txt
diff --git a/npc/005-1/_import.txt b/world/map/npc/005-1/_import.txt
index 968adcd7..968adcd7 100644
--- a/npc/005-1/_import.txt
+++ b/world/map/npc/005-1/_import.txt
diff --git a/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index 177b995e..177b995e 100644
--- a/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
diff --git a/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
index 6d8c2597..6d8c2597 100644
--- a/npc/005-1/_warps.txt
+++ b/world/map/npc/005-1/_warps.txt
diff --git a/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt
index 12f37ca1..12f37ca1 100644
--- a/npc/005-1/npcs.txt
+++ b/world/map/npc/005-1/npcs.txt
diff --git a/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt
index d6723c8e..d6723c8e 100644
--- a/npc/005-1/spirit.txt
+++ b/world/map/npc/005-1/spirit.txt
diff --git a/npc/005-1/tree.txt b/world/map/npc/005-1/tree.txt
index 54b7ed1c..54b7ed1c 100644
--- a/npc/005-1/tree.txt
+++ b/world/map/npc/005-1/tree.txt
diff --git a/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index 23982113..23982113 100644
--- a/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
diff --git a/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index b5c48308..b5c48308 100644
--- a/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
diff --git a/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index 3005e84b..3005e84b 100644
--- a/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
diff --git a/npc/005-3/monsters.txt b/world/map/npc/005-3/monsters.txt
index 439b6300..439b6300 100644
--- a/npc/005-3/monsters.txt
+++ b/world/map/npc/005-3/monsters.txt
diff --git a/npc/005-4/_import.txt b/world/map/npc/005-4/_import.txt
index 946e3c1d..946e3c1d 100644
--- a/npc/005-4/_import.txt
+++ b/world/map/npc/005-4/_import.txt
diff --git a/npc/005-4/_mobs.txt b/world/map/npc/005-4/_mobs.txt
index 9ab766cd..9ab766cd 100644
--- a/npc/005-4/_mobs.txt
+++ b/world/map/npc/005-4/_mobs.txt
diff --git a/npc/005-4/_warps.txt b/world/map/npc/005-4/_warps.txt
index 18e5e182..18e5e182 100644
--- a/npc/005-4/_warps.txt
+++ b/world/map/npc/005-4/_warps.txt
diff --git a/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index 2f040462..2f040462 100644
--- a/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
diff --git a/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index ec566450..ec566450 100644
--- a/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
diff --git a/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index d3dffdd8..d3dffdd8 100644
--- a/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
diff --git a/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index eab79c2b..eab79c2b 100644
--- a/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
diff --git a/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt
index fc2e6f44..fc2e6f44 100644
--- a/npc/006-1/mika.txt
+++ b/world/map/npc/006-1/mika.txt
diff --git a/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index c7bd1855..c7bd1855 100644
--- a/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
diff --git a/npc/006-3/_import.txt b/world/map/npc/006-3/_import.txt
index 85228166..85228166 100644
--- a/npc/006-3/_import.txt
+++ b/world/map/npc/006-3/_import.txt
diff --git a/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt
index 2a401fa6..2a401fa6 100644
--- a/npc/006-3/_mobs.txt
+++ b/world/map/npc/006-3/_mobs.txt
diff --git a/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index 807c49b8..807c49b8 100644
--- a/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
diff --git a/npc/007-1/_import.txt b/world/map/npc/007-1/_import.txt
index 0e3373a3..0e3373a3 100644
--- a/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
diff --git a/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index 7f7a266c..7f7a266c 100644
--- a/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
diff --git a/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index 71ac7a33..71ac7a33 100644
--- a/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
diff --git a/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index ff13d70b..ff13d70b 100644
--- a/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
diff --git a/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index f517bb23..f517bb23 100644
--- a/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
diff --git a/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index a4d8c3cf..a4d8c3cf 100644
--- a/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
diff --git a/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index 8cc5b652..8cc5b652 100644
--- a/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
diff --git a/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 8e80d3c5..8e80d3c5 100644
--- a/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
diff --git a/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index c5ab21a4..c5ab21a4 100644
--- a/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
diff --git a/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index 46aa5a92..46aa5a92 100644
--- a/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
diff --git a/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index 429fdbca..429fdbca 100644
--- a/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
diff --git a/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index 4d17310c..4d17310c 100644
--- a/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
diff --git a/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index cfd187fb..cfd187fb 100644
--- a/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
diff --git a/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index 629d177e..629d177e 100644
--- a/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
diff --git a/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index c8a7fad7..c8a7fad7 100644
--- a/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
diff --git a/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index a0ee0b43..a0ee0b43 100644
--- a/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
diff --git a/npc/009-1/mapflags.txt b/world/map/npc/009-1/mapflags.txt
index f435d5d7..f435d5d7 100644
--- a/npc/009-1/mapflags.txt
+++ b/world/map/npc/009-1/mapflags.txt
diff --git a/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index 2935d314..2935d314 100644
--- a/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
diff --git a/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt
index 84079138..84079138 100644
--- a/npc/009-1/old_man.txt
+++ b/world/map/npc/009-1/old_man.txt
diff --git a/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index c48b3557..c48b3557 100644
--- a/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
diff --git a/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt
index b8a45859..b8a45859 100644
--- a/npc/009-1/sabine.txt
+++ b/world/map/npc/009-1/sabine.txt
diff --git a/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt
index 5daadd23..5daadd23 100644
--- a/npc/009-1/soul-menhir.txt
+++ b/world/map/npc/009-1/soul-menhir.txt
diff --git a/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt
index 42c36d64..42c36d64 100644
--- a/npc/009-1/water_pump.txt
+++ b/world/map/npc/009-1/water_pump.txt
diff --git a/npc/009-2/_import.txt b/world/map/npc/009-2/_import.txt
index 5289780c..5289780c 100644
--- a/npc/009-2/_import.txt
+++ b/world/map/npc/009-2/_import.txt
diff --git a/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index 5ce2976c..5ce2976c 100644
--- a/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
diff --git a/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index e6c791c5..e6c791c5 100644
--- a/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
diff --git a/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 5ccaea3f..5ccaea3f 100644
--- a/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
diff --git a/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index f19990d9..f19990d9 100644
--- a/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
diff --git a/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 2fbfcbd1..2fbfcbd1 100644
--- a/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
diff --git a/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index 61246b4e..61246b4e 100644
--- a/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
diff --git a/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index f25d026a..f25d026a 100644
--- a/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
diff --git a/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index b45a1f80..b45a1f80 100644
--- a/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
diff --git a/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index 23f0e165..23f0e165 100644
--- a/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
diff --git a/npc/009-2/mapflags.txt b/world/map/npc/009-2/mapflags.txt
index 84ee64b6..84ee64b6 100644
--- a/npc/009-2/mapflags.txt
+++ b/world/map/npc/009-2/mapflags.txt
diff --git a/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index b969af7d..b969af7d 100644
--- a/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
diff --git a/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 9ce99879..9ce99879 100644
--- a/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
diff --git a/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index a47fdf95..a47fdf95 100644
--- a/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
diff --git a/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index fdc7098a..fdc7098a 100644
--- a/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
diff --git a/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 11d9931d..11d9931d 100644
--- a/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
diff --git a/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index 023f1244..023f1244 100644
--- a/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
diff --git a/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index dc7d29df..dc7d29df 100644
--- a/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
diff --git a/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index 733fa54f..733fa54f 100644
--- a/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
diff --git a/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 265cd234..265cd234 100644
--- a/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
diff --git a/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index 145f09a5..145f09a5 100644
--- a/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
diff --git a/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 12bf619c..12bf619c 100644
--- a/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
diff --git a/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index b1cc7bc4..b1cc7bc4 100644
--- a/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
diff --git a/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index 57adbca9..57adbca9 100644
--- a/npc/009-3/_warps.txt
+++ b/world/map/npc/009-3/_warps.txt
diff --git a/npc/009-3/monsters.txt b/world/map/npc/009-3/monsters.txt
index b69bb3a1..b69bb3a1 100644
--- a/npc/009-3/monsters.txt
+++ b/world/map/npc/009-3/monsters.txt
diff --git a/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt
index fbb47433..fbb47433 100644
--- a/npc/009-3/sword.txt
+++ b/world/map/npc/009-3/sword.txt
diff --git a/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index db91605c..db91605c 100644
--- a/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
diff --git a/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index f4c9140e..f4c9140e 100644
--- a/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
diff --git a/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index e666d8ca..e666d8ca 100644
--- a/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.txt
diff --git a/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 349ec44e..349ec44e 100644
--- a/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
diff --git a/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index fae4dad7..fae4dad7 100644
--- a/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
diff --git a/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt
index ebeaa857..ebeaa857 100644
--- a/npc/009-4/orum_warps.txt
+++ b/world/map/npc/009-4/orum_warps.txt
diff --git a/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index f4d2cede..f4d2cede 100644
--- a/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
diff --git a/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 9eb8e0b2..9eb8e0b2 100644
--- a/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
diff --git a/npc/010-1/_import.txt b/world/map/npc/010-1/_import.txt
index c784dbe5..c784dbe5 100644
--- a/npc/010-1/_import.txt
+++ b/world/map/npc/010-1/_import.txt
diff --git a/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt
index 785bafed..785bafed 100644
--- a/npc/010-1/_mobs.txt
+++ b/world/map/npc/010-1/_mobs.txt
diff --git a/npc/010-1/_warps.txt b/world/map/npc/010-1/_warps.txt
index d0151be7..d0151be7 100644
--- a/npc/010-1/_warps.txt
+++ b/world/map/npc/010-1/_warps.txt
diff --git a/npc/010-2/_import.txt b/world/map/npc/010-2/_import.txt
index 567b7a12..567b7a12 100644
--- a/npc/010-2/_import.txt
+++ b/world/map/npc/010-2/_import.txt
diff --git a/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt
index efa9aa57..efa9aa57 100644
--- a/npc/010-2/_mobs.txt
+++ b/world/map/npc/010-2/_mobs.txt
diff --git a/npc/010-2/_warps.txt b/world/map/npc/010-2/_warps.txt
index 76e2be8b..76e2be8b 100644
--- a/npc/010-2/_warps.txt
+++ b/world/map/npc/010-2/_warps.txt
diff --git a/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index d687bf91..d687bf91 100644
--- a/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
diff --git a/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index c1578d55..c1578d55 100644
--- a/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
diff --git a/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt
index d072073d..d072073d 100644
--- a/npc/010-2/doug.txt
+++ b/world/map/npc/010-2/doug.txt
diff --git a/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 2472ba86..2472ba86 100644
--- a/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
diff --git a/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt
index 0d80f700..0d80f700 100644
--- a/npc/010-2/workers.txt
+++ b/world/map/npc/010-2/workers.txt
diff --git a/npc/011-1/_import.txt b/world/map/npc/011-1/_import.txt
index 53f564ce..53f564ce 100644
--- a/npc/011-1/_import.txt
+++ b/world/map/npc/011-1/_import.txt
diff --git a/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index 180f3822..180f3822 100644
--- a/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
diff --git a/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt
index ad638d00..ad638d00 100644
--- a/npc/011-1/_warps.txt
+++ b/world/map/npc/011-1/_warps.txt
diff --git a/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index e38f76ba..e38f76ba 100644
--- a/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
diff --git a/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 8982f699..8982f699 100644
--- a/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
diff --git a/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index d2b40f0e..d2b40f0e 100644
--- a/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
diff --git a/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index e9616d8c..e9616d8c 100644
--- a/npc/011-1/shops.txt
+++ b/world/map/npc/011-1/shops.txt
diff --git a/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index 799e5dd0..799e5dd0 100644
--- a/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
diff --git a/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index 2fc7d85b..2fc7d85b 100644
--- a/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
diff --git a/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 0c7ae9de..0c7ae9de 100644
--- a/npc/011-3/_warps.txt
+++ b/world/map/npc/011-3/_warps.txt
diff --git a/npc/011-3/hermit.txt b/world/map/npc/011-3/hermit.txt
index 4b582cc4..4b582cc4 100644
--- a/npc/011-3/hermit.txt
+++ b/world/map/npc/011-3/hermit.txt
diff --git a/npc/011-3/monsters.txt b/world/map/npc/011-3/monsters.txt
index 37da9f40..37da9f40 100644
--- a/npc/011-3/monsters.txt
+++ b/world/map/npc/011-3/monsters.txt
diff --git a/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index f2e5264f..f2e5264f 100644
--- a/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
diff --git a/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index 2e4f3576..2e4f3576 100644
--- a/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
diff --git a/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt
index 40058613..40058613 100644
--- a/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
diff --git a/npc/011-4/bl_barrier.txt b/world/map/npc/011-4/bl_barrier.txt
index 07b44999..07b44999 100644
--- a/npc/011-4/bl_barrier.txt
+++ b/world/map/npc/011-4/bl_barrier.txt
diff --git a/npc/011-4/monsters.txt b/world/map/npc/011-4/monsters.txt
index d3b78249..d3b78249 100644
--- a/npc/011-4/monsters.txt
+++ b/world/map/npc/011-4/monsters.txt
diff --git a/npc/011-5/_import.txt b/world/map/npc/011-5/_import.txt
index 0901afa2..0901afa2 100644
--- a/npc/011-5/_import.txt
+++ b/world/map/npc/011-5/_import.txt
diff --git a/npc/011-5/_mobs.txt b/world/map/npc/011-5/_mobs.txt
index 22d89a4e..22d89a4e 100644
--- a/npc/011-5/_mobs.txt
+++ b/world/map/npc/011-5/_mobs.txt
diff --git a/npc/011-5/_warps.txt b/world/map/npc/011-5/_warps.txt
index 605abadf..605abadf 100644
--- a/npc/011-5/_warps.txt
+++ b/world/map/npc/011-5/_warps.txt
diff --git a/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index 0afbffa4..0afbffa4 100644
--- a/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
diff --git a/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 007e7e86..007e7e86 100644
--- a/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
diff --git a/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 458bc283..458bc283 100644
--- a/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
diff --git a/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 486a6ae0..486a6ae0 100644
--- a/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
diff --git a/npc/012-1/_import.txt b/world/map/npc/012-1/_import.txt
index 095de153..095de153 100644
--- a/npc/012-1/_import.txt
+++ b/world/map/npc/012-1/_import.txt
diff --git a/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 0cfb2c14..0cfb2c14 100644
--- a/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
diff --git a/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt
index de7ffc77..de7ffc77 100644
--- a/npc/012-1/_warps.txt
+++ b/world/map/npc/012-1/_warps.txt
diff --git a/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt
index 5a2a547a..5a2a547a 100644
--- a/npc/012-1/amrak.txt
+++ b/world/map/npc/012-1/amrak.txt
diff --git a/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 1aa780f5..1aa780f5 100644
--- a/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
diff --git a/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index b29e5542..b29e5542 100644
--- a/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
diff --git a/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index 6e5ac13a..6e5ac13a 100644
--- a/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
diff --git a/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index ce7a365f..ce7a365f 100644
--- a/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
diff --git a/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt
index 41ef598f..41ef598f 100644
--- a/npc/012-3/_warps.txt
+++ b/world/map/npc/012-3/_warps.txt
diff --git a/npc/012-3/mana-seed.txt b/world/map/npc/012-3/mana-seed.txt
index 6877ee2c..6877ee2c 100644
--- a/npc/012-3/mana-seed.txt
+++ b/world/map/npc/012-3/mana-seed.txt
diff --git a/npc/012-3/monsters.txt b/world/map/npc/012-3/monsters.txt
index e6f4cf79..e6f4cf79 100644
--- a/npc/012-3/monsters.txt
+++ b/world/map/npc/012-3/monsters.txt
diff --git a/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt
index 2bd31346..2bd31346 100644
--- a/npc/012-3/warningsigns.txt
+++ b/world/map/npc/012-3/warningsigns.txt
diff --git a/npc/012-4/_import.txt b/world/map/npc/012-4/_import.txt
index 7136ece3..7136ece3 100644
--- a/npc/012-4/_import.txt
+++ b/world/map/npc/012-4/_import.txt
diff --git a/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index db88e63b..db88e63b 100644
--- a/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
diff --git a/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index 8202452f..8202452f 100644
--- a/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
diff --git a/npc/012-4/pvpflag.txt b/world/map/npc/012-4/pvpflag.txt
index b796cefa..b796cefa 100644
--- a/npc/012-4/pvpflag.txt
+++ b/world/map/npc/012-4/pvpflag.txt
diff --git a/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index 62a26f85..62a26f85 100644
--- a/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
diff --git a/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 018cbda6..018cbda6 100644
--- a/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
diff --git a/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index f82b948f..f82b948f 100644
--- a/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
diff --git a/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt
index 84df4fe6..84df4fe6 100644
--- a/npc/013-1/sagatha.txt
+++ b/world/map/npc/013-1/sagatha.txt
diff --git a/npc/013-2/_import.txt b/world/map/npc/013-2/_import.txt
index 1ed37515..1ed37515 100644
--- a/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
diff --git a/npc/013-2/_mobs.txt b/world/map/npc/013-2/_mobs.txt
index 8bc43cdb..8bc43cdb 100644
--- a/npc/013-2/_mobs.txt
+++ b/world/map/npc/013-2/_mobs.txt
diff --git a/npc/013-2/_warps.txt b/world/map/npc/013-2/_warps.txt
index b713ac0d..b713ac0d 100644
--- a/npc/013-2/_warps.txt
+++ b/world/map/npc/013-2/_warps.txt
diff --git a/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt
index 830b5171..830b5171 100644
--- a/npc/013-2/apprentice.txt
+++ b/world/map/npc/013-2/apprentice.txt
diff --git a/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index f45b2554..f45b2554 100644
--- a/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
diff --git a/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt
index 927ddfc4..927ddfc4 100644
--- a/npc/013-2/wizard.txt
+++ b/world/map/npc/013-2/wizard.txt
diff --git a/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt
index 8be025b3..8be025b3 100644
--- a/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
diff --git a/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index bb36f0c7..bb36f0c7 100644
--- a/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
diff --git a/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index 373be260..373be260 100644
--- a/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
diff --git a/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt
index 0ec3f86a..0ec3f86a 100644
--- a/npc/013-3/barrier.txt
+++ b/world/map/npc/013-3/barrier.txt
diff --git a/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt
index fb72f54c..fb72f54c 100644
--- a/npc/013-3/mask_chest.txt
+++ b/world/map/npc/013-3/mask_chest.txt
diff --git a/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt
index 8f7da034..8f7da034 100644
--- a/npc/013-3/misc.txt
+++ b/world/map/npc/013-3/misc.txt
diff --git a/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt
index 5d2c97b7..5d2c97b7 100644
--- a/npc/013-3/sword_chest.txt
+++ b/world/map/npc/013-3/sword_chest.txt
diff --git a/npc/014-1/_import.txt b/world/map/npc/014-1/_import.txt
index 0483171c..0483171c 100644
--- a/npc/014-1/_import.txt
+++ b/world/map/npc/014-1/_import.txt
diff --git a/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index 1c039ba1..1c039ba1 100644
--- a/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
diff --git a/npc/014-1/_warps.txt b/world/map/npc/014-1/_warps.txt
index a3b9924b..a3b9924b 100644
--- a/npc/014-1/_warps.txt
+++ b/world/map/npc/014-1/_warps.txt
diff --git a/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt
index f6bf7c9d..f6bf7c9d 100644
--- a/npc/014-1/wedding-officiator.txt
+++ b/world/map/npc/014-1/wedding-officiator.txt
diff --git a/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index d2d03e67..d2d03e67 100644
--- a/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
diff --git a/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index 996181e3..996181e3 100644
--- a/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
diff --git a/npc/014-3/_warps.txt b/world/map/npc/014-3/_warps.txt
index 2ff59a5f..2ff59a5f 100644
--- a/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
diff --git a/npc/014-3/monsters.txt b/world/map/npc/014-3/monsters.txt
index 2237ea42..2237ea42 100644
--- a/npc/014-3/monsters.txt
+++ b/world/map/npc/014-3/monsters.txt
diff --git a/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 94963d0b..94963d0b 100644
--- a/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
diff --git a/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index cc1c71e9..cc1c71e9 100644
--- a/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
diff --git a/npc/015-1/_warps.txt b/world/map/npc/015-1/_warps.txt
index a8152425..a8152425 100644
--- a/npc/015-1/_warps.txt
+++ b/world/map/npc/015-1/_warps.txt
diff --git a/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt
index 125cc104..125cc104 100644
--- a/npc/015-1/alice.txt
+++ b/world/map/npc/015-1/alice.txt
diff --git a/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt
index 0ba82ec9..0ba82ec9 100644
--- a/npc/015-1/barrier.txt
+++ b/world/map/npc/015-1/barrier.txt
diff --git a/npc/015-1/monsters.txt b/world/map/npc/015-1/monsters.txt
index b6ff0fd9..b6ff0fd9 100644
--- a/npc/015-1/monsters.txt
+++ b/world/map/npc/015-1/monsters.txt
diff --git a/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index f5f0cd17..f5f0cd17 100644
--- a/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
diff --git a/npc/015-3/_import.txt b/world/map/npc/015-3/_import.txt
index 9a9632ba..9a9632ba 100644
--- a/npc/015-3/_import.txt
+++ b/world/map/npc/015-3/_import.txt
diff --git a/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 43f7eea0..43f7eea0 100644
--- a/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
diff --git a/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt
index 861a6938..861a6938 100644
--- a/npc/015-3/_warps.txt
+++ b/world/map/npc/015-3/_warps.txt
diff --git a/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt
index 27a18bc3..27a18bc3 100644
--- a/npc/015-3/barrier.txt
+++ b/world/map/npc/015-3/barrier.txt
diff --git a/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index f1433ed6..f1433ed6 100644
--- a/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
diff --git a/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index a965223d..a965223d 100644
--- a/npc/015-3/pot.txt
+++ b/world/map/npc/015-3/pot.txt
diff --git a/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 3ba02b95..3ba02b95 100644
--- a/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
diff --git a/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index 3cdcb753..3cdcb753 100644
--- a/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
diff --git a/npc/016-1/_warps.txt b/world/map/npc/016-1/_warps.txt
index 8503d94d..8503d94d 100644
--- a/npc/016-1/_warps.txt
+++ b/world/map/npc/016-1/_warps.txt
diff --git a/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index 469b720a..469b720a 100644
--- a/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
diff --git a/npc/016-1/monsters.txt b/world/map/npc/016-1/monsters.txt
index d9d0de4f..d9d0de4f 100644
--- a/npc/016-1/monsters.txt
+++ b/world/map/npc/016-1/monsters.txt
diff --git a/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index 41eb315e..41eb315e 100644
--- a/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
diff --git a/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index a28ae59b..a28ae59b 100644
--- a/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
diff --git a/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 3eb1c24e..3eb1c24e 100644
--- a/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
diff --git a/npc/017-1/monsters.txt b/world/map/npc/017-1/monsters.txt
index 28f2d7e2..28f2d7e2 100644
--- a/npc/017-1/monsters.txt
+++ b/world/map/npc/017-1/monsters.txt
diff --git a/npc/017-2/_import.txt b/world/map/npc/017-2/_import.txt
index 843da4e7..843da4e7 100644
--- a/npc/017-2/_import.txt
+++ b/world/map/npc/017-2/_import.txt
diff --git a/npc/017-2/_mobs.txt b/world/map/npc/017-2/_mobs.txt
index fff25198..fff25198 100644
--- a/npc/017-2/_mobs.txt
+++ b/world/map/npc/017-2/_mobs.txt
diff --git a/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt
index 0cd1dec9..0cd1dec9 100644
--- a/npc/017-2/_warps.txt
+++ b/world/map/npc/017-2/_warps.txt
diff --git a/npc/017-9/_import.txt b/world/map/npc/017-9/_import.txt
index 819fd8b3..819fd8b3 100644
--- a/npc/017-9/_import.txt
+++ b/world/map/npc/017-9/_import.txt
diff --git a/npc/017-9/_mobs.txt b/world/map/npc/017-9/_mobs.txt
index 960546c2..960546c2 100644
--- a/npc/017-9/_mobs.txt
+++ b/world/map/npc/017-9/_mobs.txt
diff --git a/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index 905f4de2..905f4de2 100644
--- a/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
diff --git a/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index b3ab9841..b3ab9841 100644
--- a/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
diff --git a/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 02cdab24..02cdab24 100644
--- a/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
diff --git a/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index 028dbd0e..028dbd0e 100644
--- a/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
diff --git a/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt
index 7e0d296c..7e0d296c 100644
--- a/npc/018-1/mike.txt
+++ b/world/map/npc/018-1/mike.txt
diff --git a/npc/018-1/miners.txt b/world/map/npc/018-1/miners.txt
index f16b8bd7..f16b8bd7 100644
--- a/npc/018-1/miners.txt
+++ b/world/map/npc/018-1/miners.txt
diff --git a/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt
index 78cad244..78cad244 100644
--- a/npc/018-1/sword.txt
+++ b/world/map/npc/018-1/sword.txt
diff --git a/npc/018-2/_import.txt b/world/map/npc/018-2/_import.txt
index 8ce96730..8ce96730 100644
--- a/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
diff --git a/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 87593b1c..87593b1c 100644
--- a/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
diff --git a/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index 78c97883..78c97883 100644
--- a/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
diff --git a/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt
index 846bed7d..846bed7d 100644
--- a/npc/018-2/angus.txt
+++ b/world/map/npc/018-2/angus.txt
diff --git a/npc/018-2/books.txt b/world/map/npc/018-2/books.txt
index 22364c6d..22364c6d 100644
--- a/npc/018-2/books.txt
+++ b/world/map/npc/018-2/books.txt
diff --git a/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 56734a69..56734a69 100644
--- a/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
diff --git a/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index 1e337036..1e337036 100644
--- a/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
diff --git a/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index ee735d14..ee735d14 100644
--- a/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
diff --git a/npc/018-3/_import.txt b/world/map/npc/018-3/_import.txt
index 53391a07..53391a07 100644
--- a/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
diff --git a/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index a063b8bb..a063b8bb 100644
--- a/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
diff --git a/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index a4450b3f..a4450b3f 100644
--- a/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
diff --git a/npc/018-3/bookcase.txt b/world/map/npc/018-3/bookcase.txt
index 843c94ae..843c94ae 100644
--- a/npc/018-3/bookcase.txt
+++ b/world/map/npc/018-3/bookcase.txt
diff --git a/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt
index 4893cfeb..4893cfeb 100644
--- a/npc/018-3/evil-obelisk.txt
+++ b/world/map/npc/018-3/evil-obelisk.txt
diff --git a/npc/018-3/sword.txt b/world/map/npc/018-3/sword.txt
index f8ee7725..f8ee7725 100644
--- a/npc/018-3/sword.txt
+++ b/world/map/npc/018-3/sword.txt
diff --git a/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 287a2cb2..287a2cb2 100644
--- a/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
diff --git a/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index ae32c186..ae32c186 100644
--- a/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
diff --git a/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 6e1fa6c9..6e1fa6c9 100644
--- a/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
diff --git a/npc/019-1/monsters.txt b/world/map/npc/019-1/monsters.txt
index d41d63b3..d41d63b3 100644
--- a/npc/019-1/monsters.txt
+++ b/world/map/npc/019-1/monsters.txt
diff --git a/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt
index d2c5bcf9..d2c5bcf9 100644
--- a/npc/019-1/santa_helper.txt
+++ b/world/map/npc/019-1/santa_helper.txt
diff --git a/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt
index 11831356..11831356 100644
--- a/npc/019-1/snowman.txt
+++ b/world/map/npc/019-1/snowman.txt
diff --git a/npc/019-3/_import.txt b/world/map/npc/019-3/_import.txt
index 4ccd622b..4ccd622b 100644
--- a/npc/019-3/_import.txt
+++ b/world/map/npc/019-3/_import.txt
diff --git a/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt
index 60d9e507..60d9e507 100644
--- a/npc/019-3/_mobs.txt
+++ b/world/map/npc/019-3/_mobs.txt
diff --git a/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt
index 2df54be1..2df54be1 100644
--- a/npc/019-3/_warps.txt
+++ b/world/map/npc/019-3/_warps.txt
diff --git a/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt
index b37dd0e1..b37dd0e1 100644
--- a/npc/020-1/KrickKrackKrock.txt
+++ b/world/map/npc/020-1/KrickKrackKrock.txt
diff --git a/npc/020-1/_import.txt b/world/map/npc/020-1/_import.txt
index 704d916d..704d916d 100644
--- a/npc/020-1/_import.txt
+++ b/world/map/npc/020-1/_import.txt
diff --git a/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index d236884e..d236884e 100644
--- a/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
diff --git a/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 5bac9e69..5bac9e69 100644
--- a/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
diff --git a/npc/020-1/mapflags.txt b/world/map/npc/020-1/mapflags.txt
index 203cf649..203cf649 100644
--- a/npc/020-1/mapflags.txt
+++ b/world/map/npc/020-1/mapflags.txt
diff --git a/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt
index d4a9d6f6..d4a9d6f6 100644
--- a/npc/020-1/rockscissor.txt
+++ b/world/map/npc/020-1/rockscissor.txt
diff --git a/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt
index f6e52869..f6e52869 100644
--- a/npc/020-1/soul-menhir.txt
+++ b/world/map/npc/020-1/soul-menhir.txt
diff --git a/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index ed025a0f..ed025a0f 100644
--- a/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
diff --git a/npc/020-2/_import.txt b/world/map/npc/020-2/_import.txt
index 77e81574..77e81574 100644
--- a/npc/020-2/_import.txt
+++ b/world/map/npc/020-2/_import.txt
diff --git a/npc/020-2/_mobs.txt b/world/map/npc/020-2/_mobs.txt
index 04e864c0..04e864c0 100644
--- a/npc/020-2/_mobs.txt
+++ b/world/map/npc/020-2/_mobs.txt
diff --git a/npc/020-2/_warps.txt b/world/map/npc/020-2/_warps.txt
index fab55b38..fab55b38 100644
--- a/npc/020-2/_warps.txt
+++ b/world/map/npc/020-2/_warps.txt
diff --git a/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 1bcbf152..1bcbf152 100644
--- a/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
diff --git a/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 98d46660..98d46660 100644
--- a/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
diff --git a/npc/020-2/mapflags.txt b/world/map/npc/020-2/mapflags.txt
index aaa1b90f..aaa1b90f 100644
--- a/npc/020-2/mapflags.txt
+++ b/world/map/npc/020-2/mapflags.txt
diff --git a/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index cc796b55..cc796b55 100644
--- a/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
diff --git a/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt
index fe2ee10c..fe2ee10c 100644
--- a/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
diff --git a/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index 1b23103c..1b23103c 100644
--- a/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
diff --git a/npc/020-3/_warps.txt b/world/map/npc/020-3/_warps.txt
index b43072b5..b43072b5 100644
--- a/npc/020-3/_warps.txt
+++ b/world/map/npc/020-3/_warps.txt
diff --git a/npc/020-3/monsters.txt b/world/map/npc/020-3/monsters.txt
index 062c6a9f..062c6a9f 100644
--- a/npc/020-3/monsters.txt
+++ b/world/map/npc/020-3/monsters.txt
diff --git a/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 0c068010..0c068010 100644
--- a/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
diff --git a/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index ab4a88c1..ab4a88c1 100644
--- a/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
diff --git a/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 5d8bdc27..5d8bdc27 100644
--- a/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
diff --git a/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index d7ca399f..d7ca399f 100644
--- a/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
diff --git a/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 1a140e81..1a140e81 100644
--- a/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
diff --git a/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index 2d0dc504..2d0dc504 100644
--- a/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
diff --git a/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
index 15f9eca3..15f9eca3 100644
--- a/npc/021-1/inac.txt
+++ b/world/map/npc/021-1/inac.txt
diff --git a/npc/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
index 3719ed0f..3719ed0f 100644
--- a/npc/021-1/mapflags.txt
+++ b/world/map/npc/021-1/mapflags.txt
diff --git a/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 4fc3c481..4fc3c481 100644
--- a/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
diff --git a/npc/021-1/royal_guards.txt b/world/map/npc/021-1/royal_guards.txt
index 02996184..02996184 100644
--- a/npc/021-1/royal_guards.txt
+++ b/world/map/npc/021-1/royal_guards.txt
diff --git a/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index 06bb8f17..06bb8f17 100644
--- a/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
diff --git a/npc/021-1/workers.txt b/world/map/npc/021-1/workers.txt
index 24ea8f84..24ea8f84 100644
--- a/npc/021-1/workers.txt
+++ b/world/map/npc/021-1/workers.txt
diff --git a/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
index 9dc3ac4b..9dc3ac4b 100644
--- a/npc/021-2/_import.txt
+++ b/world/map/npc/021-2/_import.txt
diff --git a/npc/021-2/_mobs.txt b/world/map/npc/021-2/_mobs.txt
index a390438e..a390438e 100644
--- a/npc/021-2/_mobs.txt
+++ b/world/map/npc/021-2/_mobs.txt
diff --git a/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index 0af6f275..0af6f275 100644
--- a/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
diff --git a/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 8a6dbdb2..8a6dbdb2 100644
--- a/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
diff --git a/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index f4f9d0de..f4f9d0de 100644
--- a/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
diff --git a/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 567d5fee..567d5fee 100644
--- a/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
diff --git a/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index ac383e87..ac383e87 100644
--- a/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
diff --git a/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index b4ec8380..b4ec8380 100644
--- a/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
diff --git a/npc/021-2/mapflags.txt b/world/map/npc/021-2/mapflags.txt
index 8f4a9dcd..8f4a9dcd 100644
--- a/npc/021-2/mapflags.txt
+++ b/world/map/npc/021-2/mapflags.txt
diff --git a/npc/021-2/workshop.txt b/world/map/npc/021-2/workshop.txt
index ffe732b4..ffe732b4 100644
--- a/npc/021-2/workshop.txt
+++ b/world/map/npc/021-2/workshop.txt
diff --git a/npc/022-1/_import.txt b/world/map/npc/022-1/_import.txt
index fe6db9f9..fe6db9f9 100644
--- a/npc/022-1/_import.txt
+++ b/world/map/npc/022-1/_import.txt
diff --git a/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt
index a61eb346..a61eb346 100644
--- a/npc/022-1/_mobs.txt
+++ b/world/map/npc/022-1/_mobs.txt
diff --git a/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index 38e63696..38e63696 100644
--- a/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
diff --git a/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
index 72d28486..72d28486 100644
--- a/npc/022-1/dock.txt
+++ b/world/map/npc/022-1/dock.txt
diff --git a/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
index a1d9d69a..a1d9d69a 100644
--- a/npc/022-1/ferry_master.txt
+++ b/world/map/npc/022-1/ferry_master.txt
diff --git a/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
index f1b0444b..f1b0444b 100644
--- a/npc/022-1/mapflags.txt
+++ b/world/map/npc/022-1/mapflags.txt
diff --git a/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index a0166921..a0166921 100644
--- a/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
diff --git a/npc/024-1/_import.txt b/world/map/npc/024-1/_import.txt
index debf3dda..debf3dda 100644
--- a/npc/024-1/_import.txt
+++ b/world/map/npc/024-1/_import.txt
diff --git a/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index 81103764..81103764 100644
--- a/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
diff --git a/npc/024-1/_warps.txt b/world/map/npc/024-1/_warps.txt
index 12012376..12012376 100644
--- a/npc/024-1/_warps.txt
+++ b/world/map/npc/024-1/_warps.txt
diff --git a/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt
index 43dd832e..43dd832e 100644
--- a/npc/024-1/ched.txt
+++ b/world/map/npc/024-1/ched.txt
diff --git a/npc/024-1/david.txt b/world/map/npc/024-1/david.txt
index 6c30afc9..6c30afc9 100644
--- a/npc/024-1/david.txt
+++ b/world/map/npc/024-1/david.txt
diff --git a/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 4b82920e..4b82920e 100644
--- a/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
diff --git a/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index 29381f57..29381f57 100644
--- a/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
diff --git a/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt
index 585806df..585806df 100644
--- a/npc/024-1/tondar.txt
+++ b/world/map/npc/024-1/tondar.txt
diff --git a/npc/024-2/_import.txt b/world/map/npc/024-2/_import.txt
index 2a03af32..2a03af32 100644
--- a/npc/024-2/_import.txt
+++ b/world/map/npc/024-2/_import.txt
diff --git a/npc/024-2/_mobs.txt b/world/map/npc/024-2/_mobs.txt
index 7074e7a7..7074e7a7 100644
--- a/npc/024-2/_mobs.txt
+++ b/world/map/npc/024-2/_mobs.txt
diff --git a/npc/024-2/_warps.txt b/world/map/npc/024-2/_warps.txt
index e7b9d28f..e7b9d28f 100644
--- a/npc/024-2/_warps.txt
+++ b/world/map/npc/024-2/_warps.txt
diff --git a/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
index ede39644..ede39644 100644
--- a/npc/024-2/barrier.txt
+++ b/world/map/npc/024-2/barrier.txt
diff --git a/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt
index f6b78331..f6b78331 100644
--- a/npc/024-2/tyer.txt
+++ b/world/map/npc/024-2/tyer.txt
diff --git a/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt
index ee588365..ee588365 100644
--- a/npc/024-2/tyer_trigger.txt
+++ b/world/map/npc/024-2/tyer_trigger.txt
diff --git a/npc/025-1/_import.txt b/world/map/npc/025-1/_import.txt
index a29be248..a29be248 100644
--- a/npc/025-1/_import.txt
+++ b/world/map/npc/025-1/_import.txt
diff --git a/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index 7f444112..7f444112 100644
--- a/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-1/_mobs.txt
diff --git a/npc/025-1/_warps.txt b/world/map/npc/025-1/_warps.txt
index e408c509..e408c509 100644
--- a/npc/025-1/_warps.txt
+++ b/world/map/npc/025-1/_warps.txt
diff --git a/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index df5ffc2a..df5ffc2a 100644
--- a/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
diff --git a/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt
index 26feec12..26feec12 100644
--- a/npc/025-1/reset.txt
+++ b/world/map/npc/025-1/reset.txt
diff --git a/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index b78def6b..b78def6b 100644
--- a/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
diff --git a/npc/025-3/_import.txt b/world/map/npc/025-3/_import.txt
index 285e674e..285e674e 100644
--- a/npc/025-3/_import.txt
+++ b/world/map/npc/025-3/_import.txt
diff --git a/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 9ce0508c..9ce0508c 100644
--- a/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
diff --git a/npc/025-3/_warps.txt b/world/map/npc/025-3/_warps.txt
index c64903e0..c64903e0 100644
--- a/npc/025-3/_warps.txt
+++ b/world/map/npc/025-3/_warps.txt
diff --git a/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 46048298..46048298 100644
--- a/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
diff --git a/npc/025-4/_import.txt b/world/map/npc/025-4/_import.txt
index a8b01ca1..a8b01ca1 100644
--- a/npc/025-4/_import.txt
+++ b/world/map/npc/025-4/_import.txt
diff --git a/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index 6ee5b1d1..6ee5b1d1 100644
--- a/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
diff --git a/npc/025-4/_warps.txt b/world/map/npc/025-4/_warps.txt
index e0b9ae4d..e0b9ae4d 100644
--- a/npc/025-4/_warps.txt
+++ b/world/map/npc/025-4/_warps.txt
diff --git a/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index e92d0012..e92d0012 100644
--- a/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
diff --git a/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index 1acba11d..1acba11d 100644
--- a/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
diff --git a/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt
index 8c7b3ce4..8c7b3ce4 100644
--- a/npc/025-4/julia.txt
+++ b/world/map/npc/025-4/julia.txt
diff --git a/npc/025-4/mapflags.txt b/world/map/npc/025-4/mapflags.txt
index 1c8999bb..1c8999bb 100644
--- a/npc/025-4/mapflags.txt
+++ b/world/map/npc/025-4/mapflags.txt
diff --git a/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index ae18387c..ae18387c 100644
--- a/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
diff --git a/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index 89a32db8..89a32db8 100644
--- a/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
diff --git a/npc/026-1/_warps.txt b/world/map/npc/026-1/_warps.txt
index dc5c51fc..dc5c51fc 100644
--- a/npc/026-1/_warps.txt
+++ b/world/map/npc/026-1/_warps.txt
diff --git a/npc/026-1/sign.txt b/world/map/npc/026-1/sign.txt
index 44813c38..44813c38 100644
--- a/npc/026-1/sign.txt
+++ b/world/map/npc/026-1/sign.txt
diff --git a/npc/027-1/_import.txt b/world/map/npc/027-1/_import.txt
index 14fc594e..14fc594e 100644
--- a/npc/027-1/_import.txt
+++ b/world/map/npc/027-1/_import.txt
diff --git a/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index e7eac33a..e7eac33a 100644
--- a/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
diff --git a/npc/027-1/_warps.txt b/world/map/npc/027-1/_warps.txt
index b8f1991e..b8f1991e 100644
--- a/npc/027-1/_warps.txt
+++ b/world/map/npc/027-1/_warps.txt
diff --git a/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index 336cdea3..336cdea3 100644
--- a/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
diff --git a/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index ecda6ea0..ecda6ea0 100644
--- a/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
diff --git a/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt
index 0efe43c4..0efe43c4 100644
--- a/npc/027-1/monsters.txt
+++ b/world/map/npc/027-1/monsters.txt
diff --git a/npc/027-2/_import.txt b/world/map/npc/027-2/_import.txt
index 56dcdd1b..56dcdd1b 100644
--- a/npc/027-2/_import.txt
+++ b/world/map/npc/027-2/_import.txt
diff --git a/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index b316be00..b316be00 100644
--- a/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
diff --git a/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index fcc40b4d..fcc40b4d 100644
--- a/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
diff --git a/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt
index 99714ebc..99714ebc 100644
--- a/npc/027-2/alacrius.txt
+++ b/world/map/npc/027-2/alacrius.txt
diff --git a/npc/027-2/alacrius2.txt b/world/map/npc/027-2/alacrius2.txt
index df1587ec..df1587ec 100644
--- a/npc/027-2/alacrius2.txt
+++ b/world/map/npc/027-2/alacrius2.txt
diff --git a/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt
index 616b761a..616b761a 100644
--- a/npc/027-2/barman.txt
+++ b/world/map/npc/027-2/barman.txt
diff --git a/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index bf4d35fc..bf4d35fc 100644
--- a/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
diff --git a/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index 33ee7895..33ee7895 100644
--- a/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
diff --git a/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index d7cbeac3..d7cbeac3 100644
--- a/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
diff --git a/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt
index 15eaa85e..15eaa85e 100644
--- a/npc/027-2/diary.txt
+++ b/world/map/npc/027-2/diary.txt
diff --git a/npc/027-2/door.txt b/world/map/npc/027-2/door.txt
index 630e0ee2..630e0ee2 100644
--- a/npc/027-2/door.txt
+++ b/world/map/npc/027-2/door.txt
diff --git a/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt
index 0ee91cfa..0ee91cfa 100644
--- a/npc/027-2/evil_guard.txt
+++ b/world/map/npc/027-2/evil_guard.txt
diff --git a/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 651ccac1..651ccac1 100644
--- a/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
diff --git a/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index a90d4301..a90d4301 100644
--- a/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
diff --git a/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index 5e7454ca..5e7454ca 100644
--- a/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
diff --git a/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt
index fef2bafd..fef2bafd 100644
--- a/npc/027-2/husband.txt
+++ b/world/map/npc/027-2/husband.txt
diff --git a/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index a8cd3778..a8cd3778 100644
--- a/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
diff --git a/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt
index 70fe1dc8..70fe1dc8 100644
--- a/npc/027-2/lover.txt
+++ b/world/map/npc/027-2/lover.txt
diff --git a/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt
index 57dc1f7b..57dc1f7b 100644
--- a/npc/027-2/testnpcs.txt
+++ b/world/map/npc/027-2/testnpcs.txt
diff --git a/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt
index 87d93173..87d93173 100644
--- a/npc/027-2/werewolf.txt
+++ b/world/map/npc/027-2/werewolf.txt
diff --git a/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index 96b4da1a..96b4da1a 100644
--- a/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
diff --git a/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt
index 11df5c67..11df5c67 100644
--- a/npc/027-3/_mobs.txt
+++ b/world/map/npc/027-3/_mobs.txt
diff --git a/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 50380b5d..50380b5d 100644
--- a/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
diff --git a/npc/027-3/caskets.txt b/world/map/npc/027-3/caskets.txt
index 2a3bf043..2a3bf043 100644
--- a/npc/027-3/caskets.txt
+++ b/world/map/npc/027-3/caskets.txt
diff --git a/npc/027-3/entrance.txt b/world/map/npc/027-3/entrance.txt
index 62bd93d7..62bd93d7 100644
--- a/npc/027-3/entrance.txt
+++ b/world/map/npc/027-3/entrance.txt
diff --git a/npc/027-3/mapflags.txt b/world/map/npc/027-3/mapflags.txt
index 5f9c091d..5f9c091d 100644
--- a/npc/027-3/mapflags.txt
+++ b/world/map/npc/027-3/mapflags.txt
diff --git a/npc/027-4/_import.txt b/world/map/npc/027-4/_import.txt
index d5638404..d5638404 100644
--- a/npc/027-4/_import.txt
+++ b/world/map/npc/027-4/_import.txt
diff --git a/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt
index 26dbe342..26dbe342 100644
--- a/npc/027-4/_mobs.txt
+++ b/world/map/npc/027-4/_mobs.txt
diff --git a/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 4611509a..4611509a 100644
--- a/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
diff --git a/npc/027-4/mapflags.txt b/world/map/npc/027-4/mapflags.txt
index 1784cd64..1784cd64 100644
--- a/npc/027-4/mapflags.txt
+++ b/world/map/npc/027-4/mapflags.txt
diff --git a/npc/027-4/reaper_script.txt b/world/map/npc/027-4/reaper_script.txt
index 2f218f0d..2f218f0d 100644
--- a/npc/027-4/reaper_script.txt
+++ b/world/map/npc/027-4/reaper_script.txt
diff --git a/npc/028-1/Portal.txt b/world/map/npc/028-1/Portal.txt
index ff7cea7f..ff7cea7f 100644
--- a/npc/028-1/Portal.txt
+++ b/world/map/npc/028-1/Portal.txt
diff --git a/npc/028-1/_import.txt b/world/map/npc/028-1/_import.txt
index 1cfec48c..1cfec48c 100644
--- a/npc/028-1/_import.txt
+++ b/world/map/npc/028-1/_import.txt
diff --git a/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index a71093ad..a71093ad 100644
--- a/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
diff --git a/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt
index 1d7ccba9..1d7ccba9 100644
--- a/npc/028-1/_warps.txt
+++ b/world/map/npc/028-1/_warps.txt
diff --git a/npc/028-3/_import.txt b/world/map/npc/028-3/_import.txt
index bb8dd79e..bb8dd79e 100644
--- a/npc/028-3/_import.txt
+++ b/world/map/npc/028-3/_import.txt
diff --git a/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index a5dec284..a5dec284 100644
--- a/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
diff --git a/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt
index 62972083..62972083 100644
--- a/npc/028-3/_warps.txt
+++ b/world/map/npc/028-3/_warps.txt
diff --git a/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index 5c1410b0..5c1410b0 100644
--- a/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
diff --git a/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index 7fdf044c..7fdf044c 100644
--- a/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
diff --git a/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index ffe9c2d6..ffe9c2d6 100644
--- a/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
diff --git a/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index fe51dadc..fe51dadc 100644
--- a/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
diff --git a/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index 76cc8a16..76cc8a16 100644
--- a/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
diff --git a/npc/029-3/_import.txt b/world/map/npc/029-3/_import.txt
index e8ca1dac..e8ca1dac 100644
--- a/npc/029-3/_import.txt
+++ b/world/map/npc/029-3/_import.txt
diff --git a/npc/029-3/_mobs.txt b/world/map/npc/029-3/_mobs.txt
index 4e3b4282..4e3b4282 100644
--- a/npc/029-3/_mobs.txt
+++ b/world/map/npc/029-3/_mobs.txt
diff --git a/npc/029-3/_warps.txt b/world/map/npc/029-3/_warps.txt
index 42f13dee..42f13dee 100644
--- a/npc/029-3/_warps.txt
+++ b/world/map/npc/029-3/_warps.txt
diff --git a/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt
index 23b37ea3..23b37ea3 100644
--- a/npc/029-3/barrier.txt
+++ b/world/map/npc/029-3/barrier.txt
diff --git a/npc/029-3/mapflags.txt b/world/map/npc/029-3/mapflags.txt
index 845a0f01..845a0f01 100644
--- a/npc/029-3/mapflags.txt
+++ b/world/map/npc/029-3/mapflags.txt
diff --git a/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index cfc269fe..cfc269fe 100644
--- a/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
diff --git a/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
index d8cabe5d..d8cabe5d 100644
--- a/npc/030-1/_import.txt
+++ b/world/map/npc/030-1/_import.txt
diff --git a/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index 830b17e4..830b17e4 100644
--- a/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
diff --git a/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
index 1a4e7582..1a4e7582 100644
--- a/npc/030-1/_warps.txt
+++ b/world/map/npc/030-1/_warps.txt
diff --git a/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index f525795e..f525795e 100644
--- a/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
diff --git a/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 2d799801..2d799801 100644
--- a/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
diff --git a/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 9ca21459..9ca21459 100644
--- a/npc/031-1/_warps.txt
+++ b/world/map/npc/031-1/_warps.txt
diff --git a/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 3df9daa9..3df9daa9 100644
--- a/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
diff --git a/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 4f871554..4f871554 100644
--- a/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
diff --git a/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index d9714ef5..d9714ef5 100644
--- a/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
diff --git a/npc/031-2/_import.txt b/world/map/npc/031-2/_import.txt
index 39d9ffce..39d9ffce 100644
--- a/npc/031-2/_import.txt
+++ b/world/map/npc/031-2/_import.txt
diff --git a/npc/031-2/_mobs.txt b/world/map/npc/031-2/_mobs.txt
index 196d0da7..196d0da7 100644
--- a/npc/031-2/_mobs.txt
+++ b/world/map/npc/031-2/_mobs.txt
diff --git a/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index e56544d2..e56544d2 100644
--- a/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_warps.txt
diff --git a/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt
index 488f600a..488f600a 100644
--- a/npc/031-2/angelaHouse.txt
+++ b/world/map/npc/031-2/angelaHouse.txt
diff --git a/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 97aa2bb9..97aa2bb9 100644
--- a/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
diff --git a/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index 2cb30906..2cb30906 100644
--- a/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
diff --git a/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 106d0063..106d0063 100644
--- a/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
diff --git a/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 520c7242..520c7242 100644
--- a/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
diff --git a/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt
index feef9c1d..feef9c1d 100644
--- a/npc/031-3/labyrinth.txt
+++ b/world/map/npc/031-3/labyrinth.txt
diff --git a/npc/031-4/_import.txt b/world/map/npc/031-4/_import.txt
index 87eec449..87eec449 100644
--- a/npc/031-4/_import.txt
+++ b/world/map/npc/031-4/_import.txt
diff --git a/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt
index d1ce9b7c..d1ce9b7c 100644
--- a/npc/031-4/_mobs.txt
+++ b/world/map/npc/031-4/_mobs.txt
diff --git a/npc/031-4/_warps.txt b/world/map/npc/031-4/_warps.txt
index d1984dbc..d1984dbc 100644
--- a/npc/031-4/_warps.txt
+++ b/world/map/npc/031-4/_warps.txt
diff --git a/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt
index e8b4a5ac..e8b4a5ac 100644
--- a/npc/031-4/barrier.txt
+++ b/world/map/npc/031-4/barrier.txt
diff --git a/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 223aa80b..223aa80b 100644
--- a/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
diff --git a/npc/031-4/mapflags.txt b/world/map/npc/031-4/mapflags.txt
index 9e4e8f6b..9e4e8f6b 100644
--- a/npc/031-4/mapflags.txt
+++ b/world/map/npc/031-4/mapflags.txt
diff --git a/npc/032-1/_import.txt b/world/map/npc/032-1/_import.txt
index 939f1d9c..939f1d9c 100644
--- a/npc/032-1/_import.txt
+++ b/world/map/npc/032-1/_import.txt
diff --git a/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt
index 54ab94bc..54ab94bc 100644
--- a/npc/032-1/_mobs.txt
+++ b/world/map/npc/032-1/_mobs.txt
diff --git a/npc/032-1/_warps.txt b/world/map/npc/032-1/_warps.txt
index 96d039cf..96d039cf 100644
--- a/npc/032-1/_warps.txt
+++ b/world/map/npc/032-1/_warps.txt
diff --git a/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt
index b6dac559..b6dac559 100644
--- a/npc/032-1/miriam.txt
+++ b/world/map/npc/032-1/miriam.txt
diff --git a/npc/032-3/_import.txt b/world/map/npc/032-3/_import.txt
index 67304eae..67304eae 100644
--- a/npc/032-3/_import.txt
+++ b/world/map/npc/032-3/_import.txt
diff --git a/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 0e5fc998..0e5fc998 100644
--- a/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
diff --git a/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index e84a8da2..e84a8da2 100644
--- a/npc/032-3/_warps.txt
+++ b/world/map/npc/032-3/_warps.txt
diff --git a/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index 32de0cb4..32de0cb4 100644
--- a/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
diff --git a/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 61a53305..61a53305 100644
--- a/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
diff --git a/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 37bdd507..37bdd507 100644
--- a/npc/033-1/_warps.txt
+++ b/world/map/npc/033-1/_warps.txt
diff --git a/npc/034-1/_import.txt b/world/map/npc/034-1/_import.txt
index e4b39026..e4b39026 100644
--- a/npc/034-1/_import.txt
+++ b/world/map/npc/034-1/_import.txt
diff --git a/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index 50d15f66..50d15f66 100644
--- a/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
diff --git a/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 37bdd507..37bdd507 100644
--- a/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
diff --git a/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
index 54c7edd1..54c7edd1 100644
--- a/npc/041-1/_import.txt
+++ b/world/map/npc/041-1/_import.txt
diff --git a/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
index 227677aa..227677aa 100644
--- a/npc/041-1/_mobs.txt
+++ b/world/map/npc/041-1/_mobs.txt
diff --git a/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
index a7e06dc7..a7e06dc7 100644
--- a/npc/041-1/_warps.txt
+++ b/world/map/npc/041-1/_warps.txt
diff --git a/npc/041-1/tutorial.txt b/world/map/npc/041-1/tutorial.txt
index 866bc145..866bc145 100644
--- a/npc/041-1/tutorial.txt
+++ b/world/map/npc/041-1/tutorial.txt
diff --git a/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
index 98b8f3ab..98b8f3ab 100644
--- a/npc/042-1/_import.txt
+++ b/world/map/npc/042-1/_import.txt
diff --git a/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index b5f58646..b5f58646 100644
--- a/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
diff --git a/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index 1b24105f..1b24105f 100644
--- a/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
diff --git a/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index fc0bf6fd..fc0bf6fd 100644
--- a/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
diff --git a/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index 6b9e34ca..6b9e34ca 100644
--- a/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
diff --git a/npc/042-1/malik.txt b/world/map/npc/042-1/malik.txt
index 389d3233..389d3233 100644
--- a/npc/042-1/malik.txt
+++ b/world/map/npc/042-1/malik.txt
diff --git a/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
index 7ebd6971..7ebd6971 100644
--- a/npc/042-1/valon.txt
+++ b/world/map/npc/042-1/valon.txt
diff --git a/npc/042-2/_import.txt b/world/map/npc/042-2/_import.txt
index 604c82cd..604c82cd 100644
--- a/npc/042-2/_import.txt
+++ b/world/map/npc/042-2/_import.txt
diff --git a/npc/042-2/_mobs.txt b/world/map/npc/042-2/_mobs.txt
index 3a980e8f..3a980e8f 100644
--- a/npc/042-2/_mobs.txt
+++ b/world/map/npc/042-2/_mobs.txt
diff --git a/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
index 8b3c666c..8b3c666c 100644
--- a/npc/042-2/_warps.txt
+++ b/world/map/npc/042-2/_warps.txt
diff --git a/npc/042-2/mapflags.txt b/world/map/npc/042-2/mapflags.txt
index c9f5cc23..c9f5cc23 100644
--- a/npc/042-2/mapflags.txt
+++ b/world/map/npc/042-2/mapflags.txt
diff --git a/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 53596b32..53596b32 100644
--- a/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
diff --git a/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 3ed5c6bc..3ed5c6bc 100644
--- a/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
diff --git a/npc/_import.txt b/world/map/npc/_import.txt
index f6da80e5..f6da80e5 100644
--- a/npc/_import.txt
+++ b/world/map/npc/_import.txt
diff --git a/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt
index 8c1b3663..8c1b3663 100644
--- a/npc/botcheck/_import.txt
+++ b/world/map/npc/botcheck/_import.txt
diff --git a/npc/botcheck/_mobs.txt b/world/map/npc/botcheck/_mobs.txt
index c54ee2ac..c54ee2ac 100644
--- a/npc/botcheck/_mobs.txt
+++ b/world/map/npc/botcheck/_mobs.txt
diff --git a/npc/botcheck/_warps.txt b/world/map/npc/botcheck/_warps.txt
index 605abadf..605abadf 100644
--- a/npc/botcheck/_warps.txt
+++ b/world/map/npc/botcheck/_warps.txt
diff --git a/npc/debugroom_Woodland_mining_camp/_import.txt b/world/map/npc/debugroom_Woodland_mining_camp/_import.txt
index 1a0603ae..1a0603ae 100644
--- a/npc/debugroom_Woodland_mining_camp/_import.txt
+++ b/world/map/npc/debugroom_Woodland_mining_camp/_import.txt
diff --git a/npc/debugroom_Woodland_mining_camp/_mobs.txt b/world/map/npc/debugroom_Woodland_mining_camp/_mobs.txt
index f9413155..f9413155 100644
--- a/npc/debugroom_Woodland_mining_camp/_mobs.txt
+++ b/world/map/npc/debugroom_Woodland_mining_camp/_mobs.txt
diff --git a/npc/debugroom_Woodland_mining_camp/_warps.txt b/world/map/npc/debugroom_Woodland_mining_camp/_warps.txt
index 6980cf8e..6980cf8e 100644
--- a/npc/debugroom_Woodland_mining_camp/_warps.txt
+++ b/world/map/npc/debugroom_Woodland_mining_camp/_warps.txt
diff --git a/npc/doc/magic b/world/map/npc/doc/magic
index 3e5863e0..3e5863e0 100644
--- a/npc/doc/magic
+++ b/world/map/npc/doc/magic
diff --git a/npc/easter/2008/monsters.txt b/world/map/npc/easter/2008/monsters.txt
index d886f519..d886f519 100644
--- a/npc/easter/2008/monsters.txt
+++ b/world/map/npc/easter/2008/monsters.txt
diff --git a/npc/easter/2008/npc.txt b/world/map/npc/easter/2008/npc.txt
index e93e27a2..e93e27a2 100644
--- a/npc/easter/2008/npc.txt
+++ b/world/map/npc/easter/2008/npc.txt
diff --git a/npc/easter/2009/bunny.txt b/world/map/npc/easter/2009/bunny.txt
index 62644f23..62644f23 100644
--- a/npc/easter/2009/bunny.txt
+++ b/world/map/npc/easter/2009/bunny.txt
diff --git a/npc/easter/2009/object.txt b/world/map/npc/easter/2009/object.txt
index 263321aa..263321aa 100644
--- a/npc/easter/2009/object.txt
+++ b/world/map/npc/easter/2009/object.txt
diff --git a/npc/easter/2010/Blocker.txt b/world/map/npc/easter/2010/Blocker.txt
index 8b3aa120..8b3aa120 100644
--- a/npc/easter/2010/Blocker.txt
+++ b/world/map/npc/easter/2010/Blocker.txt
diff --git a/npc/easter/2010/Doctor.txt b/world/map/npc/easter/2010/Doctor.txt
index 78097fd6..78097fd6 100644
--- a/npc/easter/2010/Doctor.txt
+++ b/world/map/npc/easter/2010/Doctor.txt
diff --git a/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt
index 1a4b9f36..1a4b9f36 100644
--- a/npc/easter/2010/Doctor2.txt
+++ b/world/map/npc/easter/2010/Doctor2.txt
diff --git a/npc/easter/2010/Doctor3.txt b/world/map/npc/easter/2010/Doctor3.txt
index e0ee86bd..e0ee86bd 100644
--- a/npc/easter/2010/Doctor3.txt
+++ b/world/map/npc/easter/2010/Doctor3.txt
diff --git a/npc/easter/2010/Doctor4.txt b/world/map/npc/easter/2010/Doctor4.txt
index dcbe7481..dcbe7481 100644
--- a/npc/easter/2010/Doctor4.txt
+++ b/world/map/npc/easter/2010/Doctor4.txt
diff --git a/npc/easter/2010/_import.txt b/world/map/npc/easter/2010/_import.txt
index 1f543006..1f543006 100644
--- a/npc/easter/2010/_import.txt
+++ b/world/map/npc/easter/2010/_import.txt
diff --git a/npc/easter/2010/egg_func.txt b/world/map/npc/easter/2010/egg_func.txt
index 9dbf669e..9dbf669e 100644
--- a/npc/easter/2010/egg_func.txt
+++ b/world/map/npc/easter/2010/egg_func.txt
diff --git a/npc/easter/2010/eggs.txt b/world/map/npc/easter/2010/eggs.txt
index 0b1af508..0b1af508 100644
--- a/npc/easter/2010/eggs.txt
+++ b/world/map/npc/easter/2010/eggs.txt
diff --git a/npc/easter/2010/helper.txt b/world/map/npc/easter/2010/helper.txt
index 2dfccae1..2dfccae1 100644
--- a/npc/easter/2010/helper.txt
+++ b/world/map/npc/easter/2010/helper.txt
diff --git a/npc/easter/2011/bunny.txt b/world/map/npc/easter/2011/bunny.txt
index e9d920ac..e9d920ac 100644
--- a/npc/easter/2011/bunny.txt
+++ b/world/map/npc/easter/2011/bunny.txt
diff --git a/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 3c060071..3c060071 100644
--- a/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
diff --git a/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index 8d0a32e3..8d0a32e3 100644
--- a/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
diff --git a/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 62eada3d..62eada3d 100644
--- a/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
diff --git a/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt
index dc56895b..dc56895b 100644
--- a/npc/functions/dailyquest.txt
+++ b/world/map/npc/functions/dailyquest.txt
diff --git a/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index 4de46eb9..4de46eb9 100644
--- a/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
diff --git a/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 95a176ec..95a176ec 100644
--- a/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
diff --git a/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index d67887f3..d67887f3 100644
--- a/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
diff --git a/npc/functions/inn.txt b/world/map/npc/functions/inn.txt
index 810dbd1d..810dbd1d 100644
--- a/npc/functions/inn.txt
+++ b/world/map/npc/functions/inn.txt
diff --git a/npc/functions/magic.txt b/world/map/npc/functions/magic.txt
index c4abcab6..c4abcab6 100644
--- a/npc/functions/magic.txt
+++ b/world/map/npc/functions/magic.txt
diff --git a/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index a84e24a5..a84e24a5 100644
--- a/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
diff --git a/npc/functions/process_equip.txt b/world/map/npc/functions/process_equip.txt
index 6a56dcbc..6a56dcbc 100644
--- a/npc/functions/process_equip.txt
+++ b/world/map/npc/functions/process_equip.txt
diff --git a/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt
index 8f4482cc..8f4482cc 100644
--- a/npc/functions/slot_machine.txt
+++ b/world/map/npc/functions/slot_machine.txt
diff --git a/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt
index a98681c6..a98681c6 100644
--- a/npc/functions/soul_menhir.txt
+++ b/world/map/npc/functions/soul_menhir.txt
diff --git a/npc/functions/strangerquiz.txt b/world/map/npc/functions/strangerquiz.txt
index 28fc6887..28fc6887 100644
--- a/npc/functions/strangerquiz.txt
+++ b/world/map/npc/functions/strangerquiz.txt
diff --git a/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index c2d9a1e0..c2d9a1e0 100644
--- a/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
diff --git a/npc/halloween/2006/halloween1.txt b/world/map/npc/halloween/2006/halloween1.txt
index 3d36a02b..3d36a02b 100644
--- a/npc/halloween/2006/halloween1.txt
+++ b/world/map/npc/halloween/2006/halloween1.txt
diff --git a/npc/halloween/2006/halloween10.txt b/world/map/npc/halloween/2006/halloween10.txt
index 7f17c860..7f17c860 100644
--- a/npc/halloween/2006/halloween10.txt
+++ b/world/map/npc/halloween/2006/halloween10.txt
diff --git a/npc/halloween/2006/halloween11.txt b/world/map/npc/halloween/2006/halloween11.txt
index adb25c88..adb25c88 100644
--- a/npc/halloween/2006/halloween11.txt
+++ b/world/map/npc/halloween/2006/halloween11.txt
diff --git a/npc/halloween/2006/halloween12.txt b/world/map/npc/halloween/2006/halloween12.txt
index e9dfb3f8..e9dfb3f8 100644
--- a/npc/halloween/2006/halloween12.txt
+++ b/world/map/npc/halloween/2006/halloween12.txt
diff --git a/npc/halloween/2006/halloween13.txt b/world/map/npc/halloween/2006/halloween13.txt
index 1d6825f1..1d6825f1 100644
--- a/npc/halloween/2006/halloween13.txt
+++ b/world/map/npc/halloween/2006/halloween13.txt
diff --git a/npc/halloween/2006/halloween14.txt b/world/map/npc/halloween/2006/halloween14.txt
index de1bcbd1..de1bcbd1 100644
--- a/npc/halloween/2006/halloween14.txt
+++ b/world/map/npc/halloween/2006/halloween14.txt
diff --git a/npc/halloween/2006/halloween15.txt b/world/map/npc/halloween/2006/halloween15.txt
index 86ae037c..86ae037c 100644
--- a/npc/halloween/2006/halloween15.txt
+++ b/world/map/npc/halloween/2006/halloween15.txt
diff --git a/npc/halloween/2006/halloween16.txt b/world/map/npc/halloween/2006/halloween16.txt
index c1ce2a0f..c1ce2a0f 100644
--- a/npc/halloween/2006/halloween16.txt
+++ b/world/map/npc/halloween/2006/halloween16.txt
diff --git a/npc/halloween/2006/halloween17.txt b/world/map/npc/halloween/2006/halloween17.txt
index 68fa53fc..68fa53fc 100644
--- a/npc/halloween/2006/halloween17.txt
+++ b/world/map/npc/halloween/2006/halloween17.txt
diff --git a/npc/halloween/2006/halloween18.txt b/world/map/npc/halloween/2006/halloween18.txt
index 4fe1c98a..4fe1c98a 100644
--- a/npc/halloween/2006/halloween18.txt
+++ b/world/map/npc/halloween/2006/halloween18.txt
diff --git a/npc/halloween/2006/halloween19.txt b/world/map/npc/halloween/2006/halloween19.txt
index 5899781e..5899781e 100644
--- a/npc/halloween/2006/halloween19.txt
+++ b/world/map/npc/halloween/2006/halloween19.txt
diff --git a/npc/halloween/2006/halloween2.txt b/world/map/npc/halloween/2006/halloween2.txt
index d4415452..d4415452 100644
--- a/npc/halloween/2006/halloween2.txt
+++ b/world/map/npc/halloween/2006/halloween2.txt
diff --git a/npc/halloween/2006/halloween20.txt b/world/map/npc/halloween/2006/halloween20.txt
index bb7c2a0b..bb7c2a0b 100644
--- a/npc/halloween/2006/halloween20.txt
+++ b/world/map/npc/halloween/2006/halloween20.txt
diff --git a/npc/halloween/2006/halloween3.txt b/world/map/npc/halloween/2006/halloween3.txt
index c640522e..c640522e 100644
--- a/npc/halloween/2006/halloween3.txt
+++ b/world/map/npc/halloween/2006/halloween3.txt
diff --git a/npc/halloween/2006/halloween4.txt b/world/map/npc/halloween/2006/halloween4.txt
index 94f4cc2a..94f4cc2a 100644
--- a/npc/halloween/2006/halloween4.txt
+++ b/world/map/npc/halloween/2006/halloween4.txt
diff --git a/npc/halloween/2006/halloween5.txt b/world/map/npc/halloween/2006/halloween5.txt
index 187b59c5..187b59c5 100644
--- a/npc/halloween/2006/halloween5.txt
+++ b/world/map/npc/halloween/2006/halloween5.txt
diff --git a/npc/halloween/2006/halloween6.txt b/world/map/npc/halloween/2006/halloween6.txt
index bd991810..bd991810 100644
--- a/npc/halloween/2006/halloween6.txt
+++ b/world/map/npc/halloween/2006/halloween6.txt
diff --git a/npc/halloween/2006/halloween7.txt b/world/map/npc/halloween/2006/halloween7.txt
index 2e8993aa..2e8993aa 100644
--- a/npc/halloween/2006/halloween7.txt
+++ b/world/map/npc/halloween/2006/halloween7.txt
diff --git a/npc/halloween/2006/halloween8.txt b/world/map/npc/halloween/2006/halloween8.txt
index 257ca0e0..257ca0e0 100644
--- a/npc/halloween/2006/halloween8.txt
+++ b/world/map/npc/halloween/2006/halloween8.txt
diff --git a/npc/halloween/2006/halloween9.txt b/world/map/npc/halloween/2006/halloween9.txt
index 3b97ecac..3b97ecac 100644
--- a/npc/halloween/2006/halloween9.txt
+++ b/world/map/npc/halloween/2006/halloween9.txt
diff --git a/npc/halloween/2006/monsters.txt b/world/map/npc/halloween/2006/monsters.txt
index e64799f4..e64799f4 100644
--- a/npc/halloween/2006/monsters.txt
+++ b/world/map/npc/halloween/2006/monsters.txt
diff --git a/npc/halloween/2008/monsters.txt b/world/map/npc/halloween/2008/monsters.txt
index a0f32222..a0f32222 100644
--- a/npc/halloween/2008/monsters.txt
+++ b/world/map/npc/halloween/2008/monsters.txt
diff --git a/npc/halloween/2008/prize_master.txt b/world/map/npc/halloween/2008/prize_master.txt
index 2b0cf642..2b0cf642 100644
--- a/npc/halloween/2008/prize_master.txt
+++ b/world/map/npc/halloween/2008/prize_master.txt
diff --git a/npc/halloween/2009/Candyman.txt b/world/map/npc/halloween/2009/Candyman.txt
index 517e94b3..517e94b3 100644
--- a/npc/halloween/2009/Candyman.txt
+++ b/world/map/npc/halloween/2009/Candyman.txt
diff --git a/npc/halloween/2010/gak.txt b/world/map/npc/halloween/2010/gak.txt
index 92d559d8..92d559d8 100644
--- a/npc/halloween/2010/gak.txt
+++ b/world/map/npc/halloween/2010/gak.txt
diff --git a/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt
index 09a854bd..09a854bd 100644
--- a/npc/items/purification_potion.txt
+++ b/world/map/npc/items/purification_potion.txt
diff --git a/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index 7d8e96ab..7d8e96ab 100644
--- a/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
diff --git a/npc/items/scissors.txt b/world/map/npc/items/scissors.txt
index 0e10453c..0e10453c 100644
--- a/npc/items/scissors.txt
+++ b/world/map/npc/items/scissors.txt
diff --git a/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index 3fc6d8e0..3fc6d8e0 100644
--- a/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
diff --git a/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt
index 72d24b70..72d24b70 100644
--- a/npc/items/unreleased_item.txt
+++ b/world/map/npc/items/unreleased_item.txt
diff --git a/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 1c39b98b..1c39b98b 100644
--- a/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
diff --git a/npc/scripts.conf b/world/map/npc/scripts.conf
index 8d07ff18..8d07ff18 100644
--- a/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
diff --git a/npc/xmas/2006/xmas1.txt b/world/map/npc/xmas/2006/xmas1.txt
index a79be191..a79be191 100644
--- a/npc/xmas/2006/xmas1.txt
+++ b/world/map/npc/xmas/2006/xmas1.txt
diff --git a/npc/xmas/2006/xmas10.txt b/world/map/npc/xmas/2006/xmas10.txt
index b0f057fc..b0f057fc 100644
--- a/npc/xmas/2006/xmas10.txt
+++ b/world/map/npc/xmas/2006/xmas10.txt
diff --git a/npc/xmas/2006/xmas11.txt b/world/map/npc/xmas/2006/xmas11.txt
index 47fece68..47fece68 100644
--- a/npc/xmas/2006/xmas11.txt
+++ b/world/map/npc/xmas/2006/xmas11.txt
diff --git a/npc/xmas/2006/xmas12.txt b/world/map/npc/xmas/2006/xmas12.txt
index cf234be1..cf234be1 100644
--- a/npc/xmas/2006/xmas12.txt
+++ b/world/map/npc/xmas/2006/xmas12.txt
diff --git a/npc/xmas/2006/xmas13.txt b/world/map/npc/xmas/2006/xmas13.txt
index aa2c87f8..aa2c87f8 100644
--- a/npc/xmas/2006/xmas13.txt
+++ b/world/map/npc/xmas/2006/xmas13.txt
diff --git a/npc/xmas/2006/xmas14.txt b/world/map/npc/xmas/2006/xmas14.txt
index 73673088..73673088 100644
--- a/npc/xmas/2006/xmas14.txt
+++ b/world/map/npc/xmas/2006/xmas14.txt
diff --git a/npc/xmas/2006/xmas15.txt b/world/map/npc/xmas/2006/xmas15.txt
index 6deca2d2..6deca2d2 100644
--- a/npc/xmas/2006/xmas15.txt
+++ b/world/map/npc/xmas/2006/xmas15.txt
diff --git a/npc/xmas/2006/xmas16.txt b/world/map/npc/xmas/2006/xmas16.txt
index 05325115..05325115 100644
--- a/npc/xmas/2006/xmas16.txt
+++ b/world/map/npc/xmas/2006/xmas16.txt
diff --git a/npc/xmas/2006/xmas17.txt b/world/map/npc/xmas/2006/xmas17.txt
index 0144dcf4..0144dcf4 100644
--- a/npc/xmas/2006/xmas17.txt
+++ b/world/map/npc/xmas/2006/xmas17.txt
diff --git a/npc/xmas/2006/xmas18.txt b/world/map/npc/xmas/2006/xmas18.txt
index a4d059a7..a4d059a7 100644
--- a/npc/xmas/2006/xmas18.txt
+++ b/world/map/npc/xmas/2006/xmas18.txt
diff --git a/npc/xmas/2006/xmas19.txt b/world/map/npc/xmas/2006/xmas19.txt
index aa2c83c8..aa2c83c8 100644
--- a/npc/xmas/2006/xmas19.txt
+++ b/world/map/npc/xmas/2006/xmas19.txt
diff --git a/npc/xmas/2006/xmas2.txt b/world/map/npc/xmas/2006/xmas2.txt
index 6fbc22bf..6fbc22bf 100644
--- a/npc/xmas/2006/xmas2.txt
+++ b/world/map/npc/xmas/2006/xmas2.txt
diff --git a/npc/xmas/2006/xmas20.txt b/world/map/npc/xmas/2006/xmas20.txt
index 488d97f6..488d97f6 100644
--- a/npc/xmas/2006/xmas20.txt
+++ b/world/map/npc/xmas/2006/xmas20.txt
diff --git a/npc/xmas/2006/xmas3.txt b/world/map/npc/xmas/2006/xmas3.txt
index df6094b1..df6094b1 100644
--- a/npc/xmas/2006/xmas3.txt
+++ b/world/map/npc/xmas/2006/xmas3.txt
diff --git a/npc/xmas/2006/xmas4.txt b/world/map/npc/xmas/2006/xmas4.txt
index a873ad76..a873ad76 100644
--- a/npc/xmas/2006/xmas4.txt
+++ b/world/map/npc/xmas/2006/xmas4.txt
diff --git a/npc/xmas/2006/xmas5.txt b/world/map/npc/xmas/2006/xmas5.txt
index ae3829e6..ae3829e6 100644
--- a/npc/xmas/2006/xmas5.txt
+++ b/world/map/npc/xmas/2006/xmas5.txt
diff --git a/npc/xmas/2006/xmas6.txt b/world/map/npc/xmas/2006/xmas6.txt
index d119451f..d119451f 100644
--- a/npc/xmas/2006/xmas6.txt
+++ b/world/map/npc/xmas/2006/xmas6.txt
diff --git a/npc/xmas/2006/xmas7.txt b/world/map/npc/xmas/2006/xmas7.txt
index 1e38da05..1e38da05 100644
--- a/npc/xmas/2006/xmas7.txt
+++ b/world/map/npc/xmas/2006/xmas7.txt
diff --git a/npc/xmas/2006/xmas8.txt b/world/map/npc/xmas/2006/xmas8.txt
index 506ebefe..506ebefe 100644
--- a/npc/xmas/2006/xmas8.txt
+++ b/world/map/npc/xmas/2006/xmas8.txt
diff --git a/npc/xmas/2006/xmas9.txt b/world/map/npc/xmas/2006/xmas9.txt
index 18da309e..18da309e 100644
--- a/npc/xmas/2006/xmas9.txt
+++ b/world/map/npc/xmas/2006/xmas9.txt
diff --git a/npc/xmas/2007/after-xmas.txt b/world/map/npc/xmas/2007/after-xmas.txt
index f7678d98..f7678d98 100644
--- a/npc/xmas/2007/after-xmas.txt
+++ b/world/map/npc/xmas/2007/after-xmas.txt
diff --git a/npc/xmas/2007/pre-xmas.txt b/world/map/npc/xmas/2007/pre-xmas.txt
index ba9c7c11..ba9c7c11 100644
--- a/npc/xmas/2007/pre-xmas.txt
+++ b/world/map/npc/xmas/2007/pre-xmas.txt
diff --git a/npc/xmas/2008/event.txt b/world/map/npc/xmas/2008/event.txt
index 5ac1be37..5ac1be37 100644
--- a/npc/xmas/2008/event.txt
+++ b/world/map/npc/xmas/2008/event.txt
diff --git a/npc/xmas/2009/event.txt b/world/map/npc/xmas/2009/event.txt
index 4e78b38a..4e78b38a 100644
--- a/npc/xmas/2009/event.txt
+++ b/world/map/npc/xmas/2009/event.txt
diff --git a/npc/xmas/2010/_import.txt b/world/map/npc/xmas/2010/_import.txt
index e68c6992..e68c6992 100644
--- a/npc/xmas/2010/_import.txt
+++ b/world/map/npc/xmas/2010/_import.txt
diff --git a/npc/xmas/2010/golbanez.txt b/world/map/npc/xmas/2010/golbanez.txt
index f5a0e01b..f5a0e01b 100644
--- a/npc/xmas/2010/golbanez.txt
+++ b/world/map/npc/xmas/2010/golbanez.txt
diff --git a/npc/xmas/2010/santa.txt b/world/map/npc/xmas/2010/santa.txt
index bd82a251..bd82a251 100644
--- a/npc/xmas/2010/santa.txt
+++ b/world/map/npc/xmas/2010/santa.txt
diff --git a/resources2.php b/world/map/resources2.php
index de77e978..de77e978 100644
--- a/resources2.php
+++ b/world/map/resources2.php
diff --git a/world/map/save/.gitignore b/world/map/save/.gitignore
new file mode 100644
index 00000000..11d10d30
--- /dev/null
+++ b/world/map/save/.gitignore
@@ -0,0 +1 @@
+/mapreg.txt
diff --git a/versions.php b/world/map/versions.php
index 601fb252..601fb252 100644
--- a/versions.php
+++ b/world/map/versions.php
diff --git a/world/save/.gitignore b/world/save/.gitignore
new file mode 100644
index 00000000..db9c3e7b
--- /dev/null
+++ b/world/save/.gitignore
@@ -0,0 +1,6 @@
+/athena.txt
+/accreg.txt
+/party.txt
+/storage.txt
+/guild.txt
+/castle.txt