From 66c29c2c8ac07e43cc2cb35df9ad1b2cd43d77cf Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sun, 4 Sep 2011 21:46:40 +0200
Subject: Replacing spawns from monsters.txt with spawn objects in maps.

Converter ran.
Submodule pointer updated.
---
 world/map/npc/001-3/_import.txt  |  1 -
 world/map/npc/001-3/_mobs.txt    |  6 ++++
 world/map/npc/001-3/monsters.txt | 13 ---------
 world/map/npc/005-3/_import.txt  |  1 -
 world/map/npc/005-3/_mobs.txt    |  6 ++++
 world/map/npc/005-3/monsters.txt | 13 ---------
 world/map/npc/009-3/_import.txt  |  1 -
 world/map/npc/009-3/_mobs.txt    | 18 ++++++++++++
 world/map/npc/009-3/monsters.txt | 26 ------------------
 world/map/npc/011-3/_import.txt  |  1 -
 world/map/npc/011-3/_mobs.txt    | 12 ++++++++
 world/map/npc/011-3/monsters.txt | 21 --------------
 world/map/npc/011-4/_import.txt  |  1 -
 world/map/npc/011-4/_mobs.txt    |  4 ++-
 world/map/npc/011-4/monsters.txt | 20 --------------
 world/map/npc/012-3/_import.txt  |  1 -
 world/map/npc/012-3/_mobs.txt    | 12 ++++++++
 world/map/npc/012-3/monsters.txt | 20 --------------
 world/map/npc/014-3/_import.txt  |  1 -
 world/map/npc/014-3/_mobs.txt    |  6 ++++
 world/map/npc/014-3/monsters.txt | 14 ----------
 world/map/npc/015-1/_import.txt  |  1 -
 world/map/npc/015-1/_mobs.txt    | 48 ++++++++++++++++++++++++++++++++
 world/map/npc/015-1/monsters.txt | 59 ----------------------------------------
 world/map/npc/016-1/_import.txt  |  1 -
 world/map/npc/016-1/_mobs.txt    | 38 ++++++++++++++++++++++++++
 world/map/npc/016-1/monsters.txt | 48 --------------------------------
 world/map/npc/019-1/_import.txt  |  1 -
 world/map/npc/019-1/_mobs.txt    | 12 ++++++++
 world/map/npc/019-1/monsters.txt | 20 --------------
 world/map/npc/020-3/_import.txt  |  1 -
 world/map/npc/020-3/_mobs.txt    |  2 ++
 world/map/npc/020-3/monsters.txt | 18 ------------
 33 files changed, 163 insertions(+), 284 deletions(-)
 delete mode 100644 world/map/npc/001-3/monsters.txt
 delete mode 100644 world/map/npc/005-3/monsters.txt
 delete mode 100644 world/map/npc/009-3/monsters.txt
 delete mode 100644 world/map/npc/011-3/monsters.txt
 delete mode 100644 world/map/npc/011-4/monsters.txt
 delete mode 100644 world/map/npc/012-3/monsters.txt
 delete mode 100644 world/map/npc/014-3/monsters.txt
 delete mode 100644 world/map/npc/015-1/monsters.txt
 delete mode 100644 world/map/npc/016-1/monsters.txt
 delete mode 100644 world/map/npc/019-1/monsters.txt
 delete mode 100644 world/map/npc/020-3/monsters.txt

(limited to 'world/map/npc')

diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index a6b8b692..2af9b83e 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -4,5 +4,4 @@ map: 001-3.gat
 npc: npc/001-3/_mobs.txt
 npc: npc/001-3/_warps.txt
 npc: npc/001-3/guards.txt
-npc: npc/001-3/monsters.txt
 npc: npc/001-3/pvpflag.txt
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index c49195bb..9a15211c 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar arena mobs
 
