Clean up generated scripts

79 files changed, 156 insertions, 156 deletions

diff --git a/tools b/tools
-Subproject 78875e3c896656458d000c1987b1b0856fdb2bb
+Subproject e5fa14b2254bb1565c44bf07a2c4c2c8bb05b4f
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index bb79c71d..85573370 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -25,6 +25,8 @@
 
 001-1.gat,0,0,0|script|Mob001-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -44,6 +46,4 @@ On1011:
     set @mobID, 1011;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index d57aeb12..2a3b53cf 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -6,10 +6,10 @@
 
 001-3.gat,0,0,0|script|Mob001-3|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 3579851b..56ddb9f6 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -19,6 +19,8 @@
 
 002-1.gat,0,0,0|script|Mob002-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -38,6 +40,4 @@ On1011:
     set @mobID, 1011;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 0fd06e51..869e499a 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -19,6 +19,8 @@
 
 002-4.gat,0,0,0|script|Mob002-4|-1,
 {
+    end;
+
 On1056:
     set @mobID, 1056;
     callfunc "MobPoints";
@@ -33,6 +35,4 @@ On1108:
     set @mobID, 1108;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt
index 9d14c217..018bebc3 100644
--- a/world/map/npc/002-5/_mobs.txt
+++ b/world/map/npc/002-5/_mobs.txt
@@ -22,6 +22,8 @@
 
 002-5.gat,0,0,0|script|Mob002-5|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -46,6 +48,4 @@ On1108:
     set @mobID, 1108;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index 35c3274f..74bb6d5e 100644
--- a/world/map/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
@@ -11,6 +11,8 @@
 
 003-1.gat,0,0,0|script|Mob003-1|-1,
 {
+    end;
+
 On1004:
     set @mobID, 1004;
     callfunc "MobPoints";
@@ -35,6 +37,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
index 31656f56..c2a2c3e5 100644
--- a/world/map/npc/004-1/_mobs.txt
+++ b/world/map/npc/004-1/_mobs.txt
@@ -12,6 +12,8 @@
 
 004-1.gat,0,0,0|script|Mob004-1|-1,
 {
+    end;
+
 On1004:
     set @mobID, 1004;
     callfunc "MobPoints";
@@ -31,6 +33,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index aea62c29..5e77612c 100644
--- a/world/map/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
@@ -16,6 +16,8 @@
 
 005-1.gat,0,0,0|script|Mob005-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -40,6 +42,4 @@ On1010:
     set @mobID, 1010;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index 08985e9a..ce412a3e 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -6,10 +6,10 @@
 
 005-3.gat,0,0,0|script|Mob005-3|-1,
 {
+    end;
+
 On1010:
     set @mobID, 1010;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 6bf53fee..653acd7f 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -20,6 +20,8 @@
 
 006-1.gat,0,0,0|script|Mob006-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -34,6 +36,4 @@ On1026:
     set @mobID, 1026;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt
index a9c22311..d369a3e7 100644
--- a/world/map/npc/006-3/_mobs.txt
+++ b/world/map/npc/006-3/_mobs.txt
@@ -31,6 +31,8 @@
 
 006-3.gat,0,0,0|script|Mob006-3|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -50,6 +52,4 @@ On1026:
     set @mobID, 1026;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index 90be87d2..16231518 100644
--- a/world/map/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
@@ -14,6 +14,8 @@
 
 007-1.gat,0,0,0|script|Mob007-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -58,6 +60,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 1f64f55f..04a93ca3 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -14,6 +14,8 @@
 
 008-1.gat,0,0,0|script|Mob008-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -58,6 +60,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index e368c8d5..dabfbb98 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -10,6 +10,8 @@
 
 009-1.gat,0,0,0|script|Mob009-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -29,6 +31,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 79285ccc..f78c4d1a 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -8,6 +8,8 @@
 
 009-3.gat,0,0,0|script|Mob009-3|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -22,6 +24,4 @@ On1009:
     set @mobID, 1009;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index 38dc2f30..c5369cad 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -12,6 +12,8 @@
 
 009-4.gat,0,0,0|script|Mob009-4|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -26,6 +28,4 @@ On1035:
     set @mobID, 1035;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt
index d9466ea3..1c207f74 100644
--- a/world/map/npc/010-1/_mobs.txt
+++ b/world/map/npc/010-1/_mobs.txt
@@ -18,6 +18,8 @@
 
 010-1.gat,0,0,0|script|Mob010-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -77,6 +79,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index f797a153..35f25bb3 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -17,6 +17,8 @@
 
 011-1.gat,0,0,0|script|Mob011-1|-1,
 {
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -71,6 +73,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index eb75be5c..2ad3e897 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -7,6 +7,8 @@
 
 011-3.gat,0,0,0|script|Mob011-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -16,6 +18,4 @@ On1035:
     set @mobID, 1035;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index a2be8c85..e4fcf12c 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -9,6 +9,8 @@
 
 011-4.gat,0,0,0|script|Mob011-4|-1,
 {
+    end;
+
 On1019:
     set @mobID, 1019;
     callfunc "MobPoints";
@@ -18,6 +20,4 @@ On1021:
     set @mobID, 1021;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index a6574415..9bf56f93 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -52,6 +52,8 @@
 
 011-6.gat,0,0,0|script|Mob011-6|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -91,6 +93,4 @@ On1064:
     set @mobID, 1064;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 45eb58b9..f0c8af8b 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -16,6 +16,8 @@
 
 012-1.gat,0,0,0|script|Mob012-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -70,6 +72,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 6395b3fb..e27b7c6f 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -21,6 +21,8 @@
 
 012-3.gat,0,0,0|script|Mob012-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -35,6 +37,4 @@ On1061:
     set @mobID, 1061;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index 205d722d..d5a30f2c 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -69,6 +69,8 @@
 
 012-4.gat,0,0,0|script|Mob012-4|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -108,6 +110,4 @@ On1062:
     set @mobID, 1062;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index c1d0453f..5e34f374 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -20,6 +20,8 @@
 
 013-1.gat,0,0,0|script|Mob013-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -74,6 +76,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index c2b44828..d3d28053 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -33,6 +33,8 @@
 
 013-3.gat,0,0,0|script|Mob013-3|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -77,6 +79,4 @@ On1024:
     set @mobID, 1024;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index 55e7797d..49e12433 100644
--- a/world/map/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
@@ -21,6 +21,8 @@
 
 014-1.gat,0,0,0|script|Mob014-1|-1,
 {
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -80,6 +82,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index 9b1d9701..2da1744f 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -6,10 +6,10 @@
 
 014-3.gat,0,0,0|script|Mob014-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index a1dbcfec..1fa54f0c 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -15,6 +15,8 @@
 
 015-1.gat,0,0,0|script|Mob015-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -64,6 +66,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 8faac86c..ba763804 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -9,6 +9,8 @@
 
 015-3.gat,0,0,0|script|Mob015-3|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -23,6 +25,4 @@ On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index b56c1f58..9fd9e68c 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -15,6 +15,8 @@
 
 016-1.gat,0,0,0|script|Mob016-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -54,6 +56,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 781dd7d3..23605651 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -23,6 +23,8 @@
 
 017-1.gat,0,0,0|script|Mob017-1|-1,
 {
+    end;
+
 On1011:
     set @mobID, 1011;
     callfunc "MobPoints";
@@ -97,6 +99,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index e0665795..7847511d 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -31,6 +31,8 @@
 
 018-1.gat,0,0,0|script|Mob018-1|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -90,6 +92,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index accf49f0..28aff946 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -6,10 +6,10 @@
 
 018-2.gat,0,0,0|script|Mob018-2|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index d3fbcf92..017b74bd 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -30,6 +30,8 @@
 
 018-3.gat,0,0,0|script|Mob018-3|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -84,6 +86,4 @@ On1024:
     set @mobID, 1024;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index 1e6403db..fd452e26 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -9,6 +9,8 @@
 
 019-1.gat,0,0,0|script|Mob019-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1112:
     set @mobID, 1112;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt
index ea68f656..a8d3c1d2 100644
--- a/world/map/npc/019-3/_mobs.txt
+++ b/world/map/npc/019-3/_mobs.txt
@@ -7,6 +7,8 @@
 
 019-3.gat,0,0,0|script|Mob019-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -16,6 +18,4 @@ On1061:
     set @mobID, 1061;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index 109df48b..2faee602 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -9,6 +9,8 @@
 
 019-4.gat,0,0,0|script|Mob019-4|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1093:
     set @mobID, 1093;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index e988ed19..bdeafe1d 100644
--- a/world/map/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
@@ -6,10 +6,10 @@
 
 020-1.gat,0,0,0|script|Mob020-1|-1,
 {
+    end;
+
 On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index 8611e97e..8ea16b7c 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -9,6 +9,8 @@
 
 020-3.gat,0,0,0|script|Mob020-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -18,6 +20,4 @@ On1018:
     set @mobID, 1018;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index fc45882c..0ec59bf0 100644
--- a/world/map/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
@@ -10,6 +10,8 @@
 
 021-1.gat,0,0,0|script|Mob021-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -19,6 +21,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
index 178a48d4..ac951460 100644
--- a/world/map/npc/021-3/_mobs.txt
+++ b/world/map/npc/021-3/_mobs.txt
@@ -18,6 +18,8 @@
 
 021-3.gat,0,0,0|script|Mob021-3|-1,
 {
+    end;
+
 On1009:
     set @mobID, 1009;
     callfunc "MobPoints";
@@ -52,6 +54,4 @@ On1109:
     set @mobID, 1109;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index 5dac248d..fe80f335 100644
--- a/world/map/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
@@ -12,6 +12,8 @@
 
 024-1.gat,0,0,0|script|Mob024-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -31,6 +33,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index b3a7ab4f..85c9c093 100644
--- a/world/map/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-1/_mobs.txt
@@ -15,6 +15,8 @@
 
 025-1.gat,0,0,0|script|Mob025-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -59,6 +61,4 @@ On1041:
     set @mobID, 1041;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index d849c118..708f755f 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -9,6 +9,8 @@
 
 025-3.gat,0,0,0|script|Mob025-3|-1,
 {
+    end;
+
 On1043:
     set @mobID, 1043;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1060:
     set @mobID, 1060;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index 9034f0b4..57cdd0a1 100644
--- a/world/map/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
@@ -7,10 +7,10 @@
 
 025-4.gat,0,0,0|script|Mob025-4|-1,
 {
+    end;
+
 On1056:
     set @mobID, 1056;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index db84953c..04a51082 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -13,6 +13,8 @@
 
 026-1.gat,0,0,0|script|Mob026-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -52,6 +54,4 @@ On1047:
     set @mobID, 1047;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 4aef122d..28865313 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -23,6 +23,8 @@
 
 027-1.gat,0,0,0|script|Mob027-1|-1,
 {
+    end;
+
 On1022:
     set @mobID, 1022;
     callfunc "MobPoints";
@@ -62,6 +64,4 @@ On1047:
     set @mobID, 1047;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index 38e0dc5d..a37e0586 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -11,6 +11,8 @@
 
 027-2.gat,0,0,0|script|Mob027-2|-1,
 {
+    end;
+
 On1077:
     set @mobID, 1077;
     callfunc "MobPoints";
@@ -25,6 +27,4 @@ On1079:
     set @mobID, 1079;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index 6e056048..6fc2f19f 100644
--- a/world/map/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
@@ -17,6 +17,8 @@
 
 028-1.gat,0,0,0|script|Mob028-1|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -56,6 +58,4 @@ On1047:
     set @mobID, 1047;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index 79accc01..c5fdba04 100644
--- a/world/map/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
@@ -9,6 +9,8 @@
 
 028-3.gat,0,0,0|script|Mob028-3|-1,
 {
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -23,6 +25,4 @@ On1035:
     set @mobID, 1035;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index e0577f4e..2836830c 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -11,6 +11,8 @@
 
 029-1.gat,0,0,0|script|Mob029-1|-1,
 {
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -40,6 +42,4 @@ On1038:
     set @mobID, 1038;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index e253b738..ead52c98 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -9,6 +9,8 @@
 
 030-1.gat,0,0,0|script|Mob030-1|-1,
 {
+    end;
+
 On1094:
     set @mobID, 1094;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1113:
     set @mobID, 1113;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 2e60b09d..e8e6c77b 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -9,6 +9,8 @@
 
 031-1.gat,0,0,0|script|Mob031-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1113:
     set @mobID, 1113;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 1966e225..324df76e 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -94,6 +94,8 @@
 
 031-3.gat,0,0,0|script|Mob031-3|-1,
 {
+    end;
+
 On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
@@ -133,6 +135,4 @@ On1113:
     set @mobID, 1113;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt
index 8d879b0d..7aa84870 100644
--- a/world/map/npc/032-1/_mobs.txt
+++ b/world/map/npc/032-1/_mobs.txt
@@ -10,6 +10,8 @@
 
 032-1.gat,0,0,0|script|Mob032-1|-1,
 {
+    end;
+
 On1009:
     set @mobID, 1009;
     callfunc "MobPoints";
@@ -19,6 +21,4 @@ On1010:
     set @mobID, 1010;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 6c04eda2..2836eba7 100644
--- a/world/map/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
@@ -15,6 +15,8 @@
 
 032-3.gat,0,0,0|script|Mob032-3|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -59,6 +61,4 @@ On1060:
     set @mobID, 1060;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 30ad6b12..35c8404e 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -9,6 +9,8 @@
 
 033-1.gat,0,0,0|script|Mob033-1|-1,
 {
+    end;
+
 On1038:
     set @mobID, 1038;
     callfunc "MobPoints";
@@ -28,6 +30,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index ac87b59f..0ecdbf8e 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -10,6 +10,8 @@
 
 034-1.gat,0,0,0|script|Mob034-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -34,6 +36,4 @@ On1112:
     set @mobID, 1112;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
index d53f9bd2..de93bfab 100644
--- a/world/map/npc/041-1/_mobs.txt
+++ b/world/map/npc/041-1/_mobs.txt
@@ -16,6 +16,8 @@
 
 041-1.gat,0,0,0|script|Mob041-1|-1,
 {
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
@@ -35,6 +37,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index a64cf913..55684f46 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -10,6 +10,8 @@
 
 042-1.gat,0,0,0|script|Mob042-1|-1,
 {
+    end;
+
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
@@ -29,6 +31,4 @@ On1011:
     set @mobID, 1011;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt
index 7d8c46b9..af45a145 100644
--- a/world/map/npc/043-1/_mobs.txt
+++ b/world/map/npc/043-1/_mobs.txt
@@ -8,6 +8,8 @@
 
 043-1.gat,0,0,0|script|Mob043-1|-1,
 {
+    end;
+
 On1005:
     set @mobID, 1005;
     callfunc "MobPoints";
@@ -22,6 +24,4 @@ On1033:
     set @mobID, 1033;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt
index 5d94a9a7..67568a24 100644
--- a/world/map/npc/043-3/_mobs.txt
+++ b/world/map/npc/043-3/_mobs.txt
@@ -14,6 +14,8 @@
 
 043-3.gat,0,0,0|script|Mob043-3|-1,
 {
+    end;
+
 On1005:
     set @mobID, 1005;
     callfunc "MobPoints";
@@ -38,6 +40,4 @@ On1108:
     set @mobID, 1108;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt
index 25a34ee2..c41ee0bd 100644
--- a/world/map/npc/043-4/_mobs.txt
+++ b/world/map/npc/043-4/_mobs.txt
@@ -27,6 +27,8 @@
 
 043-4.gat,0,0,0|script|Mob043-4|-1,
 {
+    end;
+
 On1009:
     set @mobID, 1009;
     callfunc "MobPoints";
@@ -56,6 +58,4 @@ On1117:
     set @mobID, 1117;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt
index 5812314e..432eed10 100644
--- a/world/map/npc/044-1/_mobs.txt
+++ b/world/map/npc/044-1/_mobs.txt
@@ -21,6 +21,8 @@
 
 044-1.gat,0,0,0|script|Mob044-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -65,6 +67,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt
index 93800c6f..901f17fc 100644
--- a/world/map/npc/044-3/_mobs.txt
+++ b/world/map/npc/044-3/_mobs.txt
@@ -26,6 +26,8 @@
 
 044-3.gat,0,0,0|script|Mob044-3|-1,
 {
+    end;
+
 On1058:
     set @mobID, 1058;
     callfunc "MobPoints";
@@ -55,6 +57,4 @@ On1093:
     set @mobID, 1093;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt
index d0a5f473..649ffd07 100644
--- a/world/map/npc/045-1/_mobs.txt
+++ b/world/map/npc/045-1/_mobs.txt
@@ -17,6 +17,8 @@
 
 045-1.gat,0,0,0|script|Mob045-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -41,6 +43,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt
index a52f0451..a875205e 100644
--- a/world/map/npc/046-1/_mobs.txt
+++ b/world/map/npc/046-1/_mobs.txt
@@ -16,6 +16,8 @@
 
 046-1.gat,0,0,0|script|Mob046-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -50,6 +52,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt
index 96d59230..6e7238a1 100644
--- a/world/map/npc/046-3/_mobs.txt
+++ b/world/map/npc/046-3/_mobs.txt
@@ -20,6 +20,8 @@
 
 046-3.gat,0,0,0|script|Mob046-3|-1,
 {
+    end;
+
 On1058:
     set @mobID, 1058;
     callfunc "MobPoints";
@@ -49,6 +51,4 @@ On1093:
     set @mobID, 1093;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt
index 75d39326..7b0e6f32 100644
--- a/world/map/npc/047-1/_mobs.txt
+++ b/world/map/npc/047-1/_mobs.txt
@@ -14,6 +14,8 @@
 
 047-1.gat,0,0,0|script|Mob047-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -43,6 +45,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt
index 34a8731a..2bdf466d 100644
--- a/world/map/npc/048-1/_mobs.txt
+++ b/world/map/npc/048-1/_mobs.txt
@@ -16,6 +16,8 @@
 
 048-1.gat,0,0,0|script|Mob048-1|-1,
 {
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
@@ -45,6 +47,4 @@ On1095:
     set @mobID, 1095;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt
index a1caa5be..4b464216 100644
--- a/world/map/npc/051-1/_mobs.txt
+++ b/world/map/npc/051-1/_mobs.txt
@@ -7,6 +7,8 @@
 
 051-1.gat,0,0,0|script|Mob051-1|-1,
 {
+    end;
+
 On1019:
     set @mobID, 1019;
     callfunc "MobPoints";
@@ -16,6 +18,4 @@ On1025:
     set @mobID, 1025;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt
index bf214d2f..6166fefa 100644
--- a/world/map/npc/051-3/_mobs.txt
+++ b/world/map/npc/051-3/_mobs.txt
@@ -21,6 +21,8 @@
 
 051-3.gat,0,0,0|script|Mob051-3|-1,
 {
+    end;
+
 On1008:
     set @mobID, 1008;
     callfunc "MobPoints";
@@ -60,6 +62,4 @@ On1099:
     set @mobID, 1099;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/052-1/_mobs.txt b/world/map/npc/052-1/_mobs.txt
index a63c28de..37e8e0c6 100644
--- a/world/map/npc/052-1/_mobs.txt
+++ b/world/map/npc/052-1/_mobs.txt
@@ -6,10 +6,10 @@
 
 052-1.gat,0,0,0|script|Mob052-1|-1,
 {
+    end;
+
 On1100:
     set @mobID, 1100;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index 7b3e9102..9643e9c5 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -22,6 +22,8 @@
 
 055-1.gat,0,0,0|script|Mob055-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -81,6 +83,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index 0710492f..d7787303 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -11,6 +11,8 @@
 
 055-3.gat,0,0,0|script|Mob055-3|-1,
 {
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -40,6 +42,4 @@ On1017:
     set @mobID, 1017;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt
index 39362817..e10069a9 100644
--- a/world/map/npc/056-1/_mobs.txt
+++ b/world/map/npc/056-1/_mobs.txt
@@ -8,6 +8,8 @@
 
 056-1.gat,0,0,0|script|Mob056-1|-1,
 {
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -22,6 +24,4 @@ On1029:
     set @mobID, 1029;
     callfunc "MobPoints";
     end;
-
-    end;
 }
diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt
index 66dedc41..2f563f98 100644
--- a/world/map/npc/057-1/_mobs.txt
+++ b/world/map/npc/057-1/_mobs.txt
@@ -23,6 +23,8 @@
 
 057-1.gat,0,0,0|script|Mob057-1|-1,
 {
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -77,6 +79,4 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
-
-    end;
 }