summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-20 18:51:24 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-20 18:51:24 +0300
commit8dbeb8f308bb2ae9240ed589760b0b3d9a543a35 (patch)
treefcb01d7aefe686856e503b118b2fe46de1e12b79 /npc
parent7f3ac11e400874fe996dd285f07c59c83b08d91f (diff)
downloadserverdata-8dbeb8f308bb2ae9240ed589760b0b3d9a543a35.tar.gz
serverdata-8dbeb8f308bb2ae9240ed589760b0b3d9a543a35.tar.bz2
serverdata-8dbeb8f308bb2ae9240ed589760b0b3d9a543a35.tar.xz
serverdata-8dbeb8f308bb2ae9240ed589760b0b3d9a543a35.zip
Convert npc directory into new format.
Diffstat (limited to 'npc')
-rw-r--r--npc/000-0-0/_import.txt6
-rw-r--r--npc/000-0-1/_import.txt4
-rw-r--r--npc/000-0/_import.txt4
-rw-r--r--npc/000-1/_import.txt42
-rw-r--r--npc/000-2-0/_import.txt12
-rw-r--r--npc/000-2-1/_import.txt28
-rw-r--r--npc/000-2-2/_import.txt6
-rw-r--r--npc/000-2-3/_import.txt16
-rw-r--r--npc/000-2-4/_import.txt8
-rw-r--r--npc/001-1/_import.txt74
-rw-r--r--npc/001-2-0/_import.txt8
-rw-r--r--npc/001-2-1/_import.txt6
-rw-r--r--npc/001-2-10/_import.txt6
-rw-r--r--npc/001-2-11/_import.txt8
-rw-r--r--npc/001-2-12/_import.txt6
-rw-r--r--npc/001-2-13/_import.txt6
-rw-r--r--npc/001-2-14/_import.txt6
-rw-r--r--npc/001-2-15/_import.txt6
-rw-r--r--npc/001-2-16/_import.txt4
-rw-r--r--npc/001-2-17/_import.txt4
-rw-r--r--npc/001-2-18/_import.txt4
-rw-r--r--npc/001-2-19/_import.txt8
-rw-r--r--npc/001-2-2/_import.txt6
-rw-r--r--npc/001-2-20/_import.txt6
-rw-r--r--npc/001-2-21/_import.txt8
-rw-r--r--npc/001-2-22/_import.txt20
-rw-r--r--npc/001-2-23/_import.txt6
-rw-r--r--npc/001-2-24/_import.txt10
-rw-r--r--npc/001-2-25/_import.txt6
-rw-r--r--npc/001-2-26/_import.txt8
-rw-r--r--npc/001-2-27/_import.txt12
-rw-r--r--npc/001-2-28/_import.txt12
-rw-r--r--npc/001-2-29/_import.txt6
-rw-r--r--npc/001-2-3/_import.txt6
-rw-r--r--npc/001-2-30/_import.txt6
-rw-r--r--npc/001-2-31/_import.txt4
-rw-r--r--npc/001-2-32/_import.txt8
-rw-r--r--npc/001-2-33/_import.txt10
-rw-r--r--npc/001-2-34/_import.txt8
-rw-r--r--npc/001-2-35/_import.txt4
-rw-r--r--npc/001-2-36/_import.txt6
-rw-r--r--npc/001-2-37/_import.txt8
-rw-r--r--npc/001-2-38/_import.txt8
-rw-r--r--npc/001-2-39/_import.txt6
-rw-r--r--npc/001-2-4/_import.txt10
-rw-r--r--npc/001-2-40/_import.txt7
-rw-r--r--npc/001-2-41/_import.txt6
-rw-r--r--npc/001-2-5/_import.txt6
-rw-r--r--npc/001-2-6/_import.txt12
-rw-r--r--npc/001-2-7/_import.txt4
-rw-r--r--npc/001-2-8/_import.txt4
-rw-r--r--npc/001-2-9/_import.txt6
-rw-r--r--npc/_import.txt108
-rw-r--r--npc/re/scripts_main.conf7
-rw-r--r--npc/scripts.conf66
-rw-r--r--npc/test/_import.txt22
-rw-r--r--npc/testbg/_import.txt2
57 files changed, 354 insertions, 352 deletions
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt
index 5a0e4fe9..6e826f37 100644
--- a/npc/000-0-0/_import.txt
+++ b/npc/000-0-0/_import.txt
@@ -1,4 +1,4 @@
// Map 000-0-0: La Johanne, First Deck, Sailor's Room
-npc: npc/000-0-0/mapflags.txt
-npc: npc/000-0-0/q'onan.txt
-npc: npc/000-0-0/sailors.txt
+"npc/000-0-0/mapflags.txt",
+"npc/000-0-0/q'onan.txt",
+"npc/000-0-0/sailors.txt",
diff --git a/npc/000-0-1/_import.txt b/npc/000-0-1/_import.txt
index 5fcd23ca..e6111ffc 100644
--- a/npc/000-0-1/_import.txt
+++ b/npc/000-0-1/_import.txt
@@ -1,3 +1,3 @@
// Map 000-0-1: La Johanne, First Deck, Sailor's Room
-npc: npc/000-0-1/mapflags.txt
-npc: npc/000-0-1/narrator.txt
+"npc/000-0-1/mapflags.txt",
+"npc/000-0-1/narrator.txt",
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt
index 14cd8e00..bce8195d 100644
--- a/npc/000-0/_import.txt
+++ b/npc/000-0/_import.txt
@@ -1,3 +1,3 @@
// Map 000-0: Oceania
-npc: npc/000-0/mapflags.txt
-npc: npc/000-0/sailors.txt
+"npc/000-0/mapflags.txt",
+"npc/000-0/sailors.txt",
diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
index cccfc5c9..0c43ef44 100644
--- a/npc/000-1/_import.txt
+++ b/npc/000-1/_import.txt
@@ -1,22 +1,22 @@
// Map 000-1: Drasil Island
-npc: npc/000-1/mapflags.txt
-npc: npc/000-1/_mobs.txt
-npc: npc/000-1/_warps.txt
-npc: npc/000-1/ale.txt
-npc: npc/000-1/astapolos.txt
-npc: npc/000-1/chest.txt
-npc: npc/000-1/couwan.txt
-npc: npc/000-1/darlin.txt
-npc: npc/000-1/fexil.txt
-npc: npc/000-1/gugli.txt
-npc: npc/000-1/gulukan.txt
-npc: npc/000-1/jalad.txt
-npc: npc/000-1/lean.txt
-npc: npc/000-1/maxe.txt
-npc: npc/000-1/muller.txt
-npc: npc/000-1/panels.txt
-npc: npc/000-1/sapartan.txt
-npc: npc/000-1/shop.txt
-npc: npc/000-1/silvio.txt
-npc: npc/000-1/tarlan.txt
-npc: npc/000-1/tibbo.txt
+"npc/000-1/mapflags.txt",
+"npc/000-1/_mobs.txt",
+"npc/000-1/_warps.txt",
+"npc/000-1/ale.txt",
+"npc/000-1/astapolos.txt",
+"npc/000-1/chest.txt",
+"npc/000-1/couwan.txt",
+"npc/000-1/darlin.txt",
+"npc/000-1/fexil.txt",
+"npc/000-1/gugli.txt",
+"npc/000-1/gulukan.txt",
+"npc/000-1/jalad.txt",
+"npc/000-1/lean.txt",
+"npc/000-1/maxe.txt",
+"npc/000-1/muller.txt",
+"npc/000-1/panels.txt",
+"npc/000-1/sapartan.txt",
+"npc/000-1/shop.txt",
+"npc/000-1/silvio.txt",
+"npc/000-1/tarlan.txt",
+"npc/000-1/tibbo.txt",
diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt
index b32b1376..98704625 100644
--- a/npc/000-2-0/_import.txt
+++ b/npc/000-2-0/_import.txt
@@ -1,7 +1,7 @@
// Map 000-2-0: La Johanne, First Deck
-npc: npc/000-2-0/mapflags.txt
-npc: npc/000-2-0/_warps.txt
-npc: npc/000-2-0/billybons.txt
-npc: npc/000-2-0/doors.txt
-npc: npc/000-2-0/julia.txt
-npc: npc/000-2-0/note.txt
+"npc/000-2-0/mapflags.txt",
+"npc/000-2-0/_warps.txt",
+"npc/000-2-0/billybons.txt",
+"npc/000-2-0/doors.txt",
+"npc/000-2-0/julia.txt",
+"npc/000-2-0/note.txt",
diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt
index ddc27509..5ef64326 100644
--- a/npc/000-2-1/_import.txt
+++ b/npc/000-2-1/_import.txt
@@ -1,15 +1,15 @@
// Map 000-2-1: La Johanne, Second Deck
-npc: npc/000-2-1/mapflags.txt
-npc: npc/000-2-1/_mobs.txt
-npc: npc/000-2-1/_warps.txt
-npc: npc/000-2-1/alige.txt
-npc: npc/000-2-1/arpan.txt
-npc: npc/000-2-1/chefgado.txt
-npc: npc/000-2-1/chest.txt
-npc: npc/000-2-1/dan.txt
-npc: npc/000-2-1/devis.txt
-npc: npc/000-2-1/hammock.txt
-npc: npc/000-2-1/knife.txt
-npc: npc/000-2-1/peter.txt
-npc: npc/000-2-1/q'onan.txt
-npc: npc/000-2-1/savepoint.txt
+"npc/000-2-1/mapflags.txt",
+"npc/000-2-1/_mobs.txt",
+"npc/000-2-1/_warps.txt",
+"npc/000-2-1/alige.txt",
+"npc/000-2-1/arpan.txt",
+"npc/000-2-1/chefgado.txt",
+"npc/000-2-1/chest.txt",
+"npc/000-2-1/dan.txt",
+"npc/000-2-1/devis.txt",
+"npc/000-2-1/hammock.txt",
+"npc/000-2-1/knife.txt",
+"npc/000-2-1/peter.txt",
+"npc/000-2-1/q'onan.txt",
+"npc/000-2-1/savepoint.txt",
diff --git a/npc/000-2-2/_import.txt b/npc/000-2-2/_import.txt
index 5dcd9f0d..c45d2958 100644
--- a/npc/000-2-2/_import.txt
+++ b/npc/000-2-2/_import.txt
@@ -1,4 +1,4 @@
// Map 000-2-2: La Johanne, Hold
-npc: npc/000-2-2/doors.txt
-npc: npc/000-2-2/mapflags.txt
-npc: npc/000-2-2/ratto.txt
+"npc/000-2-2/doors.txt",
+"npc/000-2-2/mapflags.txt",
+"npc/000-2-2/ratto.txt",
diff --git a/npc/000-2-3/_import.txt b/npc/000-2-3/_import.txt
index 95486a41..be1dd722 100644
--- a/npc/000-2-3/_import.txt
+++ b/npc/000-2-3/_import.txt
@@ -1,9 +1,9 @@
// Map 000-2-3: La Johanne, Nard's Room
-npc: npc/000-2-3/mapflags.txt
-npc: npc/000-2-3/_warps.txt
-npc: npc/000-2-3/box.txt
-npc: npc/000-2-3/elmo.txt
-npc: npc/000-2-3/hammock.txt
-npc: npc/000-2-3/nard.txt
-npc: npc/000-2-3/piourocket.txt
-npc: npc/000-2-3/sailors.txt
+"npc/000-2-3/mapflags.txt",
+"npc/000-2-3/_warps.txt",
+"npc/000-2-3/box.txt",
+"npc/000-2-3/elmo.txt",
+"npc/000-2-3/hammock.txt",
+"npc/000-2-3/nard.txt",
+"npc/000-2-3/piourocket.txt",
+"npc/000-2-3/sailors.txt",
diff --git a/npc/000-2-4/_import.txt b/npc/000-2-4/_import.txt
index 22ccca31..e3a3cc8c 100644
--- a/npc/000-2-4/_import.txt
+++ b/npc/000-2-4/_import.txt
@@ -1,5 +1,5 @@
// Map 000-2-4: La Johanne, Hold, Alige's Hiding Place
-npc: npc/000-2-4/mapflags.txt
-npc: npc/000-2-4/_mobs.txt
-npc: npc/000-2-4/_warps.txt
-npc: npc/000-2-4/alige.txt
+"npc/000-2-4/mapflags.txt",
+"npc/000-2-4/_mobs.txt",
+"npc/000-2-4/_warps.txt",
+"npc/000-2-4/alige.txt",
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index eccc99a9..1f21d464 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,38 +1,38 @@
// Map 001-1: Artis
-npc: npc/001-1/mapflags.txt
-npc: npc/001-1/_mobs.txt
-npc: npc/001-1/_warps.txt
-npc: npc/001-1/artaxe.txt
-npc: npc/001-1/beuss.txt
-npc: npc/001-1/calypsan.txt
-npc: npc/001-1/carmie.txt
-npc: npc/001-1/chelios.txt
-//npc: npc/001-1/cookiemaster.txt
-npc: npc/001-1/devis.txt
-npc: npc/001-1/doors.txt
-npc: npc/001-1/elmo.txt
-npc: npc/001-1/enora.txt
-npc: npc/001-1/eugene.txt
-npc: npc/001-1/fexil.txt
-npc: npc/001-1/harbours.txt
-npc: npc/001-1/juscare.txt
-npc: npc/001-1/katja.txt
-npc: npc/001-1/lucas.txt
-npc: npc/001-1/merlin.txt
-npc: npc/001-1/manhole.txt
-npc: npc/001-1/mouboo.txt
-npc: npc/001-1/nalkri.txt
-npc: npc/001-1/panels.txt
-npc: npc/001-1/qonan.txt
-npc: npc/001-1/qpid.txt
-npc: npc/001-1/rumly.txt
-npc: npc/001-1/shop.txt
-npc: npc/001-1/sign.txt
-npc: npc/001-1/taree.txt
-npc: npc/001-1/treeleaf.txt
-npc: npc/001-1/xilaxa.txt
-npc: npc/001-1/trees.txt
-npc: npc/001-1/pious.txt
-npc: npc/001-1/flyingpiou.txt
-npc: npc/001-1/wateranimation.txt
-npc: npc/001-1/salem.txt
+"npc/001-1/mapflags.txt",
+"npc/001-1/_mobs.txt",
+"npc/001-1/_warps.txt",
+"npc/001-1/artaxe.txt",
+"npc/001-1/beuss.txt",
+"npc/001-1/calypsan.txt",
+"npc/001-1/carmie.txt",
+"npc/001-1/chelios.txt",
+//"npc/001-1/cookiemaster.txt",
+"npc/001-1/devis.txt",
+"npc/001-1/doors.txt",
+"npc/001-1/elmo.txt",
+"npc/001-1/enora.txt",
+"npc/001-1/eugene.txt",
+"npc/001-1/fexil.txt",
+"npc/001-1/harbours.txt",
+"npc/001-1/juscare.txt",
+"npc/001-1/katja.txt",
+"npc/001-1/lucas.txt",
+"npc/001-1/merlin.txt",
+"npc/001-1/manhole.txt",
+"npc/001-1/mouboo.txt",
+"npc/001-1/nalkri.txt",
+"npc/001-1/panels.txt",
+"npc/001-1/qonan.txt",
+"npc/001-1/qpid.txt",
+"npc/001-1/rumly.txt",
+"npc/001-1/shop.txt",
+"npc/001-1/sign.txt",
+"npc/001-1/taree.txt",
+"npc/001-1/treeleaf.txt",
+"npc/001-1/xilaxa.txt",
+"npc/001-1/trees.txt",
+"npc/001-1/pious.txt",
+"npc/001-1/flyingpiou.txt",
+"npc/001-1/wateranimation.txt",
+"npc/001-1/salem.txt",
diff --git a/npc/001-2-0/_import.txt b/npc/001-2-0/_import.txt
index 41870f55..fb1d7098 100644
--- a/npc/001-2-0/_import.txt
+++ b/npc/001-2-0/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-0: Artis, Light Armor Shop
-npc: npc/001-2-0/mapflags.txt
-npc: npc/001-2-0/_warps.txt
-npc: npc/001-2-0/resa.txt
-npc: npc/001-2-0/shop.txt
+"npc/001-2-0/mapflags.txt",
+"npc/001-2-0/_warps.txt",
+"npc/001-2-0/resa.txt",
+"npc/001-2-0/shop.txt",
diff --git a/npc/001-2-1/_import.txt b/npc/001-2-1/_import.txt
index 26162c0d..b130b929 100644
--- a/npc/001-2-1/_import.txt
+++ b/npc/001-2-1/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-1: Artis, Noble House
-npc: npc/001-2-1/mapflags.txt
-npc: npc/001-2-1/savepoints.txt
-npc: npc/001-2-1/_warps.txt
+"npc/001-2-1/mapflags.txt",
+"npc/001-2-1/savepoints.txt",
+"npc/001-2-1/_warps.txt",
diff --git a/npc/001-2-10/_import.txt b/npc/001-2-10/_import.txt
index 0db0c683..d6cafa3d 100644
--- a/npc/001-2-10/_import.txt
+++ b/npc/001-2-10/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-10: Artis, Noble House
-npc: npc/001-2-10/mapflags.txt
-npc: npc/001-2-10/savepoints.txt
-npc: npc/001-2-10/_warps.txt
+"npc/001-2-10/mapflags.txt",
+"npc/001-2-10/savepoints.txt",
+"npc/001-2-10/_warps.txt",
diff --git a/npc/001-2-11/_import.txt b/npc/001-2-11/_import.txt
index 18caef1a..fd42a7a5 100644
--- a/npc/001-2-11/_import.txt
+++ b/npc/001-2-11/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-11: Artis, Noble House
-npc: npc/001-2-11/mapflags.txt
-npc: npc/001-2-11/mona.txt
-npc: npc/001-2-11/savepoints.txt
-npc: npc/001-2-11/_warps.txt
+"npc/001-2-11/mapflags.txt",
+"npc/001-2-11/mona.txt",
+"npc/001-2-11/savepoints.txt",
+"npc/001-2-11/_warps.txt",
diff --git a/npc/001-2-12/_import.txt b/npc/001-2-12/_import.txt
index 6ca59d2d..cb502c8c 100644
--- a/npc/001-2-12/_import.txt
+++ b/npc/001-2-12/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-12: Artis, Noble House
-npc: npc/001-2-12/mapflags.txt
-npc: npc/001-2-12/oscar.txt
-npc: npc/001-2-12/_warps.txt
+"npc/001-2-12/mapflags.txt",
+"npc/001-2-12/oscar.txt",
+"npc/001-2-12/_warps.txt",
diff --git a/npc/001-2-13/_import.txt b/npc/001-2-13/_import.txt
index 8832f50c..669325bc 100644
--- a/npc/001-2-13/_import.txt
+++ b/npc/001-2-13/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-13: Artis, Noble House, First Floor
-npc: npc/001-2-13/mapflags.txt
-npc: npc/001-2-13/savepoints.txt
-npc: npc/001-2-13/_warps.txt
+"npc/001-2-13/mapflags.txt",
+"npc/001-2-13/savepoints.txt",
+"npc/001-2-13/_warps.txt",
diff --git a/npc/001-2-14/_import.txt b/npc/001-2-14/_import.txt
index 449fa70e..f2b81f32 100644
--- a/npc/001-2-14/_import.txt
+++ b/npc/001-2-14/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-14: Artis, Noble House, Basement
-npc: npc/001-2-14/mapflags.txt
-npc: npc/001-2-14/_mobs.txt
-npc: npc/001-2-14/_warps.txt
+"npc/001-2-14/mapflags.txt",
+"npc/001-2-14/_mobs.txt",
+"npc/001-2-14/_warps.txt",
diff --git a/npc/001-2-15/_import.txt b/npc/001-2-15/_import.txt
index 9768b1ed..84d812e1 100644
--- a/npc/001-2-15/_import.txt
+++ b/npc/001-2-15/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-15: Artis, Noble House
-npc: npc/001-2-15/mapflags.txt
-npc: npc/001-2-15/savepoints.txt
-npc: npc/001-2-15/_warps.txt
+"npc/001-2-15/mapflags.txt",
+"npc/001-2-15/savepoints.txt",
+"npc/001-2-15/_warps.txt",
diff --git a/npc/001-2-16/_import.txt b/npc/001-2-16/_import.txt
index 99d127ac..a49ea87d 100644
--- a/npc/001-2-16/_import.txt
+++ b/npc/001-2-16/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-16: Artis, Harbourmaster Lodge
-npc: npc/001-2-16/mapflags.txt
-npc: npc/001-2-16/_warps.txt
+"npc/001-2-16/mapflags.txt",
+"npc/001-2-16/_warps.txt",
diff --git a/npc/001-2-17/_import.txt b/npc/001-2-17/_import.txt
index c3d7db47..e00df9a8 100644
--- a/npc/001-2-17/_import.txt
+++ b/npc/001-2-17/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-17: Artis, Harbourmaster Lodge, Backroom
-npc: npc/001-2-17/mapflags.txt
-npc: npc/001-2-17/_warps.txt
+"npc/001-2-17/mapflags.txt",
+"npc/001-2-17/_warps.txt",
diff --git a/npc/001-2-18/_import.txt b/npc/001-2-18/_import.txt
index 441a96fd..1eed4415 100644
--- a/npc/001-2-18/_import.txt
+++ b/npc/001-2-18/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-18: Artis, Docks Warehouse
-npc: npc/001-2-18/mapflags.txt
-npc: npc/001-2-18/_warps.txt
+"npc/001-2-18/mapflags.txt",
+"npc/001-2-18/_warps.txt",
diff --git a/npc/001-2-19/_import.txt b/npc/001-2-19/_import.txt
index 9b443991..4091d03e 100644
--- a/npc/001-2-19/_import.txt
+++ b/npc/001-2-19/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-19: Artis, Merchant Hall
-npc: npc/001-2-19/mapflags.txt
-npc: npc/001-2-19/_warps.txt
-npc: npc/001-2-19/doors.txt
-npc: npc/001-2-19/lloyd.txt
+"npc/001-2-19/mapflags.txt",
+"npc/001-2-19/_warps.txt",
+"npc/001-2-19/doors.txt",
+"npc/001-2-19/lloyd.txt",
diff --git a/npc/001-2-2/_import.txt b/npc/001-2-2/_import.txt
index b3584ef6..8e57a5b1 100644
--- a/npc/001-2-2/_import.txt
+++ b/npc/001-2-2/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-2: Moon's House
-npc: npc/001-2-2/mapflags.txt
-npc: npc/001-2-2/_warps.txt
-npc: npc/001-2-2/moon.txt
+"npc/001-2-2/mapflags.txt",
+"npc/001-2-2/_warps.txt",
+"npc/001-2-2/moon.txt",
diff --git a/npc/001-2-20/_import.txt b/npc/001-2-20/_import.txt
index a8b3edb3..f21ef3e0 100644
--- a/npc/001-2-20/_import.txt
+++ b/npc/001-2-20/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-20: Artis, Merchant Hall, Backroom
-npc: npc/001-2-20/mapflags.txt
-npc: npc/001-2-20/_warps.txt
-npc: npc/001-2-20/doors.txt
+"npc/001-2-20/mapflags.txt",
+"npc/001-2-20/_warps.txt",
+"npc/001-2-20/doors.txt",
diff --git a/npc/001-2-21/_import.txt b/npc/001-2-21/_import.txt
index 5740e2a8..50c3f97a 100644
--- a/npc/001-2-21/_import.txt
+++ b/npc/001-2-21/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-21: La Johanne, First Deck
-npc: npc/001-2-21/mapflags.txt
-npc: npc/001-2-21/_warps.txt
-npc: npc/001-2-21/julia.txt
-npc: npc/001-2-21/note.txt
+"npc/001-2-21/mapflags.txt",
+"npc/001-2-21/_warps.txt",
+"npc/001-2-21/julia.txt",
+"npc/001-2-21/note.txt",
diff --git a/npc/001-2-22/_import.txt b/npc/001-2-22/_import.txt
index 3063ecaf..be88ba5f 100644
--- a/npc/001-2-22/_import.txt
+++ b/npc/001-2-22/_import.txt
@@ -1,11 +1,11 @@
// Map 001-2-22: La Johanne, Second Deck
-npc: npc/001-2-22/mapflags.txt
-npc: npc/001-2-22/alige.txt
-npc: npc/001-2-22/chefgado.txt
-npc: npc/001-2-22/chest.txt
-npc: npc/001-2-22/hammock.txt
-npc: npc/001-2-22/knife.txt
-npc: npc/001-2-22/_mobs.txt
-npc: npc/001-2-22/peter.txt
-npc: npc/001-2-22/savepoints.txt
-npc: npc/001-2-22/_warps.txt
+"npc/001-2-22/mapflags.txt",
+"npc/001-2-22/alige.txt",
+"npc/001-2-22/chefgado.txt",
+"npc/001-2-22/chest.txt",
+"npc/001-2-22/hammock.txt",
+"npc/001-2-22/knife.txt",
+"npc/001-2-22/_mobs.txt",
+"npc/001-2-22/peter.txt",
+"npc/001-2-22/savepoints.txt",
+"npc/001-2-22/_warps.txt",
diff --git a/npc/001-2-23/_import.txt b/npc/001-2-23/_import.txt
index bff75ce4..f77ed2c4 100644
--- a/npc/001-2-23/_import.txt
+++ b/npc/001-2-23/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-23: La Johanne, Hold
-npc: npc/001-2-23/doors.txt
-npc: npc/001-2-23/mapflags.txt
-npc: npc/001-2-23/ratto.txt
+"npc/001-2-23/doors.txt",
+"npc/001-2-23/mapflags.txt",
+"npc/001-2-23/ratto.txt",
diff --git a/npc/001-2-24/_import.txt b/npc/001-2-24/_import.txt
index a99c484c..921a374a 100644
--- a/npc/001-2-24/_import.txt
+++ b/npc/001-2-24/_import.txt
@@ -1,6 +1,6 @@
// Map 001-2-24: La Johanne, Nard's Room
-npc: npc/001-2-24/mapflags.txt
-npc: npc/001-2-24/_warps.txt
-npc: npc/001-2-24/hammock.txt
-npc: npc/001-2-24/nard.txt
-npc: npc/001-2-24/piourocket.txt
+"npc/001-2-24/mapflags.txt",
+"npc/001-2-24/_warps.txt",
+"npc/001-2-24/hammock.txt",
+"npc/001-2-24/nard.txt",
+"npc/001-2-24/piourocket.txt",
diff --git a/npc/001-2-25/_import.txt b/npc/001-2-25/_import.txt
index 3d631f18..5adbd55e 100644
--- a/npc/001-2-25/_import.txt
+++ b/npc/001-2-25/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-25: Artis, Merchant Hall, Storage Room
-npc: npc/001-2-25/mapflags.txt
-npc: npc/001-2-25/_mobs.txt
-npc: npc/001-2-25/_warps.txt
+"npc/001-2-25/mapflags.txt",
+"npc/001-2-25/_mobs.txt",
+"npc/001-2-25/_warps.txt",
diff --git a/npc/001-2-26/_import.txt b/npc/001-2-26/_import.txt
index ebae4b09..090f9be8 100644
--- a/npc/001-2-26/_import.txt
+++ b/npc/001-2-26/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-26: Artis, Alchemy Lab
-npc: npc/001-2-26/flask.txt
-npc: npc/001-2-26/ivan.txt
-npc: npc/001-2-26/mapflags.txt
-npc: npc/001-2-26/_warps.txt
+"npc/001-2-26/flask.txt",
+"npc/001-2-26/ivan.txt",
+"npc/001-2-26/mapflags.txt",
+"npc/001-2-26/_warps.txt",
diff --git a/npc/001-2-27/_import.txt b/npc/001-2-27/_import.txt
index 57db74cc..28e0dc1b 100644
--- a/npc/001-2-27/_import.txt
+++ b/npc/001-2-27/_import.txt
@@ -1,7 +1,7 @@
// Map 001-2-27: Artis, Blacksmith Shop
-npc: npc/001-2-27/mapflags.txt
-npc: npc/001-2-27/_warps.txt
-npc: npc/001-2-27/don.txt
-npc: npc/001-2-27/kaylo.txt
-npc: npc/001-2-27/lydon.txt
-npc: npc/001-2-27/shop.txt
+"npc/001-2-27/mapflags.txt",
+"npc/001-2-27/_warps.txt",
+"npc/001-2-27/don.txt",
+"npc/001-2-27/kaylo.txt",
+"npc/001-2-27/lydon.txt",
+"npc/001-2-27/shop.txt",
diff --git a/npc/001-2-28/_import.txt b/npc/001-2-28/_import.txt
index 2337795d..5fb63de6 100644
--- a/npc/001-2-28/_import.txt
+++ b/npc/001-2-28/_import.txt
@@ -1,7 +1,7 @@
// Map 001-2-28: Artis, Red Plush Inn
-npc: npc/001-2-28/_warps.txt
-npc: npc/001-2-28/mapflags.txt
-npc: npc/001-2-28/jenna.txt
-npc: npc/001-2-28/plush.txt
-npc: npc/001-2-28/note.txt
-npc: npc/001-2-28/shop.txt
+"npc/001-2-28/_warps.txt",
+"npc/001-2-28/mapflags.txt",
+"npc/001-2-28/jenna.txt",
+"npc/001-2-28/plush.txt",
+"npc/001-2-28/note.txt",
+"npc/001-2-28/shop.txt",
diff --git a/npc/001-2-29/_import.txt b/npc/001-2-29/_import.txt
index 6c0280cc..3c5e0548 100644
--- a/npc/001-2-29/_import.txt
+++ b/npc/001-2-29/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-29: Artis, Red Plush Inn, First Floor
-npc: npc/001-2-29/_warps.txt
-npc: npc/001-2-29/mapflags.txt
-npc: npc/001-2-29/savepoint.txt
+"npc/001-2-29/_warps.txt",
+"npc/001-2-29/mapflags.txt",
+"npc/001-2-29/savepoint.txt",
diff --git a/npc/001-2-3/_import.txt b/npc/001-2-3/_import.txt
index 338fb549..9ae1cc94 100644
--- a/npc/001-2-3/_import.txt
+++ b/npc/001-2-3/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-3: Artis, Moon's House, First Floor
-npc: npc/001-2-3/mapflags.txt
-npc: npc/001-2-3/savepoints.txt
-npc: npc/001-2-3/_warps.txt
+"npc/001-2-3/mapflags.txt",
+"npc/001-2-3/savepoints.txt",
+"npc/001-2-3/_warps.txt",
diff --git a/npc/001-2-30/_import.txt b/npc/001-2-30/_import.txt
index 15d1dc8e..b6493c68 100644
--- a/npc/001-2-30/_import.txt
+++ b/npc/001-2-30/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-30: Artis, Red Plush Inn, Second Floor
-npc: npc/001-2-30/mapflags.txt
-npc: npc/001-2-30/_mobs.txt
-npc: npc/001-2-30/_warps.txt
+"npc/001-2-30/mapflags.txt",
+"npc/001-2-30/_mobs.txt",
+"npc/001-2-30/_warps.txt",
diff --git a/npc/001-2-31/_import.txt b/npc/001-2-31/_import.txt
index b080a2e0..e50911b6 100644
--- a/npc/001-2-31/_import.txt
+++ b/npc/001-2-31/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-31:
-npc: npc/001-2-31/_warps.txt
-npc: npc/001-2-31/mapflags.txt
+"npc/001-2-31/_warps.txt",
+"npc/001-2-31/mapflags.txt",
diff --git a/npc/001-2-32/_import.txt b/npc/001-2-32/_import.txt
index d9f89d1a..d023b591 100644
--- a/npc/001-2-32/_import.txt
+++ b/npc/001-2-32/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-32:
-npc: npc/001-2-32/_warps.txt
-npc: npc/001-2-32/doors.txt
-npc: npc/001-2-32/mapflags.txt
-npc: npc/001-2-32/serena.txt
+"npc/001-2-32/_warps.txt",
+"npc/001-2-32/doors.txt",
+"npc/001-2-32/mapflags.txt",
+"npc/001-2-32/serena.txt",
diff --git a/npc/001-2-33/_import.txt b/npc/001-2-33/_import.txt
index 0fc78dad..095e0187 100644
--- a/npc/001-2-33/_import.txt
+++ b/npc/001-2-33/_import.txt
@@ -1,6 +1,6 @@
// Map 001-2-33: Artis, Legion of Aemil Headquarters
-npc: npc/001-2-33/_warps.txt
-npc: npc/001-2-33/doors.txt
-npc: npc/001-2-33/lozerk.txt
-npc: npc/001-2-33/mapflags.txt
-npc: npc/001-2-33/triggers.txt
+"npc/001-2-33/_warps.txt",
+"npc/001-2-33/doors.txt",
+"npc/001-2-33/lozerk.txt",
+"npc/001-2-33/mapflags.txt",
+"npc/001-2-33/triggers.txt",
diff --git a/npc/001-2-34/_import.txt b/npc/001-2-34/_import.txt
index 7f28b678..6b70c089 100644
--- a/npc/001-2-34/_import.txt
+++ b/npc/001-2-34/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-34:
-npc: npc/001-2-34/_warps.txt
-npc: npc/001-2-34/doors.txt
-npc: npc/001-2-34/mapflags.txt
-npc: npc/001-2-34/samantha.txt
+"npc/001-2-34/_warps.txt",
+"npc/001-2-34/doors.txt",
+"npc/001-2-34/mapflags.txt",
+"npc/001-2-34/samantha.txt",
diff --git a/npc/001-2-35/_import.txt b/npc/001-2-35/_import.txt
index a5463664..1d471d17 100644
--- a/npc/001-2-35/_import.txt
+++ b/npc/001-2-35/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-35:
-npc: npc/001-2-35/_warps.txt
-npc: npc/001-2-35/mapflags.txt
+"npc/001-2-35/_warps.txt",
+"npc/001-2-35/mapflags.txt",
diff --git a/npc/001-2-36/_import.txt b/npc/001-2-36/_import.txt
index 6609407a..b064d800 100644
--- a/npc/001-2-36/_import.txt
+++ b/npc/001-2-36/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-36:
-npc: npc/001-2-36/_warps.txt
-npc: npc/001-2-36/mapflags.txt
-npc: npc/001-2-36/training_room_npc.txt
+"npc/001-2-36/_warps.txt",
+"npc/001-2-36/mapflags.txt",
+"npc/001-2-36/training_room_npc.txt",
diff --git a/npc/001-2-37/_import.txt b/npc/001-2-37/_import.txt
index 31da7304..52916239 100644
--- a/npc/001-2-37/_import.txt
+++ b/npc/001-2-37/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-37:
-npc: npc/001-2-37/hammock.txt
-npc: npc/001-2-37/mapflags.txt
-npc: npc/001-2-37/savepoints.txt
-npc: npc/001-2-37/_warps.txt
+"npc/001-2-37/hammock.txt",
+"npc/001-2-37/mapflags.txt",
+"npc/001-2-37/savepoints.txt",
+"npc/001-2-37/_warps.txt",
diff --git a/npc/001-2-38/_import.txt b/npc/001-2-38/_import.txt
index 84b789ce..b7b44d44 100644
--- a/npc/001-2-38/_import.txt
+++ b/npc/001-2-38/_import.txt
@@ -1,5 +1,5 @@
// Map 001-2-38:
-npc: npc/001-2-38/hammock.txt
-npc: npc/001-2-38/mapflags.txt
-npc: npc/001-2-38/savepoints.txt
-npc: npc/001-2-38/_warps.txt
+"npc/001-2-38/hammock.txt",
+"npc/001-2-38/mapflags.txt",
+"npc/001-2-38/savepoints.txt",
+"npc/001-2-38/_warps.txt",
diff --git a/npc/001-2-39/_import.txt b/npc/001-2-39/_import.txt
index 8cccc4dd..30810ee5 100644
--- a/npc/001-2-39/_import.txt
+++ b/npc/001-2-39/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-39:
-npc: npc/001-2-39/_warps.txt
-npc: npc/001-2-39/qanon.txt
-npc: npc/001-2-39/mapflags.txt
+"npc/001-2-39/_warps.txt",
+"npc/001-2-39/qanon.txt",
+"npc/001-2-39/mapflags.txt",
diff --git a/npc/001-2-4/_import.txt b/npc/001-2-4/_import.txt
index 4ca6e153..285809ab 100644
--- a/npc/001-2-4/_import.txt
+++ b/npc/001-2-4/_import.txt
@@ -1,6 +1,6 @@
// Map 001-2-4: Artis, Library
-npc: npc/001-2-4/mapflags.txt
-npc: npc/001-2-4/_warps.txt
-npc: npc/001-2-4/doors.txt
-npc: npc/001-2-4/robin.txt
-npc: npc/001-2-4/terry.txt
+"npc/001-2-4/mapflags.txt",
+"npc/001-2-4/_warps.txt",
+"npc/001-2-4/doors.txt",
+"npc/001-2-4/robin.txt",
+"npc/001-2-4/terry.txt",
diff --git a/npc/001-2-40/_import.txt b/npc/001-2-40/_import.txt
index d6140836..8a734ea2 100644
--- a/npc/001-2-40/_import.txt
+++ b/npc/001-2-40/_import.txt
@@ -1,5 +1,4 @@
// Map 001-2-40:
-npc: npc/001-2-40/_warps.txt
-npc: npc/001-2-40/mapflags.txt
-npc: npc/001-2-40/trozz.txt
-
+"npc/001-2-40/_warps.txt",
+"npc/001-2-40/mapflags.txt",
+"npc/001-2-40/trozz.txt",
diff --git a/npc/001-2-41/_import.txt b/npc/001-2-41/_import.txt
index 22042e39..01c76b99 100644
--- a/npc/001-2-41/_import.txt
+++ b/npc/001-2-41/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-41:
-npc: npc/001-2-41/_warps.txt
-npc: npc/001-2-41/mapflags.txt
-npc: npc/001-2-41/edouard.txt
+"npc/001-2-41/_warps.txt",
+"npc/001-2-41/mapflags.txt",
+"npc/001-2-41/edouard.txt",
diff --git a/npc/001-2-5/_import.txt b/npc/001-2-5/_import.txt
index 7088b29b..25d72856 100644
--- a/npc/001-2-5/_import.txt
+++ b/npc/001-2-5/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-5: Artis, Library, Warehouse
-npc: npc/001-2-5/books.txt
-npc: npc/001-2-5/mapflags.txt
-npc: npc/001-2-5/_warps.txt
+"npc/001-2-5/books.txt",
+"npc/001-2-5/mapflags.txt",
+"npc/001-2-5/_warps.txt",
diff --git a/npc/001-2-6/_import.txt b/npc/001-2-6/_import.txt
index 181a8297..315a24ce 100644
--- a/npc/001-2-6/_import.txt
+++ b/npc/001-2-6/_import.txt
@@ -1,7 +1,7 @@
// Map 001-2-6: Artis, Library, First Floor
-npc: npc/001-2-6/mapflags.txt
-npc: npc/001-2-6/_warps.txt
-npc: npc/001-2-6/books.txt
-npc: npc/001-2-6/christopher.txt
-npc: npc/001-2-6/dolfina.txt
-npc: npc/001-2-6/leonard.txt
+"npc/001-2-6/mapflags.txt",
+"npc/001-2-6/_warps.txt",
+"npc/001-2-6/books.txt",
+"npc/001-2-6/christopher.txt",
+"npc/001-2-6/dolfina.txt",
+"npc/001-2-6/leonard.txt",
diff --git a/npc/001-2-7/_import.txt b/npc/001-2-7/_import.txt
index e3c8fa44..356c0f79 100644
--- a/npc/001-2-7/_import.txt
+++ b/npc/001-2-7/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-7: Artis, City Hall
-npc: npc/001-2-7/mapflags.txt
-npc: npc/001-2-7/_warps.txt
+"npc/001-2-7/mapflags.txt",
+"npc/001-2-7/_warps.txt",
diff --git a/npc/001-2-8/_import.txt b/npc/001-2-8/_import.txt
index 426a6ec3..8482930a 100644
--- a/npc/001-2-8/_import.txt
+++ b/npc/001-2-8/_import.txt
@@ -1,3 +1,3 @@
// Map 001-2-8: Artis, City Hall, Left Wing
-npc: npc/001-2-8/mapflags.txt
-npc: npc/001-2-8/_warps.txt
+"npc/001-2-8/mapflags.txt",
+"npc/001-2-8/_warps.txt",
diff --git a/npc/001-2-9/_import.txt b/npc/001-2-9/_import.txt
index 00f7ef92..a74bc989 100644
--- a/npc/001-2-9/_import.txt
+++ b/npc/001-2-9/_import.txt
@@ -1,4 +1,4 @@
// Map 001-2-9: Artis, City Hall, Right Wing
-npc: npc/001-2-9/janus.txt
-npc: npc/001-2-9/mapflags.txt
-npc: npc/001-2-9/_warps.txt
+"npc/001-2-9/janus.txt",
+"npc/001-2-9/mapflags.txt",
+"npc/001-2-9/_warps.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 0f66b8c0..a17a5802 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,54 +1,54 @@
-import: npc/000-0-0/_import.txt
-import: npc/000-0-1/_import.txt
-import: npc/000-0/_import.txt
-import: npc/000-1/_import.txt
-import: npc/000-2-0/_import.txt
-import: npc/000-2-1/_import.txt
-import: npc/000-2-2/_import.txt
-import: npc/000-2-3/_import.txt
-import: npc/000-2-4/_import.txt
-import: npc/001-1/_import.txt
-import: npc/001-2-0/_import.txt
-import: npc/001-2-1/_import.txt
-import: npc/001-2-2/_import.txt
-import: npc/001-2-3/_import.txt
-import: npc/001-2-4/_import.txt
-import: npc/001-2-5/_import.txt
-import: npc/001-2-6/_import.txt
-import: npc/001-2-7/_import.txt
-import: npc/001-2-8/_import.txt
-import: npc/001-2-9/_import.txt
-import: npc/001-2-10/_import.txt
-import: npc/001-2-11/_import.txt
-import: npc/001-2-12/_import.txt
-import: npc/001-2-13/_import.txt
-import: npc/001-2-14/_import.txt
-import: npc/001-2-15/_import.txt
-import: npc/001-2-16/_import.txt
-import: npc/001-2-17/_import.txt
-import: npc/001-2-18/_import.txt
-import: npc/001-2-19/_import.txt
-import: npc/001-2-20/_import.txt
-import: npc/001-2-21/_import.txt
-import: npc/001-2-22/_import.txt
-import: npc/001-2-23/_import.txt
-import: npc/001-2-24/_import.txt
-import: npc/001-2-25/_import.txt
-import: npc/001-2-26/_import.txt
-import: npc/001-2-27/_import.txt
-import: npc/001-2-28/_import.txt
-import: npc/001-2-29/_import.txt
-import: npc/001-2-30/_import.txt
-import: npc/001-2-31/_import.txt
-import: npc/001-2-32/_import.txt
-import: npc/001-2-33/_import.txt
-import: npc/001-2-34/_import.txt
-import: npc/001-2-35/_import.txt
-import: npc/001-2-36/_import.txt
-import: npc/001-2-37/_import.txt
-import: npc/001-2-38/_import.txt
-import: npc/001-2-39/_import.txt
-import: npc/001-2-40/_import.txt
-import: npc/001-2-41/_import.txt
-import: npc/test/_import.txt
-import: npc/testbg/_import.txt
+@include "npc/000-0-0/_import.txt"
+@include "npc/000-0-1/_import.txt"
+@include "npc/000-0/_import.txt"
+@include "npc/000-1/_import.txt"
+@include "npc/000-2-0/_import.txt"
+@include "npc/000-2-1/_import.txt"
+@include "npc/000-2-2/_import.txt"
+@include "npc/000-2-3/_import.txt"
+@include "npc/000-2-4/_import.txt"
+@include "npc/001-1/_import.txt"
+@include "npc/001-2-0/_import.txt"
+@include "npc/001-2-1/_import.txt"
+@include "npc/001-2-2/_import.txt"
+@include "npc/001-2-3/_import.txt"
+@include "npc/001-2-4/_import.txt"
+@include "npc/001-2-5/_import.txt"
+@include "npc/001-2-6/_import.txt"
+@include "npc/001-2-7/_import.txt"
+@include "npc/001-2-8/_import.txt"
+@include "npc/001-2-9/_import.txt"
+@include "npc/001-2-10/_import.txt"
+@include "npc/001-2-11/_import.txt"
+@include "npc/001-2-12/_import.txt"
+@include "npc/001-2-13/_import.txt"
+@include "npc/001-2-14/_import.txt"
+@include "npc/001-2-15/_import.txt"
+@include "npc/001-2-16/_import.txt"
+@include "npc/001-2-17/_import.txt"
+@include "npc/001-2-18/_import.txt"
+@include "npc/001-2-19/_import.txt"
+@include "npc/001-2-20/_import.txt"
+@include "npc/001-2-21/_import.txt"
+@include "npc/001-2-22/_import.txt"
+@include "npc/001-2-23/_import.txt"
+@include "npc/001-2-24/_import.txt"
+@include "npc/001-2-25/_import.txt"
+@include "npc/001-2-26/_import.txt"
+@include "npc/001-2-27/_import.txt"
+@include "npc/001-2-28/_import.txt"
+@include "npc/001-2-29/_import.txt"
+@include "npc/001-2-30/_import.txt"
+@include "npc/001-2-31/_import.txt"
+@include "npc/001-2-32/_import.txt"
+@include "npc/001-2-33/_import.txt"
+@include "npc/001-2-34/_import.txt"
+@include "npc/001-2-35/_import.txt"
+@include "npc/001-2-36/_import.txt"
+@include "npc/001-2-37/_import.txt"
+@include "npc/001-2-38/_import.txt"
+@include "npc/001-2-39/_import.txt"
+@include "npc/001-2-40/_import.txt"
+@include "npc/001-2-41/_import.txt"
+@include "npc/test/_import.txt"
+@include "npc/testbg/_import.txt"
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 4dd3e77c..1861cabc 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -1,2 +1,5 @@
-npc: npc/functions/main.txt
-import: npc/scripts.conf
+// Only files that are included here will be read by the server
+npc_global_list: (
+"npc/functions/main.txt",
+@include "npc/scripts.conf"
+) // npc_global_list
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 8dd4d06f..0dfb7b9e 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -1,44 +1,44 @@
// This is the main script import file
// Item functions
-npc: npc/items/croconut.txt
-npc: npc/items/shovel.txt
-npc: npc/items/rand_sc_heal.txt
+"npc/items/croconut.txt",
+"npc/items/shovel.txt",
+"npc/items/rand_sc_heal.txt",
// Script functions
-npc: npc/functions/input.txt
-npc: npc/functions/asleep.txt
-npc: npc/functions/barber.txt
-npc: npc/functions/clientversion.txt
-npc: npc/functions/doors.txt
-npc: npc/functions/goodbye.txt
-npc: npc/functions/hammocks.txt
-npc: npc/functions/harbours.txt
-npc: npc/functions/hello.txt
-npc: npc/functions/inventoryplace.txt
-npc: npc/functions/legiontalk.txt
-npc: npc/functions/marriage.txt
-npc: npc/functions/npcmove.txt
-npc: npc/functions/masks.txt
-npc: npc/functions/openbook.txt
-npc: npc/functions/sailordialogue.txt
-npc: npc/functions/sailortalk.txt
-npc: npc/functions/savepoint.txt
-npc: npc/functions/beds.txt
-npc: npc/functions/shops.txt
-npc: npc/functions/villagertalk.txt
-npc: npc/functions/npcmovegraph.txt
-npc: npc/functions/fishing.txt
-npc: npc/functions/mouboofunc.txt
-npc: npc/functions/string.txt
+"npc/functions/input.txt",
+"npc/functions/asleep.txt",
+"npc/functions/barber.txt",
+"npc/functions/clientversion.txt",
+"npc/functions/doors.txt",
+"npc/functions/goodbye.txt",
+"npc/functions/hammocks.txt",
+"npc/functions/harbours.txt",
+"npc/functions/hello.txt",
+"npc/functions/inventoryplace.txt",
+"npc/functions/legiontalk.txt",
+"npc/functions/marriage.txt",
+"npc/functions/npcmove.txt",
+"npc/functions/masks.txt",
+"npc/functions/openbook.txt",
+"npc/functions/sailordialogue.txt",
+"npc/functions/sailortalk.txt",
+"npc/functions/savepoint.txt",
+"npc/functions/beds.txt",
+"npc/functions/shops.txt",
+"npc/functions/villagertalk.txt",
+"npc/functions/npcmovegraph.txt",
+"npc/functions/fishing.txt",
+"npc/functions/mouboofunc.txt",
+"npc/functions/string.txt",
// custom atcommands
-npc: npc/commands/music.txt
-npc: npc/commands/warp.txt
-npc: npc/commands/zeny.txt
+"npc/commands/music.txt",
+"npc/commands/warp.txt",
+"npc/commands/zeny.txt",
// config script
-npc: npc/config/hairstyle_config.txt
+"npc/config/hairstyle_config.txt",
// Maps specific scripts
-import: npc/_import.txt
+@include "npc/_import.txt"
diff --git a/npc/test/_import.txt b/npc/test/_import.txt
index e51002ba..6fc546a7 100644
--- a/npc/test/_import.txt
+++ b/npc/test/_import.txt
@@ -1,12 +1,12 @@
// Map test
-npc: npc/test/mapflags.txt
-npc: npc/test/_mobs.txt
-npc: npc/test/_warps.txt
-npc: npc/test/npc1.txt
-npc: npc/test/npc2.txt
-npc: npc/test/npc3.txt
-npc: npc/test/npc4.txt
-npc: npc/test/npc5.txt
-npc: npc/test/npcmarriage.txt
-npc: npc/test/test1.txt
-npc: npc/test/test2.txt
+"npc/test/mapflags.txt",
+"npc/test/_mobs.txt",
+"npc/test/_warps.txt",
+"npc/test/npc1.txt",
+"npc/test/npc2.txt",
+"npc/test/npc3.txt",
+"npc/test/npc4.txt",
+"npc/test/npc5.txt",
+"npc/test/npcmarriage.txt",
+"npc/test/test1.txt",
+"npc/test/test2.txt",
diff --git a/npc/testbg/_import.txt b/npc/testbg/_import.txt
index 77e1a72f..4d88d6b8 100644
--- a/npc/testbg/_import.txt
+++ b/npc/testbg/_import.txt
@@ -1,2 +1,2 @@
// Map testbg
-npc: npc/testbg/mapflags.txt
+"npc/testbg/mapflags.txt",