Regenerate map data (massive update)

9 files changed, 17 insertions, 19 deletions

diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index df5dc7031..62554cd09 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -17,5 +17,5 @@
 010-1-1,112,44,0	warp	#010-1-1_112_44	0,0,010-2,114,104
 010-1-1,119,36,0	warp	#010-1-1_119_36	0,0,010-2,123,100
 010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,105,30
-010-1-1,168,23,0	warp	#010-1-1_168_23	0,0,010-1,59,192
+010-1-1,168,23,0	warp	#010-1-1_168_23	0,0,010-2,175,81
 010-1-1,176,50,0	warp	#010-1-1_176_50	0,0,010-2,136,116
diff --git a/npc/018-3/_mobs.txt b/npc/018-3/_mobs.txt
index 3cb920606..838ec8683 100644
--- a/npc/018-3/_mobs.txt
+++ b/npc/018-3/_mobs.txt
@@ -3,11 +3,8 @@
 018-3,81,91,1,1	monster	Dark Lizard	1051,2,0,20000
 018-3,37,61,1,1	monster	Dark Lizard	1051,2,0,20000
 018-3,45,114,1,1	monster	Troll	1171,2,10000,60000
-018-3,0,0,0,0	monster	Lava Slime	1097,8,10000,0
-018-3,0,0,0,0	monster	Fire Goblin	1067,30,20,0
 018-3,75,53,1,1	monster	Black Slime	1178,1,10000,20000
 018-3,115,116,2,2	monster	Black Scorpion	1074,1,0,10000
-018-3,0,0,0,0	monster	Evil Mushroom	1042,10,20,0
 018-3,39,57,21,38	monster	Lava Slime	1097,12,10000,0
 018-3,96,46,34,27	monster	Lava Slime	1097,10,10000,0
 018-3,88,84,26,10	monster	Lava Slime	1097,5,10000,0
diff --git a/npc/018-3/_warps.txt b/npc/018-3/_warps.txt
index 7cd142b11..b04455347 100644
--- a/npc/018-3/_warps.txt
+++ b/npc/018-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-3: Somber Cave warps
 018-3,114,23,0	warp	#018-3_114_23	0,0,017-2-1,27,126
-018-3,94,96,0	warp	#018-3_94_96	0,0,018-4,164,104
+018-3,94,96,0	warp	#018-3_94_96	0,0,018-4,169,114
diff --git a/npc/018-4-1/_warps.txt b/npc/018-4-1/_warps.txt
index 335f148c4..070a064dd 100644
--- a/npc/018-4-1/_warps.txt
+++ b/npc/018-4-1/_warps.txt
@@ -2,4 +2,4 @@
 // Map 018-4-1: Secret Island Cave warps
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-4-1: sicave warps
-018-4-1,102,86,0	warp	#018-4-1_102_86	0,0,018-4,94,90
+018-4-1,102,86,0	warp	#018-4-1_102_86	0,0,018-4,99,100
diff --git a/npc/018-4-2/_warps.txt b/npc/018-4-2/_warps.txt
index 02e21aacd..796a02460 100644
--- a/npc/018-4-2/_warps.txt
+++ b/npc/018-4-2/_warps.txt
@@ -2,4 +2,4 @@
 // Map 018-4-2: Secret Island House warps
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-4-2: Secret_Island_Indoor warps
-018-4-2,33,36,0	warp	#018-4-2_33_36	0,0,018-4,73,26
+018-4-2,33,36,0	warp	#018-4-2_33_36	0,0,018-4,78,36
diff --git a/npc/018-4-2/susanne.txt b/npc/018-4-2/susanne.txt
index 9565ff48a..391bf3b25 100644
--- a/npc/018-4-2/susanne.txt
+++ b/npc/018-4-2/susanne.txt
@@ -153,7 +153,7 @@ L_Spawn:
         mesc l("Screams");
         mesq l("I hear a Fafi Dragon on THIS very island!!");
         .respawnTime=gettimetick(2)+(60*90);
-        monster "018-4", any(59,78,95,118,134), any(54,64,79), strmobinfo(1, FafiDragon), FafiDragon, 1, "Susanne::OnKillFafi";
+        monster "018-4", any(64,83,100,123,139), any(64,74,89), strmobinfo(1, FafiDragon), FafiDragon, 1, "Susanne::OnKillFafi";
     }
     close;
 
diff --git a/npc/018-4/_mobs.txt b/npc/018-4/_mobs.txt
index 8d75fc383..cff893fca 100644
--- a/npc/018-4/_mobs.txt
+++ b/npc/018-4/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-4: Secret Island mobs
-018-4,120,68,46,21	monster	Golden Scorpion	1078,7,10000,5000
-018-4,98,47,46,32	monster	Night Scorpion	1077,5,20000,10000
-018-4,98,47,46,32	monster	Black Slime	1178,10,15000,10000
-018-4,91,60,76,47	monster	Red Slime	1092,12,12000,4000
-018-4,91,60,76,47	monster	Yellow Slime	1091,15,30000,30000
-018-4,91,56,76,43	monster	Clover Patch	1028,2,75000,35000
-018-4,91,60,76,47	monster	Mouboo	1023,3,12000,4000
-018-4,98,66,40,12	monster	Wicked Mushroom	1176,2,85000,65000
+018-4,125,78,46,21	monster	Golden Scorpion	1078,7,10000,5000
+018-4,103,57,46,32	monster	Night Scorpion	1077,5,20000,10000
+018-4,103,57,46,32	monster	Black Slime	1178,10,15000,10000
+018-4,96,70,76,47	monster	Red Slime	1092,12,12000,4000
+018-4,96,70,76,47	monster	Yellow Slime	1091,15,30000,30000
+018-4,96,66,76,43	monster	Clover Patch	1028,2,75000,35000
+018-4,96,70,76,47	monster	Mouboo	1023,3,12000,4000
+018-4,103,76,40,12	monster	Wicked Mushroom	1176,2,85000,65000
diff --git a/npc/018-4/_warps.txt b/npc/018-4/_warps.txt
index ed546e4f0..99e7a8dd4 100644
--- a/npc/018-4/_warps.txt
+++ b/npc/018-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-4: Secret Island warps
-018-4,94,89,0	warp	#018-4_94_89	0,0,018-4-1,102,84
-018-4,164,105,0	warp	#018-4_164_105	0,0,018-3,94,95
-018-4,73,24,0	warp	#018-4_73_24	0,0,018-4-2,33,34
+018-4,99,99,0	warp	#018-4_99_99	0,0,018-4-1,102,84
+018-4,169,115,0	warp	#018-4_169_115	0,0,018-3,94,95
+018-4,78,34,0	warp	#018-4_78_34	0,0,018-4-2,33,34
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 15c9a4adc..437b84400 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -66,6 +66,7 @@ OnInit:
     htput(.wcore, "010-2", "desert");
 
     // Woodlands
+    htput(.wcore, "001-11", "woodland");
     htput(.wcore, "005-1", "woodland");
     htput(.wcore, "012-1", "woodland");
     htput(.wcore, "014-1", "woodland");