Merge branch 'master' of git@gitorious.org:tmw-eathena-data/map-renaming

46 files changed, 151 insertions, 147 deletions

diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index 7c475922..31adafe1 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -1,22 +1,22 @@
 map: 001-1.gat
-npc: npc/001-1_Tulimshar/workers.txt
-npc: npc/001-1_Tulimshar/vincent.txt
-npc: npc/001-1_Tulimshar/soul-menhir.txt
-npc: npc/001-1_Tulimshar/sandra.txt
-npc: npc/001-1_Tulimshar/rules.txt
-npc: npc/001-1_Tulimshar/rewards_master.txt
-npc: npc/001-1_Tulimshar/monsters.txt
-npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/merchant.txt
-npc: npc/001-1_Tulimshar/man.txt
-npc: npc/001-1_Tulimshar/guide.txt
-npc: npc/001-1_Tulimshar/guards.txt
-npc: npc/001-1_Tulimshar/elanore.txt
-npc: npc/001-1_Tulimshar/constable.txt
-npc: npc/001-1_Tulimshar/children.txt
-npc: npc/001-1_Tulimshar/bleacher.txt
-npc: npc/001-1_Tulimshar/bard.txt
-npc: npc/001-1_Tulimshar/barber.txt
-npc: npc/001-1_Tulimshar/banker.txt
-npc: npc/001-1_Tulimshar/_warps.txt
 npc: npc/001-1_Tulimshar/_mobs.txt
+npc: npc/001-1_Tulimshar/_warps.txt
+npc: npc/001-1_Tulimshar/banker.txt
+npc: npc/001-1_Tulimshar/barber.txt
+npc: npc/001-1_Tulimshar/bard.txt
+npc: npc/001-1_Tulimshar/bleacher.txt
+npc: npc/001-1_Tulimshar/children.txt
+npc: npc/001-1_Tulimshar/constable.txt
+npc: npc/001-1_Tulimshar/elanore.txt
+npc: npc/001-1_Tulimshar/guards.txt
+npc: npc/001-1_Tulimshar/guide.txt
+npc: npc/001-1_Tulimshar/man.txt
+npc: npc/001-1_Tulimshar/merchant.txt
+npc: npc/001-1_Tulimshar/monster_guide.txt
+npc: npc/001-1_Tulimshar/monsters.txt
+npc: npc/001-1_Tulimshar/rewards_master.txt
+npc: npc/001-1_Tulimshar/rules.txt
+npc: npc/001-1_Tulimshar/sandra.txt
+npc: npc/001-1_Tulimshar/soul-menhir.txt
+npc: npc/001-1_Tulimshar/vincent.txt
+npc: npc/001-1_Tulimshar/workers.txt
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
index 15ecfe64..99123cba 100644
--- a/npc/001-2_Tulimshar/_import.txt
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -1,8 +1,8 @@
 map: 001-2.gat
-npc: npc/001-2_Tulimshar/troupe_leader.txt
-npc: npc/001-2_Tulimshar/shops.txt
-npc: npc/001-2_Tulimshar/phaet.txt
-npc: npc/001-2_Tulimshar/omar.txt
-npc: npc/001-2_Tulimshar/casino.txt
-npc: npc/001-2_Tulimshar/_warps.txt
 npc: npc/001-2_Tulimshar/_mobs.txt
+npc: npc/001-2_Tulimshar/_warps.txt
+npc: npc/001-2_Tulimshar/casino.txt
+npc: npc/001-2_Tulimshar/omar.txt
+npc: npc/001-2_Tulimshar/phaet.txt
+npc: npc/001-2_Tulimshar/shops.txt
+npc: npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/001-3_Tulimshar_arena/_import.txt b/npc/001-3_Tulimshar_arena/_import.txt
index 78af71cf..a6824625 100644
--- a/npc/001-3_Tulimshar_arena/_import.txt
+++ b/npc/001-3_Tulimshar_arena/_import.txt
@@ -1,6 +1,6 @@
 map: 001-3.gat
+npc: npc/001-3_Tulimshar_arena/_mobs.txt
+npc: npc/001-3_Tulimshar_arena/_warps.txt
 npc: npc/001-3_Tulimshar_arena/guards.txt
-npc: npc/001-3_Tulimshar_arena/pvpflag.txt
 npc: npc/001-3_Tulimshar_arena/monsters.txt
