Add 006-6 Candor B3F, and allow warp to it

10 files changed, 293 insertions, 212 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index a2f362a66..d206ca4d2 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -70,6 +70,7 @@ map_list: (
     "006-4-1",
     "006-4",
     "006-5",
+    "006-6",
     "006-7",
     "007-1",
     "007-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index a3b976886..32644ff0e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -67,213 +67,214 @@
 006-4-1 67
 006-4 68
 006-5 69
-006-7 70
-007-1 71
-007-2 72
-008-0 73
-008-1 74
-008-2 75
-009-1 76
-009-2 77
-009-3 78
-009-4 79
-009-5 80
-009-6 81
-009-7 82
-010-1-1 83
-010-1 84
-010-2 85
-011-1 86
-011-2 87
-011-3 88
-012-1 89
-012-2 90
-012-3 91
-012-4 92
-012-5 93
-012-6 94
-012-7 95
-012-8 96
-013-1 97
-014-1 98
-014-2-1 99
-014-2 100
-014-3 101
-014-4 102
-014-5-1 103
-014-5 104
-015-1 105
-015-2 106
-015-3 107
-015-4 108
-015-5 109
-015-6 110
-015-7 111
-015-8-1 112
-015-8 113
-016-1 114
-016-6 115
-016-7 116
-017-0 117
-017-1 118
-017-10 119
-017-2-1 120
-017-2-2 121
-017-2 122
-017-3 123
-017-4 124
-017-5 125
-017-6 126
-017-7 127
-017-8 128
-018-1-1 129
-018-1 130
-018-2-1 131
-018-2-2 132
-018-2-3 133
-018-2-4 134
-018-2-5 135
-018-2-6 136
-018-2-7 137
-018-2-8 138
-018-2 139
-018-3 140
-018-4-1 141
-018-4-2 142
-018-4 143
-018-5-0 144
-018-5-1 145
-018-5-2 146
-018-5-3 147
-018-5-4 148
-018-5-5 149
-018-5-boss 150
-018-5 151
-018-6-0 152
-018-6-1 153
-018-6-2 154
-018-6-3 155
-018-7-1 156
-018-7 157
-019-1-1 158
-019-1 159
-019-2 160
-019-3 161
-019-4-1 162
-019-4 163
-020-1 164
-020-2 165
-020-3 166
-020-4 167
-020-5 168
-020-6 169
-020-7-1 170
-020-7-2 171
-020-7 172
-021-0 173
-021-1 174
-021-2 175
-021-3 176
-021-4 177
-022-1 178
-023-1 179
-023-2 180
-023-3-1 181
-023-3-2 182
-023-3 183
-023-4 184
-024-1 185
-024-10 186
-024-11 187
-024-12 188
-024-13 189
-024-14 190
-024-15 191
-024-16 192
-024-2 193
-024-3 194
-024-4 195
-024-5 196
-024-6 197
-024-7 198
-024-8 199
-024-9 200
-025-1 201
-025-2-1 202
-025-2-2 203
-025-2-3 204
-025-2-4 205
-025-2 206
-025-3 207
-026-0 208
-026-1 209
-026-2 210
-027-0 211
-027-1 212
-027-2 213
-027-3 214
-027-4 215
-029-0 216
-029-1 217
-029-2 218
-029-3 219
-029-4 220
-029-5 221
-029-6 222
-029-7 223
-029-8 224
-029-9 225
-030-01 226
-030-02 227
-030-03 228
-030-04 229
-030-05 230
-030-06 231
-030-07 232
-030-08 233
-030-09 234
-030-10 235
-030-11 236
-030-12 237
-030-13 238
-030-14 239
-030-15 240
-030-16 241
-030-17 242
-030-18 243
-030-19 244
-030-20 245
-030-21 246
-030-22 247
-030-23 248
-030-24 249
-031-0 250
-031-1 251
-031-2 252
-031-3 253
-031-4 254
-031-5 255
-031-6 256
-031-7 257
-031-8 258
-031-9 259
-042-0 260
-042-1 261
-042-10 262
-042-11 263
-042-2 264
-042-3 265
-042-4 266
-042-5 267
-042-6 268
-042-7 269
-042-8 270
-042-9 271
-boss 272
-botcheck 273
-guilds 274
-sec_pri 275
-soren-2 276
-soren 277
-test 278
-testbg 279
+006-6 70
+006-7 71
+007-1 72
+007-2 73
+008-0 74
+008-1 75
+008-2 76
+009-1 77
+009-2 78
+009-3 79
+009-4 80
+009-5 81
+009-6 82
+009-7 83
+010-1-1 84
+010-1 85
+010-2 86
+011-1 87
+011-2 88
+011-3 89
+012-1 90
+012-2 91
+012-3 92
+012-4 93
+012-5 94
+012-6 95
+012-7 96
+012-8 97
+013-1 98
+014-1 99
+014-2-1 100
+014-2 101
+014-3 102
+014-4 103
+014-5-1 104
+014-5 105
+015-1 106
+015-2 107
+015-3 108
+015-4 109
+015-5 110
+015-6 111
+015-7 112
+015-8-1 113
+015-8 114
+016-1 115
+016-6 116
+016-7 117
+017-0 118
+017-1 119
+017-10 120
+017-2-1 121
+017-2-2 122
+017-2 123
+017-3 124
+017-4 125
+017-5 126
+017-6 127
+017-7 128
+017-8 129
+018-1-1 130
+018-1 131
+018-2-1 132
+018-2-2 133
+018-2-3 134
+018-2-4 135
+018-2-5 136
+018-2-6 137
+018-2-7 138
+018-2-8 139
+018-2 140
+018-3 141
+018-4-1 142
+018-4-2 143
+018-4 144
+018-5-0 145
+018-5-1 146
+018-5-2 147
+018-5-3 148
+018-5-4 149
+018-5-5 150
+018-5-boss 151
+018-5 152
+018-6-0 153
+018-6-1 154
+018-6-2 155
+018-6-3 156
+018-7-1 157
+018-7 158
+019-1-1 159
+019-1 160
+019-2 161
+019-3 162
+019-4-1 163
+019-4 164
+020-1 165
+020-2 166
+020-3 167
+020-4 168
+020-5 169
+020-6 170
+020-7-1 171
+020-7-2 172
+020-7 173
+021-0 174
+021-1 175
+021-2 176
+021-3 177
+021-4 178
+022-1 179
+023-1 180
+023-2 181
+023-3-1 182
+023-3-2 183
+023-3 184
+023-4 185
+024-1 186
+024-10 187
+024-11 188
+024-12 189
+024-13 190
+024-14 191
+024-15 192
+024-16 193
+024-2 194
+024-3 195
+024-4 196
+024-5 197
+024-6 198
+024-7 199
+024-8 200
+024-9 201
+025-1 202
+025-2-1 203
+025-2-2 204
+025-2-3 205
+025-2-4 206
+025-2 207
+025-3 208
+026-0 209
+026-1 210
+026-2 211
+027-0 212
+027-1 213
+027-2 214
+027-3 215
+027-4 216
+029-0 217
+029-1 218
+029-2 219
+029-3 220
+029-4 221
+029-5 222
+029-6 223
+029-7 224
+029-8 225
+029-9 226
+030-01 227
+030-02 228
+030-03 229
+030-04 230
+030-05 231
+030-06 232
+030-07 233
+030-08 234
+030-09 235
+030-10 236
+030-11 237
+030-12 238
+030-13 239
+030-14 240
+030-15 241
+030-16 242
+030-17 243
+030-18 244
+030-19 245
+030-20 246
+030-21 247
+030-22 248
+030-23 249
+030-24 250
+031-0 251
+031-1 252
+031-2 253
+031-3 254
+031-4 255
+031-5 256
+031-6 257
+031-7 258
+031-8 259
+031-9 260
+042-0 261
+042-1 262
+042-10 263
+042-11 264
+042-2 265
+042-3 266
+042-4 267
+042-5 268
+042-6 269
+042-7 270
+042-8 271
+042-9 272
+boss 273
+botcheck 274
+guilds 275
+sec_pri 276
+soren-2 277
+soren 278
+test 279
+testbg 280
diff --git a/maps/re/006-6.mcache b/maps/re/006-6.mcache
new file mode 100644
index 000000000..a205e64c9
--- /dev/null
+++ b/maps/re/006-6.mcache
diff --git a/npc/006-3/core.txt b/npc/006-3/core.txt
index 75a20334f..b7dfa8143 100644
--- a/npc/006-3/core.txt
+++ b/npc/006-3/core.txt
@@ -9,9 +9,15 @@ OnTouch:
     if (!getq(CandorQuest_Groata)) goto L_Reject;
     if (!getq(CandorQuest_Jak1)) goto L_Reject;
 
-    // FIXME: B3F is not ready, so fallthrough to L_Reject
+    specialeffect(5000, SELF, getcharid(3));
+    dispbottom l("The power which lies in Candor acknowledges your strength.");
+    sleep2(2500);
+    warp "006-6", 49, 52;
+    sleep2(500);
+    specialeffect(5001, SELF, getcharid(3));
+    end;
+
 L_Reject:
-    //warp "006-3", 49, 52;
     specialeffect(5000, SELF, getcharid(3));
     dispbottom l("The power which lies in Candor rejects your strength.");
     sleep2(3000);
diff --git a/npc/006-6/_import.txt b/npc/006-6/_import.txt
new file mode 100644
index 000000000..824eb53ae
--- /dev/null
+++ b/npc/006-6/_import.txt
@@ -0,0 +1,6 @@
+// Map 006-6: Candor's Underground, B3F
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-6/_mobs.txt",
+"npc/006-6/_warps.txt",
+"npc/006-6/all.txt",
+"npc/006-6/core.txt",
diff --git a/npc/006-6/_mobs.txt b/npc/006-6/_mobs.txt
new file mode 100644
index 000000000..161c5d165
--- /dev/null
+++ b/npc/006-6/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-6: Candor's Underground, B3F mobs
+006-6,46,38,16,14	monster	Yellow Skull Slime	1403,3,120000,30000
+006-6,44,36,15,14	monster	Red Skull Slime	1404,3,120000,30000
+006-6,45,33,18,14	monster	Mineral Bif	1058,4,300000,30000
+006-6,44,32,23,12	monster	Troll	1171,3,240000,30000
+006-6,43,37,18,14	monster	Vampire Bat	1063,12,300000,30000
+006-6,39,46,16,7	monster	Crafty	1018,1,300000,30000
diff --git a/npc/006-6/_warps.txt b/npc/006-6/_warps.txt
new file mode 100644
index 000000000..f9f897bf9
--- /dev/null
+++ b/npc/006-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-6: Candor's Underground, B3F warps
+006-6,49,49,0	warp	#006-6_49_49	0,0,006-3,46,27
diff --git a/npc/006-6/all.txt b/npc/006-6/all.txt
new file mode 100644
index 000000000..bd1f6de45
--- /dev/null
+++ b/npc/006-6/all.txt
@@ -0,0 +1,34 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-6,53,36,0	script	Sign#0066WR	NPC_SWORDS_SIGN,{
+    mesc l("West Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+006-6,46,34,0	script	Sign#0066CR	NPC_SWORDS_SIGN,{
+    mesc l("Central Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
+006-6,39,36,0	script	Sign#0066ER	NPC_SWORDS_SIGN,{
+    mesc l("East Room closed for repairs");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
diff --git a/npc/006-6/core.txt b/npc/006-6/core.txt
new file mode 100644
index 000000000..b1dfffd8f
--- /dev/null
+++ b/npc/006-6/core.txt
@@ -0,0 +1,21 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-6,46,26,0	script	Magic Barrier#0066	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    //if (!getq(CandorQuest_Area1)) goto L_Reject;
+    //if (!getq(CandorQuest_Area2)) goto L_Reject;
+    //if (!getq(CandorQuest_Area3)) goto L_Reject;
+
+    // FIXME: B4F is not ready, so fallthrough to L_Reject
+L_Reject:
+    //warp "006-10", 49, 52;
+    specialeffect(5000, SELF, getcharid(3));
+    dispbottom l("The power which lies in Candor rejects your strength.");
+    sleep2(3000);
+    specialeffect(5002, SELF, getcharid(3));
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 8ff0ac962..019bf9ed1 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -69,6 +69,7 @@
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"
 @include "npc/006-5/_import.txt"
+@include "npc/006-6/_import.txt"
 @include "npc/006-7/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/007-2/_import.txt"