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.

3 files changed, 84 insertions, 85 deletions

diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index d2d83387..1d0b99f8 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 031-3: Ice Caves
+// Map 031-3: Ice Labyrinth
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 031-3.gat
 npc: npc/031-3/_mobs.txt
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 4ab99cfd..5815a10d 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,44 +1,43 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Ice Caves mobs
+// Ice Labyrinth mobs
 
 031-3.gat,39,276,42,16|monster|Santa Slime|1015,5,100000,30000,Mob031-3::On1015
-031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,230,279,25,26|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,195,277,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
 031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
-031-3.gat,37,213,27,23|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,35,212,27,23|monster|bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,35,212,27,23|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
 031-3.gat,38,147,44,68|monster|Moggun|1061,19,100000,30000,Mob031-3::On1061
 031-3.gat,97,261,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
 031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
-031-3.gat,36,148,64,43|monster|bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,97,277,22,42|monster|bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,148,282,22,42|monster|bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,36,148,64,43|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,97,277,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,148,282,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
 031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
-031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,144,216,29,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,98,214,39,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
-031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000,30000,Mob031-3::On1058
+031-3.gat,145,293,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,99,214,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,198,144,29,53|monster|Ice Goblin|1058,4,100000,30000,Mob031-3::On1058
 031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
 031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
 031-3.gat,283,286,33,30|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
-031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,285,218,8,75|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,278,282,33,14|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,285,218,8,75|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
 031-3.gat,283,217,41,64|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
 031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
 031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
-031-3.gat,229,226,27,34|monster|yeti|1072,3,100000,30000,Mob031-3::On1072
-031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,209,199,12,17|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,193,216,12,17|monster|yeti|1072,1,100000,30000,Mob031-3::On1072
+031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,230,227,12,42|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000,30000,Mob031-3::On1072
 031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
 031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
 031-3.gat,199,200,45,14|monster|Bat|1017,13,100000,30000,Mob031-3::On1017
-031-3.gat,209,199,12,17|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,144,216,29,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,234,141,18,19|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
 031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
 031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
 031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
@@ -46,19 +45,19 @@
 031-3.gat,284,143,40,48|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
 031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
 031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
-031-3.gat,274,81,15,32|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
 031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000,30000,Mob031-3::On1061
-031-3.gat,120,160,85,30|monster|yeti|1072,4,100000,30000,Mob031-3::On1072
-031-3.gat,120,131,82,24|monster|yeti|1072,8,100000,30000,Mob031-3::On1072
-031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,282,37,31,28|monster|iceelement|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,213,36,64,32|monster|iceelement|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,228,83,31,28|monster|iceelement|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,283,138,15,13|monster|iceelement|1071,1,100000,30000,Mob031-3::On1071
-031-3.gat,198,83,31,28|monster|iceelement|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000,30000,Mob031-3::On1072
+031-3.gat,120,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072
+031-3.gat,107,130,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,145,160,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,94,167,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,282,37,31,28|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,213,36,64,32|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,228,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,283,138,15,13|monster|Ice Element|1071,1,100000,30000,Mob031-3::On1071
+031-3.gat,198,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,214,75,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
 031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
 031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
 031-3.gat,38,277,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 2aea5e67..14a0f28b 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -1,50 +1,50 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Ice Caves warps
+// Ice Labyrinth warps
 
