Client-data: Review of all maps by Ali-G, Converter ran.

Submodule pointer updated.
Also replacing 017-1/monsters.txt with spawn objects in the map.

2 files changed, 23 insertions, 22 deletions

diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index b036bb7a..336e823b 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -3,11 +3,11 @@
 
 018-1.gat,136,79,9,41|monster|Sea Slime|1033,10,100000,30000,Mob018-1::On1033
 018-1.gat,108,87,53,25|monster|Log Head|1025,10,100000,30000,Mob018-1::On1025
-018-1.gat,116,44,6,7|monster|Sea  Slime|1033,3,100000,30000,Mob018-1::On1033
-018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000,30000,Mob018-1::On1014
+018-1.gat,116,44,6,7|monster|Sea Slime|1033,3,100000,30000,Mob018-1::On1033
+018-1.gat,119,56,13,6|monster|Pink Flower|1014,2,100000,30000,Mob018-1::On1014
 018-1.gat,175,28,17,19|monster|Jack O|1022,1,300000,240000,Mob018-1::On1022
 018-1.gat,78,59,3,1|monster|Yellow Slime|1007,1,100000,30000,Mob018-1::On1007
-018-1.gat,57,63,14,7|monster|Silk Worm|1035,2,100000,30000,Mob018-1::On1035
+018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000,30000,Mob018-1::On1035
 018-1.gat,43,63,31,28|monster|Bat|1017,10,100000,30000,Mob018-1::On1017
 018-1.gat,134,39,18,10|monster|Grass Snake|1034,4,100000,50000,Mob018-1::On1034
 018-1.gat,124,42,9,11|monster|Grass Snake|1034,2,100000,50000,Mob018-1::On1034
@@ -16,16 +16,16 @@
 018-1.gat,149,45,10,8|monster|Bat|1017,5,100000,30000,Mob018-1::On1017
 018-1.gat,169,47,20,10|monster|Red Slime|1008,4,120000,30000,Mob018-1::On1008
 018-1.gat,136,49,13,8|monster|Bat|1017,4,100000,30000,Mob018-1::On1017
-018-1.gat,136,49,13,9|monster|Clover Patch|1037,1,100000,30000,Mob018-1::On1037
-018-1.gat,111,62,5,2|monster|Silk Worm|1035,1,60000,30000,Mob018-1::On1035
+018-1.gat,166,49,13,9|monster|Clover Patch|1037,1,100000,30000,Mob018-1::On1037
+018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000,30000,Mob018-1::On1035
 018-1.gat,117,50,4,3|monster|Sea Slime|1033,1,120000,60000,Mob018-1::On1033
 018-1.gat,96,47,18,11|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
-018-1.gat,106,52,15,6|monster|Cobalt Plant|1030,1,240000,120000,Mob018-1::On1030
+018-1.gat,106,52,15,6|monster|Cobalt Herb|1030,1,240000,120000,Mob018-1::On1030
 018-1.gat,78,55,37,6|monster|Red Slime|1008,7,100000,50000,Mob018-1::On1008
 018-1.gat,145,24,10,9|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
 018-1.gat,68,89,14,17|monster|Bat|1017,3,100000,50000,Mob018-1::On1017
 018-1.gat,160,31,11,18|monster|Red Slime|1008,5,100000,50000,Mob018-1::On1008
-018-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob018-1::On1037
+018-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob018-1::On1037
 018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob018-1::On1055
 
 
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index dec3a6a7..4e9f356a 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -1,18 +1,19 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Mining Camp warps
 
-018-1.gat,79,59|warp|toMine|0,-1,018-3.gat,99,132
-018-1.gat,112,61|warp|toCave|-1,-1,018-3.gat,44,36
-018-1.gat,115,40|warp|toCave|-1,-1,013-3.gat,22,114
-018-1.gat,128,56|warp|toCave|-1,-1,018-3.gat,49,97
-018-1.gat,90,42|warp|toCave|-1,-1,018-3.gat,123,164
-018-1.gat,69,54|warp|toCave|-1,-1,018-3.gat,70,103
-018-1.gat,127,36|warp|toCave|-1,-1,013-3.gat,139,44
-018-1.gat,134,45|warp|toCave|-1,-1,013-3.gat,61,178
-018-1.gat,147,40|warp|toCave|-1,-1,013-3.gat,81,102
-018-1.gat,153,46|warp|toCave|-1,-1,018-3.gat,146,160
-018-1.gat,158,34|warp|toCave|-1,-1,018-3.gat,64,101
-018-1.gat,162,44|warp|toCave|-1,-1,018-3.gat,29,164
-018-1.gat,177,20|warp|toCave|-1,-1,013-3.gat,177,90
-018-1.gat,65,73|warp|toIndoor|-1,-1,018-2.gat,50,28
-018-1.gat,79,98|warp|toHurnscald|2,-1,008-1.gat,79,18
+018-1.gat,79,59|warp|To Northern Mine|0,-1,018-3.gat,100,132
+018-1.gat,112,61|warp|To Bat Cave|-1,-1,018-3.gat,44,38
+018-1.gat,115,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,22,114
+018-1.gat,128,56|warp|To Northern Mine|-1,-1,018-3.gat,49,99
+018-1.gat,90,42|warp|To Northern Mine|-1,-1,018-3.gat,123,166
+018-1.gat,69,54|warp|To Northern Mine|-1,-1,018-3.gat,70,105
+018-1.gat,127,36|warp|To Woodland Hills Cave|-1,-1,013-3.gat,139,44
+018-1.gat,134,45|warp|To Woodland Hills Cave|-1,-1,013-3.gat,61,178
+018-1.gat,147,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,81,102
+018-1.gat,153,46|warp|To Northern Mine|-1,-1,018-3.gat,145,162
+018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103
+018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166
+018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90
+018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28
+018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18
+018-1.gat,64,69|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21