Update various script-related files and add wlks

73 files changed, 290 insertions, 96 deletions

diff --git a/data/001-1.wlk b/data/001-1.wlk
new file mode 100644
index 00000000..05b6c7aa
--- /dev/null
+++ b/data/001-1.wlk
diff --git a/data/001-2.wlk b/data/001-2.wlk
new file mode 100644
index 00000000..0a762e12
--- /dev/null
+++ b/data/001-2.wlk
diff --git a/data/001-3.wlk b/data/001-3.wlk
new file mode 100644
index 00000000..4a9cd117
--- /dev/null
+++ b/data/001-3.wlk
diff --git a/data/002-1.wlk b/data/002-1.wlk
new file mode 100644
index 00000000..3fe7589b
--- /dev/null
+++ b/data/002-1.wlk
diff --git a/data/002-2.wlk b/data/002-2.wlk
new file mode 100644
index 00000000..5abd252f
--- /dev/null
+++ b/data/002-2.wlk
diff --git a/data/002-3.wlk b/data/002-3.wlk
new file mode 100644
index 00000000..30854f47
--- /dev/null
+++ b/data/002-3.wlk
diff --git a/data/002-4.wlk b/data/002-4.wlk
new file mode 100644
index 00000000..a9d3449b
--- /dev/null
+++ b/data/002-4.wlk
diff --git a/data/003-1.wlk b/data/003-1.wlk
new file mode 100644
index 00000000..49f98e3b
--- /dev/null
+++ b/data/003-1.wlk
diff --git a/data/004-1.wlk b/data/004-1.wlk
new file mode 100644
index 00000000..68d9c716
--- /dev/null
+++ b/data/004-1.wlk
diff --git a/data/005-1.wlk b/data/005-1.wlk
new file mode 100644
index 00000000..fe816a52
--- /dev/null
+++ b/data/005-1.wlk
diff --git a/data/005-3.wlk b/data/005-3.wlk
new file mode 100644
index 00000000..f3c047db
--- /dev/null
+++ b/data/005-3.wlk
diff --git a/data/006-1.wlk b/data/006-1.wlk
new file mode 100644
index 00000000..49ddb542
--- /dev/null
+++ b/data/006-1.wlk
diff --git a/data/006-3.wlk b/data/006-3.wlk
new file mode 100644
index 00000000..d635df84
--- /dev/null
+++ b/data/006-3.wlk
diff --git a/data/007-1.wlk b/data/007-1.wlk
new file mode 100644
index 00000000..cae67d2e
--- /dev/null
+++ b/data/007-1.wlk
diff --git a/data/008-1.wlk b/data/008-1.wlk
new file mode 100644
index 00000000..b011a566
--- /dev/null
+++ b/data/008-1.wlk
diff --git a/data/009-1.wlk b/data/009-1.wlk
new file mode 100644
index 00000000..32a3777c
--- /dev/null
+++ b/data/009-1.wlk
diff --git a/data/009-2.wlk b/data/009-2.wlk
new file mode 100644
index 00000000..06d01de3
--- /dev/null
+++ b/data/009-2.wlk
diff --git a/data/009-3.wlk b/data/009-3.wlk
new file mode 100644
index 00000000..1336606f
--- /dev/null
+++ b/data/009-3.wlk
diff --git a/data/010-1.wlk b/data/010-1.wlk
new file mode 100644
index 00000000..33a7505f
--- /dev/null
+++ b/data/010-1.wlk
diff --git a/data/010-2.wlk b/data/010-2.wlk
new file mode 100644
index 00000000..94fb92cd
--- /dev/null
+++ b/data/010-2.wlk
diff --git a/data/011-1.wlk b/data/011-1.wlk
new file mode 100644
index 00000000..2fa117b4
--- /dev/null
+++ b/data/011-1.wlk
diff --git a/data/011-3.wlk b/data/011-3.wlk
new file mode 100644
index 00000000..d85523c9
--- /dev/null
+++ b/data/011-3.wlk
diff --git a/data/011-4.wlk b/data/011-4.wlk
new file mode 100644
index 00000000..edb29d59
--- /dev/null
+++ b/data/011-4.wlk
diff --git a/data/012-1.wlk b/data/012-1.wlk
new file mode 100644
index 00000000..c1b69913
--- /dev/null
+++ b/data/012-1.wlk
diff --git a/data/012-3.wlk b/data/012-3.wlk
new file mode 100644
index 00000000..3d964065
--- /dev/null
+++ b/data/012-3.wlk
diff --git a/data/013-1.wlk b/data/013-1.wlk
new file mode 100644
index 00000000..f696920b
--- /dev/null
+++ b/data/013-1.wlk
diff --git a/data/013-2.wlk b/data/013-2.wlk
new file mode 100644
index 00000000..c536fec6
--- /dev/null
+++ b/data/013-2.wlk
diff --git a/data/013-3.wlk b/data/013-3.wlk
new file mode 100644
index 00000000..c9a3a1df
--- /dev/null
+++ b/data/013-3.wlk
diff --git a/data/014-1.wlk b/data/014-1.wlk
new file mode 100644
index 00000000..34a98185
--- /dev/null
+++ b/data/014-1.wlk
diff --git a/data/014-3.wlk b/data/014-3.wlk
new file mode 100644
index 00000000..f879ddba
--- /dev/null
+++ b/data/014-3.wlk
diff --git a/data/015-1.wlk b/data/015-1.wlk
new file mode 100644
index 00000000..f3e7bbc9
--- /dev/null
+++ b/data/015-1.wlk
diff --git a/data/016-1.wlk b/data/016-1.wlk
new file mode 100644
index 00000000..2d4f1bbf
--- /dev/null
+++ b/data/016-1.wlk
diff --git a/data/017-1.wlk b/data/017-1.wlk
new file mode 100644
index 00000000..e1468b16
--- /dev/null
+++ b/data/017-1.wlk
diff --git a/data/018-1.wlk b/data/018-1.wlk
new file mode 100644
index 00000000..8d1e57ec
--- /dev/null
+++ b/data/018-1.wlk
diff --git a/data/018-2.wlk b/data/018-2.wlk
new file mode 100644
index 00000000..522bb73d
--- /dev/null
+++ b/data/018-2.wlk
diff --git a/data/018-3.wlk b/data/018-3.wlk
new file mode 100644
index 00000000..f61f75fe
--- /dev/null
+++ b/data/018-3.wlk
diff --git a/data/019-1.wlk b/data/019-1.wlk
new file mode 100644
index 00000000..9e82af57
--- /dev/null
+++ b/data/019-1.wlk
diff --git a/data/020-1.wlk b/data/020-1.wlk
new file mode 100644
index 00000000..ce86eb9a
--- /dev/null
+++ b/data/020-1.wlk
diff --git a/data/020-2.wlk b/data/020-2.wlk
new file mode 100644
index 00000000..b51db172
--- /dev/null
+++ b/data/020-2.wlk
diff --git a/data/020-3.wlk b/data/020-3.wlk
new file mode 100644
index 00000000..49f8a6bc
--- /dev/null
+++ b/data/020-3.wlk
diff --git a/data/020-4.wlk b/data/020-4.wlk
new file mode 100644
index 00000000..e2a1852c
--- /dev/null
+++ b/data/020-4.wlk
diff --git a/data/021-1.wlk b/data/021-1.wlk
new file mode 100644
index 00000000..cd4428d7
--- /dev/null
+++ b/data/021-1.wlk
diff --git a/data/test.wlk b/data/test.wlk
new file mode 100644
index 00000000..871a2267
--- /dev/null
+++ b/data/test.wlk
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index 5aad5934..7c475922 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/merchant.txt
-npc: npc/001-1_Tulimshar/bleacher.txt
-npc: npc/001-1_Tulimshar/elanore.txt
-npc: npc/001-1_Tulimshar/constable.txt
 npc: npc/001-1_Tulimshar/workers.txt
