summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf13
-rw-r--r--db/map_index.txt29
-rw-r--r--maps/re/024-10.mcachebin0 -> 68 bytes
-rw-r--r--maps/re/024-11.mcachebin0 -> 80 bytes
-rw-r--r--maps/re/024-12.mcachebin0 -> 71 bytes
-rw-r--r--maps/re/024-13.mcachebin0 -> 75 bytes
-rw-r--r--maps/re/024-14.mcachebin0 -> 66 bytes
-rw-r--r--maps/re/024-2.mcachebin0 -> 90 bytes
-rw-r--r--maps/re/024-3.mcachebin0 -> 69 bytes
-rw-r--r--maps/re/024-4.mcachebin0 -> 75 bytes
-rw-r--r--maps/re/024-5.mcachebin0 -> 69 bytes
-rw-r--r--maps/re/024-6.mcachebin0 -> 77 bytes
-rw-r--r--maps/re/024-7.mcachebin0 -> 80 bytes
-rw-r--r--maps/re/024-8.mcachebin0 -> 95 bytes
-rw-r--r--maps/re/024-9.mcachebin0 -> 82 bytes
-rw-r--r--npc/024-1/_warps.txt14
-rw-r--r--npc/024-10/_import.txt3
-rw-r--r--npc/024-10/_warps.txt4
-rw-r--r--npc/024-11/_import.txt3
-rw-r--r--npc/024-11/_warps.txt3
-rw-r--r--npc/024-12/_import.txt3
-rw-r--r--npc/024-12/_warps.txt3
-rw-r--r--npc/024-13/_import.txt3
-rw-r--r--npc/024-13/_warps.txt3
-rw-r--r--npc/024-14/_import.txt3
-rw-r--r--npc/024-14/_warps.txt3
-rw-r--r--npc/024-2/_import.txt3
-rw-r--r--npc/024-2/_warps.txt3
-rw-r--r--npc/024-3/_import.txt3
-rw-r--r--npc/024-3/_warps.txt3
-rw-r--r--npc/024-4/_import.txt3
-rw-r--r--npc/024-4/_warps.txt4
-rw-r--r--npc/024-5/_import.txt3
-rw-r--r--npc/024-5/_warps.txt3
-rw-r--r--npc/024-6/_import.txt3
-rw-r--r--npc/024-6/_warps.txt3
-rw-r--r--npc/024-7/_import.txt3
-rw-r--r--npc/024-7/_warps.txt3
-rw-r--r--npc/024-8/_import.txt3
-rw-r--r--npc/024-8/_warps.txt33
-rw-r--r--npc/024-9/_import.txt3
-rw-r--r--npc/024-9/_warps.txt3
-rw-r--r--npc/_import.txt13
43 files changed, 171 insertions, 8 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 77110cc3f..ebefaf855 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -137,6 +137,19 @@ map_list: (
"023-1",
"023-2",
"024-1",
+ "024-10",
+ "024-11",
+ "024-12",
+ "024-13",
+ "024-14",
+ "024-2",
+ "024-3",
+ "024-4",
+ "024-5",
+ "024-6",
+ "024-7",
+ "024-8",
+ "024-9",
"boss",
"botcheck",
"guilds",
diff --git a/db/map_index.txt b/db/map_index.txt
index bd3d9eb4a..67cb67764 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -134,11 +134,24 @@
023-1 134
023-2 135
024-1 136
-boss 137
-botcheck 138
-guilds 139
-sec_pri 140
-soren-2 141
-soren 142
-test 143
-testbg 144
+024-10 137
+024-11 138
+024-12 139
+024-13 140
+024-14 141
+024-2 142
+024-3 143
+024-4 144
+024-5 145
+024-6 146
+024-7 147
+024-8 148
+024-9 149
+boss 150
+botcheck 151
+guilds 152
+sec_pri 153
+soren-2 154
+soren 155
+test 156
+testbg 157
diff --git a/maps/re/024-10.mcache b/maps/re/024-10.mcache
new file mode 100644
index 000000000..5ff67f994
--- /dev/null
+++ b/maps/re/024-10.mcache
Binary files differ
diff --git a/maps/re/024-11.mcache b/maps/re/024-11.mcache
new file mode 100644
index 000000000..6be2b8ba7
--- /dev/null
+++ b/maps/re/024-11.mcache
Binary files differ
diff --git a/maps/re/024-12.mcache b/maps/re/024-12.mcache
new file mode 100644
index 000000000..2483dbe93
--- /dev/null
+++ b/maps/re/024-12.mcache
Binary files differ
diff --git a/maps/re/024-13.mcache b/maps/re/024-13.mcache
new file mode 100644
index 000000000..c824a7596
--- /dev/null
+++ b/maps/re/024-13.mcache
Binary files differ
diff --git a/maps/re/024-14.mcache b/maps/re/024-14.mcache
new file mode 100644
index 000000000..868f6b713
--- /dev/null
+++ b/maps/re/024-14.mcache
Binary files differ
diff --git a/maps/re/024-2.mcache b/maps/re/024-2.mcache
new file mode 100644
index 000000000..59d325e64
--- /dev/null
+++ b/maps/re/024-2.mcache
Binary files differ
diff --git a/maps/re/024-3.mcache b/maps/re/024-3.mcache
new file mode 100644
index 000000000..92e7b8d7b
--- /dev/null
+++ b/maps/re/024-3.mcache
Binary files differ
diff --git a/maps/re/024-4.mcache b/maps/re/024-4.mcache
new file mode 100644
index 000000000..dea20821f
--- /dev/null
+++ b/maps/re/024-4.mcache
Binary files differ
diff --git a/maps/re/024-5.mcache b/maps/re/024-5.mcache
new file mode 100644
index 000000000..20cf3f9a7
--- /dev/null
+++ b/maps/re/024-5.mcache
Binary files differ
diff --git a/maps/re/024-6.mcache b/maps/re/024-6.mcache
new file mode 100644
index 000000000..7f66019ac
--- /dev/null
+++ b/maps/re/024-6.mcache
Binary files differ
diff --git a/maps/re/024-7.mcache b/maps/re/024-7.mcache
new file mode 100644
index 000000000..538dc5954
--- /dev/null
+++ b/maps/re/024-7.mcache
Binary files differ
diff --git a/maps/re/024-8.mcache b/maps/re/024-8.mcache
new file mode 100644
index 000000000..4d9491d54
--- /dev/null
+++ b/maps/re/024-8.mcache
Binary files differ
diff --git a/maps/re/024-9.mcache b/maps/re/024-9.mcache
new file mode 100644
index 000000000..f520368bc
--- /dev/null
+++ b/maps/re/024-9.mcache
Binary files differ
diff --git a/npc/024-1/_warps.txt b/npc/024-1/_warps.txt
index 16d5fe013..19281ccbe 100644
--- a/npc/024-1/_warps.txt
+++ b/npc/024-1/_warps.txt
@@ -6,3 +6,17 @@
OnTouch:
slide 93,72; end;
}
+024-1,32,54,0 warp #024-1_32_54 0,0,024-2,41,29
+024-1,126,28,0 warp #024-1_126_28 0,0,024-3,35,34
+024-1,154,40,0 warp #024-1_154_40 0,0,024-4,28,28
+024-1,160,40,0 warp #024-1_160_40 0,0,024-4,39,28
+024-1,155,55,0 warp #024-1_155_55 0,0,024-5,34,28
+024-1,143,40,0 warp #024-1_143_40 0,0,024-6,34,27
+024-1,160,49,0 warp #024-1_160_49 0,0,024-7,40,28
+024-1,136,28,0 warp #024-1_136_28 0,0,024-8,71,31
+024-1,134,48,0 warp #024-1_134_48 0,0,024-9,41,37
+024-1,77,59,0 warp #024-1_77_59 0,0,024-10,24,36
+024-1,83,59,0 warp #024-1_83_59 0,0,024-10,34,36
+024-1,105,34,0 warp #024-1_105_34 0,0,024-11,24,34
+024-1,76,45,0 warp #024-1_76_45 0,0,024-12,31,34
+024-1,50,54,0 warp #024-1_50_54 0,0,024-13,30,36
diff --git a/npc/024-10/_import.txt b/npc/024-10/_import.txt
new file mode 100644
index 000000000..6340503e7
--- /dev/null
+++ b/npc/024-10/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-10: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-10/_warps.txt",
diff --git a/npc/024-10/_warps.txt b/npc/024-10/_warps.txt
new file mode 100644
index 000000000..d94ba383e
--- /dev/null
+++ b/npc/024-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-10: Frostia Indoors warps
+024-10,34,37,0 warp #024-10_34_37 0,0,024-1,83,60
+024-10,24,37,0 warp #024-10_24_37 0,0,024-1,77,60
diff --git a/npc/024-11/_import.txt b/npc/024-11/_import.txt
new file mode 100644
index 000000000..4959c1a85
--- /dev/null
+++ b/npc/024-11/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-11: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-11/_warps.txt",
diff --git a/npc/024-11/_warps.txt b/npc/024-11/_warps.txt
new file mode 100644
index 000000000..7a50b04d9
--- /dev/null
+++ b/npc/024-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-11: Frostia Indoors warps
+024-11,24,35,0 warp #024-11_24_35 0,0,024-1,105,35
diff --git a/npc/024-12/_import.txt b/npc/024-12/_import.txt
new file mode 100644
index 000000000..bd57bfee9
--- /dev/null
+++ b/npc/024-12/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-12: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-12/_warps.txt",
diff --git a/npc/024-12/_warps.txt b/npc/024-12/_warps.txt
new file mode 100644
index 000000000..27cb4f47a
--- /dev/null
+++ b/npc/024-12/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-12: Frostia Indoors warps
+024-12,31,35,0 warp #024-12_31_35 0,0,024-1,76,46
diff --git a/npc/024-13/_import.txt b/npc/024-13/_import.txt
new file mode 100644
index 000000000..f2e92fbdc
--- /dev/null
+++ b/npc/024-13/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-13: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-13/_warps.txt",
diff --git a/npc/024-13/_warps.txt b/npc/024-13/_warps.txt
new file mode 100644
index 000000000..522fb3e7e
--- /dev/null
+++ b/npc/024-13/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-13: Frostia Indoors warps
+024-13,30,37,0 warp #024-13_30_37 0,0,024-1,50,55
diff --git a/npc/024-14/_import.txt b/npc/024-14/_import.txt
new file mode 100644
index 000000000..82d3bfc16
--- /dev/null
+++ b/npc/024-14/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-14: Real Estate
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-14/_warps.txt",
diff --git a/npc/024-14/_warps.txt b/npc/024-14/_warps.txt
new file mode 100644
index 000000000..de798c0de
--- /dev/null
+++ b/npc/024-14/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-14: Real Estate warps
+024-14,34,34,0 warp #024-14_34_34 1,0,024-13,29,29
diff --git a/npc/024-2/_import.txt b/npc/024-2/_import.txt
new file mode 100644
index 000000000..f9e2e3876
--- /dev/null
+++ b/npc/024-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-2: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-2/_warps.txt",
diff --git a/npc/024-2/_warps.txt b/npc/024-2/_warps.txt
new file mode 100644
index 000000000..9e28c4d56
--- /dev/null
+++ b/npc/024-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-2: Frostia Indoors warps
+024-2,41,30,0 warp #024-2_41_30 0,0,024-1,32,55
diff --git a/npc/024-3/_import.txt b/npc/024-3/_import.txt
new file mode 100644
index 000000000..2e52a6254
--- /dev/null
+++ b/npc/024-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-3: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-3/_warps.txt",
diff --git a/npc/024-3/_warps.txt b/npc/024-3/_warps.txt
new file mode 100644
index 000000000..d0ee584a8
--- /dev/null
+++ b/npc/024-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-3: Frostia Indoors warps
+024-3,35,35,0 warp #024-3_35_35 0,0,024-1,126,29
diff --git a/npc/024-4/_import.txt b/npc/024-4/_import.txt
new file mode 100644
index 000000000..568d31559
--- /dev/null
+++ b/npc/024-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-4: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-4/_warps.txt",
diff --git a/npc/024-4/_warps.txt b/npc/024-4/_warps.txt
new file mode 100644
index 000000000..c82f4372b
--- /dev/null
+++ b/npc/024-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-4: Frostia Indoors warps
+024-4,39,29,0 warp #024-4_39_29 0,0,024-1,160,41
+024-4,28,29,0 warp #024-4_28_29 0,0,024-1,154,41
diff --git a/npc/024-5/_import.txt b/npc/024-5/_import.txt
new file mode 100644
index 000000000..fc7a36f8a
--- /dev/null
+++ b/npc/024-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-5: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-5/_warps.txt",
diff --git a/npc/024-5/_warps.txt b/npc/024-5/_warps.txt
new file mode 100644
index 000000000..1373ba26a
--- /dev/null
+++ b/npc/024-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-5: Frostia Indoors warps
+024-5,34,29,0 warp #024-5_34_29 0,0,024-1,155,56
diff --git a/npc/024-6/_import.txt b/npc/024-6/_import.txt
new file mode 100644
index 000000000..5b36f2a59
--- /dev/null
+++ b/npc/024-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-6: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-6/_warps.txt",
diff --git a/npc/024-6/_warps.txt b/npc/024-6/_warps.txt
new file mode 100644
index 000000000..0cad9b4df
--- /dev/null
+++ b/npc/024-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-6: Frostia Indoors warps
+024-6,34,28,0 warp #024-6_34_28 0,0,024-1,143,41
diff --git a/npc/024-7/_import.txt b/npc/024-7/_import.txt
new file mode 100644
index 000000000..fb7ecc99b
--- /dev/null
+++ b/npc/024-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-7: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-7/_warps.txt",
diff --git a/npc/024-7/_warps.txt b/npc/024-7/_warps.txt
new file mode 100644
index 000000000..fcff26938
--- /dev/null
+++ b/npc/024-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-7: Frostia Indoors warps
+024-7,40,29,0 warp #024-7_40_29 0,0,024-1,160,50
diff --git a/npc/024-8/_import.txt b/npc/024-8/_import.txt
new file mode 100644
index 000000000..5d1c1aac0
--- /dev/null
+++ b/npc/024-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-8: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-8/_warps.txt",
diff --git a/npc/024-8/_warps.txt b/npc/024-8/_warps.txt
new file mode 100644
index 000000000..9fee9a544
--- /dev/null
+++ b/npc/024-8/_warps.txt
@@ -0,0 +1,33 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-8: Frostia Indoors warps
+024-8,71,32,0 warp #024-8_71_32 0,0,024-1,136,29
+024-8,69,24,0 script #024-8_69_24 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 37,32; end;
+}
+024-8,67,24,0 script #024-8_67_24 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 30,32; end;
+}
+024-8,65,24,0 script #024-8_65_24 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 23,32; end;
+}
+024-8,37,33,0 script #024-8_37_33 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 69,25; end;
+}
+024-8,30,33,0 script #024-8_30_33 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 67,25; end;
+}
+024-8,23,33,0 script #024-8_23_33 NPC_HIDDEN,0,0,{
+ end;
+OnTouch:
+ slide 65,25; end;
+}
diff --git a/npc/024-9/_import.txt b/npc/024-9/_import.txt
new file mode 100644
index 000000000..f038f049f
--- /dev/null
+++ b/npc/024-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-9: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-9/_warps.txt",
diff --git a/npc/024-9/_warps.txt b/npc/024-9/_warps.txt
new file mode 100644
index 000000000..6606fb7da
--- /dev/null
+++ b/npc/024-9/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-9: Frostia Indoors warps
+024-9,41,38,0 warp #024-9_41_38 0,0,024-1,134,49
diff --git a/npc/_import.txt b/npc/_import.txt
index debc0537a..3ce4af1b4 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -136,6 +136,19 @@
@include "npc/023-1/_import.txt"
@include "npc/023-2/_import.txt"
@include "npc/024-1/_import.txt"
+@include "npc/024-10/_import.txt"
+@include "npc/024-11/_import.txt"
+@include "npc/024-12/_import.txt"
+@include "npc/024-13/_import.txt"
+@include "npc/024-14/_import.txt"
+@include "npc/024-2/_import.txt"
+@include "npc/024-3/_import.txt"
+@include "npc/024-4/_import.txt"
+@include "npc/024-5/_import.txt"
+@include "npc/024-6/_import.txt"
+@include "npc/024-7/_import.txt"
+@include "npc/024-8/_import.txt"
+@include "npc/024-9/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/guilds/_import.txt"