-npc: npc/001-3_Tulimshar_arena/_warps.txt
-npc: npc/001-3_Tulimshar_arena/_mobs.txt
+npc: npc/001-3_Tulimshar_arena/pvpflag.txt
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
index 4697808e..14adaccf 100644
--- a/npc/002-1_Sandstorm/_import.txt
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -1,8 +1,8 @@
 map: 002-1.gat
-npc: npc/002-1_Sandstorm/rogue.txt
-npc: npc/002-1_Sandstorm/nomads.txt
-npc: npc/002-1_Sandstorm/monsters.txt
-npc: npc/002-1_Sandstorm/merchant.txt
-npc: npc/002-1_Sandstorm/dark_mage.txt
-npc: npc/002-1_Sandstorm/_warps.txt
 npc: npc/002-1_Sandstorm/_mobs.txt
+npc: npc/002-1_Sandstorm/_warps.txt
+npc: npc/002-1_Sandstorm/dark_mage.txt
+npc: npc/002-1_Sandstorm/merchant.txt
+npc: npc/002-1_Sandstorm/monsters.txt
+npc: npc/002-1_Sandstorm/nomads.txt
+npc: npc/002-1_Sandstorm/rogue.txt
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index 8cb14224..3e223b09 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -1,5 +1,5 @@
 map: 002-3.gat
-npc: npc/002-3_Desert_mines/monsters.txt
-npc: npc/002-3_Desert_mines/miners.txt
-npc: npc/002-3_Desert_mines/_warps.txt
 npc: npc/002-3_Desert_mines/_mobs.txt
+npc: npc/002-3_Desert_mines/_warps.txt
+npc: npc/002-3_Desert_mines/miners.txt
+npc: npc/002-3_Desert_mines/monsters.txt
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
index 5d87397b..cb715b3d 100644
--- a/npc/002-4_Desert_mines/_import.txt
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -1,6 +1,6 @@
 map: 002-4.gat
+npc: npc/002-4_Desert_mines/_mobs.txt
+npc: npc/002-4_Desert_mines/_warps.txt
+npc: npc/002-4_Desert_mines/chest.txt
 npc: npc/002-4_Desert_mines/miners.txt
 npc: npc/002-4_Desert_mines/monsters.txt
-npc: npc/002-4_Desert_mines/chest.txt
-npc: npc/002-4_Desert_mines/_warps.txt
-npc: npc/002-4_Desert_mines/_mobs.txt
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
index 4b7c721a..58b5145e 100644
--- a/npc/003-1_Beach/_import.txt
+++ b/npc/003-1_Beach/_import.txt
@@ -1,4 +1,4 @@
 map: 003-1.gat
+npc: npc/003-1_Beach/_mobs.txt
 npc: npc/003-1_Beach/_warps.txt
 npc: npc/003-1_Beach/monsters.txt
-npc: npc/003-1_Beach/_mobs.txt
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt
index 2358947b..4c86e53f 100644
--- a/npc/003-1_Beach/_warps.txt
+++ b/npc/003-1_Beach/_warps.txt
@@ -2,3 +2,4 @@
 
 003-1.gat,172,77	warp	ToSandstorm	-1,3,002-1.gat,37,109
 003-1.gat,20,23	warp	ToWoodland	1,-1,007-1.gat,120,112
+003-1.gat,141,19	warp	ToBeach	1,-1,004-1.gat,37,111
diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt
index fc7c344b..0b1dba07 100644
--- a/npc/004-1_Beach/_import.txt
+++ b/npc/004-1_Beach/_import.txt
@@ -1,4 +1,4 @@
 map: 004-1.gat
-npc: npc/004-1_Beach/monsters.txt
-npc: npc/004-1_Beach/_warps.txt
 npc: npc/004-1_Beach/_mobs.txt
+npc: npc/004-1_Beach/_warps.txt
+npc: npc/004-1_Beach/monsters.txt
diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
index 88bd9e5d..0259ed1e 100644
--- a/npc/005-1_Snake_desert/_import.txt
+++ b/npc/005-1_Snake_desert/_import.txt
@@ -1,5 +1,5 @@
 map: 005-1.gat
-npc: npc/005-1_Snake_desert/npcs.txt
-npc: npc/005-1_Snake_desert/monsters.txt
-npc: npc/005-1_Snake_desert/_warps.txt
 npc: npc/005-1_Snake_desert/_mobs.txt
