summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt539
-rw-r--r--maps/re/011-4.mcachebin0 -> 868 bytes
-rw-r--r--npc/011-3/flood.txt23
-rw-r--r--npc/011-4/_import.txt3
-rw-r--r--npc/011-4/_mobs.txt17
-rw-r--r--npc/_import.txt1
-rw-r--r--npc/functions/weather.txt1
8 files changed, 313 insertions, 272 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index ecec625bc..080b58f52 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -147,6 +147,7 @@ map_list: (
"011-1",
"011-2",
"011-3",
+ "011-4",
"012-1",
"012-2",
"012-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index ff0ac7e04..5734ecdc9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -144,272 +144,273 @@
011-1 144
011-2 145
011-3 146
-012-1 147
-012-2 148
-012-3 149
-012-4 150
-012-5 151
-012-6 152
-012-7 153
-012-8 154
-013-1 155
-014-1 156
-014-2-1 157
-014-2-2 158
-014-2 159
-014-3 160
-014-4 161
-014-5-1 162
-014-5 163
-015-1 164
-015-2 165
-015-3-1 166
-015-3-2 167
-015-3-3 168
-015-3 169
-015-4 170
-015-5 171
-015-6 172
-015-7 173
-015-8-1 174
-015-8 175
-016-1 176
-016-6 177
-016-7 178
-017-0 179
-017-1 180
-017-10 181
-017-2-1 182
-017-2-2 183
-017-2 184
-017-3 185
-017-4 186
-017-5 187
-017-6 188
-017-7 189
-017-8 190
-018-1-1 191
-018-1 192
-018-2-1 193
-018-2-2 194
-018-2-3 195
-018-2-4 196
-018-2-5 197
-018-2-6 198
-018-2-7 199
-018-2-8 200
-018-2 201
-018-3 202
-018-4-1 203
-018-4-2 204
-018-4 205
-018-5-0 206
-018-5-1 207
-018-5-2 208
-018-5-3 209
-018-5-4 210
-018-5-5 211
-018-5-boss 212
-018-5 213
-018-6-0 214
-018-6-1 215
-018-6-2 216
-018-6-3 217
-018-7-1 218
-018-7 219
-019-1-1 220
-019-1 221
-019-2 222
-019-3 223
-019-4-1 224
-019-4 225
-019-5-1 226
-019-5-2 227
-019-5-3 228
-019-5 229
-019-6 230
-020-1 231
-020-2 232
-020-3 233
-020-4 234
-020-5 235
-020-6 236
-020-7-1 237
-020-7-2 238
-020-7 239
-021-0 240
-021-1 241
-021-2 242
-021-3 243
-021-4 244
-022-1 245
-023-1 246
-023-2 247
-023-3-1 248
-023-3-2 249
-023-3 250
-023-4 251
-024-1 252
-024-10 253
-024-11 254
-024-12 255
-024-13 256
-024-14 257
-024-15 258
-024-16 259
-024-2 260
-024-3 261
-024-4 262
-024-5 263
-024-6 264
-024-7 265
-024-8 266
-024-9 267
-025-1 268
-025-2-1 269
-025-2-2 270
-025-2-3 271
-025-2-4 272
-025-2 273
-025-3 274
-026-0 275
-026-1 276
-026-2 277
-026-3 278
-026-6 279
-026-7 280
-027-0 281
-027-1 282
-027-2 283
-027-3 284
-027-4 285
-027-5 286
-027-6 287
-027-7 288
-029-0 289
-029-1 290
-029-2 291
-029-3 292
-029-4 293
-029-5 294
-029-6 295
-029-7 296
-029-8 297
-029-9 298
-030-01 299
-030-02 300
-030-03 301
-030-04 302
-030-05 303
-030-06 304
-030-07 305
-030-08 306
-030-09 307
-030-10 308
-030-11 309
-030-12 310
-030-13 311
-030-14 312
-030-15 313
-030-16 314
-030-17 315
-030-18 316
-030-19 317
-030-20 318
-030-21 319
-030-22 320
-030-23 321
-030-24 322
-030-25 323
-030-26 324
-030-27 325
-030-28 326
-030-29 327
-030-30 328
-030-31 329
-030-32 330
-030-33 331
-030-34 332
-030-35 333
-030-36 334
-030-37 335
-030-38 336
-030-39 337
-030-40 338
-030-41 339
-030-42 340
-030-43 341
-030-44 342
-030-45 343
-030-46 344
-030-47 345
-030-48 346
-030-49 347
-030-50 348
-030-51 349
-030-52 350
-030-53 351
-030-54 352
-030-55 353
-030-56 354
-030-57 355
-030-58 356
-030-59 357
-030-60 358
-030-61 359
-030-62 360
-030-63 361
-030-64 362
-030-65 363
-030-66 364
-030-67 365
-030-68 366
-030-69 367
-030-70 368
-030-71 369
-030-72 370
-030-73 371
-030-74 372
-030-75 373
-031-0 374
-031-1 375
-031-2 376
-031-3 377
-031-4 378
-031-5 379
-031-6 380
-031-7 381
-031-8 382
-031-9 383
-032-1 384
-032-2 385
-032-3 386
-032-4 387
-032-5 388
-033-1 389
-033-2 390
-033-3 391
-033-4 392
-033-5 393
-034-1 394
-034-2 395
-034-3 396
-034-4 397
-042-0 398
-042-1 399
-042-10 400
-042-11 401
-042-2 402
-042-3 403
-042-4 404
-042-5 405
-042-6 406
-042-7 407
-042-8 408
-042-9 409
-boss 410
-botcheck 411
-guilds 412
-sec_pri 413
-soren-2 414
-soren 415
+011-4 147
+012-1 148
+012-2 149
+012-3 150
+012-4 151
+012-5 152
+012-6 153
+012-7 154
+012-8 155
+013-1 156
+014-1 157
+014-2-1 158
+014-2-2 159
+014-2 160
+014-3 161
+014-4 162
+014-5-1 163
+014-5 164
+015-1 165
+015-2 166
+015-3-1 167
+015-3-2 168
+015-3-3 169
+015-3 170
+015-4 171
+015-5 172
+015-6 173
+015-7 174
+015-8-1 175
+015-8 176
+016-1 177
+016-6 178
+016-7 179
+017-0 180
+017-1 181
+017-10 182
+017-2-1 183
+017-2-2 184
+017-2 185
+017-3 186
+017-4 187
+017-5 188
+017-6 189
+017-7 190
+017-8 191
+018-1-1 192
+018-1 193
+018-2-1 194
+018-2-2 195
+018-2-3 196
+018-2-4 197
+018-2-5 198
+018-2-6 199
+018-2-7 200
+018-2-8 201
+018-2 202
+018-3 203
+018-4-1 204
+018-4-2 205
+018-4 206
+018-5-0 207
+018-5-1 208
+018-5-2 209
+018-5-3 210
+018-5-4 211
+018-5-5 212
+018-5-boss 213
+018-5 214
+018-6-0 215
+018-6-1 216
+018-6-2 217
+018-6-3 218
+018-7-1 219
+018-7 220
+019-1-1 221
+019-1 222
+019-2 223
+019-3 224
+019-4-1 225
+019-4 226
+019-5-1 227
+019-5-2 228
+019-5-3 229
+019-5 230
+019-6 231
+020-1 232
+020-2 233
+020-3 234
+020-4 235
+020-5 236
+020-6 237
+020-7-1 238
+020-7-2 239
+020-7 240
+021-0 241
+021-1 242
+021-2 243
+021-3 244
+021-4 245
+022-1 246
+023-1 247
+023-2 248
+023-3-1 249
+023-3-2 250
+023-3 251
+023-4 252
+024-1 253
+024-10 254
+024-11 255
+024-12 256
+024-13 257
+024-14 258
+024-15 259
+024-16 260
+024-2 261
+024-3 262
+024-4 263
+024-5 264
+024-6 265
+024-7 266
+024-8 267
+024-9 268
+025-1 269
+025-2-1 270
+025-2-2 271
+025-2-3 272
+025-2-4 273
+025-2 274
+025-3 275
+026-0 276
+026-1 277
+026-2 278
+026-3 279
+026-6 280
+026-7 281
+027-0 282
+027-1 283
+027-2 284
+027-3 285
+027-4 286
+027-5 287
+027-6 288
+027-7 289
+029-0 290
+029-1 291
+029-2 292
+029-3 293
+029-4 294
+029-5 295
+029-6 296
+029-7 297
+029-8 298
+029-9 299
+030-01 300
+030-02 301
+030-03 302
+030-04 303
+030-05 304
+030-06 305
+030-07 306
+030-08 307
+030-09 308
+030-10 309
+030-11 310
+030-12 311
+030-13 312
+030-14 313
+030-15 314
+030-16 315
+030-17 316
+030-18 317
+030-19 318
+030-20 319
+030-21 320
+030-22 321
+030-23 322
+030-24 323
+030-25 324
+030-26 325
+030-27 326
+030-28 327
+030-29 328
+030-30 329
+030-31 330
+030-32 331
+030-33 332
+030-34 333
+030-35 334
+030-36 335
+030-37 336
+030-38 337
+030-39 338
+030-40 339
+030-41 340
+030-42 341
+030-43 342
+030-44 343
+030-45 344
+030-46 345
+030-47 346
+030-48 347
+030-49 348
+030-50 349
+030-51 350
+030-52 351
+030-53 352
+030-54 353
+030-55 354
+030-56 355
+030-57 356
+030-58 357
+030-59 358
+030-60 359
+030-61 360
+030-62 361
+030-63 362
+030-64 363
+030-65 364
+030-66 365
+030-67 366
+030-68 367
+030-69 368
+030-70 369
+030-71 370
+030-72 371
+030-73 372
+030-74 373
+030-75 374
+031-0 375
+031-1 376
+031-2 377
+031-3 378
+031-4 379
+031-5 380
+031-6 381
+031-7 382
+031-8 383
+031-9 384
+032-1 385
+032-2 386
+032-3 387
+032-4 388
+032-5 389
+033-1 390
+033-2 391
+033-3 392
+033-4 393
+033-5 394
+034-1 395
+034-2 396
+034-3 397
+034-4 398
+042-0 399
+042-1 400
+042-10 401
+042-11 402
+042-2 403
+042-3 404
+042-4 405
+042-5 406
+042-6 407
+042-7 408
+042-8 409
+042-9 410
+boss 411
+botcheck 412
+guilds 413
+sec_pri 414
+soren-2 415
+soren 416
diff --git a/maps/re/011-4.mcache b/maps/re/011-4.mcache
new file mode 100644
index 000000000..60d3d9d78
--- /dev/null
+++ b/maps/re/011-4.mcache
Binary files differ
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 0fda21d8a..4ff712b7c 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -17,6 +17,12 @@ OnSwampMob:
OnInit:
addmapmask "011-3", MASK_SPECIAL;
bindatcmd "es_flood", "#EternalSwampCore::OnSkipFlood", 99, 99, 1;
+
+ // We need to keep 011-4 in sync with 011-3, dealt here
+ addmapmask "011-4", MASK_SPECIAL;
+ setcells "011-4", 157, 31, 159, 34, 1, "ESwpRBridge1";
+ setcells "011-4", 157, 44, 159, 52, 1, "ESwpRBridge2";
+ setcells "011-4", 151, 76, 153, 83, 1, "ESwpRBridge3";
end;
OnMinute02:
@@ -51,12 +57,19 @@ OnSkipFlood:
delcells "ESwpBridge6";
delcells "ESwpBridge7";
delcells "ESwpBridge8";
+ setcells "011-4", 157, 31, 159, 34, 1, "ESwpRBridge1";
+ setcells "011-4", 157, 44, 159, 52, 1, "ESwpRBridge2";
+ setcells "011-4", 151, 76, 153, 83, 1, "ESwpRBridge3";
mapannounce "011-3", "Eternal Swamps: The flood ceases!",bc_all|bc_npc;
+ mapannounce "011-4", "Eternal Swamps: The flood ceases!",bc_all|bc_npc;
} else {
- // 40% chances to flood, 75% during night
- .@odds=40;
+ // 45% chances to flood, 80% during night
+ // When raining: floods 60% at day and 95% at night
+ .@odds=45;
if (is_night())
.@odds+=35;
+ if (getmapmask("011-3") & MASK_RAIN)
+ .@odds+=15;
/*
// Bugfix
@@ -68,7 +81,7 @@ OnSkipFlood:
*/
// Maybe we should flood it
- if (rand(0,100) < .@odds) {
+ if (rand2(0,100) < .@odds) {
if ($@GM_OVERRIDE) debugmes "[Flood] F - Flooding";
removemapmask "011-3", MASK_SPECIAL;
@@ -81,10 +94,14 @@ OnSkipFlood:
setcells "011-3", 41, 197, 43, 203, 1, "ESwpBridge6";
setcells "011-3", 36, 227, 38, 233, 1, "ESwpBridge7";
setcells "011-3", 31, 67, 33, 72, 1, "ESwpBridge8";
+ delcells "ESwpRBridge1";
+ delcells "ESwpRBridge2";
+ delcells "ESwpRBridge3";
//debugmes "[Flood] F - Spawn and Announce";
areamonster "011-3", 20, 20, 60, 260, "Bluepar", Bluepar, rand2(11,29), "#EternalSwampCore::OnSwampMob";
mapannounce "011-3", "Eternal Swamps: A flood starts!",bc_all|bc_npc;
+ mapannounce "011-4", "Eternal Swamps: A flood starts!",bc_all|bc_npc;
// TODO: Handle players in bridges
//debugmes "[Flood] F - Map Timer OK";
diff --git a/npc/011-4/_import.txt b/npc/011-4/_import.txt
new file mode 100644
index 000000000..2841ca4db
--- /dev/null
+++ b/npc/011-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 011-4: Eternal Swamps - Navigation
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/011-4/_mobs.txt",
diff --git a/npc/011-4/_mobs.txt b/npc/011-4/_mobs.txt
new file mode 100644
index 000000000..d24e4d923
--- /dev/null
+++ b/npc/011-4/_mobs.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-4: Eternal Swamps - Navigation mobs
+011-4,91,55,24,14 monster Sea Slime 1093,5,100000,30000
+011-4,227,60,27,27 monster Sea Slime 1093,5,100000,30000
+011-4,100,77,24,14 monster Piou 1002,5,100000,30000
+011-4,56,61,30,17 monster Croc 1006,10,100000,30000
+011-4,52,75,24,14 monster Small Frog 1437,5,100000,30000
+011-4,122,67,32,36 monster Blub 1008,5,100000,30000
+011-4,160,66,24,37 monster Ocean Croc 1133,3,200000,60000
+011-4,218,88,35,16 monster Toppy Blub 1009,5,100000,30000
+011-4,195,48,36,23 monster Bluepar 1177,3,200000,60000
+011-4,161,82,41,18 monster Water Fairy 1184,5,100000,30000
+011-4,283,51,7,6 monster Golden Scorpion 1078,1,300000,120000
+011-4,277,78,7,6 monster Siege Tower 1235,1,300000,120000
+011-4,297,97,1,1 monster Water Element 1412,1,300000,120000
+011-4,278,63,16,23 monster Croc 1006,10,100000,30000
+011-4,260,35,24,14 monster Piou 1002,5,100000,30000
diff --git a/npc/_import.txt b/npc/_import.txt
index 3abcfe633..885db7540 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -146,6 +146,7 @@
@include "npc/011-1/_import.txt"
@include "npc/011-2/_import.txt"
@include "npc/011-3/_import.txt"
+@include "npc/011-4/_import.txt"
@include "npc/012-1/_import.txt"
@include "npc/012-2/_import.txt"
@include "npc/012-3/_import.txt"
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 5c369e1bd..8c1643359 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -108,6 +108,7 @@ OnInit:
// Special
htput(.wcore, "011-3", "special");
+ htput(.wcore, "011-4", "special");
consoleinfo "[Weather.sys] Total Maps = " + htsize(.wcore);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-08-21 05:17:04 +0000