Running 'make maps' for the changes on tutorial map and surroundings.

6 files changed, 40 insertions, 21 deletions

diff --git a/world/map/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
index 1024a421..8ef9ffee 100644
--- a/world/map/npc/004-1/_warps.txt
+++ b/world/map/npc/004-1/_warps.txt
@@ -5,4 +5,4 @@
 004-1.gat,37,111|warp|To Beach|1,-1,003-1.gat,141,20
 004-1.gat,80,31|warp|To Beach House|-1,-1,004-2.gat,21,28
 004-1.gat,86,27|warp|To Second Floor|-1,-1,004-2.gat,57,65
-004-1.gat,68,19|warp|To Beach|1,-1,041-1.gat,76,94
+004-1.gat,68,19|warp|To Beach|1,-1,041-1.gat,101,94
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
index ee5dc689..deb8bc50 100644
--- a/world/map/npc/041-1/_mobs.txt
+++ b/world/map/npc/041-1/_mobs.txt
@@ -1,17 +1,17 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Beach mobs
 
-041-1.gat,56,55,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,76,67,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,75,84,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,36,34,13,20|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,30,30,10,48|monster|Sea Slime|1033,3,100000,30000,Mob041-1::On1033
-041-1.gat,34,13,10,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
-041-1.gat,35,7,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,41,49,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,70,75,21,9|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
-041-1.gat,75,57,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
-041-1.gat,58,64,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
+041-1.gat,81,55,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
+041-1.gat,101,67,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
+041-1.gat,100,84,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
+041-1.gat,61,34,13,20|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
+041-1.gat,55,30,10,48|monster|Sea Slime|1033,3,100000,30000,Mob041-1::On1033
+041-1.gat,59,13,10,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
+041-1.gat,60,7,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,66,49,3,2|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,95,75,21,9|monster|Black Scorpion|1009,1,100000,30000,Mob041-1::On1009
+041-1.gat,100,57,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
+041-1.gat,83,64,18,9|monster|Red Scorpion|1004,3,100000,30000,Mob041-1::On1004
 
 
 041-1.gat,0,0,0|script|Mob041-1|-1,{
diff --git a/world/map/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
index 7f8901c4..dff4558e 100644
--- a/world/map/npc/041-1/_warps.txt
+++ b/world/map/npc/041-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Beach warps
 
-041-1.gat,76,95|warp|To Beach|1,-1,004-1.gat,68,20
+041-1.gat,101,95|warp|To Beach|1,-1,004-1.gat,68,20
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index db1aa772..a5df688d 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -1,7 +1,11 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Suburbs mobs
 
-042-1.gat,0,0,0,0|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
+042-1.gat,100,97,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
+042-1.gat,65,88,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002
+042-1.gat,95,127,55,11|monster|Black Scorpion|1009,25,100000,30000,Mob042-1::On1009
+042-1.gat,95,128,53,8|monster|Scorpion|1003,10,100000,30000,Mob042-1::On1003
+042-1.gat,62,81,42,50|monster|Fire Goblin|1011,2,100000,30000,Mob042-1::On1011
 
 
 042-1.gat,0,0,0|script|Mob042-1|-1,{
@@ -10,5 +14,20 @@ On1002:
     callfunc "MobPoints";
     end;
 
+On1003:
+    set @mobID, 1003;
+    callfunc "MobPoints";
+    end;
+
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
+On1011:
+    set @mobID, 1011;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index e6adc5c3..45283d39 100644
--- a/world/map/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Suburbs warps
 
-042-1.gat,87,76|warp|To Store House|-1,-1,042-2.gat,44,92
-042-1.gat,77,76|warp|To Store House|-1,-1,042-2.gat,22,92
-042-1.gat,62,62|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
-042-1.gat,37,56|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
+042-1.gat,63,76|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
+042-1.gat,91,102|warp|To Store House|-1,-1,042-2.gat,22,92
+042-1.gat,104,102|warp|To Store House|-1,-1,042-2.gat,44,92
+042-1.gat,65,104|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
diff --git a/world/map/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
index 4acaf9cc..1cc19c4a 100644
--- a/world/map/npc/042-2/_warps.txt
+++ b/world/map/npc/042-2/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Suburbs Indoor warps
 
-042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,62,63
-042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,77,77
-042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,87,77
+042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,65,105
+042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,91,103
+042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,104,103