+npc: npc/005-1_Snake_desert/_warps.txt
+npc: npc/005-1_Snake_desert/monsters.txt
+npc: npc/005-1_Snake_desert/npcs.txt
diff --git a/npc/005-1_Snake_desert/_warps.txt b/npc/005-1_Snake_desert/_warps.txt
index f21bdf8a..734d38d4 100644
--- a/npc/005-1_Snake_desert/_warps.txt
+++ b/npc/005-1_Snake_desert/_warps.txt
@@ -2,7 +2,7 @@
 
 005-1.gat,19,41	warp	ToSandstorm	-1,2,002-1.gat,106,78
 005-1.gat,89,23	warp	ToSnakeCave	-1,-1,005-3.gat,52,34
-005-1.gat,71,75	warp	ToSnakeCave	-1,-1,005-3.gat,33,83
+005-1.gat,71,75	warp	ToSnakeCave	-1,-1,005-3.gat,33,82
 005-1.gat,167,108	warp	ToDesertMountains	-1,-1,006-1.gat,20,33
 005-1.gat,168,107	warp	ToDesertMountains	-1,-1,006-1.gat,21,32
 005-1.gat,169,106	warp	ToDesertMountains	-1,-1,006-1.gat,22,31
diff --git a/npc/005-3_Snake_pit/_import.txt b/npc/005-3_Snake_pit/_import.txt
index b22eb36a..1f66ac7f 100644
--- a/npc/005-3_Snake_pit/_import.txt
+++ b/npc/005-3_Snake_pit/_import.txt
@@ -1,4 +1,4 @@
 map: 005-3.gat
-npc: npc/005-3_Snake_pit/monsters.txt
-npc: npc/005-3_Snake_pit/_warps.txt
 npc: npc/005-3_Snake_pit/_mobs.txt
+npc: npc/005-3_Snake_pit/_warps.txt
+npc: npc/005-3_Snake_pit/monsters.txt
diff --git a/npc/005-3_Snake_pit/_warps.txt b/npc/005-3_Snake_pit/_warps.txt
index 95a1e419..b86421f3 100644
--- a/npc/005-3_Snake_pit/_warps.txt
+++ b/npc/005-3_Snake_pit/_warps.txt
@@ -1,4 +1,4 @@
 // 005-3 Snake pit warps
 
 005-3.gat,52,33	warp	CaveExit	-1,-1,005-1.gat,89,24
-005-3.gat,33,82	warp	CaveExit	-1,-1,005-1.gat,71,76
+005-3.gat,33,82	warp	CaveExit	-1,-1,005-1.gat,71,75
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index d1373469..aa3a86de 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -1,6 +1,6 @@
 map: 006-1.gat
+npc: npc/006-1_Desert_mountains/_mobs.txt
+npc: npc/006-1_Desert_mountains/_warps.txt
 npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/pachua.txt
 npc: npc/006-1_Desert_mountains/monsters.txt
-npc: npc/006-1_Desert_mountains/_warps.txt
-npc: npc/006-1_Desert_mountains/_mobs.txt
+npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-3_Desert_mountain_caves/_import.txt b/npc/006-3_Desert_mountain_caves/_import.txt
index 90fb5864..f3a4690c 100644
--- a/npc/006-3_Desert_mountain_caves/_import.txt
+++ b/npc/006-3_Desert_mountain_caves/_import.txt
@@ -1,4 +1,4 @@
 map: 006-3.gat
-npc: npc/006-3_Desert_mountain_caves/monsters.txt
-npc: npc/006-3_Desert_mountain_caves/_warps.txt
 npc: npc/006-3_Desert_mountain_caves/_mobs.txt
+npc: npc/006-3_Desert_mountain_caves/_warps.txt
+npc: npc/006-3_Desert_mountain_caves/monsters.txt
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
index 9c40defc..25e7ee54 100644
--- a/npc/006-3_Desert_mountain_caves/_warps.txt
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -8,6 +8,7 @@
 006-3.gat,122,24	warp	CavesExit	-1,-1,006-1.gat,122,25
 006-3.gat,114,49	warp	CavesExit	-1,-1,006-1.gat,114,50
 006-3.gat,104,44	warp	CavesExit	-1,-1,006-1.gat,104,45
+006-3.gat,77,44	warp	CavesExit	-1,-1,006-1.gat,77,45
 006-3.gat,60,68	warp	CavesExit	-1,-1,006-1.gat,60,59
 006-3.gat,92,63	warp	CavesExit	-1,-1,006-1.gat,92,64
 006-3.gat,112,74	warp	CavesExit	-1,-1,006-1.gat,112,75
diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1_Woodland/_import.txt
index 946aaa92..1bd01390 100644
--- a/npc/007-1_Woodland/_import.txt
+++ b/npc/007-1_Woodland/_import.txt
@@ -1,4 +1,4 @@
 map: 007-1.gat
-npc: npc/007-1_Woodland/monsters.txt
-npc: npc/007-1_Woodland/_warps.txt
 npc: npc/007-1_Woodland/_mobs.txt
+npc: npc/007-1_Woodland/_warps.txt
+npc: npc/007-1_Woodland/monsters.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
index a734d9f3..a5a1eec8 100644
--- a/npc/008-1_Hurnscald_outskirts/_import.txt
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -1,6 +1,6 @@
 map: 008-1.gat
-npc: npc/008-1_Hurnscald_outskirts/monsters.txt
-npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
-npc: npc/008-1_Hurnscald_outskirts/george.txt
-npc: npc/008-1_Hurnscald_outskirts/_warps.txt
 npc: npc/008-1_Hurnscald_outskirts/_mobs.txt
+npc: npc/008-1_Hurnscald_outskirts/_warps.txt
+npc: npc/008-1_Hurnscald_outskirts/george.txt
+npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
+npc: npc/008-1_Hurnscald_outskirts/monsters.txt
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
index 2539081d..b98c06c3 100644
--- a/npc/009-1_Hurnscald/_import.txt
+++ b/npc/009-1_Hurnscald/_import.txt
@@ -1,9 +1,9 @@
 map: 009-1.gat
+npc: npc/009-1_Hurnscald/_mobs.txt
+npc: npc/009-1_Hurnscald/_warps.txt
 npc: npc/009-1_Hurnscald/jack.txt
-npc: npc/009-1_Hurnscald/soul-menhir.txt
-npc: npc/009-1_Hurnscald/sabine.txt
-npc: npc/009-1_Hurnscald/old_woman.txt
-npc: npc/009-1_Hurnscald/old_man.txt
 npc: npc/009-1_Hurnscald/milly.txt
-npc: npc/009-1_Hurnscald/_warps.txt
-npc: npc/009-1_Hurnscald/_mobs.txt
+npc: npc/009-1_Hurnscald/old_man.txt
+npc: npc/009-1_Hurnscald/old_woman.txt
+npc: npc/009-1_Hurnscald/sabine.txt
+npc: npc/009-1_Hurnscald/soul-menhir.txt
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
index ac8bd982..d2badb7b 100644
--- a/npc/009-2_Hurnscald/_import.txt
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -1,15 +1,15 @@
 map: 009-2.gat
+npc: npc/009-2_Hurnscald/_mobs.txt
+npc: npc/009-2_Hurnscald/_warps.txt
 npc: npc/009-2_Hurnscald/alan.txt
-npc: npc/009-2_Hurnscald/waitress.txt
-npc: npc/009-2_Hurnscald/shops.txt
-npc: npc/009-2_Hurnscald/selim.txt
-npc: npc/009-2_Hurnscald/richard.txt
-npc: npc/009-2_Hurnscald/nurse.txt
-npc: npc/009-2_Hurnscald/nicholas.txt
-npc: npc/009-2_Hurnscald/misc.txt
-npc: npc/009-2_Hurnscald/kfahr.txt
-npc: npc/009-2_Hurnscald/inspector.txt
-npc: npc/009-2_Hurnscald/drunks.txt
 npc: npc/009-2_Hurnscald/doctor.txt
-npc: npc/009-2_Hurnscald/_warps.txt
-npc: npc/009-2_Hurnscald/_mobs.txt
+npc: npc/009-2_Hurnscald/drunks.txt
+npc: npc/009-2_Hurnscald/inspector.txt
+npc: npc/009-2_Hurnscald/kfahr.txt
+npc: npc/009-2_Hurnscald/misc.txt
+npc: npc/009-2_Hurnscald/nicholas.txt
+npc: npc/009-2_Hurnscald/nurse.txt
+npc: npc/009-2_Hurnscald/richard.txt
+npc: npc/009-2_Hurnscald/selim.txt
+npc: npc/009-2_Hurnscald/shops.txt
+npc: npc/009-2_Hurnscald/waitress.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_import.txt b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
index 51acac0c..0297260b 100644
--- a/npc/009-3_Cave_beneath_Hurnscald/_import.txt
+++ b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
@@ -1,4 +1,4 @@
 map: 009-3.gat
-npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
-npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
 npc: npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt
index e322de4d..3b2aca90 100644
--- a/npc/010-1_Woodland/_import.txt
+++ b/npc/010-1_Woodland/_import.txt
@@ -1,4 +1,4 @@
 map: 010-1.gat
+npc: npc/010-1_Woodland/_mobs.txt
 npc: npc/010-1_Woodland/_warps.txt
 npc: npc/010-1_Woodland/monsters.txt
-npc: npc/010-1_Woodland/_mobs.txt
diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt
index 738d850f..dc812c2d 100644
--- a/npc/010-2_Dimond's_Cove/_import.txt
+++ b/npc/010-2_Dimond's_Cove/_import.txt
@@ -1,7 +1,7 @@
 map: 010-2.gat
+npc: npc/010-2_Dimond's_Cove/_mobs.txt
+npc: npc/010-2_Dimond's_Cove/_warps.txt
+npc: npc/010-2_Dimond's_Cove/dimonds.txt
 npc: npc/010-2_Dimond's_Cove/doug.txt
-npc: npc/010-2_Dimond's_Cove/workers.txt
 npc: npc/010-2_Dimond's_Cove/loratay.txt
-npc: npc/010-2_Dimond's_Cove/dimonds.txt
-npc: npc/010-2_Dimond's_Cove/_warps.txt
-npc: npc/010-2_Dimond's_Cove/_mobs.txt
+npc: npc/010-2_Dimond's_Cove/workers.txt
diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt
index 2afbca54..ce529acf 100644
--- a/npc/011-1_Woodland/_import.txt
+++ b/npc/011-1_Woodland/_import.txt
@@ -1,6 +1,6 @@
 map: 011-1.gat
-npc: npc/011-1_Woodland/oscar.txt
-npc: npc/011-1_Woodland/monsters.txt
-npc: npc/011-1_Woodland/alchemist.txt
-npc: npc/011-1_Woodland/_warps.txt
 npc: npc/011-1_Woodland/_mobs.txt
+npc: npc/011-1_Woodland/_warps.txt
+npc: npc/011-1_Woodland/alchemist.txt
+npc: npc/011-1_Woodland/monsters.txt
+npc: npc/011-1_Woodland/oscar.txt
diff --git a/npc/011-1_Woodland/_warps.txt b/npc/011-1_Woodland/_warps.txt
index 345ffbe2..2cb1fd80 100644
--- a/npc/011-1_Woodland/_warps.txt
+++ b/npc/011-1_Woodland/_warps.txt
@@ -1,7 +1,7 @@
 // 011-1 Woodland warps
 
 011-1.gat,58,92	warp	ToCave	-1,-1,011-3.gat,15,15
-011-1.gat,30,61	warp	ToWoodland	-1,1,014-1.gat,180,90
+011-1.gat,30,61	warp	ToWoodland	-1,1,014-1.gat,106,91
 011-1.gat,49,104	warp	ToWoodland	0,-1,010-1.gat,50,25
 011-1.gat,125,62	warp	ToWoodland	-1,2,008-1.gat,27,61
 011-1.gat,73,11	warp	ToWoodlandHills	0,-1,012-1.gat,131,162
diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt
index 08b2f921..5cf9225b 100644
--- a/npc/011-3_Hermit's_cave/_import.txt
+++ b/npc/011-3_Hermit's_cave/_import.txt
@@ -1,5 +1,5 @@
 map: 011-3.gat
-npc: npc/011-3_Hermit's_cave/monsters.txt
-npc: npc/011-3_Hermit's_cave/hermit.txt
-npc: npc/011-3_Hermit's_cave/_warps.txt
 npc: npc/011-3_Hermit's_cave/_mobs.txt
+npc: npc/011-3_Hermit's_cave/_warps.txt
+npc: npc/011-3_Hermit's_cave/hermit.txt
+npc: npc/011-3_Hermit's_cave/monsters.txt
diff --git a/npc/011-4_Lake_cave/_import.txt b/npc/011-4_Lake_cave/_import.txt
index 37f9085e..f2cfbc87 100644
--- a/npc/011-4_Lake_cave/_import.txt
+++ b/npc/011-4_Lake_cave/_import.txt
@@ -1,4 +1,4 @@
 map: 011-4.gat
