summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf55
-rw-r--r--db/map_index.txt167
-rw-r--r--maps/re/008-1-2.mcachebin5336 -> 0 bytes
-rw-r--r--maps/re/009-1.mcachebin0 -> 5335 bytes
-rw-r--r--maps/re/009-2-0.mcachebin0 -> 80 bytes
-rw-r--r--maps/re/009-2-1.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/009-2-10.mcachebin0 -> 95 bytes
-rw-r--r--maps/re/009-2-11.mcachebin0 -> 92 bytes
-rw-r--r--maps/re/009-2-12.mcachebin0 -> 67 bytes
-rw-r--r--maps/re/009-2-13.mcachebin0 -> 98 bytes
-rw-r--r--maps/re/009-2-14.mcachebin0 -> 103 bytes
-rw-r--r--maps/re/009-2-15.mcachebin0 -> 101 bytes
-rw-r--r--maps/re/009-2-16.mcachebin0 -> 65 bytes
-rw-r--r--maps/re/009-2-17.mcachebin0 -> 66 bytes
-rw-r--r--maps/re/009-2-18.mcachebin0 -> 62 bytes
-rw-r--r--maps/re/009-2-2.mcachebin0 -> 66 bytes
-rw-r--r--maps/re/009-2-3.mcachebin0 -> 90 bytes
-rw-r--r--maps/re/009-2-4.mcachebin0 -> 85 bytes
-rw-r--r--maps/re/009-2-5.mcachebin0 -> 117 bytes
-rw-r--r--maps/re/009-2-6.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/009-2-7.mcachebin0 -> 66 bytes
-rw-r--r--maps/re/009-2-8.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/009-2-9.mcachebin0 -> 84 bytes
-rw-r--r--maps/re/020-1.mcachebin4690 -> 4791 bytes
-rw-r--r--maps/re/020-2-0.mcachebin0 -> 94 bytes
-rw-r--r--maps/re/020-2-1.mcachebin0 -> 88 bytes
-rw-r--r--maps/re/020-2-10.mcachebin0 -> 71 bytes
-rw-r--r--maps/re/020-2-11.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/020-2-12.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/020-2-13.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/020-2-14.mcachebin0 -> 80 bytes
-rw-r--r--maps/re/020-2-15.mcachebin0 -> 73 bytes
-rw-r--r--maps/re/020-2-16.mcachebin0 -> 75 bytes
-rw-r--r--maps/re/020-2-17.mcachebin0 -> 65 bytes
-rw-r--r--maps/re/020-2-18.mcachebin0 -> 67 bytes
-rw-r--r--maps/re/020-2-19.mcachebin0 -> 65 bytes
-rw-r--r--maps/re/020-2-2.mcachebin0 -> 68 bytes
-rw-r--r--maps/re/020-2-20.mcachebin0 -> 77 bytes
-rw-r--r--maps/re/020-2-21.mcachebin0 -> 65 bytes
-rw-r--r--maps/re/020-2-22.mcachebin0 -> 81 bytes
-rw-r--r--maps/re/020-2-23.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/020-2-24.mcachebin0 -> 64 bytes
-rw-r--r--maps/re/020-2-25.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/020-2-26.mcachebin0 -> 140 bytes
-rw-r--r--maps/re/020-2-27.mcachebin0 -> 77 bytes
-rw-r--r--maps/re/020-2-28.mcachebin0 -> 78 bytes
-rw-r--r--maps/re/020-2-29.mcachebin0 -> 72 bytes
-rw-r--r--maps/re/020-2-3.mcachebin0 -> 79 bytes
-rw-r--r--maps/re/020-2-30.mcachebin0 -> 62 bytes
-rw-r--r--maps/re/020-2-31.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/020-2-32.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/020-2-33.mcachebin0 -> 70 bytes
-rw-r--r--maps/re/020-2-4.mcachebin0 -> 67 bytes
-rw-r--r--maps/re/020-2-5.mcachebin0 -> 80 bytes
-rw-r--r--maps/re/020-2-6.mcachebin0 -> 74 bytes
-rw-r--r--maps/re/020-2-7.mcachebin0 -> 63 bytes
-rw-r--r--maps/re/020-2-8.mcachebin0 -> 65 bytes
-rw-r--r--maps/re/020-2-9.mcachebin0 -> 75 bytes
-rw-r--r--npc/000-2-1/_savepoints.txt8
-rw-r--r--npc/001-2-1/_savepoints.txt2
-rw-r--r--npc/001-2-10/_savepoints.txt2
-rw-r--r--npc/001-2-11/_savepoints.txt2
-rw-r--r--npc/001-2-13/_savepoints.txt2
-rw-r--r--npc/001-2-15/_savepoints.txt2
-rw-r--r--npc/001-2-22/_savepoints.txt10
-rw-r--r--npc/001-2-29/_savepoints.txt8
-rw-r--r--npc/001-2-3/_savepoints.txt2
-rw-r--r--npc/001-2-37/_savepoints.txt8
-rw-r--r--npc/001-2-38/_savepoints.txt8
-rw-r--r--npc/008-1-1/_warps.txt2
-rw-r--r--npc/008-1/_warps.txt2
-rw-r--r--npc/008-2-0/_savepoints.txt2
-rw-r--r--npc/008-2-1/_savepoints.txt2
-rw-r--r--npc/008-2-11/_savepoints.txt4
-rw-r--r--npc/008-2-13/_savepoints.txt8
-rw-r--r--npc/008-2-14/_savepoints.txt2
-rw-r--r--npc/008-2-22/_savepoints.txt2
-rw-r--r--npc/008-2-3/_savepoints.txt16
-rw-r--r--npc/008-2-4/_savepoints.txt2
-rw-r--r--npc/008-2-7/_savepoints.txt2
-rw-r--r--npc/008-2-9/_savepoints.txt2
-rw-r--r--npc/009-1/_import.txt4
-rw-r--r--npc/009-1/_mobs.txt19
-rw-r--r--npc/009-1/_warps.txt15
-rw-r--r--npc/009-2-0/_import.txt3
-rw-r--r--npc/009-2-0/_warps.txt3
-rw-r--r--npc/009-2-1/_import.txt3
-rw-r--r--npc/009-2-1/_warps.txt3
-rw-r--r--npc/009-2-10/_import.txt3
-rw-r--r--npc/009-2-10/_warps.txt4
-rw-r--r--npc/009-2-11/_import.txt3
-rw-r--r--npc/009-2-11/_warps.txt3
-rw-r--r--npc/009-2-12/_import.txt3
-rw-r--r--npc/009-2-12/_warps.txt4
-rw-r--r--npc/009-2-13/_import.txt3
-rw-r--r--npc/009-2-13/_warps.txt4
-rw-r--r--npc/009-2-14/_import.txt3
-rw-r--r--npc/009-2-14/_warps.txt3
-rw-r--r--npc/009-2-15/_import.txt3
-rw-r--r--npc/009-2-15/_warps.txt5
-rw-r--r--npc/009-2-16/_import.txt3
-rw-r--r--npc/009-2-16/_warps.txt4
-rw-r--r--npc/009-2-17/_import.txt3
-rw-r--r--npc/009-2-17/_warps.txt4
-rw-r--r--npc/009-2-18/_import.txt3
-rw-r--r--npc/009-2-18/_warps.txt3
-rw-r--r--npc/009-2-2/_import.txt3
-rw-r--r--npc/009-2-2/_warps.txt3
-rw-r--r--npc/009-2-3/_import.txt3
-rw-r--r--npc/009-2-3/_warps.txt5
-rw-r--r--npc/009-2-4/_import.txt3
-rw-r--r--npc/009-2-4/_warps.txt3
-rw-r--r--npc/009-2-5/_import.txt3
-rw-r--r--npc/009-2-5/_warps.txt3
-rw-r--r--npc/009-2-6/_import.txt3
-rw-r--r--npc/009-2-6/_warps.txt3
-rw-r--r--npc/009-2-7/_import.txt3
-rw-r--r--npc/009-2-7/_warps.txt3
-rw-r--r--npc/009-2-8/_import.txt3
-rw-r--r--npc/009-2-8/_warps.txt3
-rw-r--r--npc/009-2-9/_import.txt3
-rw-r--r--npc/009-2-9/_warps.txt4
-rw-r--r--npc/012-2-2/_savepoints.txt4
-rw-r--r--npc/012-2-7/_savepoints.txt2
-rw-r--r--npc/020-1/_warps.txt42
-rw-r--r--npc/020-2-0/_import.txt4
-rw-r--r--npc/020-2-0/_mobs.txt5
-rw-r--r--npc/020-2-0/_warps.txt3
-rw-r--r--npc/020-2-1/_import.txt3
-rw-r--r--npc/020-2-1/_warps.txt5
-rw-r--r--npc/020-2-10/_import.txt3
-rw-r--r--npc/020-2-10/_warps.txt4
-rw-r--r--npc/020-2-11/_import.txt3
-rw-r--r--npc/020-2-11/_warps.txt3
-rw-r--r--npc/020-2-12/_import.txt3
-rw-r--r--npc/020-2-12/_warps.txt3
-rw-r--r--npc/020-2-13/_import.txt3
-rw-r--r--npc/020-2-13/_warps.txt3
-rw-r--r--npc/020-2-14/_import.txt3
-rw-r--r--npc/020-2-14/_warps.txt3
-rw-r--r--npc/020-2-15/_import.txt3
-rw-r--r--npc/020-2-15/_warps.txt3
-rw-r--r--npc/020-2-16/_import.txt3
-rw-r--r--npc/020-2-16/_warps.txt3
-rw-r--r--npc/020-2-17/_import.txt3
-rw-r--r--npc/020-2-17/_warps.txt3
-rw-r--r--npc/020-2-18/_import.txt3
-rw-r--r--npc/020-2-18/_warps.txt4
-rw-r--r--npc/020-2-19/_import.txt3
-rw-r--r--npc/020-2-19/_warps.txt3
-rw-r--r--npc/020-2-2/_import.txt3
-rw-r--r--npc/020-2-2/_warps.txt4
-rw-r--r--npc/020-2-20/_import.txt3
-rw-r--r--npc/020-2-20/_warps.txt5
-rw-r--r--npc/020-2-21/_import.txt3
-rw-r--r--npc/020-2-21/_warps.txt3
-rw-r--r--npc/020-2-22/_import.txt3
-rw-r--r--npc/020-2-22/_warps.txt5
-rw-r--r--npc/020-2-23/_import.txt3
-rw-r--r--npc/020-2-23/_warps.txt4
-rw-r--r--npc/020-2-24/_import.txt3
-rw-r--r--npc/020-2-24/_warps.txt4
-rw-r--r--npc/020-2-25/_import.txt3
-rw-r--r--npc/020-2-25/_warps.txt6
-rw-r--r--npc/020-2-26/_import.txt3
-rw-r--r--npc/020-2-26/_warps.txt9
-rw-r--r--npc/020-2-27/_import.txt3
-rw-r--r--npc/020-2-27/_warps.txt4
-rw-r--r--npc/020-2-28/_import.txt3
-rw-r--r--npc/020-2-28/_warps.txt5
-rw-r--r--npc/020-2-29/_import.txt3
-rw-r--r--npc/020-2-29/_warps.txt4
-rw-r--r--npc/020-2-3/_import.txt3
-rw-r--r--npc/020-2-3/_warps.txt4
-rw-r--r--npc/020-2-30/_import.txt3
-rw-r--r--npc/020-2-30/_warps.txt3
-rw-r--r--npc/020-2-31/_import.txt3
-rw-r--r--npc/020-2-31/_warps.txt4
-rw-r--r--npc/020-2-32/_import.txt3
-rw-r--r--npc/020-2-32/_warps.txt4
-rw-r--r--npc/020-2-33/_import.txt3
-rw-r--r--npc/020-2-33/_warps.txt4
-rw-r--r--npc/020-2-4/_import.txt3
-rw-r--r--npc/020-2-4/_warps.txt3
-rw-r--r--npc/020-2-5/_import.txt3
-rw-r--r--npc/020-2-5/_warps.txt5
-rw-r--r--npc/020-2-6/_import.txt3
-rw-r--r--npc/020-2-6/_warps.txt5
-rw-r--r--npc/020-2-7/_import.txt3
-rw-r--r--npc/020-2-7/_warps.txt3
-rw-r--r--npc/020-2-8/_import.txt3
-rw-r--r--npc/020-2-8/_warps.txt3
-rw-r--r--npc/020-2-9/_import.txt3
-rw-r--r--npc/020-2-9/_warps.txt3
-rw-r--r--npc/_anchors.txt3
-rw-r--r--npc/_import.txt55
196 files changed, 720 insertions, 112 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 9c520b52..1cdb2d88 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -59,7 +59,6 @@ map_list: (
"001-3-1",
"001-3-2",
"008-1-1",
- "008-1-2",
"008-1",
"008-2-0",
"008-2-1",
@@ -101,6 +100,26 @@ map_list: (
"008-3-4",
"008-3-5",
"008-3-6",
+ "009-1",
+ "009-2-0",
+ "009-2-1",
+ "009-2-10",
+ "009-2-11",
+ "009-2-12",
+ "009-2-13",
+ "009-2-14",
+ "009-2-15",
+ "009-2-16",
+ "009-2-17",
+ "009-2-18",
+ "009-2-2",
+ "009-2-3",
+ "009-2-4",
+ "009-2-5",
+ "009-2-6",
+ "009-2-7",
+ "009-2-8",
+ "009-2-9",
"012-1",
"012-2-1",
"012-2-2",
@@ -113,6 +132,40 @@ map_list: (
"012-3-2",
"012-3-3",
"020-1",
+ "020-2-0",
+ "020-2-1",
+ "020-2-10",
+ "020-2-11",
+ "020-2-12",
+ "020-2-13",
+ "020-2-14",
+ "020-2-15",
+ "020-2-16",
+ "020-2-17",
+ "020-2-18",
+ "020-2-19",
+ "020-2-2",
+ "020-2-20",
+ "020-2-21",
+ "020-2-22",
+ "020-2-23",
+ "020-2-24",
+ "020-2-25",
+ "020-2-26",
+ "020-2-27",
+ "020-2-28",
+ "020-2-29",
+ "020-2-3",
+ "020-2-30",
+ "020-2-31",
+ "020-2-32",
+ "020-2-33",
+ "020-2-4",
+ "020-2-5",
+ "020-2-6",
+ "020-2-7",
+ "020-2-8",
+ "020-2-9",
"sec_pri",
"test",
"testbg",
diff --git a/db/map_index.txt b/db/map_index.txt
index a593a5b8..d3d4f255 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -56,60 +56,113 @@
001-3-1 56
001-3-2 57
008-1-1 58
-008-1-2 59
-008-1 60
-008-2-0 61
-008-2-1 62
-008-2-10 63
-008-2-11 64
-008-2-12 65
-008-2-13 66
-008-2-14 67
-008-2-15 68
-008-2-16 69
-008-2-17 70
-008-2-18 71
-008-2-19 72
-008-2-2 73
-008-2-20 74
-008-2-21 75
-008-2-22 76
-008-2-23 77
-008-2-24 78
-008-2-25 79
-008-2-26 80
-008-2-27 81
-008-2-28 82
-008-2-29 83
-008-2-3 84
-008-2-30 85
-008-2-31 86
-008-2-32 87
-008-2-4 88
-008-2-5 89
-008-2-6 90
-008-2-7 91
-008-2-8 92
-008-2-9 93
-008-3-0 94
-008-3-1 95
-008-3-2 96
-008-3-3 97
-008-3-4 98
-008-3-5 99
-008-3-6 100
-012-1 101
-012-2-1 102
-012-2-2 103
-012-2-3 104
-012-2-4 105
-012-2-5 106
-012-2-6 107
-012-2-7 108
-012-3-1 109
-012-3-2 110
-012-3-3 111
-020-1 112
-sec_pri 113
-test 114
-testbg 115
+008-1 59
+008-2-0 60
+008-2-1 61
+008-2-10 62
+008-2-11 63
+008-2-12 64
+008-2-13 65
+008-2-14 66
+008-2-15 67
+008-2-16 68
+008-2-17 69
+008-2-18 70
+008-2-19 71
+008-2-2 72
+008-2-20 73
+008-2-21 74
+008-2-22 75
+008-2-23 76
+008-2-24 77
+008-2-25 78
+008-2-26 79
+008-2-27 80
+008-2-28 81
+008-2-29 82
+008-2-3 83
+008-2-30 84
+008-2-31 85
+008-2-32 86
+008-2-4 87
+008-2-5 88
+008-2-6 89
+008-2-7 90
+008-2-8 91
+008-2-9 92
+008-3-0 93
+008-3-1 94
+008-3-2 95
+008-3-3 96
+008-3-4 97
+008-3-5 98
+008-3-6 99
+009-1 100
+009-2-0 101
+009-2-1 102
+009-2-10 103
+009-2-11 104
+009-2-12 105
+009-2-13 106
+009-2-14 107
+009-2-15 108
+009-2-16 109
+009-2-17 110
+009-2-18 111
+009-2-2 112
+009-2-3 113
+009-2-4 114
+009-2-5 115
+009-2-6 116
+009-2-7 117
+009-2-8 118
+009-2-9 119
+012-1 120
+012-2-1 121
+012-2-2 122
+012-2-3 123
+012-2-4 124
+012-2-5 125
+012-2-6 126
+012-2-7 127
+012-3-1 128
+012-3-2 129
+012-3-3 130
+020-1 131
+020-2-0 132
+020-2-1 133
+020-2-10 134
+020-2-11 135
+020-2-12 136
+020-2-13 137
+020-2-14 138
+020-2-15 139
+020-2-16 140
+020-2-17 141
+020-2-18 142
+020-2-19 143
+020-2-2 144
+020-2-20 145
+020-2-21 146
+020-2-22 147
+020-2-23 148
+020-2-24 149
+020-2-25 150
+020-2-26 151
+020-2-27 152
+020-2-28 153
+020-2-29 154
+020-2-3 155
+020-2-30 156
+020-2-31 157
+020-2-32 158
+020-2-33 159
+020-2-4 160
+020-2-5 161
+020-2-6 162
+020-2-7 163
+020-2-8 164
+020-2-9 165
+sec_pri 166
+test 167
+testbg 168
diff --git a/maps/re/008-1-2.mcache b/maps/re/008-1-2.mcache
deleted file mode 100644
index 7c9d08f7..00000000
--- a/maps/re/008-1-2.mcache
+++ /dev/null
Binary files differ
diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache
new file mode 100644
index 00000000..0c26df8e
--- /dev/null
+++ b/maps/re/009-1.mcache
Binary files differ
diff --git a/maps/re/009-2-0.mcache b/maps/re/009-2-0.mcache
new file mode 100644
index 00000000..800be227
--- /dev/null
+++ b/maps/re/009-2-0.mcache
Binary files differ
diff --git a/maps/re/009-2-1.mcache b/maps/re/009-2-1.mcache
new file mode 100644
index 00000000..aebc6f00
--- /dev/null
+++ b/maps/re/009-2-1.mcache
Binary files differ
diff --git a/maps/re/009-2-10.mcache b/maps/re/009-2-10.mcache
new file mode 100644
index 00000000..0384e4aa
--- /dev/null
+++ b/maps/re/009-2-10.mcache
Binary files differ
diff --git a/maps/re/009-2-11.mcache b/maps/re/009-2-11.mcache
new file mode 100644
index 00000000..6deadf7b
--- /dev/null
+++ b/maps/re/009-2-11.mcache
Binary files differ
diff --git a/maps/re/009-2-12.mcache b/maps/re/009-2-12.mcache
new file mode 100644
index 00000000..378f3c1a
--- /dev/null
+++ b/maps/re/009-2-12.mcache
Binary files differ
diff --git a/maps/re/009-2-13.mcache b/maps/re/009-2-13.mcache
new file mode 100644
index 00000000..c8ade115
--- /dev/null
+++ b/maps/re/009-2-13.mcache
Binary files differ
diff --git a/maps/re/009-2-14.mcache b/maps/re/009-2-14.mcache
new file mode 100644
index 00000000..553f1948
--- /dev/null
+++ b/maps/re/009-2-14.mcache
Binary files differ
diff --git a/maps/re/009-2-15.mcache b/maps/re/009-2-15.mcache
new file mode 100644
index 00000000..fd7424e8
--- /dev/null
+++ b/maps/re/009-2-15.mcache
Binary files differ
diff --git a/maps/re/009-2-16.mcache b/maps/re/009-2-16.mcache
new file mode 100644
index 00000000..1d4ce99f
--- /dev/null
+++ b/maps/re/009-2-16.mcache
Binary files differ
diff --git a/maps/re/009-2-17.mcache b/maps/re/009-2-17.mcache
new file mode 100644
index 00000000..2e1e7b32
--- /dev/null
+++ b/maps/re/009-2-17.mcache
Binary files differ
diff --git a/maps/re/009-2-18.mcache b/maps/re/009-2-18.mcache
new file mode 100644
index 00000000..8a33b639
--- /dev/null
+++ b/maps/re/009-2-18.mcache
Binary files differ
diff --git a/maps/re/009-2-2.mcache b/maps/re/009-2-2.mcache
new file mode 100644
index 00000000..8a7a7ad9
--- /dev/null
+++ b/maps/re/009-2-2.mcache
Binary files differ
diff --git a/maps/re/009-2-3.mcache b/maps/re/009-2-3.mcache
new file mode 100644
index 00000000..57f9a137
--- /dev/null
+++ b/maps/re/009-2-3.mcache
Binary files differ
diff --git a/maps/re/009-2-4.mcache b/maps/re/009-2-4.mcache
new file mode 100644
index 00000000..1823f15c
--- /dev/null
+++ b/maps/re/009-2-4.mcache
Binary files differ
diff --git a/maps/re/009-2-5.mcache b/maps/re/009-2-5.mcache
new file mode 100644
index 00000000..bfd93411
--- /dev/null
+++ b/maps/re/009-2-5.mcache
Binary files differ
diff --git a/maps/re/009-2-6.mcache b/maps/re/009-2-6.mcache
new file mode 100644
index 00000000..5410315f
--- /dev/null
+++ b/maps/re/009-2-6.mcache
Binary files differ
diff --git a/maps/re/009-2-7.mcache b/maps/re/009-2-7.mcache
new file mode 100644
index 00000000..ce295182
--- /dev/null
+++ b/maps/re/009-2-7.mcache
Binary files differ
diff --git a/maps/re/009-2-8.mcache b/maps/re/009-2-8.mcache
new file mode 100644
index 00000000..61a78219
--- /dev/null
+++ b/maps/re/009-2-8.mcache
Binary files differ
diff --git a/maps/re/009-2-9.mcache b/maps/re/009-2-9.mcache
new file mode 100644
index 00000000..7ccdcda5
--- /dev/null
+++ b/maps/re/009-2-9.mcache
Binary files differ
diff --git a/maps/re/020-1.mcache b/maps/re/020-1.mcache
index dfb5b8f8..a8dcf0cd 100644
--- a/maps/re/020-1.mcache
+++ b/maps/re/020-1.mcache
Binary files differ
diff --git a/maps/re/020-2-0.mcache b/maps/re/020-2-0.mcache
new file mode 100644
index 00000000..0630f689
--- /dev/null
+++ b/maps/re/020-2-0.mcache
Binary files differ
diff --git a/maps/re/020-2-1.mcache b/maps/re/020-2-1.mcache
new file mode 100644
index 00000000..ab4b0621
--- /dev/null
+++ b/maps/re/020-2-1.mcache
Binary files differ
diff --git a/maps/re/020-2-10.mcache b/maps/re/020-2-10.mcache
new file mode 100644
index 00000000..6636b995
--- /dev/null
+++ b/maps/re/020-2-10.mcache
Binary files differ
diff --git a/maps/re/020-2-11.mcache b/maps/re/020-2-11.mcache
new file mode 100644
index 00000000..2d10e23d
--- /dev/null
+++ b/maps/re/020-2-11.mcache
Binary files differ
diff --git a/maps/re/020-2-12.mcache b/maps/re/020-2-12.mcache
new file mode 100644
index 00000000..2d10e23d
--- /dev/null
+++ b/maps/re/020-2-12.mcache
Binary files differ
diff --git a/maps/re/020-2-13.mcache b/maps/re/020-2-13.mcache
new file mode 100644
index 00000000..cb22ccdd
--- /dev/null
+++ b/maps/re/020-2-13.mcache
Binary files differ
diff --git a/maps/re/020-2-14.mcache b/maps/re/020-2-14.mcache
new file mode 100644
index 00000000..14b26323
--- /dev/null
+++ b/maps/re/020-2-14.mcache
Binary files differ
diff --git a/maps/re/020-2-15.mcache b/maps/re/020-2-15.mcache
new file mode 100644
index 00000000..30e94454
--- /dev/null
+++ b/maps/re/020-2-15.mcache
Binary files differ
diff --git a/maps/re/020-2-16.mcache b/maps/re/020-2-16.mcache
new file mode 100644
index 00000000..598fa010
--- /dev/null
+++ b/maps/re/020-2-16.mcache
Binary files differ
diff --git a/maps/re/020-2-17.mcache b/maps/re/020-2-17.mcache
new file mode 100644
index 00000000..7a1d5fc5
--- /dev/null
+++ b/maps/re/020-2-17.mcache
Binary files differ
diff --git a/maps/re/020-2-18.mcache b/maps/re/020-2-18.mcache
new file mode 100644
index 00000000..871bd776
--- /dev/null
+++ b/maps/re/020-2-18.mcache
Binary files differ
diff --git a/maps/re/020-2-19.mcache b/maps/re/020-2-19.mcache
new file mode 100644
index 00000000..7a1d5fc5
--- /dev/null
+++ b/maps/re/020-2-19.mcache
Binary files differ
diff --git a/maps/re/020-2-2.mcache b/maps/re/020-2-2.mcache
new file mode 100644
index 00000000..f4379b2e
--- /dev/null
+++ b/maps/re/020-2-2.mcache
Binary files differ
diff --git a/maps/re/020-2-20.mcache b/maps/re/020-2-20.mcache
new file mode 100644
index 00000000..0ae011f7
--- /dev/null
+++ b/maps/re/020-2-20.mcache
Binary files differ
diff --git a/maps/re/020-2-21.mcache b/maps/re/020-2-21.mcache
new file mode 100644
index 00000000..7a1d5fc5
--- /dev/null
+++ b/maps/re/020-2-21.mcache
Binary files differ
diff --git a/maps/re/020-2-22.mcache b/maps/re/020-2-22.mcache
new file mode 100644
index 00000000..2878461e
--- /dev/null
+++ b/maps/re/020-2-22.mcache
Binary files differ
diff --git a/maps/re/020-2-23.mcache b/maps/re/020-2-23.mcache
new file mode 100644
index 00000000..fbbf15bd
--- /dev/null
+++ b/maps/re/020-2-23.mcache
Binary files differ
diff --git a/maps/re/020-2-24.mcache b/maps/re/020-2-24.mcache
new file mode 100644
index 00000000..fbbf15bd
--- /dev/null
+++ b/maps/re/020-2-24.mcache
Binary files differ
diff --git a/maps/re/020-2-25.mcache b/maps/re/020-2-25.mcache
new file mode 100644
index 00000000..981490f4
--- /dev/null
+++ b/maps/re/020-2-25.mcache
Binary files differ
diff --git a/maps/re/020-2-26.mcache b/maps/re/020-2-26.mcache
new file mode 100644
index 00000000..9a8c7f4f
--- /dev/null
+++ b/maps/re/020-2-26.mcache
Binary files differ
diff --git a/maps/re/020-2-27.mcache b/maps/re/020-2-27.mcache
new file mode 100644
index 00000000..580b75ba
--- /dev/null
+++ b/maps/re/020-2-27.mcache
Binary files differ
diff --git a/maps/re/020-2-28.mcache b/maps/re/020-2-28.mcache
new file mode 100644
index 00000000..3c61f20f
--- /dev/null
+++ b/maps/re/020-2-28.mcache
Binary files differ
diff --git a/maps/re/020-2-29.mcache b/maps/re/020-2-29.mcache
new file mode 100644
index 00000000..ba828b0e
--- /dev/null
+++ b/maps/re/020-2-29.mcache
Binary files differ
diff --git a/maps/re/020-2-3.mcache b/maps/re/020-2-3.mcache
new file mode 100644
index 00000000..ef25224d
--- /dev/null
+++ b/maps/re/020-2-3.mcache
Binary files differ
diff --git a/maps/re/020-2-30.mcache b/maps/re/020-2-30.mcache
new file mode 100644
index 00000000..be7ca971
--- /dev/null
+++ b/maps/re/020-2-30.mcache
Binary files differ
diff --git a/maps/re/020-2-31.mcache b/maps/re/020-2-31.mcache
new file mode 100644
index 00000000..17e85c20
--- /dev/null
+++ b/maps/re/020-2-31.mcache
Binary files differ
diff --git a/maps/re/020-2-32.mcache b/maps/re/020-2-32.mcache
new file mode 100644
index 00000000..f638e9dd
--- /dev/null
+++ b/maps/re/020-2-32.mcache
Binary files differ
diff --git a/maps/re/020-2-33.mcache b/maps/re/020-2-33.mcache
new file mode 100644
index 00000000..4e42953d
--- /dev/null
+++ b/maps/re/020-2-33.mcache
Binary files differ
diff --git a/maps/re/020-2-4.mcache b/maps/re/020-2-4.mcache
new file mode 100644
index 00000000..9f22191b
--- /dev/null
+++ b/maps/re/020-2-4.mcache
Binary files differ
diff --git a/maps/re/020-2-5.mcache b/maps/re/020-2-5.mcache
new file mode 100644
index 00000000..c5682e30
--- /dev/null
+++ b/maps/re/020-2-5.mcache
Binary files differ
diff --git a/maps/re/020-2-6.mcache b/maps/re/020-2-6.mcache
new file mode 100644
index 00000000..ce74db44
--- /dev/null
+++ b/maps/re/020-2-6.mcache
Binary files differ
diff --git a/maps/re/020-2-7.mcache b/maps/re/020-2-7.mcache
new file mode 100644
index 00000000..f8dc51ab
--- /dev/null
+++ b/maps/re/020-2-7.mcache
Binary files differ
diff --git a/maps/re/020-2-8.mcache b/maps/re/020-2-8.mcache
new file mode 100644
index 00000000..f422b33b
--- /dev/null
+++ b/maps/re/020-2-8.mcache
Binary files differ
diff --git a/maps/re/020-2-9.mcache b/maps/re/020-2-9.mcache
new file mode 100644
index 00000000..b211728e
--- /dev/null
+++ b/maps/re/020-2-9.mcache
Binary files differ
diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt
index c120951b..da074f25 100644
--- a/npc/000-2-1/_savepoints.txt
+++ b/npc/000-2-1/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-1/_savepoints.txt b/npc/001-2-1/_savepoints.txt
index bb4e89eb..fa9c1ecc 100644
--- a/npc/001-2-1/_savepoints.txt
+++ b/npc/001-2-1/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-10/_savepoints.txt b/npc/001-2-10/_savepoints.txt
index cc34de1f..91b14f37 100644
--- a/npc/001-2-10/_savepoints.txt
+++ b/npc/001-2-10/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-11/_savepoints.txt b/npc/001-2-11/_savepoints.txt
index 5061e7b4..00b8c05c 100644
--- a/npc/001-2-11/_savepoints.txt
+++ b/npc/001-2-11/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-13/_savepoints.txt b/npc/001-2-13/_savepoints.txt
index 6f280f95..fd073ac6 100644
--- a/npc/001-2-13/_savepoints.txt
+++ b/npc/001-2-13/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-15/_savepoints.txt b/npc/001-2-15/_savepoints.txt
index 6e62c159..cd164505 100644
--- a/npc/001-2-15/_savepoints.txt
+++ b/npc/001-2-15/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-22/_savepoints.txt b/npc/001-2-22/_savepoints.txt
index 3a1f7f0b..b4a5c1ba 100644
--- a/npc/001-2-22/_savepoints.txt
+++ b/npc/001-2-22/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -58,7 +58,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-29/_savepoints.txt b/npc/001-2-29/_savepoints.txt
index 65e56c79..c2176e4c 100644
--- a/npc/001-2-29/_savepoints.txt
+++ b/npc/001-2-29/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-3/_savepoints.txt b/npc/001-2-3/_savepoints.txt
index 64ed218f..e835aaa1 100644
--- a/npc/001-2-3/_savepoints.txt
+++ b/npc/001-2-3/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-37/_savepoints.txt b/npc/001-2-37/_savepoints.txt
index 06ba9a0e..30d7a797 100644
--- a/npc/001-2-37/_savepoints.txt
+++ b/npc/001-2-37/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/001-2-38/_savepoints.txt b/npc/001-2-38/_savepoints.txt
index 26bbb153..59be0f59 100644
--- a/npc/001-2-38/_savepoints.txt
+++ b/npc/001-2-38/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt
index db9189dc..bd7867d4 100644
--- a/npc/008-1-1/_warps.txt
+++ b/npc/008-1-1/_warps.txt
@@ -3,4 +3,4 @@
008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85
008-1-1,202,47,0 warp #008-1-1_202_47 0,0,008-3-0,129,112
008-1-1,51,57,0 warp #008-1-1_51_57 0,0,008-2-32,40,37
-008-1-1,181,198,0 warp #008-1-1_181_198 1,0,008-1-2,180,32
+008-1-1,181,198,0 warp #008-1-1_181_198 1,0,009-1,180,32
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
index fad30de8..af0621c9 100644
--- a/npc/008-1/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -29,5 +29,5 @@
008-1,20,85,0 warp #008-1_20_85 0,1,008-1-1,246,85
008-1,165,171,0 warp #008-1_165_171 0,0,008-3-2,175,21
008-1,289,125,0 warp #008-1_289_125 0,0,008-2-31,29,25
-008-1,22,216,0 warp #008-1_22_216 0,0,008-1-2,248,48
+008-1,22,216,0 warp #008-1_22_216 0,0,009-1,248,48
008-1,109,82,0 warp #008-1_109_82 0,0,008-3-5,92,107
diff --git a/npc/008-2-0/_savepoints.txt b/npc/008-2-0/_savepoints.txt
index cc12ff48..2c108fa8 100644
--- a/npc/008-2-0/_savepoints.txt
+++ b/npc/008-2-0/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-1/_savepoints.txt b/npc/008-2-1/_savepoints.txt
index f6cc8572..19f0f307 100644
--- a/npc/008-2-1/_savepoints.txt
+++ b/npc/008-2-1/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-11/_savepoints.txt b/npc/008-2-11/_savepoints.txt
index c725504a..db593899 100644
--- a/npc/008-2-11/_savepoints.txt
+++ b/npc/008-2-11/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-13/_savepoints.txt b/npc/008-2-13/_savepoints.txt
index 86ecc1ef..b82ce152 100644
--- a/npc/008-2-13/_savepoints.txt
+++ b/npc/008-2-13/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-14/_savepoints.txt b/npc/008-2-14/_savepoints.txt
index ede785b2..9eb50488 100644
--- a/npc/008-2-14/_savepoints.txt
+++ b/npc/008-2-14/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-22/_savepoints.txt b/npc/008-2-22/_savepoints.txt
index 352aeb45..1cc5c220 100644
--- a/npc/008-2-22/_savepoints.txt
+++ b/npc/008-2-22/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-3/_savepoints.txt b/npc/008-2-3/_savepoints.txt
index 5ef58255..4e70dc2e 100644
--- a/npc/008-2-3/_savepoints.txt
+++ b/npc/008-2-3/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -32,7 +32,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -45,7 +45,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -58,7 +58,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -71,7 +71,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -84,7 +84,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -97,7 +97,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-4/_savepoints.txt b/npc/008-2-4/_savepoints.txt
index d7e1afab..0129971e 100644
--- a/npc/008-2-4/_savepoints.txt
+++ b/npc/008-2-4/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-7/_savepoints.txt b/npc/008-2-7/_savepoints.txt
index dbf05a30..ab8ddbb4 100644
--- a/npc/008-2-7/_savepoints.txt
+++ b/npc/008-2-7/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/008-2-9/_savepoints.txt b/npc/008-2-9/_savepoints.txt
index 4f81f0b7..b606d73c 100644
--- a/npc/008-2-9/_savepoints.txt
+++ b/npc/008-2-9/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt
new file mode 100644
index 00000000..a6738b93
--- /dev/null
+++ b/npc/009-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 009-1: Swamp
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-1/_mobs.txt",
+"npc/009-1/_warps.txt",
diff --git a/npc/009-1/_mobs.txt b/npc/009-1/_mobs.txt
new file mode 100644
index 00000000..141279c2
--- /dev/null
+++ b/npc/009-1/_mobs.txt
@@ -0,0 +1,19 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-1: Swamp mobs
+009-1,190,74,53,40 monster Silkworm 1040,12,4500,6000
+009-1,152,116,48,43 monster Forest Maggot 1028,20,3600,12000
+009-1,89,116,43,31 monster Grass Snake 1042,5,6000,24000
+009-1,192,155,43,31 monster Grass Snake 1042,7,3000,12000
+009-1,228,64,17,32 monster Log Head 1031,4,5000,30000
+009-1,168,95,14,9 monster Bandit 1063,2,9000,18000
+009-1,115,150,45,26 monster Thief Slime 1105,5,11500,45000
+009-1,185,179,45,20 monster Blub 1008,4,60000,120000
+009-1,127,144,77,47 monster Green Slime 1024,10,10000,30000
+009-1,63,175,30,15 monster Little Green Slime 1025,5,10000,30000
+009-1,84,111,30,15 monster Little Green Slime 1025,5,10000,50000
+009-1,228,139,13,12 monster Mana Ghost 1101,2,10000,30000
+009-1,45,182,13,12 monster Mana Ghost 1101,4,10000,60000
+009-1,69,185,31,9 monster Skeleton 1084,4,6000,24000
+009-1,142,159,84,20 monster Swampling 1109,10,30000,60000
+009-1,162,99,17,15 monster Robin Bandit 1064,2,9000,18000
+009-1,189,50,38,13 monster Spiky Mushroom 1049,4,3000,12000
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
new file mode 100644
index 00000000..a5300fba
--- /dev/null
+++ b/npc/009-1/_warps.txt
@@ -0,0 +1,15 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-1: Swamp warps
+009-1,181,31,0 warp #009-1_181_31 1,0,008-1-1,180,197
+009-1,249,48,0 warp #009-1_249_48 0,0,008-1,23,216
+009-1,175,77,0 warp #009-1_175_77 1,0,009-2-1,34,44
+009-1,161,90,0 warp #009-1_161_90 1,0,009-2-0,31,39
+009-1,184,101,0 warp #009-1_184_101 0,0,009-2-2,32,39
+009-1,35,168,0 warp #009-1_35_168 1,0,009-2-3,41,39
+009-1,67,159,0 warp #009-1_67_159 0,0,009-2-6,29,35
+009-1,64,186,0 warp #009-1_64_186 0,0,009-2-7,29,35
+009-1,90,159,0 warp #009-1_90_159 0,0,009-2-8,29,40
+009-1,196,96,0 warp #009-1_196_96 1,0,009-2-9,34,43
+009-1,95,192,0 warp #009-1_95_192 0,0,009-2-12,28,43
+009-1,206,148,0 warp #009-1_206_148 0,0,009-2-15,28,41
+009-1,213,147,0 warp #009-1_213_147 1,0,009-2-15,43,40
diff --git a/npc/009-2-0/_import.txt b/npc/009-2-0/_import.txt
new file mode 100644
index 00000000..9054121f
--- /dev/null
+++ b/npc/009-2-0/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-0: Soren's Home
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-0/_warps.txt",
diff --git a/npc/009-2-0/_warps.txt b/npc/009-2-0/_warps.txt
new file mode 100644
index 00000000..56769a5c
--- /dev/null
+++ b/npc/009-2-0/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-0: Soren's Home warps
+009-2-0,32,40,0 warp #009-2-0_32_40 1,0,009-1,160,91
diff --git a/npc/009-2-1/_import.txt b/npc/009-2-1/_import.txt
new file mode 100644
index 00000000..2c025b07
--- /dev/null
+++ b/npc/009-2-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-1: Migglemire Townhall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-1/_warps.txt",
diff --git a/npc/009-2-1/_warps.txt b/npc/009-2-1/_warps.txt
new file mode 100644
index 00000000..8ecaf6a3
--- /dev/null
+++ b/npc/009-2-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-1: Migglemire Townhall warps
+009-2-1,35,45,0 warp #009-2-1_35_45 1,0,009-1,174,78
diff --git a/npc/009-2-10/_import.txt b/npc/009-2-10/_import.txt
new file mode 100644
index 00000000..964d28a6
--- /dev/null
+++ b/npc/009-2-10/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-10: Migglemire Crypt Level 2
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-10/_warps.txt",
diff --git a/npc/009-2-10/_warps.txt b/npc/009-2-10/_warps.txt
new file mode 100644
index 00000000..4a28845e
--- /dev/null
+++ b/npc/009-2-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-10: Migglemire Crypt Level 2 warps
+009-2-10,41,33,0 warp #009-2-10_41_33 2,0,009-2-9,40,40
+009-2-10,51,41,0 warp #009-2-10_51_41 2,0,009-2-11,29,28
diff --git a/npc/009-2-11/_import.txt b/npc/009-2-11/_import.txt
new file mode 100644
index 00000000..34f7cbd6
--- /dev/null
+++ b/npc/009-2-11/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-11: Migglemire Crypt Boss Chamber
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-11/_warps.txt",
diff --git a/npc/009-2-11/_warps.txt b/npc/009-2-11/_warps.txt
new file mode 100644
index 00000000..57985373
--- /dev/null
+++ b/npc/009-2-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-11: Migglemire Crypt Boss Chamber warps
+009-2-11,29,27,0 warp #009-2-11_29_27 2,0,009-2-10,51,40
diff --git a/npc/009-2-12/_import.txt b/npc/009-2-12/_import.txt
new file mode 100644
index 00000000..329928e0
--- /dev/null
+++ b/npc/009-2-12/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-12: Asphodel Moor Crypt Ground Level
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-12/_warps.txt",
diff --git a/npc/009-2-12/_warps.txt b/npc/009-2-12/_warps.txt
new file mode 100644
index 00000000..23182569
--- /dev/null
+++ b/npc/009-2-12/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-12: Asphodel Moor Crypt Ground Level warps
+009-2-12,29,44,0 warp #009-2-12_29_44 1,0,009-1,95,793
+009-2-12,41,44,0 warp #009-2-12_41_44 1,0,009-2-13,60,46
diff --git a/npc/009-2-13/_import.txt b/npc/009-2-13/_import.txt
new file mode 100644
index 00000000..9d732c47
--- /dev/null
+++ b/npc/009-2-13/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-13: Asphodel Moor Crypt Level 2
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-13/_warps.txt",
diff --git a/npc/009-2-13/_warps.txt b/npc/009-2-13/_warps.txt
new file mode 100644
index 00000000..9b003dca
--- /dev/null
+++ b/npc/009-2-13/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-13: Asphodel Moor Crypt Level 2 warps
+009-2-13,60,45,0 warp #009-2-13_60_45 2,0,009-2-12,40,43
+009-2-13,41,29,0 warp #009-2-13_41_29 0,2,009-2-14,61,37
diff --git a/npc/009-2-14/_import.txt b/npc/009-2-14/_import.txt
new file mode 100644
index 00000000..0c78394b
--- /dev/null
+++ b/npc/009-2-14/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-14: Asphodel Moor Crypt Boss Chamber
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-14/_warps.txt",
diff --git a/npc/009-2-14/_warps.txt b/npc/009-2-14/_warps.txt
new file mode 100644
index 00000000..6da17a0d
--- /dev/null
+++ b/npc/009-2-14/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-14: Asphodel Moor Crypt Boss Chamber warps
+009-2-14,62,37,0 warp #009-2-14_62_37 0,2,009-2-13,42,29
diff --git a/npc/009-2-15/_import.txt b/npc/009-2-15/_import.txt
new file mode 100644
index 00000000..6a79a87b
--- /dev/null
+++ b/npc/009-2-15/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-15: Chapel
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-15/_warps.txt",
diff --git a/npc/009-2-15/_warps.txt b/npc/009-2-15/_warps.txt
new file mode 100644
index 00000000..00e194e0
--- /dev/null
+++ b/npc/009-2-15/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-15: Chapel warps
+009-2-15,44,41,0 warp #009-2-15_44_41 1,0,009-1,212,148
+009-2-15,28,42,0 warp #009-2-15_28_42 0,0,009-1,206,149
+009-2-15,26,32,0 warp #009-2-15_26_32 2,0,009-2-16,27,35
diff --git a/npc/009-2-16/_import.txt b/npc/009-2-16/_import.txt
new file mode 100644
index 00000000..6da0f6d3
--- /dev/null
+++ b/npc/009-2-16/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-16: Chapel Tower 1st Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-16/_warps.txt",
diff --git a/npc/009-2-16/_warps.txt b/npc/009-2-16/_warps.txt
new file mode 100644
index 00000000..00ddcacb
--- /dev/null
+++ b/npc/009-2-16/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-16: Chapel Tower 1st Floor warps
+009-2-16,33,36,0 warp #009-2-16_33_36 1,0,009-2-17,26,35
+009-2-16,27,36,0 warp #009-2-16_27_36 2,0,009-2-15,26,33
diff --git a/npc/009-2-17/_import.txt b/npc/009-2-17/_import.txt
new file mode 100644
index 00000000..b7303201
--- /dev/null
+++ b/npc/009-2-17/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-17: Chapel Tower 2nd Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-17/_warps.txt",
diff --git a/npc/009-2-17/_warps.txt b/npc/009-2-17/_warps.txt
new file mode 100644
index 00000000..a86a0a91
--- /dev/null
+++ b/npc/009-2-17/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-17: Chapel Tower 2nd Floor warps
+009-2-17,33,36,0 warp #009-2-17_33_36 1,0,009-2-18,67,160
+009-2-17,27,36,0 warp #009-2-17_27_36 1,0,009-2-16,33,35
diff --git a/npc/009-2-18/_import.txt b/npc/009-2-18/_import.txt
new file mode 100644
index 00000000..ec6f6a4d
--- /dev/null
+++ b/npc/009-2-18/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-18: Chapel Tower Top
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-18/_warps.txt",
diff --git a/npc/009-2-18/_warps.txt b/npc/009-2-18/_warps.txt
new file mode 100644
index 00000000..76d9c59a
--- /dev/null
+++ b/npc/009-2-18/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-18: Chapel Tower Top warps
+009-2-18,27,36,0 warp #009-2-18_27_36 1,0,009-2-17,33,35
diff --git a/npc/009-2-2/_import.txt b/npc/009-2-2/_import.txt
new file mode 100644
index 00000000..84a2b757
--- /dev/null
+++ b/npc/009-2-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-2: Gardenhouse
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-2/_warps.txt",
diff --git a/npc/009-2-2/_warps.txt b/npc/009-2-2/_warps.txt
new file mode 100644
index 00000000..950b9671
--- /dev/null
+++ b/npc/009-2-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-2: Gardenhouse warps
+009-2-2,32,40,0 warp #009-2-2_32_40 0,0,009-1,184,102
diff --git a/npc/009-2-3/_import.txt b/npc/009-2-3/_import.txt
new file mode 100644
index 00000000..ec13efe3
--- /dev/null
+++ b/npc/009-2-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-3: Reid's Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-3/_warps.txt",
diff --git a/npc/009-2-3/_warps.txt b/npc/009-2-3/_warps.txt
new file mode 100644
index 00000000..a61ea11b
--- /dev/null
+++ b/npc/009-2-3/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-3: Reid's Inn warps
+009-2-3,42,40,0 warp #009-2-3_42_40 1,0,009-1,34,169
+009-2-3,56,28,0 warp #009-2-3_56_28 0,0,009-2-5,55,31
+009-2-3,56,42,0 warp #009-2-3_56_42 0,0,009-2-4,56,39
diff --git a/npc/009-2-4/_import.txt b/npc/009-2-4/_import.txt
new file mode 100644
index 00000000..480c5419
--- /dev/null
+++ b/npc/009-2-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-4: Reid's Inn Basement
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-4/_warps.txt",
diff --git a/npc/009-2-4/_warps.txt b/npc/009-2-4/_warps.txt
new file mode 100644
index 00000000..d7773e5f
--- /dev/null
+++ b/npc/009-2-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-4: Reid's Inn Basement warps
+009-2-4,56,38,0 warp #009-2-4_56_38 0,0,009-2-3,56,41
diff --git a/npc/009-2-5/_import.txt b/npc/009-2-5/_import.txt
new file mode 100644
index 00000000..424539d2
--- /dev/null
+++ b/npc/009-2-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-5: Reid's Inn First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-5/_warps.txt",
diff --git a/npc/009-2-5/_warps.txt b/npc/009-2-5/_warps.txt
new file mode 100644
index 00000000..034d33b3
--- /dev/null
+++ b/npc/009-2-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-5: Reid's Inn First Floor warps
+009-2-5,56,32,0 warp #009-2-5_56_32 1,0,009-2-3,56,29
diff --git a/npc/009-2-6/_import.txt b/npc/009-2-6/_import.txt
new file mode 100644
index 00000000..774558a8
--- /dev/null
+++ b/npc/009-2-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-6: Small House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-6/_warps.txt",
diff --git a/npc/009-2-6/_warps.txt b/npc/009-2-6/_warps.txt
new file mode 100644
index 00000000..bfd06300
--- /dev/null
+++ b/npc/009-2-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-6: Small House warps
+009-2-6,29,36,0 warp #009-2-6_29_36 0,0,009-1,67,160
diff --git a/npc/009-2-7/_import.txt b/npc/009-2-7/_import.txt
new file mode 100644
index 00000000..2dc0427e
--- /dev/null
+++ b/npc/009-2-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-7: Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-7/_warps.txt",
diff --git a/npc/009-2-7/_warps.txt b/npc/009-2-7/_warps.txt
new file mode 100644
index 00000000..f675c6c2
--- /dev/null
+++ b/npc/009-2-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-7: Shop warps
+009-2-7,29,36,0 warp #009-2-7_29_36 0,0,009-1,64,187
diff --git a/npc/009-2-8/_import.txt b/npc/009-2-8/_import.txt
new file mode 100644
index 00000000..65356779
--- /dev/null
+++ b/npc/009-2-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-8: Blacksmith
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-8/_warps.txt",
diff --git a/npc/009-2-8/_warps.txt b/npc/009-2-8/_warps.txt
new file mode 100644
index 00000000..018f381b
--- /dev/null
+++ b/npc/009-2-8/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-8: Blacksmith warps
+009-2-8,29,41,0 warp #009-2-8_29_41 0,0,009-1,90,160
diff --git a/npc/009-2-9/_import.txt b/npc/009-2-9/_import.txt
new file mode 100644
index 00000000..cef8231a
--- /dev/null
+++ b/npc/009-2-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2-9: Migglemire Crypt Ground Level
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2-9/_warps.txt",
diff --git a/npc/009-2-9/_warps.txt b/npc/009-2-9/_warps.txt
new file mode 100644
index 00000000..15eaa9e9
--- /dev/null
+++ b/npc/009-2-9/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2-9: Migglemire Crypt Ground Level warps
+009-2-9,35,44,0 warp #009-2-9_35_44 1,0,009-1,195,97
+009-2-9,41,41,0 warp #009-2-9_41_41 1,0,009-2-10,41,34
diff --git a/npc/012-2-2/_savepoints.txt b/npc/012-2-2/_savepoints.txt
index d023d3f6..1aedace4 100644
--- a/npc/012-2-2/_savepoints.txt
+++ b/npc/012-2-2/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
@@ -19,7 +19,7 @@ OnTouch:
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/012-2-7/_savepoints.txt b/npc/012-2-7/_savepoints.txt
index 6ba291b9..0230a227 100644
--- a/npc/012-2-7/_savepoints.txt
+++ b/npc/012-2-7/_savepoints.txt
@@ -6,7 +6,7 @@
OnInit:
.distance = 2;
- .bodytype = BODYTYPE_1;
+ .sex = G_OTHER;
end;
OnTouch:
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index 3c273cc5..30dc8dd5 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -2,3 +2,45 @@
// Map 020-1: Tulimshar warps
020-1,166,242,0 warp #020-1_166_242 1,0,020-1,165,250
020-1,166,249,0 warp #020-1_166_249 1,0,020-1,165,241
+020-1,169,135,0 warp #020-1_169_135 0,0,020-2-0,36,40
+020-1,140,71,0 warp #020-1_140_71 0,0,020-2-1,35,38
+020-1,146,70,0 warp #020-1_146_70 0,0,020-2-1,47,36
+020-1,141,59,0 warp #020-1_141_59 0,0,020-2-2,37,22
+020-1,166,77,0 warp #020-1_166_77 0,0,020-2-3,45,33
+020-1,179,98,0 warp #020-1_179_98 0,0,020-2-4,35,28
+020-1,281,85,0 warp #020-1_281_85 0,0,020-2-5,34,30
+020-1,291,88,0 warp #020-1_291_88 0,0,020-2-5,45,37
+020-1,289,80,0 warp #020-1_289_80 0,0,020-2-6,31,29
+020-1,290,72,0 warp #020-1_290_72 0,0,020-2-6,37,22
+020-1,293,106,0 warp #020-1_293_106 0,0,020-2-7,35,32
+020-1,292,130,0 warp #020-1_292_130 0,0,020-2-8,35,32
+020-1,280,140,0 warp #020-1_280_140 0,0,020-2-9,44,36
+020-1,294,148,0 warp #020-1_294_148 0,0,020-2-11,38,31
+020-1,264,152,0 warp #020-1_264_152 0,0,020-2-10,45,32
+020-1,259,152,0 warp #020-1_259_152 0,0,020-2-10,34,32
+020-1,295,163,0 warp #020-1_295_163 0,0,020-2-12,38,31
+020-1,290,157,0 warp #020-1_290_157 0,0,020-2-13,40,31
+020-1,279,168,0 warp #020-1_279_168 0,0,020-2-14,42,33
+020-1,267,181,0 warp #020-1_267_181 0,0,020-2-15,45,32
+020-1,270,173,0 warp #020-1_270_173 0,0,020-2-16,32,25
+020-1,254,165,0 warp #020-1_254_165 0,0,020-2-17,40,26
+020-1,225,190,0 warp #020-1_225_190 0,0,020-2-18,45,33
+020-1,219,190,0 warp #020-1_219_190 0,0,020-2-18,35,33
+020-1,200,186,0 warp #020-1_200_186 0,0,020-2-19,40,26
+020-1,194,168,0 warp #020-1_194_168 0,0,020-2-20,35,37
+020-1,202,168,0 warp #020-1_202_168 0,0,020-2-20,49,37
+020-1,161,146,0 warp #020-1_161_146 0,0,020-2-21,40,26
+020-1,153,131,0 warp #020-1_153_131 0,0,020-2-22,42,32
+020-1,163,72,0 warp #020-1_163_72 0,0,020-2-23,32,28
+020-1,194,162,0 warp #020-1_194_162 0,0,020-2-24,32,28
+020-1,149,128,0 warp #020-1_149_128 0,0,020-2-25,32,28
+020-1,157,128,0 warp #020-1_157_128 0,0,020-2-25,42,28
+020-1,67,116,0 warp #020-1_67_116 0,0,020-2-26,71,43
+020-1,59,117,0 warp #020-1_59_117 1,0,020-2-26,58,45
+020-1,49,115,0 warp #020-1_49_115 0,0,020-2-26,44,41
+020-1,41,118,0 warp #020-1_41_118 0,0,020-2-26,34,48
+020-1,56,107,0 warp #020-1_56_107 0,0,020-2-28,34,32
+020-1,60,107,0 warp #020-1_60_107 0,0,020-2-28,42,32
+020-1,87,114,0 warp #020-1_87_114 0,0,020-2-29,53,33
+020-1,71,56,0 warp #020-1_71_56 0,0,020-2-31,34,30
+020-1,72,44,0 warp #020-1_72_44 0,0,020-2-33,37,22
diff --git a/npc/020-2-0/_import.txt b/npc/020-2-0/_import.txt
new file mode 100644
index 00000000..38f92c4e
--- /dev/null
+++ b/npc/020-2-0/_import.txt
@@ -0,0 +1,4 @@
+// Map 020-2-0: Ratto Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-0/_mobs.txt",
+"npc/020-2-0/_warps.txt",
diff --git a/npc/020-2-0/_mobs.txt b/npc/020-2-0/_mobs.txt
new file mode 100644
index 00000000..dd5d42ba
--- /dev/null
+++ b/npc/020-2-0/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-0: Ratto Hut mobs
+020-2-0,40,22,0,0 monster Ratto 1005,1,5000,10000
+020-2-0,35,29,0,0 monster Ratto 1005,1,5000,10000
+020-2-0,41,36,0,0 monster Ratto 1005,1,5000,10000
diff --git a/npc/020-2-0/_warps.txt b/npc/020-2-0/_warps.txt
new file mode 100644
index 00000000..8dcdbe87
--- /dev/null
+++ b/npc/020-2-0/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-0: Ratto Hut warps
+020-2-0,36,41,0 warp #020-2-0_36_41 0,0,020-1,169,136
diff --git a/npc/020-2-1/_import.txt b/npc/020-2-1/_import.txt
new file mode 100644
index 00000000..d410e471
--- /dev/null
+++ b/npc/020-2-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-1: Brotherhood Castle
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-1/_warps.txt",
diff --git a/npc/020-2-1/_warps.txt b/npc/020-2-1/_warps.txt
new file mode 100644
index 00000000..88307a19
--- /dev/null
+++ b/npc/020-2-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-1: Brotherhood Castle warps
+020-2-1,35,39,0 warp #020-2-1_35_39 0,0,020-1,140,72
+020-2-1,47,37,0 warp #020-2-1_47_37 0,0,020-1,146,71
+020-2-1,36,29,0 warp #020-2-1_36_29 2,0,020-2-2,32,28
diff --git a/npc/020-2-10/_import.txt b/npc/020-2-10/_import.txt
new file mode 100644
index 00000000..a2d0c1cd
--- /dev/null
+++ b/npc/020-2-10/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-10: Tailor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-10/_warps.txt",
diff --git a/npc/020-2-10/_warps.txt b/npc/020-2-10/_warps.txt
new file mode 100644
index 00000000..099f754a
--- /dev/null
+++ b/npc/020-2-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-10: Tailor warps
+020-2-10,45,33,0 warp #020-2-10_45_33 0,0,020-1,264,153
+020-2-10,34,33,0 warp #020-2-10_34_33 0,0,020-1,259,153
diff --git a/npc/020-2-11/_import.txt b/npc/020-2-11/_import.txt
new file mode 100644
index 00000000..b3a212c8
--- /dev/null
+++ b/npc/020-2-11/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-11: Ramshackle Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-11/_warps.txt",
diff --git a/npc/020-2-11/_warps.txt b/npc/020-2-11/_warps.txt
new file mode 100644
index 00000000..e6c771a5
--- /dev/null
+++ b/npc/020-2-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-11: Ramshackle Hut warps
+020-2-11,38,32,0 warp #020-2-11_38_32 0,0,020-1,294,149
diff --git a/npc/020-2-12/_import.txt b/npc/020-2-12/_import.txt
new file mode 100644
index 00000000..f95de8cc
--- /dev/null
+++ b/npc/020-2-12/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-12: Small Garden Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-12/_warps.txt",
diff --git a/npc/020-2-12/_warps.txt b/npc/020-2-12/_warps.txt
new file mode 100644
index 00000000..76cedf4e
--- /dev/null
+++ b/npc/020-2-12/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-12: Small Garden Hut warps
+020-2-12,38,32,0 warp #020-2-12_38_32 0,0,020-1,295,164
diff --git a/npc/020-2-13/_import.txt b/npc/020-2-13/_import.txt
new file mode 100644
index 00000000..a962abca
--- /dev/null
+++ b/npc/020-2-13/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-13: Large Garden Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-13/_warps.txt",
diff --git a/npc/020-2-13/_warps.txt b/npc/020-2-13/_warps.txt
new file mode 100644
index 00000000..ac853a91
--- /dev/null
+++ b/npc/020-2-13/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-13: Large Garden Hut warps
+020-2-13,40,32,0 warp #020-2-13_40_32 0,0,020-1,290,158
diff --git a/npc/020-2-14/_import.txt b/npc/020-2-14/_import.txt
new file mode 100644
index 00000000..2a32c09c
--- /dev/null
+++ b/npc/020-2-14/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-14: Small Slum Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-14/_warps.txt",
diff --git a/npc/020-2-14/_warps.txt b/npc/020-2-14/_warps.txt
new file mode 100644
index 00000000..4165732b
--- /dev/null
+++ b/npc/020-2-14/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-14: Small Slum Hut warps
+020-2-14,42,34,0 warp #020-2-14_42_34 0,0,020-1,279,169
diff --git a/npc/020-2-15/_import.txt b/npc/020-2-15/_import.txt
new file mode 100644
index 00000000..d6549d49
--- /dev/null
+++ b/npc/020-2-15/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-15: Large Slum Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-15/_warps.txt",
diff --git a/npc/020-2-15/_warps.txt b/npc/020-2-15/_warps.txt
new file mode 100644
index 00000000..a6467391
--- /dev/null
+++ b/npc/020-2-15/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-15: Large Slum Hut warps
+020-2-15,45,33,0 warp #020-2-15_45_33 0,0,020-1,267,182
diff --git a/npc/020-2-16/_import.txt b/npc/020-2-16/_import.txt
new file mode 100644
index 00000000..e73eda08
--- /dev/null
+++ b/npc/020-2-16/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-16: Slum Laundry
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-16/_warps.txt",
diff --git a/npc/020-2-16/_warps.txt b/npc/020-2-16/_warps.txt
new file mode 100644
index 00000000..6eef2fbf
--- /dev/null
+++ b/npc/020-2-16/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-16: Slum Laundry warps
+020-2-16,31,25,0 warp #020-2-16_31_25 0,0,020-1,269,173
diff --git a/npc/020-2-17/_import.txt b/npc/020-2-17/_import.txt
new file mode 100644
index 00000000..3b44100e
--- /dev/null
+++ b/npc/020-2-17/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-17: Fisherman's Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-17/_warps.txt",
diff --git a/npc/020-2-17/_warps.txt b/npc/020-2-17/_warps.txt
new file mode 100644
index 00000000..4675eb7e
--- /dev/null
+++ b/npc/020-2-17/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-17: Fisherman's Hut warps
+020-2-17,40,27,0 warp #020-2-17_40_27 0,0,020-1,254,166
diff --git a/npc/020-2-18/_import.txt b/npc/020-2-18/_import.txt
new file mode 100644
index 00000000..7c171074
--- /dev/null
+++ b/npc/020-2-18/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-18: Market Administration
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-18/_warps.txt",
diff --git a/npc/020-2-18/_warps.txt b/npc/020-2-18/_warps.txt
new file mode 100644
index 00000000..be5cc0b7
--- /dev/null
+++ b/npc/020-2-18/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-18: Market Administration warps
+020-2-18,45,34,0 warp #020-2-18_45_34 0,0,020-1,225,191
+020-2-18,35,34,0 warp #020-2-18_35_34 0,0,020-1,219,191
diff --git a/npc/020-2-19/_import.txt b/npc/020-2-19/_import.txt
new file mode 100644
index 00000000..85597f7c
--- /dev/null
+++ b/npc/020-2-19/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-19: Farmer's Home
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-19/_warps.txt",
diff --git a/npc/020-2-19/_warps.txt b/npc/020-2-19/_warps.txt
new file mode 100644
index 00000000..08a82dd8
--- /dev/null
+++ b/npc/020-2-19/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-19: Farmer's Home warps
+020-2-19,40,27,0 warp #020-2-19_40_27 0,0,020-1,200,187
diff --git a/npc/020-2-2/_import.txt b/npc/020-2-2/_import.txt
new file mode 100644
index 00000000..7f33c28e
--- /dev/null
+++ b/npc/020-2-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-2: Brotherhood Tower
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-2/_warps.txt",
diff --git a/npc/020-2-2/_warps.txt b/npc/020-2-2/_warps.txt
new file mode 100644
index 00000000..faa57616
--- /dev/null
+++ b/npc/020-2-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-2: Brotherhood Tower warps
+020-2-2,32,29,0 warp #020-2-2_32_29 2,0,020-2-1,36,30
+020-2-2,37,21,0 warp #020-2-2_37_21 0,0,020-1,140,59
diff --git a/npc/020-2-20/_import.txt b/npc/020-2-20/_import.txt
new file mode 100644
index 00000000..fd72cbf9
--- /dev/null
+++ b/npc/020-2-20/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-20: Tulimshar Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-20/_warps.txt",
diff --git a/npc/020-2-20/_warps.txt b/npc/020-2-20/_warps.txt
new file mode 100644
index 00000000..772fc3c3
--- /dev/null
+++ b/npc/020-2-20/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-20: Tulimshar Inn warps
+020-2-20,49,38,0 warp #020-2-20_49_38 0,0,020-1,202,169
+020-2-20,35,38,0 warp #020-2-20_35_38 0,0,020-1,194,169
+020-2-20,33,22,0 warp #020-2-20_33_22 0,0,020-2-24,32,24
diff --git a/npc/020-2-21/_import.txt b/npc/020-2-21/_import.txt
new file mode 100644
index 00000000..99dcb741
--- /dev/null
+++ b/npc/020-2-21/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-21: Queer Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-21/_warps.txt",
diff --git a/npc/020-2-21/_warps.txt b/npc/020-2-21/_warps.txt
new file mode 100644
index 00000000..00ea811f
--- /dev/null
+++ b/npc/020-2-21/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-21: Queer Hut warps
+020-2-21,40,27,0 warp #020-2-21_40_27 0,0,020-1,161,147
diff --git a/npc/020-2-22/_import.txt b/npc/020-2-22/_import.txt
new file mode 100644
index 00000000..dec610b2
--- /dev/null
+++ b/npc/020-2-22/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-22: Residence
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-22/_warps.txt",
diff --git a/npc/020-2-22/_warps.txt b/npc/020-2-22/_warps.txt
new file mode 100644
index 00000000..944911c8
--- /dev/null
+++ b/npc/020-2-22/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-22: Residence warps
+020-2-22,42,33,0 warp #020-2-22_42_33 0,0,020-1,153,132
+020-2-22,33,24,0 warp #020-2-22_33_24 0,0,020-2-25,32,24
+020-2-22,51,24,0 warp #020-2-22_51_24 0,0,020-2-25,42,24
diff --git a/npc/020-2-23/_import.txt b/npc/020-2-23/_import.txt
new file mode 100644
index 00000000..bf53aaa9
--- /dev/null
+++ b/npc/020-2-23/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-23: Brotherhood Inn First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-23/_warps.txt",
diff --git a/npc/020-2-23/_warps.txt b/npc/020-2-23/_warps.txt
new file mode 100644
index 00000000..e1f1e502
--- /dev/null
+++ b/npc/020-2-23/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-23: Brotherhood Inn First Floor warps
+020-2-23,33,29,0 warp #020-2-23_33_29 1,0,020-1,163,73
+020-2-23,38,24,0 warp #020-2-23_38_24 0,0,020-2-3,46,26
diff --git a/npc/020-2-24/_import.txt b/npc/020-2-24/_import.txt
new file mode 100644
index 00000000..267cff9a
--- /dev/null
+++ b/npc/020-2-24/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-24: Tulimshar Inn First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-24/_warps.txt",
diff --git a/npc/020-2-24/_warps.txt b/npc/020-2-24/_warps.txt
new file mode 100644
index 00000000..619469f5
--- /dev/null
+++ b/npc/020-2-24/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-24: Tulimshar Inn First Floor warps
+020-2-24,33,29,0 warp #020-2-24_33_29 1,0,020-1,194,163
+020-2-24,31,24,0 warp #020-2-24_31_24 0,0,020-2-20,33,23
diff --git a/npc/020-2-25/_import.txt b/npc/020-2-25/_import.txt
new file mode 100644
index 00000000..c6d2cf19
--- /dev/null
+++ b/npc/020-2-25/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-25: Residence First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-25/_warps.txt",
diff --git a/npc/020-2-25/_warps.txt b/npc/020-2-25/_warps.txt
new file mode 100644
index 00000000..878a7b7d
--- /dev/null
+++ b/npc/020-2-25/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-25: Residence First Floor warps
+020-2-25,33,29,0 warp #020-2-25_33_29 1,0,020-1,149,129
+020-2-25,31,24,0 warp #020-2-25_31_24 0,0,020-2-22,33,25
+020-2-25,43,24,0 warp #020-2-25_43_24 0,0,020-2-22,51,25
+020-2-25,42,29,0 warp #020-2-25_42_29 1,0,020-1,157,129
diff --git a/npc/020-2-26/_import.txt b/npc/020-2-26/_import.txt
new file mode 100644
index 00000000..7fc3a49c
--- /dev/null
+++ b/npc/020-2-26/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-26: Magic Academy Ground Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-26/_warps.txt",
diff --git a/npc/020-2-26/_warps.txt b/npc/020-2-26/_warps.txt
new file mode 100644
index 00000000..b9ad76db
--- /dev/null
+++ b/npc/020-2-26/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-26: Magic Academy Ground Floor warps
+020-2-26,44,42,0 warp #020-2-26_44_42 0,0,020-1,49,116
+020-2-26,34,49,0 warp #020-2-26_34_49 0,0,020-1,41,119
+020-2-26,58,46,0 warp #020-2-26_58_46 1,0,020-1,58,118
+020-2-26,71,44,0 warp #020-2-26_71_44 0,0,020-1,67,117
+020-2-26,53,27,0 warp #020-2-26_53_27 1,0,020-2-27,33,26
+020-2-26,76,33,0 warp #020-2-26_76_33 0,2,020-2-29,34,25
+020-2-26,32,37,0 warp #020-2-26_32_37 0,2,020-2-30,43,21
diff --git a/npc/020-2-27/_import.txt b/npc/020-2-27/_import.txt
new file mode 100644
index 00000000..527b9e60
--- /dev/null
+++ b/npc/020-2-27/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-27: Magic Acedemy Central, First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-27/_warps.txt",
diff --git a/npc/020-2-27/_warps.txt b/npc/020-2-27/_warps.txt
new file mode 100644
index 00000000..5654eb94
--- /dev/null
+++ b/npc/020-2-27/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-27: Magic Acedemy Central, First Floor warps
+020-2-27,33,27,0 warp #020-2-27_33_27 2,0,020-2-26,52,28
+020-2-27,46,22,0 warp #020-2-27_46_22 2,0,020-2-28,42,22
diff --git a/npc/020-2-28/_import.txt b/npc/020-2-28/_import.txt
new file mode 100644
index 00000000..fc26fb22
--- /dev/null
+++ b/npc/020-2-28/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-28: Magic Acedemy Central, Second Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-28/_warps.txt",
diff --git a/npc/020-2-28/_warps.txt b/npc/020-2-28/_warps.txt
new file mode 100644
index 00000000..bb588fb5
--- /dev/null
+++ b/npc/020-2-28/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-28: Magic Acedemy Central, Second Floor warps
+020-2-28,43,23,0 warp #020-2-28_43_23 2,0,020-2-27,46,24
+020-2-28,34,33,0 warp #020-2-28_34_33 0,0,020-1,56,108
+020-2-28,42,33,0 warp #020-2-28_42_33 0,0,020-1,60,108
diff --git a/npc/020-2-29/_import.txt b/npc/020-2-29/_import.txt
new file mode 100644
index 00000000..f6d5a319
--- /dev/null
+++ b/npc/020-2-29/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-29: Magic Acedemy East, First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-29/_warps.txt",
diff --git a/npc/020-2-29/_warps.txt b/npc/020-2-29/_warps.txt
new file mode 100644
index 00000000..385b2b03
--- /dev/null
+++ b/npc/020-2-29/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-29: Magic Acedemy East, First Floor warps
+020-2-29,33,25,0 warp #020-2-29_33_25 0,2,020-2-26,75,34
+020-2-29,53,34,0 warp #020-2-29_53_34 0,0,020-1,87,115
diff --git a/npc/020-2-3/_import.txt b/npc/020-2-3/_import.txt
new file mode 100644
index 00000000..5f9ad85f
--- /dev/null
+++ b/npc/020-2-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-3: Brotherhood Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-3/_warps.txt",
diff --git a/npc/020-2-3/_warps.txt b/npc/020-2-3/_warps.txt
new file mode 100644
index 00000000..027b732e
--- /dev/null
+++ b/npc/020-2-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-3: Brotherhood Inn warps
+020-2-3,45,34,0 warp #020-2-3_45_34 0,0,020-1,166,78
+020-2-3,46,25,0 warp #020-2-3_46_25 0,0,020-2-23,37,24
diff --git a/npc/020-2-30/_import.txt b/npc/020-2-30/_import.txt
new file mode 100644
index 00000000..5647fac2
--- /dev/null
+++ b/npc/020-2-30/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-30: Magic Acedemy West, First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-30/_warps.txt",
diff --git a/npc/020-2-30/_warps.txt b/npc/020-2-30/_warps.txt
new file mode 100644
index 00000000..bddd1648
--- /dev/null
+++ b/npc/020-2-30/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-30: Magic Acedemy West, First Floor warps
+020-2-30,44,21,0 warp #020-2-30_44_21 0,2,020-2-26,33,38
diff --git a/npc/020-2-31/_import.txt b/npc/020-2-31/_import.txt
new file mode 100644
index 00000000..da30659a
--- /dev/null
+++ b/npc/020-2-31/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-31: Lighthouse Ground Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-31/_warps.txt",
diff --git a/npc/020-2-31/_warps.txt b/npc/020-2-31/_warps.txt
new file mode 100644
index 00000000..b7c6e28c
--- /dev/null
+++ b/npc/020-2-31/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-31: Lighthouse Ground Floor warps
+020-2-31,36,20,0 warp #020-2-31_36_20 2,0,020-2-32,36,28
+020-2-31,34,32,0 warp #020-2-31_34_32 0,0,020-1,71,57
diff --git a/npc/020-2-32/_import.txt b/npc/020-2-32/_import.txt
new file mode 100644
index 00000000..8d34c469
--- /dev/null
+++ b/npc/020-2-32/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-32: Lighthouse First Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-32/_warps.txt",
diff --git a/npc/020-2-32/_warps.txt b/npc/020-2-32/_warps.txt
new file mode 100644
index 00000000..f66179a2
--- /dev/null
+++ b/npc/020-2-32/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-32: Lighthouse First Floor warps
+020-2-32,36,29,0 warp #020-2-32_36_29 2,0,020-2-31,36,22
+020-2-32,36,20,0 warp #020-2-32_36_20 2,0,020-2-33,36,28
diff --git a/npc/020-2-33/_import.txt b/npc/020-2-33/_import.txt
new file mode 100644
index 00000000..c65039f6
--- /dev/null
+++ b/npc/020-2-33/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-33: Lighthouse Second Floor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-33/_warps.txt",
diff --git a/npc/020-2-33/_warps.txt b/npc/020-2-33/_warps.txt
new file mode 100644
index 00000000..4b8ce343
--- /dev/null
+++ b/npc/020-2-33/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-33: Lighthouse Second Floor warps
+020-2-33,36,29,0 warp #020-2-33_36_29 2,0,020-2-32,36,22
+020-2-33,37,21,0 warp #020-2-33_37_21 0,0,020-1,71,44
diff --git a/npc/020-2-4/_import.txt b/npc/020-2-4/_import.txt
new file mode 100644
index 00000000..5ff8744a
--- /dev/null
+++ b/npc/020-2-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-4: Brotherhood Hut
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-4/_warps.txt",
diff --git a/npc/020-2-4/_warps.txt b/npc/020-2-4/_warps.txt
new file mode 100644
index 00000000..1a32b934
--- /dev/null
+++ b/npc/020-2-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-4: Brotherhood Hut warps
+020-2-4,35,29,0 warp #020-2-4_35_29 0,0,020-1,179,99
diff --git a/npc/020-2-5/_import.txt b/npc/020-2-5/_import.txt
new file mode 100644
index 00000000..f7be2ce9
--- /dev/null
+++ b/npc/020-2-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-5: Legion Castle
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-5/_warps.txt",
diff --git a/npc/020-2-5/_warps.txt b/npc/020-2-5/_warps.txt
new file mode 100644
index 00000000..de006eac
--- /dev/null
+++ b/npc/020-2-5/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-5: Legion Castle warps
+020-2-5,34,31,0 warp #020-2-5_34_31 0,0,020-1,281,86
+020-2-5,45,38,0 warp #020-2-5_45_38 0,0,020-1,291,89
+020-2-5,46,21,0 warp #020-2-5_46_21 2,0,020-2-6,36,28
diff --git a/npc/020-2-6/_import.txt b/npc/020-2-6/_import.txt
new file mode 100644
index 00000000..82764d38
--- /dev/null
+++ b/npc/020-2-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-6: Legion Tower
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-6/_warps.txt",
diff --git a/npc/020-2-6/_warps.txt b/npc/020-2-6/_warps.txt
new file mode 100644
index 00000000..90ae3308
--- /dev/null
+++ b/npc/020-2-6/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-6: Legion Tower warps
+020-2-6,36,29,0 warp #020-2-6_36_29 2,0,020-2-5,46,22
+020-2-6,37,21,0 warp #020-2-6_37_21 0,0,020-1,289,72
+020-2-6,31,30,0 warp #020-2-6_31_30 0,0,020-1,289,81
diff --git a/npc/020-2-7/_import.txt b/npc/020-2-7/_import.txt
new file mode 100644
index 00000000..855eef7d
--- /dev/null
+++ b/npc/020-2-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-7: Legion Guardhouse
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-7/_warps.txt",
diff --git a/npc/020-2-7/_warps.txt b/npc/020-2-7/_warps.txt
new file mode 100644
index 00000000..c008e51d
--- /dev/null
+++ b/npc/020-2-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-7: Legion Guardhouse warps
+020-2-7,35,33,0 warp #020-2-7_35_33 0,0,020-1,293,107
diff --git a/npc/020-2-8/_import.txt b/npc/020-2-8/_import.txt
new file mode 100644
index 00000000..410f0b3e
--- /dev/null
+++ b/npc/020-2-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-8: Tulimshar Blacksmith
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-8/_warps.txt",
diff --git a/npc/020-2-8/_warps.txt b/npc/020-2-8/_warps.txt
new file mode 100644
index 00000000..1a0eaf03
--- /dev/null
+++ b/npc/020-2-8/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-8: Tulimshar Blacksmith warps
+020-2-8,35,33,0 warp #020-2-8_35_33 0,0,020-1,292,131
diff --git a/npc/020-2-9/_import.txt b/npc/020-2-9/_import.txt
new file mode 100644
index 00000000..25967b52
--- /dev/null
+++ b/npc/020-2-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-2-9: Tulimshar Townhall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-2-9/_warps.txt",
diff --git a/npc/020-2-9/_warps.txt b/npc/020-2-9/_warps.txt
new file mode 100644
index 00000000..d9a8afc5
--- /dev/null
+++ b/npc/020-2-9/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-2-9: Tulimshar Townhall warps
+020-2-9,44,37,0 warp #020-2-9_44_37 0,0,020-1,280,141
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index c0574e8d..454a9eab 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -6,9 +6,11 @@ OnInit:
htput(.ht, "^ALCH", "001-2-26 32 40");
htput(.ht, "^ALIG|^HID", "000-2-4 36 30");
htput(.ht, "^ART", "001-1 89 86");
+ htput(.ht, "^ASPH|MOOR", "009-1 53 171");
htput(.ht, "^BLACK|SMITH", "001-2-27 35 32");
htput(.ht, "^CAMP|FIRE", "008-1 55 46");
htput(.ht, "^CANDOR", "012-1 49 114");
+ htput(.ht, "^CHAP", "009-1 212 151");
htput(.ht, "^CITY|^HALL", "001-2-7 36 41");
htput(.ht, "^DIMOND|COVE", "008-1 106 222");
htput(.ht, "^DRA|ISLAND", "000-1 62 111");
@@ -25,6 +27,7 @@ OnInit:
htput(.ht, "^LUVIA", "008-1 256 206");
htput(.ht, "^MAGIC|ACAD", "020-1 51 119");
htput(.ht, "^MERCH|^BANK", "001-2-19 28 30");
+ htput(.ht, "^MIGGLE|SOREN", "009-1 174 95");
htput(.ht, "^MINE", "020-1 76 237");
htput(.ht, "^MOON", "001-2-2 40 34");
htput(.ht, "^NARD", "000-2-3 21 28");
diff --git a/npc/_import.txt b/npc/_import.txt
index 7fba4b92..ed967629 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -58,7 +58,6 @@
@include "npc/001-3-1/_import.txt"
@include "npc/001-3-2/_import.txt"
@include "npc/008-1-1/_import.txt"
-@include "npc/008-1-2/_import.txt"
@include "npc/008-1/_import.txt"
@include "npc/008-2-0/_import.txt"
@include "npc/008-2-1/_import.txt"
@@ -100,6 +99,26 @@
@include "npc/008-3-4/_import.txt"
@include "npc/008-3-5/_import.txt"
@include "npc/008-3-6/_import.txt"
+@include "npc/009-1/_import.txt"
+@include "npc/009-2-0/_import.txt"
+@include "npc/009-2-1/_import.txt"
+@include "npc/009-2-10/_import.txt"
+@include "npc/009-2-11/_import.txt"
+@include "npc/009-2-12/_import.txt"
+@include "npc/009-2-13/_import.txt"
+@include "npc/009-2-14/_import.txt"
+@include "npc/009-2-15/_import.txt"
+@include "npc/009-2-16/_import.txt"
+@include "npc/009-2-17/_import.txt"
+@include "npc/009-2-18/_import.txt"
+@include "npc/009-2-2/_import.txt"
+@include "npc/009-2-3/_import.txt"
+@include "npc/009-2-4/_import.txt"
+@include "npc/009-2-5/_import.txt"
+@include "npc/009-2-6/_import.txt"
+@include "npc/009-2-7/_import.txt"
+@include "npc/009-2-8/_import.txt"
+@include "npc/009-2-9/_import.txt"
@include "npc/012-1/_import.txt"
@include "npc/012-2-1/_import.txt"
@include "npc/012-2-2/_import.txt"
@@ -112,6 +131,40 @@
@include "npc/012-3-2/_import.txt"
@include "npc/012-3-3/_import.txt"
@include "npc/020-1/_import.txt"
+@include "npc/020-2-0/_import.txt"
+@include "npc/020-2-1/_import.txt"
+@include "npc/020-2-10/_import.txt"
+@include "npc/020-2-11/_import.txt"
+@include "npc/020-2-12/_import.txt"
+@include "npc/020-2-13/_import.txt"
+@include "npc/020-2-14/_import.txt"
+@include "npc/020-2-15/_import.txt"
+@include "npc/020-2-16/_import.txt"
+@include "npc/020-2-17/_import.txt"
+@include "npc/020-2-18/_import.txt"
+@include "npc/020-2-19/_import.txt"
+@include "npc/020-2-2/_import.txt"
+@include "npc/020-2-20/_import.txt"
+@include "npc/020-2-21/_import.txt"
+@include "npc/020-2-22/_import.txt"
+@include "npc/020-2-23/_import.txt"
+@include "npc/020-2-24/_import.txt"
+@include "npc/020-2-25/_import.txt"
+@include "npc/020-2-26/_import.txt"
+@include "npc/020-2-27/_import.txt"
+@include "npc/020-2-28/_import.txt"
+@include "npc/020-2-29/_import.txt"
+@include "npc/020-2-3/_import.txt"
+@include "npc/020-2-30/_import.txt"
+@include "npc/020-2-31/_import.txt"
+@include "npc/020-2-32/_import.txt"
+@include "npc/020-2-33/_import.txt"
+@include "npc/020-2-4/_import.txt"
+@include "npc/020-2-5/_import.txt"
+@include "npc/020-2-6/_import.txt"
+@include "npc/020-2-7/_import.txt"
+@include "npc/020-2-8/_import.txt"
+@include "npc/020-2-9/_import.txt"
@include "npc/sec_pri/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"