-npc: npc/001-1_Tulimshar/rewards_master.txt
+npc: npc/001-1_Tulimshar/vincent.txt
 npc: npc/001-1_Tulimshar/soul-menhir.txt
-npc: npc/001-1_Tulimshar/guide.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/barber.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/man.txt
-npc: npc/001-1_Tulimshar/vincent.txt
-npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/sandra.txt
-npc: npc/001-1_Tulimshar/rules.txt
-npc: npc/001-1_Tulimshar/banker.txt
-npc: npc/001-1_Tulimshar/children.txt
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
index 8e4299a0..15ecfe64 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/_warps.txt
-npc: npc/001-2_Tulimshar/_mobs.txt
-npc: npc/001-2_Tulimshar/casino.txt
 npc: npc/001-2_Tulimshar/phaet.txt
 npc: npc/001-2_Tulimshar/omar.txt
-npc: npc/001-2_Tulimshar/troupe_leader.txt
+npc: npc/001-2_Tulimshar/casino.txt
+npc: npc/001-2_Tulimshar/_warps.txt
+npc: npc/001-2_Tulimshar/_mobs.txt
diff --git a/npc/001-3_Tulimshar_arena/_import.txt b/npc/001-3_Tulimshar_arena/_import.txt
index c0d05ff3..78af71cf 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/guards.txt
 npc: npc/001-3_Tulimshar_arena/pvpflag.txt
 npc: npc/001-3_Tulimshar_arena/monsters.txt