-npc: npc/011-4_Lake_cave/monsters.txt
-npc: npc/011-4_Lake_cave/_warps.txt
 npc: npc/011-4_Lake_cave/_mobs.txt
+npc: npc/011-4_Lake_cave/_warps.txt
+npc: npc/011-4_Lake_cave/monsters.txt
diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
index 178bca3f..851f97fc 100644
--- a/npc/012-1_Woodland_Hills/_import.txt
+++ b/npc/012-1_Woodland_Hills/_import.txt
@@ -1,5 +1,5 @@
 map: 012-1.gat
-npc: npc/012-1_Woodland_Hills/shops.txt
-npc: npc/012-1_Woodland_Hills/monsters.txt
-npc: npc/012-1_Woodland_Hills/_warps.txt
 npc: npc/012-1_Woodland_Hills/_mobs.txt
+npc: npc/012-1_Woodland_Hills/_warps.txt
+npc: npc/012-1_Woodland_Hills/monsters.txt
+npc: npc/012-1_Woodland_Hills/shops.txt
diff --git a/npc/012-1_Woodland_Hills/_warps.txt b/npc/012-1_Woodland_Hills/_warps.txt
index f8c58466..6c4eaead 100644
--- a/npc/012-1_Woodland_Hills/_warps.txt
+++ b/npc/012-1_Woodland_Hills/_warps.txt
@@ -1,6 +1,7 @@
 // 012-1 Woodland Hills warps
 
 012-1.gat,51,39	warp	ToCaves	-1,-1,012-3.gat,370,45
+012-1.gat,147,67	warp	ToCaves	-1,-1,012-3.gat,474,103
 012-1.gat,41,48	warp	ToCaves	-1,-1,012-3.gat,353,78
 012-1.gat,44,88	warp	ToCaves	-1,-1,012-3.gat,354,187
 012-1.gat,92,104	warp	ToCaves	-1,-1,012-3.gat,270,111
diff --git a/npc/012-3_Cave/_import.txt b/npc/012-3_Cave/_import.txt
index 270632e0..92995992 100644
--- a/npc/012-3_Cave/_import.txt
+++ b/npc/012-3_Cave/_import.txt
@@ -1,4 +1,4 @@
 map: 012-3.gat
-npc: npc/012-3_Cave/monsters.txt
-npc: npc/012-3_Cave/_warps.txt
 npc: npc/012-3_Cave/_mobs.txt
+npc: npc/012-3_Cave/_warps.txt
+npc: npc/012-3_Cave/monsters.txt
diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt
index 595ef1ad..c4c325bc 100644
--- a/npc/013-1_Woodland_hills/_import.txt
+++ b/npc/013-1_Woodland_hills/_import.txt
@@ -1,4 +1,4 @@
 map: 013-1.gat
+npc: npc/013-1_Woodland_hills/_mobs.txt
 npc: npc/013-1_Woodland_hills/_warps.txt
 npc: npc/013-1_Woodland_hills/monsters.txt
-npc: npc/013-1_Woodland_hills/_mobs.txt
diff --git a/npc/013-2_Magic_house/_import.txt b/npc/013-2_Magic_house/_import.txt
index 0861a37d..3be5cbed 100644
--- a/npc/013-2_Magic_house/_import.txt
+++ b/npc/013-2_Magic_house/_import.txt
@@ -1,6 +1,6 @@
 map: 013-2.gat
+npc: npc/013-2_Magic_house/_mobs.txt
+npc: npc/013-2_Magic_house/_warps.txt
 npc: npc/013-2_Magic_house/apprentice.txt
-npc: npc/013-2_Magic_house/wizard.txt
 npc: npc/013-2_Magic_house/notes.txt
-npc: npc/013-2_Magic_house/_warps.txt
-npc: npc/013-2_Magic_house/_mobs.txt
+npc: npc/013-2_Magic_house/wizard.txt
diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
index 40597409..87e36072 100644
--- a/npc/013-3_Cave/_import.txt
+++ b/npc/013-3_Cave/_import.txt
@@ -1,8 +1,9 @@
 map: 013-3.gat
-npc: npc/013-3_Cave/barrier.txt
-npc: npc/013-3_Cave/misc.txt
-npc: npc/013-3_Cave/_warps.txt
 npc: npc/013-3_Cave/_mobs.txt
+npc: npc/013-3_Cave/_warps.txt
+npc: npc/013-3_Cave/barrier.txt
+npc: npc/013-3_Cave/bookcase.txt
 npc: npc/013-3_Cave/mask_chest.txt
