Introducing slides on 021-1. Weather update. Two new maps.

11 files changed, 272 insertions, 55 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 68f28a294..9043a7ee1 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -108,6 +108,8 @@ map_list: (
     "021-2",
     "021-3",
     "021-4",
+    "022-1",
+    "023-1",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 01a62ee9f..d36805ede 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -105,10 +105,12 @@
 021-2 105
 021-3 106
 021-4 107
-boss 108
-botcheck 109
-sec_pri 110
-soren-2 111
-soren 112
-test 113
-testbg 114
+022-1 108
+023-1 109
+boss 110
+botcheck 111
+sec_pri 112
+soren-2 113
+soren 114
+test 115
+testbg 116
diff --git a/maps/re/022-1.mcache b/maps/re/022-1.mcache
new file mode 100644
index 000000000..94015ceb3
--- /dev/null
+++ b/maps/re/022-1.mcache
diff --git a/maps/re/023-1.mcache b/maps/re/023-1.mcache
new file mode 100644
index 000000000..3fe7c4f2d
--- /dev/null
+++ b/maps/re/023-1.mcache
diff --git a/npc/021-1/_warps.txt b/npc/021-1/_warps.txt
index 58f87bfe9..36fc0c3a5 100644
--- a/npc/021-1/_warps.txt
+++ b/npc/021-1/_warps.txt
@@ -1,51 +1,243 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 021-1: Ice Labyrinth warps
-021-1,103,40,0	warp	#021-1_103_40	0,0,021-1,56,49
-021-1,241,280,0	warp	#021-1_241_280	0,0,021-1,266,284
-021-1,183,282,0	warp	#021-1_183_282	0,0,021-1,158,282
-021-1,159,282,0	warp	#021-1_159_282	0,0,021-1,184,282
+021-1,103,40,0	script	#021-1_103_40	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 56,49; end;
+}
+021-1,241,280,0	script	#021-1_241_280	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 266,284; end;
+}
+021-1,183,282,0	script	#021-1_183_282	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 158,282; end;
+}
+021-1,159,282,0	script	#021-1_159_282	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 184,282; end;
+}
 021-1,212,300,0	warp	#021-1_212_300	0,0,019-2,76,25