-npc: npc/001-3_Tulimshar_arena/guards.txt
 npc: npc/001-3_Tulimshar_arena/_warps.txt
 npc: npc/001-3_Tulimshar_arena/_mobs.txt
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
index 081efc41..4697808e 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/merchant.txt
-npc: npc/002-1_Sandstorm/dark_mage.txt
-npc: npc/002-1_Sandstorm/nomads.txt
 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
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index 0a67b2bb..8cb14224 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -1,4 +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/miners.txt
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
index 2fe848bb..5d87397b 100644
--- a/npc/002-4_Desert_mines/_import.txt
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -1,5 +1,6 @@
 map: 002-4.gat
+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
-npc: npc/002-4_Desert_mines/chest.txt
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
index 68474692..4b7c721a 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/monsters.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/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
index 1e044ebb..88bd9e5d 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/monsters.txt
 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
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index f9b8cbc5..d1373469 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/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/mika.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
index 4b580a56..a734d9f3 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/hinnak.txt
 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
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
index 30460185..2539081d 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/soul-menhir.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/sabine.txt
-npc: npc/009-1_Hurnscald/milly.txt
-npc: npc/009-1_Hurnscald/old_woman.txt
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
index 09ac6fb5..ac8bd982 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/nicholas.txt
 npc: npc/009-2_Hurnscald/alan.txt
-npc: npc/009-2_Hurnscald/doctor.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/misc.txt
-npc: npc/009-2_Hurnscald/drunks.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/inspector.txt
diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt
index b57664d0..e322de4d 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/monsters.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 d6dce5d1..738d850f 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/loratay.txt
-npc: npc/010-2_Dimond's_Cove/workers.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/dimonds.txt
diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt
index 94c4f6c9..2afbca54 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/alchemist.txt
+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/oscar.txt
 npc: npc/011-1_Woodland/_mobs.txt
diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt
index f97408df..08b2f921 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/hermit.txt
 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
diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
index 0b283c90..178bca3f 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/monsters.txt
 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
diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt
index 8ee0c0be..595ef1ad 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/monsters.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 a1303967..0861a37d 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/apprentice.txt
 npc: npc/013-2_Magic_house/wizard.txt
 npc: npc/013-2_Magic_house/notes.txt
-npc: npc/013-2_Magic_house/apprentice.txt
 npc: npc/013-2_Magic_house/_warps.txt
 npc: npc/013-2_Magic_house/_mobs.txt
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
index 4c3e8330..b89dc170 100644
--- a/npc/013-3_Cave/_mobs.txt
+++ b/npc/013-3_Cave/_mobs.txt
@@ -1,7 +1,86 @@
 // 013-3 Cave mobs
 