+npc: npc/013-3_Cave/misc.txt
 npc: npc/013-3_Cave/sword_chest.txt
 npc: npc/013-3_Cave/bookcase.txt
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 1ddf1947..6160ff13 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,6 +1,6 @@
 map: 014-1.gat
+npc: npc/014-1_Woodland/_mobs.txt
+npc: npc/014-1_Woodland/_warps.txt
 npc: npc/014-1_Woodland/monsters.txt
 npc: npc/014-1_Woodland/taro.txt
 npc: npc/014-1_Woodland/wedding-officiator.txt
-npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/_mobs.txt
diff --git a/npc/014-3_Cave/_import.txt b/npc/014-3_Cave/_import.txt
index f18b6e02..c9f668ac 100644
--- a/npc/014-3_Cave/_import.txt
+++ b/npc/014-3_Cave/_import.txt
@@ -1,4 +1,4 @@
 map: 014-3.gat
-npc: npc/014-3_Cave/monsters.txt
-npc: npc/014-3_Cave/_warps.txt
 npc: npc/014-3_Cave/_mobs.txt
+npc: npc/014-3_Cave/_warps.txt
+npc: npc/014-3_Cave/monsters.txt
diff --git a/npc/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
index 18c482ca..d92e0749 100644
--- a/npc/015-1_Woodland/_import.txt
+++ b/npc/015-1_Woodland/_import.txt
@@ -1,5 +1,5 @@
 map: 015-1.gat
+npc: npc/015-1_Woodland/_mobs.txt
+npc: npc/015-1_Woodland/_warps.txt
 npc: npc/015-1_Woodland/alice.txt
 npc: npc/015-1_Woodland/monsters.txt
-npc: npc/015-1_Woodland/_warps.txt
-npc: npc/015-1_Woodland/_mobs.txt
diff --git a/npc/016-1_Woodland/_import.txt b/npc/016-1_Woodland/_import.txt
index 5147cc8f..6d6c7bc9 100644
--- a/npc/016-1_Woodland/_import.txt
+++ b/npc/016-1_Woodland/_import.txt
@@ -1,4 +1,4 @@
 map: 016-1.gat
-npc: npc/016-1_Woodland/monsters.txt
-npc: npc/016-1_Woodland/_warps.txt
 npc: npc/016-1_Woodland/_mobs.txt
+npc: npc/016-1_Woodland/_warps.txt
+npc: npc/016-1_Woodland/monsters.txt
diff --git a/npc/017-1_Woodland_hills/_import.txt b/npc/017-1_Woodland_hills/_import.txt
index a447c2d4..30f8ac26 100644
--- a/npc/017-1_Woodland_hills/_import.txt
+++ b/npc/017-1_Woodland_hills/_import.txt
@@ -1,4 +1,4 @@
 map: 017-1.gat
-npc: npc/017-1_Woodland_hills/monsters.txt
-npc: npc/017-1_Woodland_hills/_warps.txt
 npc: npc/017-1_Woodland_hills/_mobs.txt
+npc: npc/017-1_Woodland_hills/_warps.txt
+npc: npc/017-1_Woodland_hills/monsters.txt
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
index c8cd0a44..c2131c51 100644
--- a/npc/018-1_Woodland_mining_camp/_import.txt
+++ b/npc/018-1_Woodland_mining_camp/_import.txt
@@ -1,5 +1,5 @@
 map: 018-1.gat
-npc: npc/018-1_Woodland_mining_camp/monsters.txt
-npc: npc/018-1_Woodland_mining_camp/miners.txt
-npc: npc/018-1_Woodland_mining_camp/_warps.txt
 npc: npc/018-1_Woodland_mining_camp/_mobs.txt
+npc: npc/018-1_Woodland_mining_camp/_warps.txt
+npc: npc/018-1_Woodland_mining_camp/miners.txt
+npc: npc/018-1_Woodland_mining_camp/monsters.txt
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
index 0cb0ff99..2251a393 100644
--- a/npc/018-2_Woodland_minning_camp/_import.txt
+++ b/npc/018-2_Woodland_minning_camp/_import.txt
@@ -1,9 +1,9 @@
 map: 018-2.gat
+npc: npc/018-2_Woodland_minning_camp/_mobs.txt
+npc: npc/018-2_Woodland_minning_camp/_warps.txt
+npc: npc/018-2_Woodland_minning_camp/angus.txt
+npc: npc/018-2_Woodland_minning_camp/books.txt
 npc: npc/018-2_Woodland_minning_camp/caul.txt