-021-1,128,266,0	warp	#021-1_128_266	0,0,021-1,115,266
-021-1,116,266,0	warp	#021-1_116_266	0,0,021-1,129,266
-021-1,80,268,0	warp	#021-1_80_268	0,0,021-1,55,268
-021-1,56,268,0	warp	#021-1_56_268	0,0,021-1,81,268
-021-1,109,255,0	warp	#021-1_109_255	0,0,021-1,106,231
-021-1,106,232,0	warp	#021-1_106_232	0,0,021-1,109,256
-021-1,103,199,0	warp	#021-1_103_199	0,0,021-1,92,174
-021-1,92,175,0	warp	#021-1_92_175	0,0,021-1,103,200
-021-1,148,150,0	warp	#021-1_148_150	0,0,021-1,128,134
-021-1,128,135,0	warp	#021-1_128_135	0,0,021-1,148,151
-021-1,146,172,0	warp	#021-1_146_172	0,0,021-1,135,197
-021-1,135,196,0	warp	#021-1_135_196	0,0,021-1,146,171
-021-1,36,249,0	warp	#021-1_36_249	0,0,021-1,35,225
-021-1,35,226,0	warp	#021-1_35_226	0,0,021-1,36,250
-021-1,36,200,0	warp	#021-1_36_200	0,0,021-1,26,177
-021-1,26,178,0	warp	#021-1_26_178	0,0,021-1,36,201
-021-1,24,157,0	warp	#021-1_24_157	0,0,021-1,31,143
-021-1,31,144,0	warp	#021-1_31_144	0,0,021-1,24,158
-021-1,91,125,0	warp	#021-1_91_125	0,0,021-1,115,76
-021-1,115,77,0	warp	#021-1_115_77	0,0,021-1,91,126
-021-1,57,49,0	warp	#021-1_57_49	0,0,021-1,104,40
-021-1,265,284,0	warp	#021-1_265_284	0,0,021-1,240,280
-021-1,283,271,0	warp	#021-1_283_271	0,0,021-1,269,244
-021-1,269,245,0	warp	#021-1_269_245	0,0,021-1,283,272
-021-1,286,190,0	warp	#021-1_286_190	0,0,021-1,289,163
-021-1,289,164,0	warp	#021-1_289_164	0,0,021-1,286,191
-021-1,292,123,0	warp	#021-1_292_123	0,0,021-1,296,96
-021-1,296,97,0	warp	#021-1_296_97	0,0,021-1,292,124
-021-1,275,73,0	warp	#021-1_275_73	0,0,021-1,283,47
-021-1,283,48,0	warp	#021-1_283_48	0,0,021-1,275,74
-021-1,197,263,0	warp	#021-1_197_263	0,0,021-1,187,227
-021-1,187,228,0	warp	#021-1_187_228	0,0,021-1,197,264
-021-1,218,265,0	warp	#021-1_218_265	0,0,021-1,227,241
-021-1,227,242,0	warp	#021-1_227_242	0,0,021-1,218,266
-021-1,212,193,0	warp	#021-1_212_193	0,0,021-1,207,167
-021-1,207,168,0	warp	#021-1_207_168	0,0,021-1,212,194
-021-1,236,211,0	warp	#021-1_236_211	0,0,021-1,235,166
-021-1,235,167,0	warp	#021-1_235_167	0,0,021-1,236,212
-021-1,195,122,0	warp	#021-1_195_122	0,0,021-1,208,91
-021-1,208,92,0	warp	#021-1_208_92	0,0,021-1,195,123
-021-1,228,121,0	warp	#021-1_228_121	0,0,021-1,232,92
-021-1,232,93,0	warp	#021-1_232_93	0,0,021-1,228,122
-021-1,192,70,0	warp	#021-1_192_70	0,0,021-1,200,49
-021-1,200,50,0	warp	#021-1_200_50	0,0,021-1,192,71
+021-1,128,266,0	script	#021-1_128_266	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 115,266; end;
+}
+021-1,116,266,0	script	#021-1_116_266	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 129,266; end;
+}
+021-1,80,268,0	script	#021-1_80_268	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 55,268; end;
+}
+021-1,56,268,0	script	#021-1_56_268	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 81,268; end;
+}
+021-1,109,255,0	script	#021-1_109_255	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 106,231; end;
+}
+021-1,106,232,0	script	#021-1_106_232	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 109,256; end;
+}
+021-1,103,199,0	script	#021-1_103_199	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 92,174; end;
+}
+021-1,92,175,0	script	#021-1_92_175	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 103,200; end;
+}
+021-1,148,150,0	script	#021-1_148_150	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 128,134; end;
+}
+021-1,128,135,0	script	#021-1_128_135	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 148,151; end;
+}
+021-1,146,172,0	script	#021-1_146_172	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 135,197; end;
+}
+021-1,135,196,0	script	#021-1_135_196	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 146,171; end;
+}
+021-1,36,249,0	script	#021-1_36_249	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 35,225; end;
+}
+021-1,35,226,0	script	#021-1_35_226	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 36,250; end;
+}
+021-1,36,200,0	script	#021-1_36_200	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 26,177; end;
+}
+021-1,26,178,0	script	#021-1_26_178	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 36,201; end;
+}
+021-1,24,157,0	script	#021-1_24_157	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 31,143; end;
+}
+021-1,31,144,0	script	#021-1_31_144	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 24,158; end;
+}
+021-1,91,125,0	script	#021-1_91_125	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 115,76; end;
+}
+021-1,115,77,0	script	#021-1_115_77	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 91,126; end;
+}
+021-1,57,49,0	script	#021-1_57_49	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 104,40; end;
+}
+021-1,265,284,0	script	#021-1_265_284	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 240,280; end;
+}
+021-1,283,271,0	script	#021-1_283_271	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 269,244; end;
+}
+021-1,269,245,0	script	#021-1_269_245	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 283,272; end;
+}
+021-1,286,190,0	script	#021-1_286_190	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 289,163; end;
+}
+021-1,289,164,0	script	#021-1_289_164	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 286,191; end;
+}
+021-1,292,123,0	script	#021-1_292_123	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 296,96; end;
+}
+021-1,296,97,0	script	#021-1_296_97	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 292,124; end;
+}
+021-1,275,73,0	script	#021-1_275_73	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 283,47; end;
+}
+021-1,283,48,0	script	#021-1_283_48	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 275,74; end;
+}
+021-1,197,263,0	script	#021-1_197_263	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 187,227; end;
+}
+021-1,187,228,0	script	#021-1_187_228	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 197,264; end;
+}
+021-1,218,265,0	script	#021-1_218_265	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 227,241; end;
+}
+021-1,227,242,0	script	#021-1_227_242	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 218,266; end;
+}
+021-1,212,193,0	script	#021-1_212_193	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 207,167; end;
+}
+021-1,207,168,0	script	#021-1_207_168	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 212,194; end;
+}
+021-1,236,211,0	script	#021-1_236_211	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 235,166; end;
+}
+021-1,235,167,0	script	#021-1_235_167	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 236,212; end;
+}
+021-1,195,122,0	script	#021-1_195_122	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 208,91; end;
+}
+021-1,208,92,0	script	#021-1_208_92	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 195,123; end;
+}
+021-1,228,121,0	script	#021-1_228_121	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 232,92; end;
+}
+021-1,232,93,0	script	#021-1_232_93	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 228,122; end;
+}
+021-1,192,70,0	script	#021-1_192_70	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 200,49; end;
+}
+021-1,200,50,0	script	#021-1_200_50	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 192,71; end;
+}
diff --git a/npc/022-1/_import.txt b/npc/022-1/_import.txt
new file mode 100644
index 000000000..546c5fc6b
--- /dev/null
+++ b/npc/022-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 022-1: North Icelands
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/022-1/_mobs.txt",
diff --git a/npc/022-1/_mobs.txt b/npc/022-1/_mobs.txt
new file mode 100644
index 000000000..1e92d29d9
--- /dev/null
+++ b/npc/022-1/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 022-1: North Icelands mobs
+022-1,30,73,10,34	monster	Rudolph Slime	1086,8,0,0
+022-1,29,72,10,34	monster	Noel Slime	1096,3,0,0
+022-1,92,58,9,6	monster	Blue Slime	1087,8,0,0
+022-1,65,53,23,14	monster	Noel Slime	1096,3,0,0
+022-1,69,75,13,6	monster	Rudolph Slime	1086,8,0,0
+022-1,77,104,31,15	monster	Rudolph Slime	1086,8,0,0
+022-1,78,105,31,15	monster	Noel Slime	1096,3,0,0
diff --git a/npc/023-1/_import.txt b/npc/023-1/_import.txt
new file mode 100644
index 000000000..49f75b648
--- /dev/null
+++ b/npc/023-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 023-1: Frozen Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/023-1/_mobs.txt",
diff --git a/npc/023-1/_mobs.txt b/npc/023-1/_mobs.txt
new file mode 100644
index 000000000..600dd2978
--- /dev/null
+++ b/npc/023-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 023-1: Frozen Cave mobs
+023-1,42,33,23,13	monster	Noel Slime	1096,4,0,0
diff --git a/npc/_import.txt b/npc/_import.txt
index e7b85b88d..2ee08f475 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -107,6 +107,8 @@
 @include "npc/021-2/_import.txt"
 @include "npc/021-3/_import.txt"
 @include "npc/021-4/_import.txt"
+@include "npc/022-1/_import.txt"
+@include "npc/023-1/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 482ab5243..882b46c00 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -80,6 +80,7 @@ OnInit:
     htput(.wcore, "001-7", "iceland");
     htput(.wcore, "019-1", "iceland");
     htput(.wcore, "019-2", "iceland");
+    htput(.wcore, "022-1", "iceland");
 
     debugmes "[Weather.sys] Total Maps = " + htsize(.wcore);
     // No "end" here, so server starts with weather