+013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,0,0,Mob013-3::On1021
+013-3.gat,61,22,2,2	monster	Fire Skull	1023,3,0,0,Mob013-3::On1023
+013-3.gat,81,22,2,2	monster	Poison Skull	1024,3,0,0,Mob013-3::On1024
+013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,0,0,Mob013-3::On1009
+013-3.gat,119,84,27,38	monster	Spider	1012,20,0,0,Mob013-3::On1012
+013-3.gat,176,23,5,6	monster	Spider	1012,10,0,0,Mob013-3::On1012
+013-3.gat,82,75,2,2	monster	Fire skull	1023,1,0,0,Mob013-3::On1023
+013-3.gat,142,37,2,2	monster	Poison skull	1024,1,0,0,Mob013-3::On1024
+013-3.gat,79,134,21,16	monster	Scorpion	1003,5,0,0,Mob013-3::On1003
+013-3.gat,71,169,38,17	monster	Red scorpion	1004,5,0,0,Mob013-3::On1004
+013-3.gat,64,85,9,21	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
+013-3.gat,81,92,3,20	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
+013-3.gat,162,84,33,37	monster	Snake	1010,30,0,0,Mob013-3::On1010
+013-3.gat,162,85,33,37	monster	Spider	1012,30,0,0,Mob013-3::On1012
+013-3.gat,172,77,18,25	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
+013-3.gat,145,36,20,15	monster	Red slime	1008,25,0,0,Mob013-3::On1008
+013-3.gat,167,37,23,11	monster	Snake	1010,20,0,0,Mob013-3::On1010
+013-3.gat,165,25,16,11	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
+013-3.gat,71,39,2,3	monster	Cave snake	1021,2,0,0,Mob013-3::On1021
+013-3.gat,159,102,3,5	monster	Yellow slime	1007,2,0,0,Mob013-3::On1007
+013-3.gat,67,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
+013-3.gat,75,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
+013-3.gat,76,39,7,4	monster	Black scorpion	1009,8,0,0,Mob013-3::On1009
+013-3.gat,65,39,7,4	monster	Red slime	1008,8,0,0,Mob013-3::On1008
 
 
 013-3.gat,0,0,0	script	Mob013-3	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1004:
+	set @mobID, 1004;
+	callfunc "MobPoints";
+	break;
+
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+On1021:
+	set @mobID, 1021;
+	callfunc "MobPoints";
+	break;
+
+On1023:
+	set @mobID, 1023;
+	callfunc "MobPoints";
+	break;
+
+On1024:
+	set @mobID, 1024;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 9828f4d8..1ddf1947 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/wedding-officiator.txt
-npc: npc/014-1_Woodland/taro.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/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
index e37b2791..18c482ca 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/monsters.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/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
index 38e14457..c8cd0a44 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/miners.txt
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index df2cf445..1f6d4706 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -22,6 +22,7 @@
 018-1.gat,78,55,37,6	monster	Fire Goblin	1011,7,0,0,Mob018-1::On1011
 018-1.gat,145,24,10,9	monster	Green Slime	1005,3,0,0,Mob018-1::On1005
 018-1.gat,68,89,14,17	monster	Scorpion	1003,3,0,0,Mob018-1::On1003