+001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002
 
 
 001-3.gat,0,0,0|script|Mob001-3|-1,{
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
deleted file mode 100644
index 8f5e167c..00000000
--- a/world/map/npc/001-3/monsters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Map: 001-3
-// This is the Tulimshar Arena -- below Tulimshar.
-//
-
-001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob6::OnMaggot
-
-001-3.gat,0,0,0|script|Mob6|-1,{
-OnMaggot:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    break;
-    end;
-}
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index 23982113..df5cc31b 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -3,4 +3,3 @@
 map: 005-3.gat
 npc: npc/005-3/_mobs.txt
 npc: npc/005-3/_warps.txt
-npc: npc/005-3/monsters.txt
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index bc9ee2dc..cb22dbbc 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snake pit mobs
 
+005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob005-3::On1010
 
 
 005-3.gat,0,0,0|script|Mob005-3|-1,{
+On1010:
+    set @mobID, 1010;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/005-3/monsters.txt b/world/map/npc/005-3/monsters.txt
deleted file mode 100644
index a52d0dc3..00000000
--- a/world/map/npc/005-3/monsters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Map: 05-3
-// This is the Snake Pit, a cave in the Snake Desert.
-//
-
-005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob22::OnSnake
-
-005-3.gat,0,0,0|script|Mob22|-1,{
-OnSnake:
-    set @mobID, 1010;
-    callfunc "MobPoints";
-    break;
-    end;
-}
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 12bf619c..23954c93 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -3,5 +3,4 @@
 map: 009-3.gat
 npc: npc/009-3/_mobs.txt
 npc: npc/009-3/_warps.txt
-npc: npc/009-3/monsters.txt
 npc: npc/009-3/sword.txt
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 94479055..582a462f 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,8 +1,26 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Cave beneath Hurnscald mobs
 
+009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0,0,Mob009-3::On1007
+009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0,0,Mob009-3::On1009
+009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0,0,Mob009-3::On1008
 
 
 009-3.gat,0,0,0|script|Mob009-3|-1,{
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1008:
+    set @mobID, 1008;
+    callfunc "MobPoints";
+    end;
+
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/009-3/monsters.txt b/world/map/npc/009-3/monsters.txt
deleted file mode 100644
index b69bb3a1..00000000
--- a/world/map/npc/009-3/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 009-3
-// This is the cave beneath Hurnscald.
-//
-
-009-3.gat,0,0,0,0	monster	YellowSlime	1007,20,0,0,Mob35::OnYellowSlime
-009-3.gat,0,0,0,0	monster	RedSlime	1008,35,0,0,Mob35::OnRedSlime
-009-3.gat,0,0,0,0	monster	BlackScorpion	1009,25,0,0,Mob35::OnBlackScorpion
-
-009-3.gat,0,0,0	script	Mob35	-1,{
-OnYellowSlime:
-	set @mobID, 1007;
-	callfunc "MobPoints";
-	break;
-
-OnRedSlime:
-	set @mobID, 1008;
-	callfunc "MobPoints";
-	break;
-
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index 799e5dd0..f58ba275 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -4,4 +4,3 @@ map: 011-3.gat
 npc: npc/011-3/_mobs.txt
 npc: npc/011-3/_warps.txt
 npc: npc/011-3/hermit.txt
-npc: npc/011-3/monsters.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index d17c348d..120a7da9 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -1,8 +1,20 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hermit's cave mobs
 
+011-3.gat,0,0,0,0|monster|Bat|1017,10,0,0,Mob011-3::On1017
+011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000,30000,Mob011-3::On1035
 
 
 011-3.gat,0,0,0|script|Mob011-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/011-3/monsters.txt b/world/map/npc/011-3/monsters.txt
deleted file mode 100644
index 37da9f40..00000000
--- a/world/map/npc/011-3/monsters.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Map: 011-3
-// This is the Hermit's Cave -- level 1.
-//
-
-011-3.gat,0,0,0,0	monster	Bat	1017,10,0,0,Mob4::OnBat
-
-011-3.gat,0,0,0,0	monster	SilkWorm	1035,3,60000,30000,Mob4::OnSilkWorm
-
-011-3.gat,0,0,0	script	Mob4	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index f2e5264f..b40334b4 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -4,4 +4,3 @@ map: 011-4.gat
 npc: npc/011-4/_mobs.txt
 npc: npc/011-4/_warps.txt
 npc: npc/011-4/bl_barrier.txt
-npc: npc/011-4/monsters.txt
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index c4faef23..b3dd8813 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,8 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Lake cave mobs
 
-011-4.gat,51,29,39,39|monster|Shroom|1019,1,100000,30000,Mob011-4::On1019
+011-4.gat,52,30,39,39|monster|SpkiyMushroom|1019,1,100000,30000,Mob011-4::On1019
 011-4.gat,93,114,39,39|monster|Lamp Snake|1021,1,100000,30000,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0,0,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob011-4::On1019
 
 
 011-4.gat,0,0,0|script|Mob011-4|-1,{
diff --git a/world/map/npc/011-4/monsters.txt b/world/map/npc/011-4/monsters.txt
deleted file mode 100644
index d3b78249..00000000
--- a/world/map/npc/011-4/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 011-4
-// This is the Lake Cave, second level of the Hermit's Cave.
-//
-
-011-4.gat,0,0,0,0	monster	CaveSnake	1021,40,0,0,Mob17::OnCaveSnake
-011-4.gat,0,0,0,0	monster	SpikyMushroom	1019,15,0,0,Mob17::OnSpikyMushroom
-
-011-4.gat,0,0,0	script	Mob17	-1,{
-OnCaveSnake:
-	set @mobID, 1021;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index 6e5ac13a..78b3bcca 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -4,5 +4,4 @@ map: 012-3.gat
 npc: npc/012-3/_mobs.txt
 npc: npc/012-3/_warps.txt
 npc: npc/012-3/mana-seed.txt
-npc: npc/012-3/monsters.txt
 npc: npc/012-3/warningsigns.txt
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 0a204e84..924e8ebb 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -15,9 +15,21 @@
 012-3.gat,268,138,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,188,51,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,164,105,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,0,0,0,0|monster|Bat|1017,100,0,0,Mob012-3::On1017
+012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0,0,Mob012-3::On1021
 
 
 012-3.gat,0,0,0|script|Mob012-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+On1021:
+    set @mobID, 1021;
+    callfunc "MobPoints";
+    end;
+
 On1061:
     set @mobID, 1061;
     callfunc "MobPoints";
diff --git a/world/map/npc/012-3/monsters.txt b/world/map/npc/012-3/monsters.txt
deleted file mode 100644
index e6f4cf79..00000000
--- a/world/map/npc/012-3/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 012-3
-// This is the Caves beneath the North Woodland.
-//
-
-012-3.gat,0,0,0,0	monster	Bat		1017,100,0,0,Mob27::OnBat
-012-3.gat,0,0,0,0	monster	CaveSnake	1021,75,0,0,Mob27::OnCaveSnake
-
-012-3.gat,0,0,0	script	Mob27	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnCaveSnake:
-	set @mobID, 1021;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index d2d03e67..581e3648 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -3,4 +3,3 @@
 map: 014-3.gat
 npc: npc/014-3/_mobs.txt
 npc: npc/014-3/_warps.txt
-npc: npc/014-3/monsters.txt
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index bc868d9d..e805bd02 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Cave mobs
 
+014-3.gat,0,0,0,0|monster|Bat|1017,50,0,0,Mob014-3::On1017
 
 
 014-3.gat,0,0,0|script|Mob014-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/014-3/monsters.txt b/world/map/npc/014-3/monsters.txt
deleted file mode 100644
index 2237ea42..00000000
--- a/world/map/npc/014-3/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 014-3
-// This is the caves beneath West Woodland.
-//
-
-014-3.gat,0,0,0,0	monster	Bat	1017,50,0,0,Mob30::OnBat
-
-014-3.gat,0,0,0	script	Mob30	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 94963d0b..7e038c51 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -5,5 +5,4 @@ npc: npc/015-1/_mobs.txt
 npc: npc/015-1/_warps.txt
 npc: npc/015-1/alice.txt
 npc: npc/015-1/barrier.txt
-npc: npc/015-1/monsters.txt
 npc: npc/015-1/sword.txt
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index a398b22b..44544f23 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -3,14 +3,62 @@
 
 015-1.gat,0,0,0,0|monster|Clover|1037,2,100000,1000,Mob015-1::On1037
 015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob015-1::On1055
+015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob015-1::On1038
+015-1.gat,0,0,0,0|monster|LogHead|1025,40,0,0,Mob015-1::On1025
+015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0,0,Mob015-1::On1019
+015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob015-1::On1014
+015-1.gat,0,0,0,0|monster|Gamboge|1031,5,0,0,Mob015-1::On1031
+015-1.gat,0,0,0,0|monster|Alizarin|1032,5,0,0,Mob015-1::On1032
+015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000,7000,Mob015-1::On1035
+015-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob015-1::On1029
 
 
 015-1.gat,0,0,0|script|Mob015-1|-1,{
+On1014:
+    set @mobID, 1014;
+    callfunc "MobPoints";
+    end;
+
+On1019:
+    set @mobID, 1019;
+    callfunc "MobPoints";
+    end;
+
+On1025:
+    set @mobID, 1025;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1031:
+    set @mobID, 1031;
+    callfunc "MobPoints";
+    end;
+
+On1032:
+    set @mobID, 1032;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
 On1037:
     set @mobID, 1037;
     callfunc "MobPoints";
     end;
 
+On1038:
+    set @mobID, 1038;
+    callfunc "MobPoints";
+    end;
+
 On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
diff --git a/world/map/npc/015-1/monsters.txt b/world/map/npc/015-1/monsters.txt
deleted file mode 100644
index b6ff0fd9..00000000
--- a/world/map/npc/015-1/monsters.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Map: 015-1
-// This is South-West Woodland.
-//
-
-015-1.gat,0,0,0,0	monster	LogHead		1025,40,0,0,Mob31::OnLogHead
-015-1.gat,0,0,0,0	monster	SpikyMushroom	1019,20,0,0,Mob31::OnSpikyMushroom
-015-1.gat,0,0,0,0	monster	PinkFlower		1014,20,0,0,Mob31::OnPinkFlower
-
-015-1.gat,0,0,0,0	monster	Gamboge		1031,5,0,0,Mob31::OnGamboge
-015-1.gat,0,0,0,0	monster	Alizarin	1032,5,0,0,Mob31::OnAlizarin
-015-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob31::OnMauve
-
-015-1.gat,0,0,0,0	monster	SilkWorm	1035,7,15000,7000,Mob31::onSilkWorm
-
-015-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob31::OnSquirrel
-
-015-1.gat,0,0,0	script	Mob31	-1,{
-OnLogHead:
-	set @mobID, 1025;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-OnPinkFlower:
-	set @mobID, 1014;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnGamboge:
-	set @mobID, 1031;
-	callfunc "MobPoints";
-	break;
-
-OnAlizarin:
-	set @mobID, 1032;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 3ba02b95..333dc950 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -4,4 +4,3 @@ map: 016-1.gat
 npc: npc/016-1/_mobs.txt
 npc: npc/016-1/_warps.txt
 npc: npc/016-1/gwendolyn.txt
-npc: npc/016-1/monsters.txt
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index fdd033fc..e9e8dcde 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -3,14 +3,52 @@
 
 016-1.gat,0,0,0,0|monster|Clover|1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055
+016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038
+016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028
+016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003
+016-1.gat,0,0,0,0|monster|Mauve|1029,3,0,0,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Cobalt|1030,3,0,0,Mob016-1::On1030
+016-1.gat,0,0,0,0|monster|Butterfly|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Silkworn|1035,7,150000,7000,Mob016-1::On1035
 
 
 016-1.gat,0,0,0|script|Mob016-1|-1,{
+On1003:
+    set @mobID, 1003;
+    callfunc "MobPoints";
+    end;
+
+On1028:
+    set @mobID, 1028;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1030:
+    set @mobID, 1030;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
 On1037:
     set @mobID, 1037;
     callfunc "MobPoints";
     end;
 
+On1038:
+    set @mobID, 1038;
+    callfunc "MobPoints";
+    end;
+
 On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
diff --git a/world/map/npc/016-1/monsters.txt b/world/map/npc/016-1/monsters.txt
deleted file mode 100644
index d9d0de4f..00000000
--- a/world/map/npc/016-1/monsters.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Map: 016-1
-// This is Southernmost Woodlands.
-//
-
-016-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob32::OnMouboo
-016-1.gat,0,0,0,0	monster	Scorpion	1003,15,0,0,Mob32::OnScorpion
-
-016-1.gat,0,0,0,0	monster	Mauve		1029,3,0,0,Mob32::OnMauve
-016-1.gat,0,0,0,0	monster	Cobalt		1030,3,0,0,Mob32::OnCobalt
-016-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob32::OnMauve
-
-016-1.gat,0,0,0,0	monster	SilkWorm	1035,7,15000,7000,Mob32::onSilkWorm
-
-016-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob32::OnSquirrel
-
-016-1.gat,0,0,0	script	Mob32	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnCobalt:
-	set @mobID, 1030;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 287a2cb2..4b4ebcf1 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -3,6 +3,5 @@
 map: 019-1.gat
 npc: npc/019-1/_mobs.txt
 npc: npc/019-1/_warps.txt
-npc: npc/019-1/monsters.txt
 npc: npc/019-1/santa_helper.txt
 npc: npc/019-1/snowman.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index a2273ce7..c9b69705 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -2,9 +2,21 @@
 // Snow field mobs
 
 019-1.gat,0,0,0,0|monster|Fluffy|1020,100,100000,30000,Mob019-1::On1020
+019-1.gat,0,0,0,0|monster|SantaSlime|1015,10,0,0,Mob019-1::On1015
+019-1.gat,0,0,0,0|monster|RudolphSlime|1016,25,0,0,Mob019-1::On1016
 
 
 019-1.gat,0,0,0|script|Mob019-1|-1,{
+On1015:
+    set @mobID, 1015;
+    callfunc "MobPoints";
+    end;
+
+On1016:
+    set @mobID, 1016;
+    callfunc "MobPoints";
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
diff --git a/world/map/npc/019-1/monsters.txt b/world/map/npc/019-1/monsters.txt
deleted file mode 100644
index d41d63b3..00000000
--- a/world/map/npc/019-1/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 019-1
-// This is the Snow Fields.
-//
-
-019-1.gat,0,0,0,0	monster	SantaSlime	1015,10,0,0,Mob10::OnSantaSlime
-019-1.gat,0,0,0,0	monster	RudolphSlime	1016,25,0,0,Mob10::OnRudolphSlime
-
-019-1.gat,0,0,0	script	Mob10	-1,{
-OnSantaSlime:
-	set @mobID, 1015;
-	callfunc "MobPoints";
-	break;
-
-OnRudolphSlime:
-	set @mobID, 1016;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt
index fe2ee10c..d82428bf 100644
--- a/world/map/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
@@ -3,4 +3,3 @@
 map: 020-3.gat
 npc: npc/020-3/_mobs.txt
 npc: npc/020-3/_warps.txt
-npc: npc/020-3/monsters.txt
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index e886fbde..d28b5c88 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -3,6 +3,8 @@
 
 020-3.gat,40,36,29,4|monster|Bat|1017,1,100000,30000,Mob020-3::On1017
 020-3.gat,40,49,34,7|monster|Violet|1018,1,100000,30000,Mob020-3::On1018
+020-3.gat,0,0,0,0|monster|Bat|1017,20,0,0,Mob020-3::On1017
+020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0,0,Mob020-3::On1018
 
 
 020-3.gat,0,0,0|script|Mob020-3|-1,{
diff --git a/world/map/npc/020-3/monsters.txt b/world/map/npc/020-3/monsters.txt
deleted file mode 100644
index 062c6a9f..00000000
--- a/world/map/npc/020-3/monsters.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Ice Cave level 1
-
-020-3.gat,0,0,0,0	monster	Bat	1017,20,0,0,Mob12::OnBat
-020-3.gat,0,0,0,0	monster	Pinkie	1018,10,0,0,Mob12::OnPinkie
-
-020-3.gat,0,0,0	script	Mob12	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnPinkie:
-	set @mobID, 1018;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
-- 
cgit v1.2.3-60-g2f50