-031-3.gat,212,300|warp|toOutside|-1,-1,031-1.gat,76,26
-031-3.gat,205,264|warp|toCave|-1,-1,031-3.gat,149,261
-031-3.gat,149,259|warp|toCave|-1,-1,031-3.gat,205,266
-031-3.gat,225,282|warp|toCave|-1,-1,031-3.gat,274,299
-031-3.gat,274,300|warp|toCave|-1,-1,031-3.gat,225,283
-031-3.gat,283,271|warp|toCave|-1,-1,031-3.gat,269,244
-031-3.gat,269,245|warp|toCave|-1,-1,031-3.gat,283,272
-031-3.gat,148,150|warp|toCave|-1,-1,031-3.gat,128,134
-031-3.gat,139,258|warp|toCave|-1,-1,031-3.gat,155,196
-031-3.gat,155,195|warp|toCave|-1,-1,031-3.gat,139,259
-031-3.gat,142,301|warp|toCave|-1,-1,031-3.gat,97,298
-031-3.gat,97,301|warp|toCave|-1,-1,031-3.gat,142,298
-031-3.gat,135,196|warp|toCave|-1,-1,031-3.gat,106,231
-031-3.gat,106,232|warp|toCave|-1,-1,031-3.gat,135,197
-031-3.gat,286,190|warp|toCave|-1,-1,031-3.gat,227,241
-031-3.gat,227,242|warp|toCave|-1,-1,031-3.gat,286,191
-031-3.gat,236,211|warp|toCave|-1,-1,031-3.gat,187,227
-031-3.gat,187,228|warp|toCave|-1,-1,031-3.gat,236,212
-031-3.gat,94,254|warp|toCave|-1,-1,031-3.gat,54,253
-031-3.gat,54,250|warp|toCave|-1,-1,031-3.gat,94,257
-031-3.gat,103,199|warp|toCave|-1,-1,031-3.gat,52,175
-031-3.gat,52,177|warp|toCave|-1,-1,031-3.gat,103,201
-031-3.gat,212,193|warp|toCave|-1,-1,031-3.gat,207,165
-031-3.gat,207,168|warp|toCave|-1,-1,031-3.gat,212,195
-031-3.gat,235,167|warp|toCave|-1,-1,031-3.gat,195,124
-031-3.gat,195,122|warp|toCave|-1,-1,031-3.gat,235,165
-031-3.gat,296,97|warp|toCave|-1,-1,031-3.gat,292,125
-031-3.gat,292,123|warp|toCave|-1,-1,031-3.gat,296,95
-031-3.gat,289,164|warp|toCave|-1,-1,031-3.gat,228,123
-031-3.gat,228,121|warp|toCave|-1,-1,031-3.gat,289,162
-031-3.gat,24,157|warp|toCave|-1,-1,031-3.gat,31,142
-031-3.gat,31,144|warp|toCave|-1,-1,031-3.gat,24,159
-031-3.gat,36,249|warp|toCave|-1,-1,031-3.gat,35,224
-031-3.gat,35,226|warp|toCave|-1,-1,031-3.gat,36,251
-031-3.gat,34,25|warp|toCave|-1,-1,031-3.gat,281,25
-031-3.gat,281,22|warp|toCave|-1,-1,031-3.gat,34,28
-031-3.gat,283,48|warp|toCave|-1,-1,031-3.gat,275,74
-031-3.gat,275,73|warp|toCave|-1,-1,031-3.gat,283,47
-031-3.gat,26,178|warp|toCave|-1,-1,031-3.gat,36,202
-031-3.gat,36,200|warp|toCave|-1,-1,031-3.gat,26,176
-031-3.gat,91,125|warp|toCave|-1,-1,031-3.gat,36,78
-031-3.gat,36,80|warp|toCave|-1,-1,031-3.gat,91,127
-031-3.gat,52,78|warp|toCave|-1,-1,031-3.gat,192,72
-031-3.gat,192,70|warp|toCave|-1,-1,031-3.gat,52,76
-031-3.gat,128,135|warp|toCave|-1,-1,031-3.gat,148,152
-031-3.gat,232,93|warp|toCave|-1,-1,031-3.gat,200,47
-031-3.gat,200,50|warp|toCave|-1,-1,031-3.gat,232,90
+031-3.gat,212,300|warp|To Nivalis Port|-1,-1,031-1.gat,76,25
+031-3.gat,205,264|warp|To Ice Labyrinth|-1,-1,031-3.gat,150,260
+031-3.gat,149,259|warp|To Ice Labyrinth|-1,-1,031-3.gat,206,265
+031-3.gat,225,282|warp|To Ice Labyrinth|-1,-1,031-3.gat,274,299
+031-3.gat,274,300|warp|To Ice Labyrinth|-1,-1,031-3.gat,225,283
+031-3.gat,283,271|warp|To Ice Labyrinth|-1,-1,031-3.gat,269,244
+031-3.gat,269,245|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,272
+031-3.gat,148,150|warp|To Ice Labyrinth|-1,-1,031-3.gat,128,134
+031-3.gat,139,258|warp|To Ice Labyrinth|-1,-1,031-3.gat,156,196
+031-3.gat,155,195|warp|To Ice Labyrinth|-1,-1,031-3.gat,139,259
+031-3.gat,142,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,98,300
+031-3.gat,97,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,143,300
+031-3.gat,135,196|warp|To Ice Labyrinth|-1,-1,031-3.gat,106,231
+031-3.gat,106,232|warp|To Ice Labyrinth|-1,-1,031-3.gat,135,197
+031-3.gat,286,190|warp|To Ice Labyrinth|-1,-1,031-3.gat,227,241
+031-3.gat,227,242|warp|To Ice Labyrinth|-1,-1,031-3.gat,286,191
+031-3.gat,236,211|warp|To Ice Labyrinth|-1,-1,031-3.gat,187,227
+031-3.gat,187,228|warp|To Ice Labyrinth|-1,-1,031-3.gat,236,212
+031-3.gat,94,254|warp|To Ice Labyrinth|-1,-1,031-3.gat,54,251
+031-3.gat,54,250|warp|To Ice Labyrinth|-1,-1,031-3.gat,94,255
+031-3.gat,103,199|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,176
+031-3.gat,52,177|warp|To Ice Labyrinth|-1,-1,031-3.gat,103,200
+031-3.gat,212,193|warp|To Ice Labyrinth|-1,-1,031-3.gat,207,167
+031-3.gat,207,168|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,194
+031-3.gat,235,167|warp|To Ice Labyrinth|-1,-1,031-3.gat,195,123
+031-3.gat,195,122|warp|To Ice Labyrinth|-1,-1,031-3.gat,235,166
+031-3.gat,296,97|warp|To Ice Labyrinth|-1,-1,031-3.gat,292,124
+031-3.gat,292,123|warp|To Ice Labyrinth|-1,-1,031-3.gat,296,96
+031-3.gat,289,164|warp|To Ice Labyrinth|-1,-1,031-3.gat,228,122
+031-3.gat,228,121|warp|To Ice Labyrinth|-1,-1,031-3.gat,289,163
+031-3.gat,24,157|warp|To Ice Labyrinth|-1,-1,031-3.gat,31,143
+031-3.gat,31,144|warp|To Ice Labyrinth|-1,-1,031-3.gat,24,158
+031-3.gat,36,249|warp|To Ice Labyrinth|-1,-1,031-3.gat,35,225
+031-3.gat,35,226|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,250
+031-3.gat,34,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,282,23
+031-3.gat,281,22|warp|To Ice Labyrinth|-1,-1,031-3.gat,34,26
+031-3.gat,283,48|warp|To Ice Labyrinth|-1,-1,031-3.gat,275,74
+031-3.gat,275,73|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,47
+031-3.gat,26,178|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,201
+031-3.gat,36,200|warp|To Ice Labyrinth|-1,-1,031-3.gat,26,177
+031-3.gat,91,125|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,79
+031-3.gat,36,80|warp|To Ice Labyrinth|-1,-1,031-3.gat,91,126
+031-3.gat,52,78|warp|To Ice Labyrinth|-1,-1,031-3.gat,192,71
+031-3.gat,192,70|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,77
+031-3.gat,128,135|warp|To Ice Labyrinth|-1,-1,031-3.gat,148,151
+031-3.gat,232,93|warp|To Ice Labyrinth|-1,-1,031-3.gat,234,26
+031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92