+018-1.gat,160,31,11,18	monster	Scorpion	1003,5,0,0,Mob018-1::On1003
 
 
 018-1.gat,0,0,0	script	Mob018-1	-1,{
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
index 247fe1d3..0cb0ff99 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/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/monsters.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/receptionist.txt
-npc: npc/018-2_Woodland_minning_camp/miners.txt
-npc: npc/018-2_Woodland_minning_camp/caul.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
index f18b58ab..668d5902 100644
--- a/npc/018-3_Cave/_mobs.txt
+++ b/npc/018-3_Cave/_mobs.txt
@@ -1,7 +1,118 @@
 // 018-3 Cave mobs
 
+018-3.gat,48,28,57,16	monster	Silk Worm	1035,8,0,0,Mob018-3::On1035
+018-3.gat,48,28,56,17	monster	Bat	1017,10,0,0,Mob018-3::On1017
+018-3.gat,35,62,31,15	monster	Evil Mushroom	1013,10,0,0,Mob018-3::On1013
+018-3.gat,35,65,28,22	monster	Spiky Mushroom	1019,15,0,0,Mob018-3::On1019
+018-3.gat,28,157,3,2	monster	Flower	1014,1,0,0,Mob018-3::On1014
+018-3.gat,99,110,17,39	monster	Yellow slime	1007,10,0,0,Mob018-3::On1007
+018-3.gat,137,140,2,1	monster	Spider	1012,1,300000,120000,Mob018-3::On1012
+018-3.gat,102,172,131,13	monster	Black scorpions	1009,20,0,0,Mob018-3::On1009
+018-3.gat,174,37,10,31	monster	Yellow slime	1007,5,0,0,Mob018-3::On1007
+018-3.gat,135,148,10,6	monster	Giant maggot	1006,2,0,0,Mob018-3::On1006
+018-3.gat,134,140,12,8	monster	Maggot	1002,3,0,0,Mob018-3::On1002
+018-3.gat,34,142,30,48	monster	Fire goblin	1011,4,0,0,Mob018-3::On1011
+018-3.gat,87,153,78,22	monster	Snake	1010,10,0,0,Mob018-3::On1010
+018-3.gat,148,148,13,24	monster	Bat	1017,3,0,0,Mob018-3::On1017
+018-3.gat,153,97,18,22	monster	Yellow slime	1007,6,0,0,Mob018-3::On1007
+018-3.gat,81,77,27,21	monster	Red slime	1008,15,0,0,Mob018-3::On1008
+018-3.gat,111,80,5,6	monster	Black scorpions	1009,10,0,0,Mob018-3::On1009
+018-3.gat,175,122,5,40	monster	Snake	1010,15,0,0,Mob018-3::On1010
+018-3.gat,98,75,1,2	monster	Fire skull	1023,1,0,0,Mob018-3::On1023
+018-3.gat,100,75,1,2	monster	Poison skull	2024,1,0,0,Mob018-3::On2024
+018-3.gat,171,95,15,19	monster	Red scorpion	1004,5,0,0,Mob018-3::On1004
+018-3.gat,134,87,17,7	monster	Red slime	1008,10,0,0,Mob018-3::On1008
+018-3.gat,59,95,11,8	monster	Spider	1012,15,0,0,Mob018-3::On1012
+018-3.gat,77,92,23,7	monster	Black scorpion	1009,15,0,0,Mob018-3::On1009
+018-3.gat,133,39,12,17	monster	Spider	1012,10,0,0,Mob018-3::On1012
+018-3.gat,111,33,30,16	monster	Mountain snake	1026,15,0,0,Mob018-3::On1026
 
 
 018-3.gat,0,0,0	script	Mob018-3	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1004:
+	set @mobID, 1004;
+	callfunc "MobPoints";
+	break;
+
+On1006:
+	set @mobID, 1006;
+	callfunc "MobPoints";
+	break;
+
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+On1013:
+	set @mobID, 1013;
+	callfunc "MobPoints";
+	break;
+
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1017:
+	set @mobID, 1017;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1023:
+	set @mobID, 1023;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
+On1035:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
+On2024:
+	set @mobID, 2024;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 0b6958a8..3db5780c 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/snowman.txt
 npc: npc/019-1_Snow_field/taro.txt
-npc: npc/019-1_Snow_field/monsters.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
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index c6c4d3b5..bae7c91f 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/amrak.txt
-npc: npc/020-1/sexchanger.txt
+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/startrek.txt
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
index b49bb059..2190955a 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/furquest.txt
 npc: npc/020-2/shops.txt
+npc: npc/020-2/furquest.txt
 npc: npc/020-2/_warps.txt
 npc: npc/020-2/_mobs.txt
diff --git a/npc/_import.txt b/npc/_import.txt
index bb22ec47..42b140a9 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,41 +1,42 @@
-import: npc/020-3_Ice_cave/_import.txt
-import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/012-3_Cave/_import.txt
-import: npc/010-2_Dimond's_Cove/_import.txt
-import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
-import: npc/020-2/_import.txt
-import: npc/018-3_Cave/_import.txt
-import: npc/008-1_Hurnscald_outskirts/_import.txt
-import: npc/006-3_Desert_mountain_caves/_import.txt
-import: npc/019-1_Snow_field/_import.txt
+import: npc/001-1_Tulimshar/_import.txt
+import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/020-1/_import.txt
+import: npc/002-1_Sandstorm/_import.txt
 import: npc/002-2/_import.txt
-import: npc/007-1_Woodland/_import.txt
-import: npc/013-1_Woodland_hills/_import.txt
-import: npc/016-1_Woodland/_import.txt
-import: npc/010-1_Woodland/_import.txt
-import: npc/014-1_Woodland/_import.txt
+import: npc/002-3_Desert_mines/_import.txt
+import: npc/002-4_Desert_mines/_import.txt
+import: npc/003-1_Beach/_import.txt
 import: npc/004-1_Beach/_import.txt
 import: npc/005-1_Snake_desert/_import.txt
-import: npc/002-1_Sandstorm/_import.txt
-import: npc/018-2_Woodland_minning_camp/_import.txt
-import: npc/011-4_Lake_cave/_import.txt
-import: npc/013-2_Magic_house/_import.txt
-import: npc/003-1_Beach/_import.txt
-import: npc/015-1_Woodland/_import.txt
 import: npc/005-3_Snake_pit/_import.txt
-import: npc/014-3_Cave/_import.txt
-import: npc/011-3_Hermit's_cave/_import.txt
-import: npc/017-1_Woodland_hills/_import.txt
-import: npc/001-2_Tulimshar/_import.txt
+import: npc/006-1_Desert_mountains/_import.txt
+import: npc/006-3_Desert_mountain_caves/_import.txt
+import: npc/007-1_Woodland/_import.txt
+import: npc/008-1_Hurnscald_outskirts/_import.txt
+import: npc/009-1_Hurnscald/_import.txt
 import: npc/009-2_Hurnscald/_import.txt
+import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
+import: npc/010-1_Woodland/_import.txt
+import: npc/010-2_Dimond's_Cove/_import.txt
+import: npc/011-1_Woodland/_import.txt
+import: npc/011-3_Hermit's_cave/_import.txt
+import: npc/011-4_Lake_cave/_import.txt
 import: npc/012-1_Woodland_Hills/_import.txt
-import: npc/001-1_Tulimshar/_import.txt
-import: npc/002-4_Desert_mines/_import.txt
+import: npc/012-3_Cave/_import.txt
+import: npc/013-1_Woodland_hills/_import.txt
+import: npc/013-2_Magic_house/_import.txt
 import: npc/013-3_Cave/_import.txt
-import: npc/009-1_Hurnscald/_import.txt
-import: npc/006-1_Desert_mountains/_import.txt
+import: npc/014-1_Woodland/_import.txt
+import: npc/014-3_Cave/_import.txt
+import: npc/015-1_Woodland/_import.txt
+import: npc/016-1_Woodland/_import.txt
+import: npc/017-1_Woodland_hills/_import.txt
+import: npc/018-1_Woodland_mining_camp/_import.txt
+import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-3_Cave/_import.txt
+import: npc/019-1_Snow_field/_import.txt
+import: npc/020-1/_import.txt
+import: npc/test/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3_Ice_cave/_import.txt
 import: npc/020-4_Ice_cave/_import.txt
-import: npc/002-3_Desert_mines/_import.txt
-import: npc/011-1_Woodland/_import.txt