-npc: npc/018-2_Woodland_minning_camp/receptionist.txt
-npc: npc/018-2_Woodland_minning_camp/monsters.txt
 npc: npc/018-2_Woodland_minning_camp/miners.txt
-npc: npc/018-2_Woodland_minning_camp/books.txt
-npc: npc/018-2_Woodland_minning_camp/angus.txt
-npc: npc/018-2_Woodland_minning_camp/_warps.txt
-npc: npc/018-2_Woodland_minning_camp/_mobs.txt
+npc: npc/018-2_Woodland_minning_camp/monsters.txt
+npc: npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt
index c716a259..76f20bf9 100644
--- a/npc/018-3_Cave/_import.txt
+++ b/npc/018-3_Cave/_import.txt
@@ -1,3 +1,3 @@
 map: 018-3.gat
-npc: npc/018-3_Cave/_warps.txt
 npc: npc/018-3_Cave/_mobs.txt
+npc: npc/018-3_Cave/_warps.txt
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 3db5780c..855671ad 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -1,7 +1,7 @@
 map: 019-1.gat
-npc: npc/019-1_Snow_field/taro.txt
-npc: npc/019-1_Snow_field/snowman.txt
-npc: npc/019-1_Snow_field/santa.txt
-npc: npc/019-1_Snow_field/monsters.txt
-npc: npc/019-1_Snow_field/_warps.txt
 npc: npc/019-1_Snow_field/_mobs.txt
+npc: npc/019-1_Snow_field/_warps.txt
+npc: npc/019-1_Snow_field/monsters.txt
+npc: npc/019-1_Snow_field/santa.txt
+npc: npc/019-1_Snow_field/snowman.txt
+npc: npc/019-1_Snow_field/taro.txt
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index bae7c91f..2565ac9d 100644
--- a/npc/020-1/_import.txt
+++ b/npc/020-1/_import.txt
@@ -1,8 +1,8 @@
 map: 020-1.gat
-npc: npc/020-1/startrek.txt
-npc: npc/020-1/soul-menhir.txt
-npc: npc/020-1/sexchanger.txt
-npc: npc/020-1/monsters.txt
-npc: npc/020-1/amrak.txt
-npc: npc/020-1/_warps.txt
 npc: npc/020-1/_mobs.txt
+npc: npc/020-1/_warps.txt
+npc: npc/020-1/amrak.txt
+npc: npc/020-1/monsters.txt
+npc: npc/020-1/sexchanger.txt
+npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/startrek.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
index 2190955a..f71241f7 100644
--- a/npc/020-2/_import.txt
+++ b/npc/020-2/_import.txt
@@ -1,5 +1,5 @@
 map: 020-2.gat
-npc: npc/020-2/shops.txt
-npc: npc/020-2/furquest.txt
-npc: npc/020-2/_warps.txt
 npc: npc/020-2/_mobs.txt
+npc: npc/020-2/_warps.txt
+npc: npc/020-2/furquest.txt
+npc: npc/020-2/shops.txt
diff --git a/npc/020-3_Ice_cave/_import.txt b/npc/020-3_Ice_cave/_import.txt
index 98550f66..182e4b6e 100644
--- a/npc/020-3_Ice_cave/_import.txt
+++ b/npc/020-3_Ice_cave/_import.txt
@@ -1,4 +1,4 @@
 map: 020-3.gat
-npc: npc/020-3_Ice_cave/monsters.txt
-npc: npc/020-3_Ice_cave/_warps.txt
 npc: npc/020-3_Ice_cave/_mobs.txt
+npc: npc/020-3_Ice_cave/_warps.txt
+npc: npc/020-3_Ice_cave/monsters.txt
diff --git a/npc/020-4_Ice_cave/_import.txt b/npc/020-4_Ice_cave/_import.txt
index 925010e5..64953f5d 100644
--- a/npc/020-4_Ice_cave/_import.txt
+++ b/npc/020-4_Ice_cave/_import.txt
@@ -1,4 +1,4 @@
 map: 020-4.gat
-npc: npc/020-4_Ice_cave/monsters.txt
-npc: npc/020-4_Ice_cave/_warps.txt
 npc: npc/020-4_Ice_cave/_mobs.txt
+npc: npc/020-4_Ice_cave/_warps.txt
+npc: npc/020-4_Ice_cave/monsters.txt