Prepare the Bloodbath Room

8 files changed, 257 insertions, 213 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index d17f1f12f..16b435839 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -73,6 +73,7 @@ map_list: (
     "006-5",
     "006-6",
     "006-7",
+    "006-9",
     "007-1",
     "007-2",
     "008-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index f6aa95764..2ffc998eb 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -70,212 +70,213 @@
 006-5 70
 006-6 71
 006-7 72
-007-1 73
-007-2 74
-008-0 75
-008-1 76
-008-2 77
-009-1 78
-009-2 79
-009-3 80
-009-4 81
-009-5 82
-009-6 83
-009-7 84
-010-1-1 85
-010-1 86
-010-2 87
-011-1 88
-011-2 89
-011-3 90
-012-1 91
-012-2 92
-012-3 93
-012-4 94
-012-5 95
-012-6 96
-012-7 97
-012-8 98
-013-1 99
-014-1 100
-014-2-1 101
-014-2 102
-014-3 103
-014-4 104
-014-5-1 105
-014-5 106
-015-1 107
-015-2 108
-015-3 109
-015-4 110
-015-5 111
-015-6 112
-015-7 113
-015-8-1 114
-015-8 115
-016-1 116
-016-6 117
-016-7 118
-017-0 119
-017-1 120
-017-10 121
-017-2-1 122
-017-2-2 123
-017-2 124
-017-3 125
-017-4 126
-017-5 127
-017-6 128
-017-7 129
-017-8 130
-018-1-1 131
-018-1 132
-018-2-1 133
-018-2-2 134
-018-2-3 135
-018-2-4 136
-018-2-5 137
-018-2-6 138
-018-2-7 139
-018-2-8 140
-018-2 141
-018-3 142
-018-4-1 143
-018-4-2 144
-018-4 145
-018-5-0 146
-018-5-1 147
-018-5-2 148
-018-5-3 149
-018-5-4 150
-018-5-5 151
-018-5-boss 152
-018-5 153
-018-6-0 154
-018-6-1 155
-018-6-2 156
-018-6-3 157
-018-7-1 158
-018-7 159
-019-1-1 160
-019-1 161
-019-2 162
-019-3 163
-019-4-1 164
-019-4 165
-020-1 166
-020-2 167
-020-3 168
-020-4 169
-020-5 170
-020-6 171
-020-7-1 172
-020-7-2 173
-020-7 174
-021-0 175
-021-1 176
-021-2 177
-021-3 178
-021-4 179
-022-1 180
-023-1 181
-023-2 182
-023-3-1 183
-023-3-2 184
-023-3 185
-023-4 186
-024-1 187
-024-10 188
-024-11 189
-024-12 190
-024-13 191
-024-14 192
-024-15 193
-024-16 194
-024-2 195
-024-3 196
-024-4 197
-024-5 198
-024-6 199
-024-7 200
-024-8 201
-024-9 202
-025-1 203
-025-2-1 204
-025-2-2 205
-025-2-3 206
-025-2-4 207
-025-2 208
-025-3 209
-026-0 210
-026-1 211
-026-2 212
-027-0 213
-027-1 214
-027-2 215
-027-3 216
-027-4 217
-029-0 218
-029-1 219
-029-2 220
-029-3 221
-029-4 222
-029-5 223
-029-6 224
-029-7 225
-029-8 226
-029-9 227
-030-01 228
-030-02 229
-030-03 230
-030-04 231
-030-05 232
-030-06 233
-030-07 234
-030-08 235
-030-09 236
-030-10 237
-030-11 238
-030-12 239
-030-13 240
-030-14 241
-030-15 242
-030-16 243
-030-17 244
-030-18 245
-030-19 246
-030-20 247
-030-21 248
-030-22 249
-030-23 250
-030-24 251
-031-0 252
-031-1 253
-031-2 254
-031-3 255
-031-4 256
-031-5 257
-031-6 258
-031-7 259
-031-8 260
-031-9 261
-042-0 262
-042-1 263
-042-10 264
-042-11 265
-042-2 266
-042-3 267
-042-4 268
-042-5 269
-042-6 270
-042-7 271
-042-8 272
-042-9 273
-boss 274
-botcheck 275
-guilds 276
-sec_pri 277
-soren-2 278
-soren 279
-test 280
-testbg 281
+006-9 73
+007-1 74
+007-2 75
+008-0 76
+008-1 77
+008-2 78
+009-1 79
+009-2 80
+009-3 81
+009-4 82
+009-5 83
+009-6 84
+009-7 85
+010-1-1 86
+010-1 87
+010-2 88
+011-1 89
+011-2 90
+011-3 91
+012-1 92
+012-2 93
+012-3 94
+012-4 95
+012-5 96
+012-6 97
+012-7 98
+012-8 99
+013-1 100
+014-1 101
+014-2-1 102
+014-2 103
+014-3 104
+014-4 105
+014-5-1 106
+014-5 107
+015-1 108
+015-2 109
+015-3 110
+015-4 111
+015-5 112
+015-6 113
+015-7 114
+015-8-1 115
+015-8 116
+016-1 117
+016-6 118
+016-7 119
+017-0 120
+017-1 121
+017-10 122
+017-2-1 123
+017-2-2 124
+017-2 125
+017-3 126
+017-4 127
+017-5 128
+017-6 129
+017-7 130
+017-8 131
+018-1-1 132
+018-1 133
+018-2-1 134
+018-2-2 135
+018-2-3 136
+018-2-4 137
+018-2-5 138
+018-2-6 139
+018-2-7 140
+018-2-8 141
+018-2 142
+018-3 143
+018-4-1 144
+018-4-2 145
+018-4 146
+018-5-0 147
+018-5-1 148
+018-5-2 149
+018-5-3 150
+018-5-4 151
+018-5-5 152
+018-5-boss 153
+018-5 154
+018-6-0 155
+018-6-1 156
+018-6-2 157
+018-6-3 158
+018-7-1 159
+018-7 160
+019-1-1 161
+019-1 162
+019-2 163
+019-3 164
+019-4-1 165
+019-4 166
+020-1 167
+020-2 168
+020-3 169
+020-4 170
+020-5 171
+020-6 172
+020-7-1 173
+020-7-2 174
+020-7 175
+021-0 176
+021-1 177
+021-2 178
+021-3 179
+021-4 180
+022-1 181
+023-1 182
+023-2 183
+023-3-1 184
+023-3-2 185
+023-3 186
+023-4 187
+024-1 188
+024-10 189
+024-11 190
+024-12 191
+024-13 192
+024-14 193
+024-15 194
+024-16 195
+024-2 196
+024-3 197
+024-4 198
+024-5 199
+024-6 200
+024-7 201
+024-8 202
+024-9 203
+025-1 204
+025-2-1 205
+025-2-2 206
+025-2-3 207
+025-2-4 208
+025-2 209
+025-3 210
+026-0 211
+026-1 212
+026-2 213
+027-0 214
+027-1 215
+027-2 216
+027-3 217
+027-4 218
+029-0 219
+029-1 220
+029-2 221
+029-3 222
+029-4 223
+029-5 224
+029-6 225
+029-7 226
+029-8 227
+029-9 228
+030-01 229
+030-02 230
+030-03 231
+030-04 232
+030-05 233
+030-06 234
+030-07 235
+030-08 236
+030-09 237
+030-10 238
+030-11 239
+030-12 240
+030-13 241
+030-14 242
+030-15 243
+030-16 244
+030-17 245
+030-18 246
+030-19 247
+030-20 248
+030-21 249
+030-22 250
+030-23 251
+030-24 252
+031-0 253
+031-1 254
+031-2 255
+031-3 256
+031-4 257
+031-5 258
+031-6 259
+031-7 260
+031-8 261
+031-9 262
+042-0 263
+042-1 264
+042-10 265
+042-11 266
+042-2 267
+042-3 268
+042-4 269
+042-5 270
+042-6 271
+042-7 272
+042-8 273
+042-9 274
+boss 275
+botcheck 276
+guilds 277
+sec_pri 278
+soren-2 279
+soren 280
+test 281
+testbg 282
diff --git a/maps/re/006-9.mcache b/maps/re/006-9.mcache
new file mode 100644
index 000000000..a7d4ec959
--- /dev/null
+++ b/maps/re/006-9.mcache
diff --git a/npc/006-6/all.txt b/npc/006-6/all.txt
index 50a40781f..41ec7b611 100644
--- a/npc/006-6/all.txt
+++ b/npc/006-6/all.txt
@@ -3,7 +3,7 @@
 //    Jesusalva
 
 006-6,53,36,0	script	Sign#0066WR	NPC_SWORDS_SIGN,{
-    mesc l("West Room closed for repairs");
+    mesc l("In a blood bath, survival is the epitaph.");
     close;
 
 OnInit:
@@ -33,17 +33,28 @@ OnInit:
 }
 
 // Effective warps
