summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf3
-rw-r--r--db/map_index.txt297
-rw-r--r--maps/re/006-3.mcachebin0 -> 243 bytes
-rw-r--r--maps/re/006-4-1.mcachebin0 -> 356 bytes
-rw-r--r--maps/re/006-4.mcachebin0 -> 1882 bytes
-rw-r--r--npc/006-0/_import.txt2
-rw-r--r--npc/006-0/_mobs.txt2
-rw-r--r--npc/006-0/_warps.txt2
-rw-r--r--npc/006-3/_import.txt4
-rw-r--r--npc/006-3/_mobs.txt6
-rw-r--r--npc/006-3/_warps.txt3
-rw-r--r--npc/006-4-1/_import.txt4
-rw-r--r--npc/006-4-1/_mobs.txt3
-rw-r--r--npc/006-4-1/_warps.txt23
-rw-r--r--npc/006-4/_import.txt4
-rw-r--r--npc/006-4/_mobs.txt5
-rw-r--r--npc/006-4/_warps.txt3
-rw-r--r--npc/_import.txt3
18 files changed, 214 insertions, 150 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 6a25c0473..fc6134970 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -57,6 +57,9 @@ map_list: (
"005-7",
"006-0",
"006-1",
+ "006-3",
+ "006-4-1",
+ "006-4",
"007-1",
"008-0",
"008-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 40b1cf28f..9243e6f2a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -54,150 +54,153 @@
005-7 54
006-0 55
006-1 56
-007-1 57
-008-0 58
-008-1 59
-008-2 60
-009-1 61
-009-2 62
-009-3 63
-009-4 64
-009-5 65
-009-6 66
-009-7 67
-010-1-1 68
-010-1 69
-010-2 70
-011-1 71
-011-2 72
-011-3 73
-012-1 74
-012-2 75
-012-3 76
-012-4 77
-012-5 78
-012-6 79
-012-7 80
-012-8 81
-013-1 82
-014-1 83
-014-2-1 84
-014-2 85
-014-3 86
-014-4 87
-014-5-1 88
-014-5 89
-015-1 90
-015-2 91
-015-3 92
-015-4 93
-015-5 94
-015-6 95
-015-7 96
-015-8-1 97
-015-8 98
-016-1 99
-016-6 100
-016-7 101
-017-1 102
-017-10 103
-017-2-1 104
-017-2-2 105
-017-2 106
-017-3 107
-017-4 108
-017-5 109
-017-6 110
-017-7 111
-017-8 112
-018-1-1 113
-018-1 114
-018-2-1 115
-018-2-2 116
-018-2-3 117
-018-2-4 118
-018-2-5 119
-018-2 120
-018-3 121
-018-4-1 122
-018-4-2 123
-018-4 124
-018-5-0 125
-018-5-1 126
-018-5-2 127
-018-5-3 128
-018-5-4 129
-018-5-boss 130
-018-5 131
-018-6-0 132
-018-6-1 133
-018-6-2 134
-018-6-3 135
-019-1-1 136
-019-1 137
-019-2 138
-019-3 139
-019-4-1 140
-019-4 141
-020-1 142
-020-2 143
-020-3 144
-020-4 145
-020-5 146
-020-6 147
-020-7-1 148
-020-7-2 149
-020-7 150
-021-1 151
-021-2 152
-021-3 153
-021-4 154
-022-1 155
-023-1 156
-023-2 157
-023-3-1 158
-023-3-2 159
-023-3 160
-024-1 161
-024-10 162
-024-11 163
-024-12 164
-024-13 165
-024-14 166
-024-15 167
-024-16 168
-024-2 169
-024-3 170
-024-4 171
-024-5 172
-024-6 173
-024-7 174
-024-8 175
-024-9 176
-025-2-1 177
-025-2 178
-027-1 179
-boss 180
-botcheck 181
-guilds 182
-maze0 183
-maze1 184
-maze10 185
-maze11 186
-maze12 187
-maze13 188
-maze14 189
-maze15 190
-maze2 191
-maze3 192
-maze4 193
-maze5 194
-maze6 195
-maze7 196
-maze8 197
-maze9 198
-sec_pri 199
-soren-2 200
-soren 201
-test 202
-testbg 203
+006-3 57
+006-4-1 58
+006-4 59
+007-1 60
+008-0 61
+008-1 62
+008-2 63
+009-1 64
+009-2 65
+009-3 66
+009-4 67
+009-5 68
+009-6 69
+009-7 70
+010-1-1 71
+010-1 72
+010-2 73
+011-1 74
+011-2 75
+011-3 76
+012-1 77
+012-2 78
+012-3 79
+012-4 80
+012-5 81
+012-6 82
+012-7 83
+012-8 84
+013-1 85
+014-1 86
+014-2-1 87
+014-2 88
+014-3 89
+014-4 90
+014-5-1 91
+014-5 92
+015-1 93
+015-2 94
+015-3 95
+015-4 96
+015-5 97
+015-6 98
+015-7 99
+015-8-1 100
+015-8 101
+016-1 102
+016-6 103
+016-7 104
+017-1 105
+017-10 106
+017-2-1 107
+017-2-2 108
+017-2 109
+017-3 110
+017-4 111
+017-5 112
+017-6 113
+017-7 114
+017-8 115
+018-1-1 116
+018-1 117
+018-2-1 118
+018-2-2 119
+018-2-3 120
+018-2-4 121
+018-2-5 122
+018-2 123
+018-3 124
+018-4-1 125
+018-4-2 126
+018-4 127
+018-5-0 128
+018-5-1 129
+018-5-2 130
+018-5-3 131
+018-5-4 132
+018-5-boss 133
+018-5 134
+018-6-0 135
+018-6-1 136
+018-6-2 137
+018-6-3 138
+019-1-1 139
+019-1 140
+019-2 141
+019-3 142
+019-4-1 143
+019-4 144
+020-1 145
+020-2 146
+020-3 147
+020-4 148
+020-5 149
+020-6 150
+020-7-1 151
+020-7-2 152
+020-7 153
+021-1 154
+021-2 155
+021-3 156
+021-4 157
+022-1 158
+023-1 159
+023-2 160
+023-3-1 161
+023-3-2 162
+023-3 163
+024-1 164
+024-10 165
+024-11 166
+024-12 167
+024-13 168
+024-14 169
+024-15 170
+024-16 171
+024-2 172
+024-3 173
+024-4 174
+024-5 175
+024-6 176
+024-7 177
+024-8 178
+024-9 179
+025-2-1 180
+025-2 181
+027-1 182
+boss 183
+botcheck 184
+guilds 185
+maze0 186
+maze1 187
+maze10 188
+maze11 189
+maze12 190
+maze13 191
+maze14 192
+maze15 193
+maze2 194
+maze3 195
+maze4 196
+maze5 197
+maze6 198
+maze7 199
+maze8 200
+maze9 201
+sec_pri 202
+soren-2 203
+soren 204
+test 205
+testbg 206
diff --git a/maps/re/006-3.mcache b/maps/re/006-3.mcache
new file mode 100644
index 000000000..3dbbb801b
--- /dev/null
+++ b/maps/re/006-3.mcache
Binary files differ
diff --git a/maps/re/006-4-1.mcache b/maps/re/006-4-1.mcache
new file mode 100644
index 000000000..51552736d
--- /dev/null
+++ b/maps/re/006-4-1.mcache
Binary files differ
diff --git a/maps/re/006-4.mcache b/maps/re/006-4.mcache
new file mode 100644
index 000000000..d914ada25
--- /dev/null
+++ b/maps/re/006-4.mcache
Binary files differ
diff --git a/npc/006-0/_import.txt b/npc/006-0/_import.txt
index 4dfc6e193..898661697 100644
--- a/npc/006-0/_import.txt
+++ b/npc/006-0/_import.txt
@@ -1,4 +1,4 @@
-// Map 006-0: Candor's Underground, 1F
+// Map 006-0: Candor's Underground, B1F
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/006-0/_mobs.txt",
"npc/006-0/_warps.txt",
diff --git a/npc/006-0/_mobs.txt b/npc/006-0/_mobs.txt
index 629dda987..0b0825ab0 100644
--- a/npc/006-0/_mobs.txt
+++ b/npc/006-0/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 006-0: Candor's Underground, 1F mobs
+// Map 006-0: Candor's Underground, B1F mobs
006-0,46,38,16,14 monster Little Yellow Slime 1233,6,120000,30000
006-0,45,30,16,8 monster Little Red Slime 1234,4,120000,30000
006-0,46,23,19,4 monster Mineral Bif 1058,1,300000,30000
diff --git a/npc/006-0/_warps.txt b/npc/006-0/_warps.txt
index 42c187325..68a575bfc 100644
--- a/npc/006-0/_warps.txt
+++ b/npc/006-0/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 006-0: Candor's Underground, 1F warps
+// Map 006-0: Candor's Underground, B1F warps
006-0,49,54,0 warp #006-0_49_54 0,0,005-1,66,63
diff --git a/npc/006-3/_import.txt b/npc/006-3/_import.txt
new file mode 100644
index 000000000..c5d479086
--- /dev/null
+++ b/npc/006-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-3: Candor's Underground, B2F
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-3/_mobs.txt",
+"npc/006-3/_warps.txt",
diff --git a/npc/006-3/_mobs.txt b/npc/006-3/_mobs.txt
new file mode 100644
index 000000000..60f86343b
--- /dev/null
+++ b/npc/006-3/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-3: Candor's Underground, B2F mobs
+006-3,46,38,16,14 monster Yellow Slime 1091,6,120000,30000
+006-3,44,36,15,14 monster Red Slime 1092,4,120000,30000
+006-3,45,33,18,14 monster Mineral Bif 1058,1,300000,30000
+006-3,44,32,23,12 monster Big Diamond Bif 1109,1,240000,30000
diff --git a/npc/006-3/_warps.txt b/npc/006-3/_warps.txt
new file mode 100644
index 000000000..8bbe83192
--- /dev/null
+++ b/npc/006-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-3: Candor's Underground, B2F warps
+006-3,49,49,0 warp #006-3_49_49 0,0,006-0,46,27
diff --git a/npc/006-4-1/_import.txt b/npc/006-4-1/_import.txt
new file mode 100644
index 000000000..e218adf14
--- /dev/null
+++ b/npc/006-4-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-4-1: Abandoned Building
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-4-1/_mobs.txt",
+"npc/006-4-1/_warps.txt",
diff --git a/npc/006-4-1/_mobs.txt b/npc/006-4-1/_mobs.txt
new file mode 100644
index 000000000..412057877
--- /dev/null
+++ b/npc/006-4-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-4-1: Abandoned Building mobs
+006-4-1,30,103,2,2 monster Mana Ghost 1068,6,75000,250000
diff --git a/npc/006-4-1/_warps.txt b/npc/006-4-1/_warps.txt
new file mode 100644
index 000000000..24ae1b116
--- /dev/null
+++ b/npc/006-4-1/_warps.txt
@@ -0,0 +1,23 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-4-1: Abandoned Building warps
+006-4-1,27,108,0 script #006-4-1_27_108 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ slide 87,53; end;
+}
+006-4-1,86,103,0 script #006-4-1_86_103 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ slide 40,160; end;
+}
+006-4-1,39,160,0 script #006-4-1_39_160 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ slide 85,103; end;
+}
+006-4-1,58,61,0 warp #006-4-1_58_61 6,0,006-4,95,99
+006-4-1,88,53,0 script #006-4-1_88_53 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ slide 28,108; end;
+}
diff --git a/npc/006-4/_import.txt b/npc/006-4/_import.txt
new file mode 100644
index 000000000..0719ad348
--- /dev/null
+++ b/npc/006-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-4: Abandoned Island
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-4/_mobs.txt",
+"npc/006-4/_warps.txt",
diff --git a/npc/006-4/_mobs.txt b/npc/006-4/_mobs.txt
new file mode 100644
index 000000000..023a4b4db
--- /dev/null
+++ b/npc/006-4/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-4: Abandoned Island mobs
+006-4,107,83,6,0 monster Mana Ghost 1068,5,75000,25000
+006-4,78,101,2,0 monster Mana Ghost 1068,8,75000,25000
+006-4,132,66,6,4 monster Mana Ghost 1068,9,75000,250000
diff --git a/npc/006-4/_warps.txt b/npc/006-4/_warps.txt
new file mode 100644
index 000000000..872c72394
--- /dev/null
+++ b/npc/006-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-4: Abandoned Island warps
+006-4,95,99,0 warp #006-4_95_99 1,-1,006-4-1,58,60
diff --git a/npc/_import.txt b/npc/_import.txt
index 738391d3b..55cc7a74a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -56,6 +56,9 @@
@include "npc/005-7/_import.txt"
@include "npc/006-0/_import.txt"
@include "npc/006-1/_import.txt"
+@include "npc/006-3/_import.txt"
+@include "npc/006-4-1/_import.txt"
+@include "npc/006-4/_import.txt"
@include "npc/007-1/_import.txt"
@include "npc/008-0/_import.txt"
@include "npc/008-1/_import.txt"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-17 14:29:21 +0000