-006-6,40,35,0	script	Magic Barrier#0067	NPC_HIDDEN,0,0,{
+006-6,40,35,0	script	Magic Barrier#0067E	NPC_HIDDEN,0,0,{
     end;
 
 OnTouch:
-    if (!$@ICICLE_CHALLENGE)
+    if (!$@ICICLE_CHALLENGE || is_admin())
         warp "006-7", 44, 49;
     else
         dispbottom l("Your strength is not enough to power on this portal.");
     end;
 }
 
+// Effective warps
+006-6,54,35,0	script	Magic Barrier#0067W	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (!$@SURVIVAL_CANDOR || is_admin())
+        warp "006-9", 37, 22;
+    else
+        dispbottom l("Your strength is not enough to power on this portal.");
+    end;
+}
 
 
 
diff --git a/npc/006-7/_import.txt b/npc/006-7/_import.txt
index 7dc8dace0..87e959550 100644
--- a/npc/006-7/_import.txt
+++ b/npc/006-7/_import.txt
@@ -1,3 +1,3 @@
-// Map 006-7: Existential Frontier
+// Map 006-7: Aethyr Chamber
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/006-7/ctrl.txt",
diff --git a/npc/006-9/_import.txt b/npc/006-9/_import.txt
new file mode 100644
index 000000000..d1042ca2a
--- /dev/null
+++ b/npc/006-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 006-9: The Abyss
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-9/ctrl.txt",
diff --git a/npc/006-9/ctrl.txt b/npc/006-9/ctrl.txt
new file mode 100644
index 000000000..c9bdaba19
--- /dev/null
+++ b/npc/006-9/ctrl.txt
@@ -0,0 +1,27 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+006-9,37,21,0	script	#OutOf0069	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    if (!$@SURVIVAL_CANDOR)
+        warp "006-6", 40, 36;
+    end;
+}
+
+006-9,55,32,0	script	Bloodbath	NPC_NO_SPRITE,{
+    if ($@SURVIVAL_CANDOR) end;
+    // $@SURVIVAL_CANDOR = gettimetick(2);
+    mesn;
+    mes l("Goal: Survive the longest possible.");
+    mes l("Monsters will spawn in the south fountain continuously.");
+    mes l("After five minutes, they'll also start spawning on whole map.");
+    close;
+
+OnInit:
+    .distance=3;
+    end;
+}
+
diff --git a/npc/_import.txt b/npc/_import.txt
index ed32d2623..d5346f8f2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -72,6 +72,7 @@
 @include "npc/006-5/_import.txt"
 @include "npc/006-6/_import.txt"
 @include "npc/006-7/_import.txt"
+@include "npc/006-9/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/007-2/_import.txt"
 @include "npc/008-0/_import.txt"