You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2084 lines
53 KiB
2084 lines
53 KiB
|
6 years ago
|
/**
|
||
|
4 years ago
|
* @file levels/drlg_l1.cpp
|
||
|
6 years ago
|
*
|
||
|
|
* Implementation of the cathedral level generation algorithms.
|
||
|
|
*/
|
||
|
4 years ago
|
#include "levels/drlg_l1.h"
|
||
|
5 years ago
|
|
||
|
5 years ago
|
#include "engine/load_file.hpp"
|
||
|
5 years ago
|
#include "engine/point.hpp"
|
||
|
5 years ago
|
#include "engine/random.hpp"
|
||
|
4 years ago
|
#include "levels/gendung.h"
|
||
|
5 years ago
|
#include "player.h"
|
||
|
|
#include "quests.h"
|
||
|
4 years ago
|
#include "utils/bitset2d.hpp"
|
||
|
8 years ago
|
|
||
|
5 years ago
|
namespace devilution {
|
||
|
7 years ago
|
|
||
|
5 years ago
|
int UberRow;
|
||
|
|
int UberCol;
|
||
|
|
bool IsUberRoomOpened;
|
||
|
|
bool IsUberLeverActivated;
|
||
|
|
int UberDiabloMonsterIndex;
|
||
|
|
|
||
|
|
namespace {
|
||
|
|
|
||
|
6 years ago
|
/** Represents a tile ID map of twice the size, repeating each tile of the original map in blocks of 4. */
|
||
|
7 years ago
|
BYTE L5dungeon[80][80];
|
||
|
4 years ago
|
/** Marks where walls may not be added to the level */
|
||
|
4 years ago
|
Bitset2d<DMAXX, DMAXY> Chamber;
|
||
|
4 years ago
|
/** Specifies whether to generate a horizontal or vertical layout. */
|
||
|
|
bool VerticalLayout;
|
||
|
|
/** Specifies whether to generate a room at position 1 in the Cathedral. */
|
||
|
|
bool HasChamber1;
|
||
|
|
/** Specifies whether to generate a room at position 2 in the Cathedral. */
|
||
|
|
bool HasChamber2;
|
||
|
|
/** Specifies whether to generate a room at position 3 in the Cathedral. */
|
||
|
|
bool HasChamber3;
|
||
|
8 years ago
|
|
||
|
6 years ago
|
/** Contains shadows for 2x2 blocks of base tile IDs in the Cathedral. */
|
||
|
8 years ago
|
const ShadowStruct SPATS[37] = {
|
||
|
7 years ago
|
// clang-format off
|
||
|
7 years ago
|
// strig, s1, s2, s3, nv1, nv2, nv3
|
||
|
|
{ 7, 13, 0, 13, 144, 0, 142 },
|
||
|
|
{ 16, 13, 0, 13, 144, 0, 142 },
|
||
|
|
{ 15, 13, 0, 13, 145, 0, 142 },
|
||
|
|
{ 5, 13, 13, 13, 152, 140, 139 },
|
||
|
|
{ 5, 13, 1, 13, 143, 146, 139 },
|
||
|
|
{ 5, 13, 13, 2, 143, 140, 148 },
|
||
|
|
{ 5, 0, 1, 2, 0, 146, 148 },
|
||
|
|
{ 5, 13, 11, 13, 143, 147, 139 },
|
||
|
|
{ 5, 13, 13, 12, 143, 140, 149 },
|
||
|
|
{ 5, 13, 11, 12, 150, 147, 149 },
|
||
|
|
{ 5, 13, 1, 12, 143, 146, 149 },
|
||
|
|
{ 5, 13, 11, 2, 143, 147, 148 },
|
||
|
|
{ 9, 13, 13, 13, 144, 140, 142 },
|
||
|
|
{ 9, 13, 1, 13, 144, 146, 142 },
|
||
|
|
{ 9, 13, 11, 13, 151, 147, 142 },
|
||
|
|
{ 8, 13, 0, 13, 144, 0, 139 },
|
||
|
|
{ 8, 13, 0, 12, 143, 0, 149 },
|
||
|
|
{ 8, 0, 0, 2, 0, 0, 148 },
|
||
|
|
{ 11, 0, 0, 13, 0, 0, 139 },
|
||
|
|
{ 11, 13, 0, 13, 139, 0, 139 },
|
||
|
|
{ 11, 2, 0, 13, 148, 0, 139 },
|
||
|
|
{ 11, 12, 0, 13, 149, 0, 139 },
|
||
|
|
{ 11, 13, 11, 12, 139, 0, 149 },
|
||
|
|
{ 14, 0, 0, 13, 0, 0, 139 },
|
||
|
|
{ 14, 13, 0, 13, 139, 0, 139 },
|
||
|
|
{ 14, 2, 0, 13, 148, 0, 139 },
|
||
|
|
{ 14, 12, 0, 13, 149, 0, 139 },
|
||
|
|
{ 14, 13, 11, 12, 139, 0, 149 },
|
||
|
|
{ 10, 0, 13, 0, 0, 140, 0 },
|
||
|
|
{ 10, 13, 13, 0, 140, 140, 0 },
|
||
|
|
{ 10, 0, 1, 0, 0, 146, 0 },
|
||
|
|
{ 10, 13, 11, 0, 140, 147, 0 },
|
||
|
|
{ 12, 0, 13, 0, 0, 140, 0 },
|
||
|
|
{ 12, 13, 13, 0, 140, 140, 0 },
|
||
|
|
{ 12, 0, 1, 0, 0, 146, 0 },
|
||
|
|
{ 12, 13, 11, 0, 140, 147, 0 },
|
||
|
|
{ 3, 13, 11, 12, 150, 0, 0 }
|
||
|
7 years ago
|
// clang-format on
|
||
|
8 years ago
|
};
|
||
|
6 years ago
|
|
||
|
|
// BUGFIX: This array should contain an additional 0 (207 elements).
|
||
|
6 years ago
|
/** Maps tile IDs to their corresponding base tile ID. */
|
||
|
6 years ago
|
const BYTE BSTYPES[] = {
|
||
|
7 years ago
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
||
|
|
10, 11, 12, 13, 14, 15, 16, 17, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 1, 2, 10, 4, 5,
|
||
|
|
6, 7, 8, 9, 10, 11, 12, 14, 5, 14,
|
||
|
|
10, 4, 14, 4, 5, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
|
||
|
|
2, 3, 4, 1, 6, 7, 16, 17, 2, 1,
|
||
|
|
1, 2, 2, 1, 1, 2, 2, 2, 2, 2,
|
||
|
|
1, 1, 11, 1, 13, 13, 13, 1, 2, 1,
|
||
|
|
2, 1, 2, 1, 2, 2, 2, 2, 12, 0,
|
||
|
|
0, 11, 1, 11, 1, 13, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 13, 13, 13, 13, 13, 13, 13,
|
||
|
|
13, 13, 13, 13, 13, 13, 1, 11, 2, 12,
|
||
|
|
13, 13, 13, 12, 2, 1, 2, 2, 4, 14,
|
||
|
|
4, 10, 13, 13, 4, 4, 1, 1, 4, 2,
|
||
|
|
2, 13, 13, 13, 13, 25, 26, 28, 30, 31,
|
||
|
|
41, 43, 40, 41, 42, 43, 25, 41, 43, 28,
|
||
|
|
28, 1, 2, 25, 26, 22, 22, 25, 26, 0,
|
||
|
6 years ago
|
0, 0, 0, 0, 0, 0, 0
|
||
|
8 years ago
|
};
|
||
|
6 years ago
|
|
||
|
6 years ago
|
// BUGFIX: This array should contain an additional 0 (207 elements) (fixed).
|
||
|
6 years ago
|
/** Maps tile IDs to their corresponding undecorated tile ID. */
|
||
|
6 years ago
|
const BYTE L5BTYPES[] = {
|
||
|
7 years ago
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
||
|
|
10, 11, 12, 13, 14, 15, 16, 17, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 25, 26, 0, 28, 0,
|
||
|
|
30, 31, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
40, 41, 42, 43, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 79,
|
||
|
|
80, 0, 82, 0, 0, 0, 0, 0, 0, 79,
|
||
|
|
0, 80, 0, 0, 79, 80, 0, 2, 2, 2,
|
||
|
|
1, 1, 11, 25, 13, 13, 13, 1, 2, 1,
|
||
|
|
2, 1, 2, 1, 2, 2, 2, 2, 12, 0,
|
||
|
|
0, 11, 1, 11, 1, 13, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 13, 13, 13, 13, 13, 13, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||
|
6 years ago
|
0, 0, 0, 0, 0, 0, 0
|
||
|
8 years ago
|
};
|
||
|
6 years ago
|
/** Miniset: stairs up on a corner wall. */
|
||
|
4 years ago
|
const Miniset STAIRSUP {
|
||
|
|
{ 4, 4 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 2, 2, 2, 2 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 66, 6, 0 },
|
||
|
|
{ 63, 64, 65, 0 },
|
||
|
|
{ 0, 67, 68, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset L5STAIRSUPHF {
|
||
|
|
{ 4, 5 },
|
||
|
|
{
|
||
|
|
{ 22, 22, 22, 22 },
|
||
|
|
{ 22, 22, 22, 22 },
|
||
|
|
{ 2, 2, 2, 2 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 54, 23, 0 },
|
||
|
|
{ 0, 53, 18, 0 },
|
||
|
|
{ 55, 56, 57, 0 },
|
||
|
|
{ 58, 59, 60, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
6 years ago
|
/** Miniset: stairs up. */
|
||
|
4 years ago
|
const Miniset L5STAIRSUP {
|
||
|
|
{ 4, 4 },
|
||
|
|
{
|
||
|
|
{ 22, 22, 22, 22 },
|
||
|
|
{ 2, 2, 2, 2 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 66, 23, 0 },
|
||
|
|
{ 63, 64, 65, 0 },
|
||
|
|
{ 0, 67, 68, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
|
/** Miniset: stairs down. */
|
||
|
4 years ago
|
const Miniset STAIRSDOWN {
|
||
|
|
{ 4, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 62, 57, 58, 0 },
|
||
|
|
{ 61, 59, 60, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset L5STAIRSDOWN {
|
||
|
|
{ 4, 5 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 52, 0 },
|
||
|
|
{ 0, 48, 51, 0 },
|
||
|
|
{ 0, 47, 50, 0 },
|
||
|
|
{ 45, 46, 49, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset L5STAIRSTOWN {
|
||
|
|
{ 4, 5 },
|
||
|
|
{
|
||
|
|
{ 22, 22, 22, 22 },
|
||
|
|
{ 22, 22, 22, 22 },
|
||
|
|
{ 2, 2, 2, 2 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 62, 23, 0 },
|
||
|
|
{ 0, 61, 18, 0 },
|
||
|
|
{ 63, 64, 65, 0 },
|
||
|
|
{ 66, 67, 68, 0 },
|
||
|
|
{ 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
6 years ago
|
/** Miniset: candlestick. */
|
||
|
4 years ago
|
const Miniset LAMPS {
|
||
|
|
{ 2, 2 },
|
||
|
|
{
|
||
|
|
{ 13, 0 },
|
||
|
|
{ 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 129, 0 },
|
||
|
|
{ 130, 128 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
|
/** Miniset: Poisoned Water Supply entrance. */
|
||
|
4 years ago
|
const Miniset PWATERIN {
|
||
|
|
{ 6, 6 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
{ 13, 13, 13, 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0, 0, 0, 0 },
|
||
|
|
{ 0, 202, 200, 200, 84, 0 },
|
||
|
|
{ 0, 199, 203, 203, 83, 0 },
|
||
|
|
{ 0, 85, 206, 80, 81, 0 },
|
||
|
|
{ 0, 0, 134, 135, 0, 0 },
|
||
|
|
{ 0, 0, 0, 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset VWallSection {
|
||
|
|
{ 1, 3 },
|
||
|
|
{
|
||
|
|
{ 1 },
|
||
|
|
{ 1 },
|
||
|
|
{ 1 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 91 },
|
||
|
|
{ 90 },
|
||
|
|
{ 89 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset HWallSection {
|
||
|
|
{ 3, 1 },
|
||
|
|
{ { 2, 2, 2 } },
|
||
|
|
{ { 94, 93, 92 } }
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptFloorLave {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 101, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptPillar1 {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 167, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptPillar2 {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 168, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptPillar3 {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 169, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptPillar4 {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 170, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptPillar5 {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 171, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
4 years ago
|
const Miniset CryptStar {
|
||
|
|
{ 3, 3 },
|
||
|
|
{
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
{ 13, 13, 13 },
|
||
|
|
},
|
||
|
|
{
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
{ 0, 172, 0 },
|
||
|
|
{ 0, 0, 0 },
|
||
|
|
}
|
||
|
6 years ago
|
};
|
||
|
8 years ago
|
|
||
|
4 years ago
|
const Miniset UberRoomPattern {
|
||
|
|
{ 4, 6 },
|
||
|
|
{},
|
||
|
|
{
|
||
|
|
{ 115, 130, 6, 13 },
|
||
|
|
{ 129, 108, 1, 13 },
|
||
|
|
{ 1, 107, 103, 13 },
|
||
|
|
{ 146, 106, 102, 13 },
|
||
|
|
{ 129, 168, 1, 13 },
|
||
|
|
{ 7, 2, 3, 13 },
|
||
|
|
}
|
||
|
5 years ago
|
};
|
||
|
4 years ago
|
const Miniset CornerstoneRoomPattern {
|
||
|
|
{ 5, 5 },
|
||
|
|
{},
|
||
|
|
{
|
||
|
|
{ 4, 2, 2, 2, 6 },
|
||
|
|
{ 1, 111, 172, 13, 1 },
|
||
|
|
{ 1, 172, 13, 13, 25 },
|
||
|
|
{ 1, 13, 13, 13, 1 },
|
||
|
|
{ 7, 2, 2, 2, 3 },
|
||
|
|
}
|
||
|
5 years ago
|
};
|
||
|
6 years ago
|
/**
|
||
|
|
* A lookup table for the 16 possible patterns of a 2x2 area,
|
||
|
|
* where each cell either contains a SW wall or it doesn't.
|
||
|
|
*/
|
||
|
7 years ago
|
BYTE L5ConvTbl[16] = { 22, 13, 1, 13, 2, 13, 13, 13, 4, 13, 1, 13, 2, 13, 16, 13 };
|
||
|
8 years ago
|
|
||
|
4 years ago
|
enum Tile : uint8_t {
|
||
|
4 years ago
|
// clang-format off
|
||
|
|
VWall = 1,
|
||
|
|
HWall = 2,
|
||
|
|
Corner = 3,
|
||
|
|
DWall = 4,
|
||
|
|
DArch = 5,
|
||
|
|
VWallEnd = 6,
|
||
|
|
HWallEnd = 7,
|
||
|
|
HArchEnd = 8,
|
||
|
|
VArchEnd = 9,
|
||
|
|
HArchVWall = 10,
|
||
|
|
VArch = 11,
|
||
|
|
HArch = 12,
|
||
|
|
Floor = 13,
|
||
|
|
HWallVArch = 14,
|
||
|
4 years ago
|
Pillar = 15,
|
||
|
|
Pillar1 = 16,
|
||
|
|
Pillar2 = 17,
|
||
|
4 years ago
|
DirtCorner = 21,
|
||
|
|
VDoor = 25,
|
||
|
|
HDoor = 26,
|
||
|
|
HFenceVWall = 27,
|
||
|
|
HDoorVDoor = 28,
|
||
|
4 years ago
|
DFence = 29,
|
||
|
4 years ago
|
VDoorEnd = 30,
|
||
|
|
HDoorEnd = 31,
|
||
|
4 years ago
|
VFenceEnd = 32,
|
||
|
4 years ago
|
VFence = 35,
|
||
|
|
HFence = 36,
|
||
|
|
HWallVFence = 37,
|
||
|
4 years ago
|
HArchVFence = 38,
|
||
|
|
HArchVDoor = 39,
|
||
|
4 years ago
|
EntranceStairs = 64,
|
||
|
|
// clang-format on
|
||
|
|
};
|
||
|
|
|
||
|
4 years ago
|
enum CathedralTile : uint8_t {
|
||
|
|
// clang-format off
|
||
|
|
HWallShadow = 148,
|
||
|
|
HArchShadow = 149,
|
||
|
|
HArchShadow2 = 153,
|
||
|
|
HWallShadow2 = 154,
|
||
|
|
// clang-format on
|
||
|
|
};
|
||
|
|
|
||
|
4 years ago
|
enum CryptTile : uint8_t {
|
||
|
|
// clang-format off
|
||
|
|
VWall5 = 89,
|
||
|
|
VWall6 = 90,
|
||
|
|
VWall7 = 91,
|
||
|
|
HWall5 = 92,
|
||
|
|
HWall6 = 93,
|
||
|
|
HWall7 = 94,
|
||
|
|
VArch5 = 95,
|
||
|
|
HArch5 = 96,
|
||
|
|
Floor6 = 97,
|
||
|
|
Floor7 = 98,
|
||
|
|
Floor8 = 99,
|
||
|
|
Floor9 = 100,
|
||
|
|
Floor10 = 101,
|
||
|
|
VWall2 = 112,
|
||
|
|
HWall2 = 113,
|
||
|
|
Corner2 = 114,
|
||
|
|
DWall2 = 115,
|
||
|
|
DArch2 = 116,
|
||
|
|
VWallEnd2 = 117,
|
||
|
|
HWallEnd2 = 118,
|
||
|
|
HArchEnd2 = 119,
|
||
|
|
VArchEnd2 = 120,
|
||
|
|
HArchVWall2 = 121,
|
||
|
|
VArch2 = 122,
|
||
|
|
HArch2 = 123,
|
||
|
|
Floor2 = 124,
|
||
|
|
HWallVArch2 = 125,
|
||
|
|
Pillar3 = 126,
|
||
|
|
Pillar4 = 127,
|
||
|
|
Pillar5 = 128,
|
||
|
|
VWall3 = 129,
|
||
|
|
HWall3 = 130,
|
||
|
|
Corner3 = 131,
|
||
|
|
DWall3 = 132,
|
||
|
|
DArch3 = 133,
|
||
|
|
VWallEnd3 = 134,
|
||
|
|
HWallEnd3 = 135,
|
||
|
|
HArchEnd3 = 136,
|
||
|
|
VArchEnd3 = 137,
|
||
|
|
HArchVWall3 = 138,
|
||
|
|
VArch3 = 139,
|
||
|
|
HArch3 = 140,
|
||
|
|
Floor3 = 141,
|
||
|
|
HWallVArch3 = 142,
|
||
|
|
Pillar6 = 143,
|
||
|
|
Pillar7 = 144,
|
||
|
|
Pillar8 = 145,
|
||
|
|
VWall4 = 146,
|
||
|
|
HWall4 = 147,
|
||
|
|
Corner4 = 148,
|
||
|
|
DWall4 = 149,
|
||
|
|
DArch4 = 150,
|
||
|
|
VWallEnd4 = 151,
|
||
|
|
HWallEnd4 = 152,
|
||
|
|
HArchEnd4 = 153,
|
||
|
|
VArchEnd4 = 154,
|
||
|
|
HArchVWall4 = 155,
|
||
|
|
VArch4 = 156,
|
||
|
|
HArch4 = 157,
|
||
|
|
Floor4 = 158,
|
||
|
|
HWallVArch4 = 159,
|
||
|
|
Pillar9 = 160,
|
||
|
|
Pillar10 = 161,
|
||
|
|
Pillar11 = 162,
|
||
|
|
Floor11 = 163,
|
||
|
|
Floor12 = 164,
|
||
|
|
Floor13 = 165,
|
||
|
|
Floor14 = 166,
|
||
|
4 years ago
|
PillarHalf = 167,
|
||
|
4 years ago
|
VWall8 = 173,
|
||
|
|
VWall9 = 174,
|
||
|
|
VWall10 = 175,
|
||
|
|
VWall11 = 176,
|
||
|
|
VWall12 = 177,
|
||
|
|
VWall13 = 178,
|
||
|
|
HWall8 = 179,
|
||
|
|
HWall9 = 180,
|
||
|
|
HWall10 = 181,
|
||
|
|
HWall11 = 182,
|
||
|
|
HWall12 = 183,
|
||
|
|
HWall13 = 184,
|
||
|
|
VArch6 = 185,
|
||
|
|
VArch7 = 186,
|
||
|
|
HArch6 = 187,
|
||
|
|
HArch7 = 188,
|
||
|
|
Floor15 = 189,
|
||
|
|
Floor16 = 190,
|
||
|
|
Floor17 = 191,
|
||
|
|
Pillar12 = 192,
|
||
|
|
Floor18 = 193,
|
||
|
|
Floor19 = 194,
|
||
|
|
Floor20 = 195,
|
||
|
|
Floor21 = 196,
|
||
|
|
Floor22 = 197,
|
||
|
|
Floor23 = 198,
|
||
|
|
VDemon = 199,
|
||
|
|
HDemon = 200,
|
||
|
|
VSuccubus = 201,
|
||
|
|
HSuccubus = 202,
|
||
|
4 years ago
|
Shadow1 = 203,
|
||
|
|
Shadow2 = 204,
|
||
|
|
Shadow3 = 205,
|
||
|
|
Shadow4 = 206,
|
||
|
|
Shadow5 = 207,
|
||
|
|
Shadow6 = 208,
|
||
|
|
Shadow7 = 209,
|
||
|
|
Shadow8 = 210,
|
||
|
|
Shadow9 = 211,
|
||
|
|
Shadow10 = 212,
|
||
|
|
Shadow11 = 213,
|
||
|
|
Shadow12 = 214,
|
||
|
|
Shadow13 = 215,
|
||
|
|
Shadow14 = 216,
|
||
|
|
Shadow15 = 217,
|
||
|
4 years ago
|
// clang-format on
|
||
|
|
};
|
||
|
|
|
||
|
5 years ago
|
void InitCryptPieces()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < MAXDUNY; j++) {
|
||
|
|
for (int i = 0; i < MAXDUNX; i++) {
|
||
|
4 years ago
|
if (dPiece[i][j] == 76) {
|
||
|
5 years ago
|
dSpecial[i][j] = 1;
|
||
|
4 years ago
|
} else if (dPiece[i][j] == 79) {
|
||
|
5 years ago
|
dSpecial[i][j] = 2;
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void ApplyCryptShadowsPatterns()
|
||
|
7 years ago
|
{
|
||
|
4 years ago
|
for (int j = 1; j < DMAXY; j++) {
|
||
|
|
for (int i = 1; i < DMAXX; i++) {
|
||
|
5 years ago
|
switch (dungeon[i][j]) {
|
||
|
4 years ago
|
case DArch:
|
||
|
|
case DArch2:
|
||
|
|
case DArch3:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow1;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow2;
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow3;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case HWallEnd:
|
||
|
|
case HWallEnd2:
|
||
|
|
case HWallEnd3:
|
||
|
|
case HWallEnd4:
|
||
|
|
case Pillar:
|
||
|
|
case Pillar2:
|
||
|
|
case Pillar3:
|
||
|
|
case Pillar5:
|
||
|
|
case Pillar9:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow4;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow5;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case HArchEnd:
|
||
|
|
case HArchEnd2:
|
||
|
|
case HArchEnd3:
|
||
|
|
case HArchEnd4:
|
||
|
|
case HWallVArch:
|
||
|
|
case HWallVArch2:
|
||
|
|
case HWallVArch3:
|
||
|
|
case HWallVArch4:
|
||
|
|
case VArch:
|
||
|
|
case VArch4:
|
||
|
|
case VArch5:
|
||
|
|
case VArch6:
|
||
|
|
case VArch7:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow1;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow2;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case VArchEnd:
|
||
|
|
case VArchEnd2:
|
||
|
|
case VArchEnd4:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow4;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow5;
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow3;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case HArch:
|
||
|
|
case HArch2:
|
||
|
|
case HArchVWall:
|
||
|
|
case HArchVWall2:
|
||
|
|
case HArchVWall3:
|
||
|
|
case HArchVWall4:
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow3;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case HArch5:
|
||
|
|
case HArch6:
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow6;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case VArch2:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow9;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow10;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case VArchEnd3:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = CryptTile::Shadow11;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = CryptTile::Shadow12;
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow3;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case VArch3:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow13;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow14;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case HArch3:
|
||
|
|
case HArch4:
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow15;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case Pillar6:
|
||
|
|
case Pillar8:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = CryptTile::Shadow11;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = CryptTile::Shadow12;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case DArch4:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow1;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow2;
|
||
|
|
if (dungeon[i][j - 1] == Floor)
|
||
|
|
dungeon[i][j - 1] = Shadow15;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case Pillar11:
|
||
|
|
case Pillar12:
|
||
|
|
case PillarHalf:
|
||
|
|
if (dungeon[i - 1][j] == Floor)
|
||
|
|
dungeon[i - 1][j] = Shadow7;
|
||
|
|
if (dungeon[i - 1][j - 1] == Floor)
|
||
|
|
dungeon[i - 1][j - 1] = Shadow8;
|
||
|
7 years ago
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void ApplyShadowsPatterns()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
uint8_t sd[2][2];
|
||
|
8 years ago
|
|
||
|
5 years ago
|
for (int y = 1; y < DMAXY; y++) {
|
||
|
|
for (int x = 1; x < DMAXX; x++) {
|
||
|
7 years ago
|
sd[0][0] = BSTYPES[dungeon[x][y]];
|
||
|
|
sd[1][0] = BSTYPES[dungeon[x - 1][y]];
|
||
|
|
sd[0][1] = BSTYPES[dungeon[x][y - 1]];
|
||
|
|
sd[1][1] = BSTYPES[dungeon[x - 1][y - 1]];
|
||
|
7 years ago
|
|
||
|
5 years ago
|
for (const auto &shadow : SPATS) {
|
||
|
|
if (shadow.strig != sd[0][0])
|
||
|
|
continue;
|
||
|
|
if (shadow.s1 != 0 && shadow.s1 != sd[1][1])
|
||
|
|
continue;
|
||
|
|
if (shadow.s2 != 0 && shadow.s2 != sd[0][1])
|
||
|
|
continue;
|
||
|
|
if (shadow.s3 != 0 && shadow.s3 != sd[1][0])
|
||
|
|
continue;
|
||
|
|
|
||
|
4 years ago
|
if (shadow.nv1 != 0 && !Protected.test(x - 1, y - 1)) {
|
||
|
5 years ago
|
dungeon[x - 1][y - 1] = shadow.nv1;
|
||
|
5 years ago
|
}
|
||
|
4 years ago
|
if (shadow.nv2 != 0 && !Protected.test(x, y - 1)) {
|
||
|
5 years ago
|
dungeon[x][y - 1] = shadow.nv2;
|
||
|
5 years ago
|
}
|
||
|
4 years ago
|
if (shadow.nv3 != 0 && !Protected.test(x - 1, y)) {
|
||
|
5 years ago
|
dungeon[x - 1][y] = shadow.nv3;
|
||
|
5 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
8 years ago
|
|
||
|
5 years ago
|
for (int y = 1; y < DMAXY; y++) {
|
||
|
|
for (int x = 1; x < DMAXX; x++) {
|
||
|
4 years ago
|
if (Protected.test(x - 1, y))
|
||
|
4 years ago
|
continue;
|
||
|
|
|
||
|
|
if (dungeon[x - 1][y] == 139) {
|
||
|
5 years ago
|
uint8_t tnv3 = 139;
|
||
|
4 years ago
|
if (IsAnyOf(dungeon[x][y], DFence, VFenceEnd, VFence, HWallVFence, HArchVFence, HArchVDoor)) {
|
||
|
8 years ago
|
tnv3 = 141;
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
dungeon[x - 1][y] = tnv3;
|
||
|
8 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[x - 1][y] == HArchShadow) {
|
||
|
|
uint8_t tnv3 = HArchShadow;
|
||
|
|
if (IsAnyOf(dungeon[x][y], DFence, VFenceEnd, VFence, HWallVFence, HArchVFence, HArchVDoor)) {
|
||
|
|
tnv3 = HArchShadow2;
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
dungeon[x - 1][y] = tnv3;
|
||
|
8 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[x - 1][y] == HWallShadow) {
|
||
|
|
uint8_t tnv3 = HWallShadow;
|
||
|
|
if (IsAnyOf(dungeon[x][y], DFence, VFenceEnd, VFence, HWallVFence, HArchVFence, HArchVDoor)) {
|
||
|
|
tnv3 = HWallShadow2;
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
dungeon[x - 1][y] = tnv3;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
4 years ago
|
bool CanReplaceTile(uint8_t replace, Point tile)
|
||
|
|
{
|
||
|
|
if (replace < 84 || replace > 100) {
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
// BUGFIX: p2 is a workaround for a bug, only p1 should have been used (fixing this breaks compatability)
|
||
|
|
constexpr auto ComparisonWithBoundsCheck = [](Point p1, Point p2) {
|
||
|
|
return (p1.x >= 0 && p1.x < DMAXX && p1.y >= 0 && p1.y < DMAXY)
|
||
|
|
&& (p2.x >= 0 && p2.x < DMAXX && p2.y >= 0 && p2.y < DMAXY)
|
||
|
|
&& (dungeon[p1.x][p1.y] >= 84 && dungeon[p2.x][p2.y] <= 100);
|
||
|
|
};
|
||
|
|
if (ComparisonWithBoundsCheck(tile + Direction::NorthWest, tile + Direction::NorthWest)
|
||
|
|
|| ComparisonWithBoundsCheck(tile + Direction::SouthEast, tile + Direction::NorthWest)
|
||
|
|
|| ComparisonWithBoundsCheck(tile + Direction::SouthWest, tile + Direction::NorthWest)
|
||
|
|
|| ComparisonWithBoundsCheck(tile + Direction::NorthEast, tile + Direction::NorthWest)) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
4 years ago
|
void PlaceMiniSetRandom(const Miniset &miniset, int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
int sw = miniset.size.width;
|
||
|
|
int sh = miniset.size.height;
|
||
|
5 years ago
|
|
||
|
|
for (int sy = 0; sy < DMAXY - sh; sy++) {
|
||
|
|
for (int sx = 0; sx < DMAXX - sw; sx++) {
|
||
|
4 years ago
|
if (!miniset.matches({ sx, sy }, false))
|
||
|
4 years ago
|
continue;
|
||
|
4 years ago
|
if (!CanReplaceTile(miniset.replace[0][0], { sx, sy }))
|
||
|
4 years ago
|
continue;
|
||
|
|
if (GenerateRnd(100) >= rndper)
|
||
|
|
continue;
|
||
|
4 years ago
|
miniset.place({ sx, sy });
|
||
|
5 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
4 years ago
|
void PlaceMiniSetRandom1x1(uint8_t search, uint8_t replace, int rndper)
|
||
|
|
{
|
||
|
4 years ago
|
PlaceMiniSetRandom({ { 1, 1 }, { search }, { replace } }, rndper);
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void FillFloor()
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
4 years ago
|
if (!Protected.test(i, j) && dungeon[i][j] == Tile::Floor) {
|
||
|
5 years ago
|
int rv = GenerateRnd(3);
|
||
|
7 years ago
|
|
||
|
|
if (rv == 1)
|
||
|
|
dungeon[i][j] = 162;
|
||
|
|
if (rv == 2)
|
||
|
|
dungeon[i][j] = 163;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void LoadQuestSetPieces()
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
if (Quests[Q_BUTCHER].IsAvailable()) {
|
||
|
4 years ago
|
pSetPiece = LoadFileInMem<uint16_t>("Levels\\L1Data\\rnd6.DUN");
|
||
|
5 years ago
|
} else if (Quests[Q_SKELKING].IsAvailable() && !gbIsMultiplayer) {
|
||
|
4 years ago
|
pSetPiece = LoadFileInMem<uint16_t>("Levels\\L1Data\\SKngDO.DUN");
|
||
|
5 years ago
|
} else if (Quests[Q_LTBANNER].IsAvailable()) {
|
||
|
4 years ago
|
pSetPiece = LoadFileInMem<uint16_t>("Levels\\L1Data\\Banner2.DUN");
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void InitDungeonPieces()
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < MAXDUNY; j++) {
|
||
|
|
for (int i = 0; i < MAXDUNX; i++) {
|
||
|
5 years ago
|
int8_t pc;
|
||
|
4 years ago
|
if (IsAnyOf(dPiece[i][j], 11, 70, 320, 210, 340, 417)) {
|
||
|
7 years ago
|
pc = 1;
|
||
|
4 years ago
|
} else if (IsAnyOf(dPiece[i][j], 10, 248, 324, 343, 330, 420)) {
|
||
|
7 years ago
|
pc = 2;
|
||
|
4 years ago
|
} else if (dPiece[i][j] == 252) {
|
||
|
6 years ago
|
pc = 3;
|
||
|
4 years ago
|
} else if (dPiece[i][j] == 254) {
|
||
|
7 years ago
|
pc = 4;
|
||
|
4 years ago
|
} else if (dPiece[i][j] == 258) {
|
||
|
5 years ago
|
pc = 5;
|
||
|
4 years ago
|
} else if (dPiece[i][j] == 266) {
|
||
|
5 years ago
|
pc = 6;
|
||
|
7 years ago
|
} else {
|
||
|
|
continue;
|
||
|
|
}
|
||
|
6 years ago
|
dSpecial[i][j] = pc;
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void InitDungeonFlags()
|
||
|
8 years ago
|
{
|
||
|
4 years ago
|
memset(dungeon, 0, sizeof(dungeon));
|
||
|
|
Protected.reset();
|
||
|
|
Chamber.reset();
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void MapRoom(int x, int y, int width, int height)
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < height; j++) {
|
||
|
|
for (int i = 0; i < width; i++) {
|
||
|
4 years ago
|
dungeon[x + i][y + j] = Tile::VWall;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
bool CheckRoom(int x, int y, int width, int height)
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < height; j++) {
|
||
|
|
for (int i = 0; i < width; i++) {
|
||
|
5 years ago
|
if (i + x < 0 || i + x >= DMAXX || j + y < 0 || j + y >= DMAXY) {
|
||
|
5 years ago
|
return false;
|
||
|
5 years ago
|
}
|
||
|
|
if (dungeon[i + x][j + y] != 0) {
|
||
|
5 years ago
|
return false;
|
||
|
5 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
7 years ago
|
|
||
|
5 years ago
|
return true;
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void GenerateRoom(int x, int y, int w, int h, int dir)
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
int dirProb = GenerateRnd(4);
|
||
|
5 years ago
|
int num = 0;
|
||
|
7 years ago
|
|
||
|
5 years ago
|
bool ran;
|
||
|
5 years ago
|
if ((dir == 1 && dirProb == 0) || (dir != 1 && dirProb != 0)) {
|
||
|
5 years ago
|
int cw;
|
||
|
|
int ch;
|
||
|
|
int cx1;
|
||
|
|
int cy1;
|
||
|
7 years ago
|
do {
|
||
|
5 years ago
|
cw = (GenerateRnd(5) + 2) & ~1;
|
||
|
|
ch = (GenerateRnd(5) + 2) & ~1;
|
||
|
7 years ago
|
cx1 = x - cw;
|
||
|
5 years ago
|
cy1 = h / 2 + y - ch / 2;
|
||
|
4 years ago
|
ran = CheckRoom(cx1 - 1, cy1 - 1, ch + 2, cw + 1); /// BUGFIX: swap args 3 and 4 ("ch+2" and "cw+1") (workaround applied below)
|
||
|
7 years ago
|
num++;
|
||
|
5 years ago
|
} while (!ran && num < 20);
|
||
|
7 years ago
|
|
||
|
5 years ago
|
if (ran)
|
||
|
4 years ago
|
MapRoom(cx1, cy1, std::min(DMAXX - cx1, cw), std::min(DMAXX - cy1, ch));
|
||
|
5 years ago
|
int cx2 = x + w;
|
||
|
5 years ago
|
bool ran2 = CheckRoom(cx2, cy1 - 1, cw + 1, ch + 2);
|
||
|
5 years ago
|
if (ran2)
|
||
|
5 years ago
|
MapRoom(cx2, cy1, cw, ch);
|
||
|
5 years ago
|
if (ran)
|
||
|
5 years ago
|
GenerateRoom(cx1, cy1, cw, ch, 1);
|
||
|
5 years ago
|
if (ran2)
|
||
|
5 years ago
|
GenerateRoom(cx2, cy1, cw, ch, 1);
|
||
|
5 years ago
|
return;
|
||
|
7 years ago
|
}
|
||
|
5 years ago
|
|
||
|
5 years ago
|
int width;
|
||
|
|
int height;
|
||
|
|
int rx;
|
||
|
|
int ry;
|
||
|
5 years ago
|
do {
|
||
|
5 years ago
|
width = (GenerateRnd(5) + 2) & ~1;
|
||
|
|
height = (GenerateRnd(5) + 2) & ~1;
|
||
|
5 years ago
|
rx = w / 2 + x - width / 2;
|
||
|
|
ry = y - height;
|
||
|
5 years ago
|
ran = CheckRoom(rx - 1, ry - 1, width + 2, height + 1);
|
||
|
5 years ago
|
num++;
|
||
|
5 years ago
|
} while (!ran && num < 20);
|
||
|
5 years ago
|
|
||
|
5 years ago
|
if (ran)
|
||
|
5 years ago
|
MapRoom(rx, ry, width, height);
|
||
|
5 years ago
|
int ry2 = y + h;
|
||
|
5 years ago
|
bool ran2 = CheckRoom(rx - 1, ry2, width + 2, height + 1);
|
||
|
5 years ago
|
if (ran2)
|
||
|
5 years ago
|
MapRoom(rx, ry2, width, height);
|
||
|
5 years ago
|
if (ran)
|
||
|
5 years ago
|
GenerateRoom(rx, ry, width, height, 0);
|
||
|
5 years ago
|
if (ran2)
|
||
|
5 years ago
|
GenerateRoom(rx, ry2, width, height, 0);
|
||
|
7 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void FirstRoom()
|
||
|
7 years ago
|
{
|
||
|
4 years ago
|
VerticalLayout = GenerateRnd(2) == 0;
|
||
|
4 years ago
|
HasChamber1 = (GenerateRnd(2) != 0);
|
||
|
|
HasChamber2 = (GenerateRnd(2) != 0);
|
||
|
|
HasChamber3 = (GenerateRnd(2) != 0);
|
||
|
|
|
||
|
|
if (!HasChamber1 || !HasChamber3)
|
||
|
|
HasChamber2 = true;
|
||
|
4 years ago
|
|
||
|
|
if (VerticalLayout) {
|
||
|
5 years ago
|
int ys = 1;
|
||
|
|
int ye = DMAXY - 1;
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (HasChamber1)
|
||
|
5 years ago
|
MapRoom(15, 1, 10, 10);
|
||
|
7 years ago
|
else
|
||
|
|
ys = 18;
|
||
|
|
|
||
|
4 years ago
|
if (HasChamber2)
|
||
|
5 years ago
|
MapRoom(15, 15, 10, 10);
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
5 years ago
|
MapRoom(15, 29, 10, 10);
|
||
|
7 years ago
|
else
|
||
|
|
ye = 22;
|
||
|
|
|
||
|
5 years ago
|
for (int y = ys; y < ye; y++) {
|
||
|
4 years ago
|
dungeon[17][y] = Tile::VWall;
|
||
|
|
dungeon[18][y] = Tile::VWall;
|
||
|
|
dungeon[19][y] = Tile::VWall;
|
||
|
|
dungeon[20][y] = Tile::VWall;
|
||
|
|
dungeon[21][y] = Tile::VWall;
|
||
|
|
dungeon[22][y] = Tile::VWall;
|
||
|
7 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
if (HasChamber1)
|
||
|
5 years ago
|
GenerateRoom(15, 1, 10, 10, 0);
|
||
|
4 years ago
|
if (HasChamber2)
|
||
|
5 years ago
|
GenerateRoom(15, 15, 10, 10, 0);
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
5 years ago
|
GenerateRoom(15, 29, 10, 10, 0);
|
||
|
7 years ago
|
} else {
|
||
|
5 years ago
|
int xs = 1;
|
||
|
|
int xe = DMAXX - 1;
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (HasChamber1)
|
||
|
5 years ago
|
MapRoom(1, 15, 10, 10);
|
||
|
7 years ago
|
else
|
||
|
|
xs = 18;
|
||
|
|
|
||
|
4 years ago
|
if (HasChamber2)
|
||
|
5 years ago
|
MapRoom(15, 15, 10, 10);
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
5 years ago
|
MapRoom(29, 15, 10, 10);
|
||
|
7 years ago
|
else
|
||
|
|
xe = 22;
|
||
|
|
|
||
|
5 years ago
|
for (int x = xs; x < xe; x++) {
|
||
|
4 years ago
|
dungeon[x][17] = Tile::VWall;
|
||
|
|
dungeon[x][18] = Tile::VWall;
|
||
|
|
dungeon[x][19] = Tile::VWall;
|
||
|
|
dungeon[x][20] = Tile::VWall;
|
||
|
|
dungeon[x][21] = Tile::VWall;
|
||
|
|
dungeon[x][22] = Tile::VWall;
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
if (HasChamber1)
|
||
|
5 years ago
|
GenerateRoom(1, 15, 10, 10, 1);
|
||
|
4 years ago
|
if (HasChamber2)
|
||
|
5 years ago
|
GenerateRoom(15, 15, 10, 10, 1);
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
5 years ago
|
GenerateRoom(29, 15, 10, 10, 1);
|
||
|
7 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
int FindArea()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
int rv = 0;
|
||
|
8 years ago
|
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::VWall)
|
||
|
8 years ago
|
rv++;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
|
||
|
8 years ago
|
return rv;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void MakeDungeon()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
5 years ago
|
int i2 = i * 2;
|
||
|
|
int j2 = j * 2;
|
||
|
|
L5dungeon[i2][j2] = dungeon[i][j];
|
||
|
|
L5dungeon[i2][j2 + 1] = dungeon[i][j];
|
||
|
|
L5dungeon[i2 + 1][j2] = dungeon[i][j];
|
||
|
|
L5dungeon[i2 + 1][j2 + 1] = dungeon[i][j];
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void MakeDmt()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)
|
||
|
8 years ago
|
dungeon[i][j] = 22;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
|
||
|
5 years ago
|
int dmty = 1;
|
||
|
|
for (int j = 0; dmty <= 77; j++, dmty += 2) {
|
||
|
|
int dmtx = 1;
|
||
|
|
for (int i = 0; dmtx <= 77; i++, dmtx += 2) {
|
||
|
|
int val = 8 * L5dungeon[dmtx + 1][dmty + 1]
|
||
|
6 years ago
|
+ 4 * L5dungeon[dmtx][dmty + 1]
|
||
|
|
+ 2 * L5dungeon[dmtx + 1][dmty]
|
||
|
|
+ L5dungeon[dmtx][dmty];
|
||
|
5 years ago
|
dungeon[i][j] = L5ConvTbl[val];
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
int HorizontalWallOk(int i, int j)
|
||
|
8 years ago
|
{
|
||
|
8 years ago
|
int x;
|
||
|
7 years ago
|
for (x = 1; dungeon[i + x][j] == 13; x++) {
|
||
|
4 years ago
|
if (dungeon[i + x][j - 1] != 13 || dungeon[i + x][j + 1] != 13 || Protected.test(i + x, j) || Chamber.test(i + x, j))
|
||
|
8 years ago
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
bool wallok = false;
|
||
|
7 years ago
|
if (dungeon[i + x][j] >= 3 && dungeon[i + x][j] <= 7)
|
||
|
5 years ago
|
wallok = true;
|
||
|
7 years ago
|
if (dungeon[i + x][j] >= 16 && dungeon[i + x][j] <= 24)
|
||
|
5 years ago
|
wallok = true;
|
||
|
7 years ago
|
if (dungeon[i + x][j] == 22)
|
||
|
5 years ago
|
wallok = false;
|
||
|
7 years ago
|
if (x == 1)
|
||
|
5 years ago
|
wallok = false;
|
||
|
8 years ago
|
|
||
|
7 years ago
|
if (wallok)
|
||
|
8 years ago
|
return x;
|
||
|
5 years ago
|
|
||
|
|
return -1;
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
int VerticalWallOk(int i, int j)
|
||
|
8 years ago
|
{
|
||
|
8 years ago
|
int y;
|
||
|
7 years ago
|
for (y = 1; dungeon[i][j + y] == 13; y++) {
|
||
|
4 years ago
|
if (dungeon[i - 1][j + y] != 13 || dungeon[i + 1][j + y] != 13 || Protected.test(i, j + y) || Chamber.test(i, j + y))
|
||
|
8 years ago
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
bool wallok = false;
|
||
|
7 years ago
|
if (dungeon[i][j + y] >= 3 && dungeon[i][j + y] <= 7)
|
||
|
5 years ago
|
wallok = true;
|
||
|
7 years ago
|
if (dungeon[i][j + y] >= 16 && dungeon[i][j + y] <= 24)
|
||
|
5 years ago
|
wallok = true;
|
||
|
7 years ago
|
if (dungeon[i][j + y] == 22)
|
||
|
5 years ago
|
wallok = false;
|
||
|
7 years ago
|
if (y == 1)
|
||
|
5 years ago
|
wallok = false;
|
||
|
8 years ago
|
|
||
|
7 years ago
|
if (wallok)
|
||
|
8 years ago
|
return y;
|
||
|
5 years ago
|
|
||
|
|
return -1;
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void HorizontalWall(int i, int j, Tile p, int dx)
|
||
|
8 years ago
|
{
|
||
|
4 years ago
|
Tile dt = Tile::HWall;
|
||
|
|
Tile wt = Tile::HDoor;
|
||
|
8 years ago
|
|
||
|
5 years ago
|
switch (GenerateRnd(4)) {
|
||
|
4 years ago
|
case 2: // Add arch
|
||
|
4 years ago
|
dt = Tile::HArch;
|
||
|
|
wt = Tile::HArch;
|
||
|
|
if (p == Tile::HWall)
|
||
|
|
p = Tile::HArch;
|
||
|
|
else if (p == Tile::DWall)
|
||
|
|
p = Tile::HArchVWall;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case 3: // Add Fence
|
||
|
4 years ago
|
dt = Tile::HFence;
|
||
|
|
if (p == Tile::HWall)
|
||
|
|
p = Tile::HFence;
|
||
|
|
else if (p == Tile::DWall)
|
||
|
|
p = Tile::HFenceVWall;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
default:
|
||
|
7 years ago
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
if (GenerateRnd(6) == 5)
|
||
|
4 years ago
|
wt = Tile::HArch;
|
||
|
8 years ago
|
|
||
|
|
dungeon[i][j] = p;
|
||
|
|
|
||
|
5 years ago
|
for (int xx = 1; xx < dx; xx++) {
|
||
|
7 years ago
|
dungeon[i + xx][j] = dt;
|
||
|
8 years ago
|
}
|
||
|
8 years ago
|
|
||
|
5 years ago
|
int xx = GenerateRnd(dx - 1) + 1;
|
||
|
7 years ago
|
|
||
|
4 years ago
|
dungeon[i + xx][j] = wt;
|
||
|
4 years ago
|
if (wt == Tile::HDoor) {
|
||
|
4 years ago
|
Protected.set(i + xx, j);
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
4 years ago
|
void VerticalWall(int i, int j, Tile p, int dy)
|
||
|
7 years ago
|
{
|
||
|
4 years ago
|
Tile dt = Tile::VWall;
|
||
|
|
Tile wt = Tile::VDoor;
|
||
|
7 years ago
|
|
||
|
5 years ago
|
switch (GenerateRnd(4)) {
|
||
|
4 years ago
|
case 2: // Add arch
|
||
|
4 years ago
|
dt = Tile::VArch;
|
||
|
|
wt = Tile::VArch;
|
||
|
|
if (p == Tile::VWall)
|
||
|
|
p = Tile::VArch;
|
||
|
|
else if (p == Tile::DWall)
|
||
|
|
p = Tile::HWallVArch;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
case 3: // Add Fence
|
||
|
4 years ago
|
dt = Tile::VFence;
|
||
|
|
if (p == Tile::VWall)
|
||
|
|
p = Tile::VFence;
|
||
|
|
else if (p == Tile::DWall)
|
||
|
|
p = Tile::HWallVFence;
|
||
|
7 years ago
|
break;
|
||
|
4 years ago
|
default:
|
||
|
7 years ago
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
if (GenerateRnd(6) == 5)
|
||
|
4 years ago
|
wt = Tile::VArch;
|
||
|
7 years ago
|
|
||
|
|
dungeon[i][j] = p;
|
||
|
|
|
||
|
5 years ago
|
for (int yy = 1; yy < dy; yy++) {
|
||
|
7 years ago
|
dungeon[i][j + yy] = dt;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
int yy = GenerateRnd(dy - 1) + 1;
|
||
|
7 years ago
|
|
||
|
4 years ago
|
dungeon[i][j + yy] = wt;
|
||
|
4 years ago
|
if (wt == Tile::VDoor) {
|
||
|
4 years ago
|
Protected.set(i, j + yy);
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void AddWall()
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
4 years ago
|
if (!Protected.test(i, j) && !Chamber.test(i, j)) {
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::Corner) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int x = HorizontalWallOk(i, j);
|
||
|
5 years ago
|
if (x != -1) {
|
||
|
4 years ago
|
HorizontalWall(i, j, Tile::HWall, x);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::Corner) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int y = VerticalWallOk(i, j);
|
||
|
5 years ago
|
if (y != -1) {
|
||
|
4 years ago
|
VerticalWall(i, j, Tile::VWall, y);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::VWallEnd) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int x = HorizontalWallOk(i, j);
|
||
|
5 years ago
|
if (x != -1) {
|
||
|
4 years ago
|
HorizontalWall(i, j, Tile::DWall, x);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::HWallEnd) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int y = VerticalWallOk(i, j);
|
||
|
5 years ago
|
if (y != -1) {
|
||
|
4 years ago
|
VerticalWall(i, j, Tile::DWall, y);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::HWall) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int x = HorizontalWallOk(i, j);
|
||
|
5 years ago
|
if (x != -1) {
|
||
|
4 years ago
|
HorizontalWall(i, j, Tile::HWall, x);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::VWall) {
|
||
|
5 years ago
|
AdvanceRndSeed();
|
||
|
5 years ago
|
int y = VerticalWallOk(i, j);
|
||
|
5 years ago
|
if (y != -1) {
|
||
|
4 years ago
|
VerticalWall(i, j, Tile::VWall, y);
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void GenerateChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftflag, bool rightflag)
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
if (topflag) {
|
||
|
4 years ago
|
dungeon[sx + 2][sy] = Tile::HArch;
|
||
|
|
dungeon[sx + 3][sy] = Tile::HArch;
|
||
|
|
dungeon[sx + 4][sy] = Tile::Corner;
|
||
|
|
dungeon[sx + 7][sy] = Tile::VArchEnd;
|
||
|
|
dungeon[sx + 8][sy] = Tile::HArch;
|
||
|
|
dungeon[sx + 9][sy] = Tile::HWall;
|
||
|
7 years ago
|
}
|
||
|
5 years ago
|
if (bottomflag) {
|
||
|
7 years ago
|
sy += 11;
|
||
|
4 years ago
|
dungeon[sx + 2][sy] = Tile::HArchVWall;
|
||
|
|
dungeon[sx + 3][sy] = Tile::HArch;
|
||
|
|
dungeon[sx + 4][sy] = Tile::HArchEnd;
|
||
|
|
dungeon[sx + 7][sy] = Tile::DArch;
|
||
|
|
dungeon[sx + 8][sy] = Tile::HArch;
|
||
|
|
if (dungeon[sx + 9][sy] != Tile::DWall) {
|
||
|
|
dungeon[sx + 9][sy] = Tile::DirtCorner;
|
||
|
7 years ago
|
}
|
||
|
|
sy -= 11;
|
||
|
|
}
|
||
|
5 years ago
|
if (leftflag) {
|
||
|
4 years ago
|
dungeon[sx][sy + 2] = Tile::VArch;
|
||
|
|
dungeon[sx][sy + 3] = Tile::VArch;
|
||
|
|
dungeon[sx][sy + 4] = Tile::Corner;
|
||
|
|
dungeon[sx][sy + 7] = Tile::HArchEnd;
|
||
|
|
dungeon[sx][sy + 8] = Tile::VArch;
|
||
|
|
dungeon[sx][sy + 9] = Tile::VWall;
|
||
|
7 years ago
|
}
|
||
|
5 years ago
|
if (rightflag) {
|
||
|
7 years ago
|
sx += 11;
|
||
|
4 years ago
|
dungeon[sx][sy + 2] = Tile::HWallVArch;
|
||
|
|
dungeon[sx][sy + 3] = Tile::VArch;
|
||
|
|
dungeon[sx][sy + 4] = Tile::VArchEnd;
|
||
|
|
dungeon[sx][sy + 7] = Tile::DArch;
|
||
|
|
dungeon[sx][sy + 8] = Tile::VArch;
|
||
|
|
if (dungeon[sx][sy + 9] != Tile::DWall) {
|
||
|
|
dungeon[sx][sy + 9] = Tile::DirtCorner;
|
||
|
7 years ago
|
}
|
||
|
|
sx -= 11;
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
for (int j = 1; j < 11; j++) {
|
||
|
|
for (int i = 1; i < 11; i++) {
|
||
|
4 years ago
|
dungeon[i + sx][j + sy] = Tile::Floor;
|
||
|
4 years ago
|
Chamber.set(i + sx, j + sy);
|
||
|
7 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
dungeon[sx + 4][sy + 4] = Tile::Pillar;
|
||
|
|
dungeon[sx + 7][sy + 4] = Tile::Pillar;
|
||
|
|
dungeon[sx + 4][sy + 7] = Tile::Pillar;
|
||
|
|
dungeon[sx + 7][sy + 7] = Tile::Pillar;
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void GenerateHall(int x1, int y1, int x2, int y2)
|
||
|
8 years ago
|
{
|
||
|
7 years ago
|
if (y1 == y2) {
|
||
|
5 years ago
|
for (int i = x1; i < x2; i++) {
|
||
|
4 years ago
|
dungeon[i][y1] = Tile::HArch;
|
||
|
|
dungeon[i][y1 + 3] = Tile::HArch;
|
||
|
7 years ago
|
}
|
||
|
5 years ago
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
for (int i = y1; i < y2; i++) {
|
||
|
4 years ago
|
dungeon[x1][i] = Tile::VArch;
|
||
|
|
dungeon[x1 + 3][i] = Tile::VArch;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void FixTilesPatterns()
|
||
|
8 years ago
|
{
|
||
|
6 years ago
|
// BUGFIX: Bounds checks are required in all loop bodies.
|
||
|
|
// See https://github.com/diasurgical/devilutionX/pull/401
|
||
|
|
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
6 years ago
|
if (i + 1 < DMAXX) {
|
||
|
|
if (dungeon[i][j] == 2 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 23;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 18;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i + 1][j] == 2)
|
||
|
|
dungeon[i + 1][j] = 7;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 24;
|
||
|
|
}
|
||
|
|
if (j + 1 < DMAXY) {
|
||
|
|
if (dungeon[i][j] == 1 && dungeon[i][j + 1] == 22)
|
||
|
|
dungeon[i][j + 1] = 24;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i][j + 1] == 1)
|
||
|
|
dungeon[i][j + 1] = 6;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i][j + 1] == 22)
|
||
|
|
dungeon[i][j + 1] = 19;
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
6 years ago
|
if (i + 1 < DMAXX) {
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i + 1][j] == 19)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 20;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 23;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i + 1][j] == 24)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 19 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 20;
|
||
|
|
if (dungeon[i][j] == 2 && dungeon[i + 1][j] == 19)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 19 && dungeon[i + 1][j] == 1)
|
||
|
|
dungeon[i + 1][j] = 6;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i + 1][j] == 19)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 2 && dungeon[i + 1][j] == 1)
|
||
|
|
dungeon[i + 1][j] = 6;
|
||
|
|
if (dungeon[i][j] == 3 && dungeon[i + 1][j] == 22)
|
||
|
|
dungeon[i + 1][j] = 24;
|
||
|
|
if (dungeon[i][j] == 21 && dungeon[i + 1][j] == 1)
|
||
|
|
dungeon[i + 1][j] = 6;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i + 1][j] == 1)
|
||
|
|
dungeon[i + 1][j] = 6;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i + 1][j] == 24)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 4 && dungeon[i + 1][j] == 16)
|
||
|
|
dungeon[i + 1][j] = 17;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i + 1][j] == 13)
|
||
|
|
dungeon[i + 1][j] = 17;
|
||
|
|
if (dungeon[i][j] == 2 && dungeon[i + 1][j] == 24)
|
||
|
|
dungeon[i + 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 2 && dungeon[i + 1][j] == 13)
|
||
|
|
dungeon[i + 1][j] = 17;
|
||
|
|
}
|
||
|
|
if (i > 0) {
|
||
|
|
if (dungeon[i][j] == 23 && dungeon[i - 1][j] == 22)
|
||
|
|
dungeon[i - 1][j] = 19;
|
||
|
|
if (dungeon[i][j] == 19 && dungeon[i - 1][j] == 23)
|
||
|
|
dungeon[i - 1][j] = 21;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i - 1][j] == 22)
|
||
|
|
dungeon[i - 1][j] = 24;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i - 1][j] == 23)
|
||
|
|
dungeon[i - 1][j] = 21;
|
||
|
|
}
|
||
|
|
if (j + 1 < DMAXY) {
|
||
|
|
if (dungeon[i][j] == 1 && dungeon[i][j + 1] == 2)
|
||
|
|
dungeon[i][j + 1] = 7;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j + 1] == 18)
|
||
|
|
dungeon[i][j + 1] = 21;
|
||
|
|
if (dungeon[i][j] == 18 && dungeon[i][j + 1] == 2)
|
||
|
|
dungeon[i][j + 1] = 7;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j + 1] == 2)
|
||
|
|
dungeon[i][j + 1] = 7;
|
||
|
|
if (dungeon[i][j] == 21 && dungeon[i][j + 1] == 2)
|
||
|
|
dungeon[i][j + 1] = 7;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j + 1] == 22)
|
||
|
|
dungeon[i][j + 1] = 24;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j + 1] == 13)
|
||
|
|
dungeon[i][j + 1] = 16;
|
||
|
|
if (dungeon[i][j] == 1 && dungeon[i][j + 1] == 13)
|
||
|
|
dungeon[i][j + 1] = 16;
|
||
|
|
if (dungeon[i][j] == 13 && dungeon[i][j + 1] == 16)
|
||
|
|
dungeon[i][j + 1] = 17;
|
||
|
|
}
|
||
|
|
if (j > 0) {
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j - 1] == 22)
|
||
|
|
dungeon[i][j - 1] = 7;
|
||
|
|
if (dungeon[i][j] == 6 && dungeon[i][j - 1] == 22)
|
||
|
|
dungeon[i][j - 1] = 24;
|
||
|
|
if (dungeon[i][j] == 7 && dungeon[i][j - 1] == 24)
|
||
|
|
dungeon[i][j - 1] = 21;
|
||
|
|
if (dungeon[i][j] == 18 && dungeon[i][j - 1] == 24)
|
||
|
|
dungeon[i][j - 1] = 21;
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
8 years ago
|
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
6 years ago
|
if (j + 1 < DMAXY && dungeon[i][j] == 4 && dungeon[i][j + 1] == 2)
|
||
|
7 years ago
|
dungeon[i][j + 1] = 7;
|
||
|
6 years ago
|
if (i + 1 < DMAXX && dungeon[i][j] == 2 && dungeon[i + 1][j] == 19)
|
||
|
7 years ago
|
dungeon[i + 1][j] = 21;
|
||
|
6 years ago
|
if (j + 1 < DMAXY && dungeon[i][j] == 18 && dungeon[i][j + 1] == 22)
|
||
|
7 years ago
|
dungeon[i][j + 1] = 20;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void Substitution()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int y = 0; y < DMAXY; y++) {
|
||
|
|
for (int x = 0; x < DMAXX; x++) {
|
||
|
5 years ago
|
if (GenerateRnd(4) == 0) {
|
||
|
5 years ago
|
uint8_t c = L5BTYPES[dungeon[x][y]];
|
||
|
4 years ago
|
if (c != 0 && !Protected.test(x, y)) {
|
||
|
5 years ago
|
int rv = GenerateRnd(16);
|
||
|
|
int i = -1;
|
||
|
7 years ago
|
while (rv >= 0) {
|
||
|
5 years ago
|
i++;
|
||
|
|
if (i == sizeof(L5BTYPES)) {
|
||
|
8 years ago
|
i = 0;
|
||
|
5 years ago
|
}
|
||
|
|
if (c == L5BTYPES[i]) {
|
||
|
8 years ago
|
rv--;
|
||
|
5 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
6 years ago
|
// BUGFIX: Add `&& y > 0` to the if statement. (fixed)
|
||
|
|
if (i == 89 && y > 0) {
|
||
|
4 years ago
|
if (L5BTYPES[dungeon[x][y - 1]] != 79 || Protected.test(x, y - 1))
|
||
|
8 years ago
|
i = 79;
|
||
|
|
else
|
||
|
7 years ago
|
dungeon[x][y - 1] = 90;
|
||
|
8 years ago
|
}
|
||
|
6 years ago
|
// BUGFIX: Add `&& x + 1 < DMAXX` to the if statement. (fixed)
|
||
|
|
if (i == 91 && x + 1 < DMAXX) {
|
||
|
4 years ago
|
if (L5BTYPES[dungeon[x + 1][y]] != 80 || Protected.test(x + 1, y))
|
||
|
8 years ago
|
i = 80;
|
||
|
|
else
|
||
|
7 years ago
|
dungeon[x + 1][y] = 92;
|
||
|
8 years ago
|
}
|
||
|
8 years ago
|
dungeon[x][y] = i;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
4 years ago
|
Point SelectChamber()
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
int chamber;
|
||
|
|
if (!HasChamber1)
|
||
|
|
chamber = GenerateRnd(2) != 0 ? 3 : 2;
|
||
|
|
else if (!HasChamber2)
|
||
|
|
chamber = GenerateRnd(2) != 0 ? 1 : 3;
|
||
|
|
else if (!HasChamber3)
|
||
|
|
chamber = GenerateRnd(2) != 0 ? 1 : 2;
|
||
|
|
else
|
||
|
|
chamber = GenerateRnd(3) + 1;
|
||
|
|
|
||
|
|
switch (chamber) {
|
||
|
|
case 1:
|
||
|
|
return VerticalLayout ? Point { 16, 2 } : Point { 2, 16 };
|
||
|
|
case 3:
|
||
|
|
return VerticalLayout ? Point { 16, 30 } : Point { 30, 16 };
|
||
|
|
default:
|
||
|
|
return { 16, 16 };
|
||
|
|
}
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void SetCryptRoom()
|
||
|
|
{
|
||
|
|
Point position = SelectChamber();
|
||
|
7 years ago
|
|
||
|
4 years ago
|
UberRow = 2 * position.x + 6;
|
||
|
|
UberCol = 2 * position.y + 8;
|
||
|
|
IsUberRoomOpened = false;
|
||
|
|
IsUberLeverActivated = false;
|
||
|
7 years ago
|
|
||
|
4 years ago
|
SetPiece = { position, UberRoomPattern.size };
|
||
|
7 years ago
|
|
||
|
4 years ago
|
UberRoomPattern.place(position, true);
|
||
|
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
void SetCornerRoom()
|
||
|
|
{
|
||
|
|
Point position = SelectChamber();
|
||
|
7 years ago
|
|
||
|
4 years ago
|
SetPiece = { position, CornerstoneRoomPattern.size };
|
||
|
7 years ago
|
|
||
|
4 years ago
|
CornerstoneRoomPattern.place(position, true);
|
||
|
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
void FillChambers()
|
||
|
|
{
|
||
|
|
if (!VerticalLayout) {
|
||
|
|
if (HasChamber1)
|
||
|
|
GenerateChamber(0, 14, false, false, false, true);
|
||
|
|
|
||
|
4 years ago
|
if (!HasChamber3)
|
||
|
|
GenerateChamber(14, 14, false, false, true, false);
|
||
|
|
else if (!HasChamber1)
|
||
|
|
GenerateChamber(14, 14, false, false, false, true);
|
||
|
|
else if (HasChamber1 && HasChamber2 && HasChamber3)
|
||
|
|
GenerateChamber(14, 14, false, false, true, true);
|
||
|
8 years ago
|
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
|
GenerateChamber(28, 14, false, false, true, false);
|
||
|
|
if (HasChamber1 && HasChamber2)
|
||
|
|
GenerateHall(12, 18, 14, 18);
|
||
|
|
if (HasChamber2 && HasChamber3)
|
||
|
|
GenerateHall(26, 18, 28, 18);
|
||
|
4 years ago
|
if (!HasChamber2)
|
||
|
4 years ago
|
GenerateHall(12, 18, 28, 18);
|
||
|
|
} else {
|
||
|
|
if (HasChamber1)
|
||
|
|
GenerateChamber(14, 0, false, true, false, false);
|
||
|
|
|
||
|
4 years ago
|
if (!HasChamber3)
|
||
|
|
GenerateChamber(14, 14, true, false, false, false);
|
||
|
|
else if (!HasChamber1)
|
||
|
|
GenerateChamber(14, 14, false, true, false, false);
|
||
|
|
else if (HasChamber1 && HasChamber2 && HasChamber3)
|
||
|
|
GenerateChamber(14, 14, true, true, false, false);
|
||
|
8 years ago
|
|
||
|
4 years ago
|
if (HasChamber3)
|
||
|
|
GenerateChamber(14, 28, true, false, false, false);
|
||
|
|
if (HasChamber1 && HasChamber2)
|
||
|
|
GenerateHall(18, 12, 18, 14);
|
||
|
|
if (HasChamber2 && HasChamber3)
|
||
|
|
GenerateHall(18, 26, 18, 28);
|
||
|
4 years ago
|
if (!HasChamber2)
|
||
|
4 years ago
|
GenerateHall(18, 12, 18, 28);
|
||
|
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CRYPT) {
|
||
|
|
if (currlevel == 24) {
|
||
|
|
SetCryptRoom();
|
||
|
|
} else if (currlevel == 21) {
|
||
|
|
SetCornerRoom();
|
||
|
8 years ago
|
}
|
||
|
4 years ago
|
} else if (pSetPiece != nullptr) {
|
||
|
|
SetSetPieceRoom(SelectChamber(), Tile::Floor);
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void FixTransparency()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
int yy = 16;
|
||
|
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
int xx = 16;
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
6 years ago
|
// BUGFIX: Should check for `j > 0` first. (fixed)
|
||
|
|
if (dungeon[i][j] == 23 && j > 0 && dungeon[i][j - 1] == 18) {
|
||
|
7 years ago
|
dTransVal[xx + 1][yy] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx + 1][yy + 1] = dTransVal[xx][yy];
|
||
|
8 years ago
|
}
|
||
|
6 years ago
|
// BUGFIX: Should check for `i + 1 < DMAXY` first. (fixed)
|
||
|
|
if (dungeon[i][j] == 24 && i + 1 < DMAXY && dungeon[i + 1][j] == 19) {
|
||
|
7 years ago
|
dTransVal[xx][yy + 1] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx + 1][yy + 1] = dTransVal[xx][yy];
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
if (dungeon[i][j] == 18) {
|
||
|
7 years ago
|
dTransVal[xx + 1][yy] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx + 1][yy + 1] = dTransVal[xx][yy];
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
if (dungeon[i][j] == 19) {
|
||
|
7 years ago
|
dTransVal[xx][yy + 1] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx + 1][yy + 1] = dTransVal[xx][yy];
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
if (dungeon[i][j] == 20) {
|
||
|
7 years ago
|
dTransVal[xx + 1][yy] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx][yy + 1] = dTransVal[xx][yy];
|
||
|
|
dTransVal[xx + 1][yy + 1] = dTransVal[xx][yy];
|
||
|
8 years ago
|
}
|
||
|
8 years ago
|
xx += 2;
|
||
|
8 years ago
|
}
|
||
|
8 years ago
|
yy += 2;
|
||
|
8 years ago
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void FixDirtTiles()
|
||
|
8 years ago
|
{
|
||
|
4 years ago
|
for (int j = 0; j < DMAXY - 1; j++) {
|
||
|
|
for (int i = 0; i < DMAXX - 1; i++) {
|
||
|
|
if (dungeon[i][j] == 21 && dungeon[i + 1][j] != 19) {
|
||
|
|
dungeon[i][j] = 202;
|
||
|
|
}
|
||
|
|
if (dungeon[i][j] == 19 && dungeon[i + 1][j] != 19) {
|
||
|
|
dungeon[i][j] = 200;
|
||
|
|
}
|
||
|
|
if (dungeon[i][j] == 24 && dungeon[i + 1][j] != 19) {
|
||
|
|
dungeon[i][j] = 205;
|
||
|
|
}
|
||
|
|
if (dungeon[i][j] == 18 && dungeon[i][j + 1] != 18) {
|
||
|
|
dungeon[i][j] = 199;
|
||
|
|
}
|
||
|
|
if (dungeon[i][j] == 21 && dungeon[i][j + 1] != 18) {
|
||
|
|
dungeon[i][j] = 202;
|
||
|
|
}
|
||
|
|
if (dungeon[i][j] == 23 && dungeon[i][j + 1] != 18) {
|
||
|
|
dungeon[i][j] = 204;
|
||
|
7 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
5 years ago
|
}
|
||
|
4 years ago
|
}
|
||
|
5 years ago
|
|
||
|
4 years ago
|
void FixCryptDirtTiles()
|
||
|
|
{
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY - 1; j++) {
|
||
|
|
for (int i = 0; i < DMAXX - 1; i++) {
|
||
|
|
if (dungeon[i][j] == 19)
|
||
|
|
dungeon[i][j] = 83;
|
||
|
|
if (dungeon[i][j] == 21)
|
||
|
|
dungeon[i][j] = 85;
|
||
|
|
if (dungeon[i][j] == 23)
|
||
|
|
dungeon[i][j] = 87;
|
||
|
|
if (dungeon[i][j] == 24)
|
||
|
|
dungeon[i][j] = 88;
|
||
|
|
if (dungeon[i][j] == 18)
|
||
|
|
dungeon[i][j] = 82;
|
||
|
7 years ago
|
}
|
||
|
7 years ago
|
}
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void FixCornerTiles()
|
||
|
8 years ago
|
{
|
||
|
5 years ago
|
for (int j = 1; j < DMAXY - 1; j++) {
|
||
|
|
for (int i = 1; i < DMAXX - 1; i++) {
|
||
|
4 years ago
|
if (!Protected.test(i, j) && dungeon[i][j] == 17 && dungeon[i - 1][j] == Tile::Floor && dungeon[i][j - 1] == Tile::VWall) {
|
||
|
7 years ago
|
dungeon[i][j] = 16;
|
||
|
4 years ago
|
// BUGFIX: Set tile as Protected
|
||
|
8 years ago
|
}
|
||
|
4 years ago
|
if (dungeon[i][j] == 202 && dungeon[i + 1][j] == Tile::Floor && dungeon[i][j + 1] == Tile::VWall) {
|
||
|
7 years ago
|
dungeon[i][j] = 8;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
8 years ago
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
void CryptStatues(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
PlaceMiniSetRandom1x1(Tile::VWall, CryptTile::VDemon, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWall, CryptTile::VSuccubus, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWall, CryptTile::HDemon, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWall, CryptTile::HSuccubus, rndper);
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptCracked(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
// clang-format off
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWall, CryptTile::VWall2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWall, CryptTile::HWall2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Corner, CryptTile::Corner2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DWall, CryptTile::DWall2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DArch, CryptTile::DArch2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWallEnd, CryptTile::VWallEnd2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallEnd, CryptTile::HWallEnd2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchEnd, CryptTile::HArchEnd2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArchEnd, CryptTile::VArchEnd2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchVWall, CryptTile::HArchVWall2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallVArch, CryptTile::HWallVArch2, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar, CryptTile::Pillar3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar1, CryptTile::Pillar4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar2, CryptTile::Pillar5, rndper);
|
||
|
|
// clang-format on
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptBroken(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
// clang-format off
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWall, CryptTile::VWall3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWall, CryptTile::HWall3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Corner, CryptTile::Corner3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DWall, CryptTile::DWall3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DArch, CryptTile::DArch3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWallEnd, CryptTile::VWallEnd3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallEnd, CryptTile::HWallEnd3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchEnd, CryptTile::HArchEnd3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArchEnd, CryptTile::VArchEnd3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchVWall, CryptTile::HArchVWall3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallVArch, CryptTile::HWallVArch3, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar, CryptTile::Pillar6, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar1, CryptTile::Pillar7, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar2, CryptTile::Pillar8, rndper);
|
||
|
|
// clang-format on
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptLeaking(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
// clang-format off
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWall, CryptTile::VWall4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWall, CryptTile::HWall4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Corner, CryptTile::Corner4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DWall, CryptTile::DWall4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::DArch, CryptTile::DArch4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VWallEnd, CryptTile::VWallEnd4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallEnd, CryptTile::HWallEnd4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchEnd, CryptTile::HArchEnd4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArchEnd, CryptTile::VArchEnd4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArchVWall, CryptTile::HArchVWall4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HWallVArch, CryptTile::HWallVArch4, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar, CryptTile::Pillar9, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar1, CryptTile::Pillar10, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar2, CryptTile::Pillar11, rndper);
|
||
|
|
// clang-format on
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptSubstitions1(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch6, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch6, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch7, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch7, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall5, CryptTile::VWall8, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall5, CryptTile::VWall9, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall6, CryptTile::VWall10, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall6, CryptTile::VWall11, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall7, CryptTile::VWall12, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::VWall7, CryptTile::VWall13, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall8, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall9, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall10, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall11, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall12, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::HWall5, CryptTile::HWall13, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor7, CryptTile::Floor15, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor7, CryptTile::Floor16, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor6, CryptTile::Floor17, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Pillar, CryptTile::Pillar12, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor8, CryptTile::Floor18, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor8, CryptTile::Floor19, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor9, CryptTile::Floor20, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor10, CryptTile::Floor21, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor10, CryptTile::Floor22, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(CryptTile::Floor10, CryptTile::Floor23, rndper);
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptSubstitions2(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
PlaceMiniSetRandom(CryptPillar1, rndper);
|
||
|
|
PlaceMiniSetRandom(CryptPillar2, rndper);
|
||
|
|
PlaceMiniSetRandom(CryptPillar3, rndper);
|
||
|
|
PlaceMiniSetRandom(CryptPillar4, rndper);
|
||
|
|
PlaceMiniSetRandom(CryptPillar5, rndper);
|
||
|
|
PlaceMiniSetRandom(CryptStar, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor11, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor12, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor13, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor14, rndper);
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void CryptFloor(int rndper)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor6, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor7, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor8, rndper);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::Floor, CryptTile::Floor9, rndper);
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
bool PlaceCathedralStairs(lvl_entry entry)
|
||
|
|
{
|
||
|
|
bool success = true;
|
||
|
4 years ago
|
std::optional<Point> position;
|
||
|
4 years ago
|
|
||
|
|
// Place poison water entrance
|
||
|
|
if (Quests[Q_PWATER].IsAvailable()) {
|
||
|
4 years ago
|
position = PlaceMiniSet(PWATERIN, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
if (!position) {
|
||
|
4 years ago
|
success = false;
|
||
|
4 years ago
|
} else {
|
||
|
|
int8_t t = TransVal;
|
||
|
|
TransVal = 0;
|
||
|
|
Point miniPosition = *position;
|
||
|
4 years ago
|
DRLG_MRectTrans({ miniPosition + Displacement { 0, 2 }, { 5, 2 } });
|
||
|
4 years ago
|
TransVal = t;
|
||
|
|
Quests[Q_PWATER].position = miniPosition.megaToWorld() + Displacement { 5, 7 };
|
||
|
|
if (entry == ENTRY_RTNLVL)
|
||
|
|
ViewPosition = Quests[Q_PWATER].position;
|
||
|
|
}
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
|
// Place stairs up
|
||
|
4 years ago
|
position = PlaceMiniSet(MyPlayer->pOriginalCathedral ? L5STAIRSUP : STAIRSUP, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
if (!position) {
|
||
|
4 years ago
|
if (MyPlayer->pOriginalCathedral)
|
||
|
|
return false;
|
||
|
|
success = false;
|
||
|
4 years ago
|
} else if (entry == ENTRY_MAIN) {
|
||
|
|
ViewPosition = position->megaToWorld() + Displacement { 3, 4 };
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
|
// Place stairs down
|
||
|
4 years ago
|
if (Quests[Q_LTBANNER].IsAvailable()) {
|
||
|
|
if (entry == ENTRY_PREV)
|
||
|
4 years ago
|
ViewPosition = SetPiece.position.megaToWorld() + Displacement { 4, 12 };
|
||
|
4 years ago
|
} else {
|
||
|
4 years ago
|
position = PlaceMiniSet(STAIRSDOWN, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
if (!position) {
|
||
|
|
success = false;
|
||
|
|
} else if (entry == ENTRY_PREV) {
|
||
|
|
ViewPosition = position->megaToWorld() + Displacement { 3, 3 };
|
||
|
|
}
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
|
return success;
|
||
|
|
}
|
||
|
|
|
||
|
|
bool PlaceCryptStairs(lvl_entry entry)
|
||
|
|
{
|
||
|
|
bool success = true;
|
||
|
4 years ago
|
std::optional<Point> position;
|
||
|
4 years ago
|
|
||
|
|
// Place stairs up
|
||
|
4 years ago
|
position = PlaceMiniSet(currlevel != 21 ? L5STAIRSUPHF : L5STAIRSTOWN, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
if (!position) {
|
||
|
4 years ago
|
success = false;
|
||
|
4 years ago
|
} else if (entry == ENTRY_MAIN || entry == ENTRY_TWARPDN) {
|
||
|
|
ViewPosition = position->megaToWorld() + Displacement { 3, 5 };
|
||
|
|
}
|
||
|
4 years ago
|
|
||
|
|
// Place stairs down
|
||
|
|
if (currlevel != 24) {
|
||
|
4 years ago
|
position = PlaceMiniSet(L5STAIRSDOWN, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
if (!position)
|
||
|
4 years ago
|
success = false;
|
||
|
4 years ago
|
else if (entry == ENTRY_PREV)
|
||
|
|
ViewPosition = position->megaToWorld() + Displacement { 3, 7 };
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
|
return success;
|
||
|
|
}
|
||
|
|
|
||
|
|
bool PlaceStairs(lvl_entry entry)
|
||
|
|
{
|
||
|
|
if (leveltype == DTYPE_CRYPT) {
|
||
|
|
return PlaceCryptStairs(entry);
|
||
|
|
}
|
||
|
|
|
||
|
|
return PlaceCathedralStairs(entry);
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
void GenerateLevel(lvl_entry entry)
|
||
|
7 years ago
|
{
|
||
|
5 years ago
|
int minarea = 761;
|
||
|
7 years ago
|
switch (currlevel) {
|
||
|
|
case 1:
|
||
|
|
minarea = 533;
|
||
|
|
break;
|
||
|
|
case 2:
|
||
|
|
minarea = 693;
|
||
|
|
break;
|
||
|
7 years ago
|
default:
|
||
|
|
break;
|
||
|
7 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
LoadQuestSetPieces();
|
||
|
|
|
||
|
4 years ago
|
while (true) {
|
||
|
7 years ago
|
DRLG_InitTrans();
|
||
|
|
|
||
|
|
do {
|
||
|
5 years ago
|
InitDungeonFlags();
|
||
|
|
FirstRoom();
|
||
|
|
} while (FindArea() < minarea);
|
||
|
|
|
||
|
|
MakeDungeon();
|
||
|
|
MakeDmt();
|
||
|
|
FillChambers();
|
||
|
|
FixTilesPatterns();
|
||
|
|
AddWall();
|
||
|
5 years ago
|
FloodTransparencyValues(13);
|
||
|
4 years ago
|
if (PlaceStairs(entry))
|
||
|
|
break;
|
||
|
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
FreeQuestSetPieces();
|
||
|
|
|
||
|
5 years ago
|
for (int j = 0; j < DMAXY; j++) {
|
||
|
|
for (int i = 0; i < DMAXX; i++) {
|
||
|
4 years ago
|
if (dungeon[i][j] == Tile::EntranceStairs) {
|
||
|
7 years ago
|
int xx = 2 * i + 16; /* todo: fix loop */
|
||
|
|
int yy = 2 * j + 16;
|
||
|
|
DRLG_CopyTrans(xx, yy + 1, xx, yy);
|
||
|
|
DRLG_CopyTrans(xx + 1, yy + 1, xx + 1, yy);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
5 years ago
|
FixTransparency();
|
||
|
4 years ago
|
if (leveltype == DTYPE_CRYPT) {
|
||
|
|
FixCryptDirtTiles();
|
||
|
|
} else {
|
||
|
|
FixDirtTiles();
|
||
|
|
}
|
||
|
5 years ago
|
FixCornerTiles();
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CRYPT) {
|
||
|
4 years ago
|
CryptStatues(10);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::VArch, CryptTile::VArch5, 95);
|
||
|
|
PlaceMiniSetRandom1x1(Tile::HArch, CryptTile::HArch5, 95);
|
||
|
|
PlaceMiniSetRandom(VWallSection, 100);
|
||
|
|
PlaceMiniSetRandom(HWallSection, 100);
|
||
|
|
PlaceMiniSetRandom(CryptFloorLave, 60);
|
||
|
4 years ago
|
ApplyCryptShadowsPatterns();
|
||
|
5 years ago
|
switch (currlevel) {
|
||
|
7 years ago
|
case 21:
|
||
|
4 years ago
|
CryptCracked(30);
|
||
|
|
CryptBroken(15);
|
||
|
|
CryptLeaking(5);
|
||
|
4 years ago
|
ApplyCryptShadowsPatterns();
|
||
|
4 years ago
|
CryptFloor(10);
|
||
|
|
CryptSubstitions1(5);
|
||
|
|
CryptSubstitions2(20);
|
||
|
7 years ago
|
break;
|
||
|
|
case 22:
|
||
|
4 years ago
|
CryptFloor(10);
|
||
|
|
CryptSubstitions1(10);
|
||
|
|
CryptSubstitions2(20);
|
||
|
|
CryptCracked(30);
|
||
|
|
CryptBroken(20);
|
||
|
|
CryptLeaking(10);
|
||
|
4 years ago
|
ApplyCryptShadowsPatterns();
|
||
|
7 years ago
|
break;
|
||
|
|
case 23:
|
||
|
4 years ago
|
CryptFloor(10);
|
||
|
|
CryptSubstitions1(15);
|
||
|
|
CryptSubstitions2(30);
|
||
|
|
CryptCracked(30);
|
||
|
|
CryptBroken(20);
|
||
|
|
CryptLeaking(15);
|
||
|
4 years ago
|
ApplyCryptShadowsPatterns();
|
||
|
7 years ago
|
break;
|
||
|
|
default:
|
||
|
4 years ago
|
CryptFloor(10);
|
||
|
|
CryptSubstitions1(20);
|
||
|
|
CryptSubstitions2(30);
|
||
|
|
CryptCracked(30);
|
||
|
|
CryptBroken(20);
|
||
|
|
CryptLeaking(20);
|
||
|
4 years ago
|
ApplyCryptShadowsPatterns();
|
||
|
7 years ago
|
break;
|
||
|
7 years ago
|
}
|
||
|
4 years ago
|
} else {
|
||
|
|
Substitution();
|
||
|
5 years ago
|
ApplyShadowsPatterns();
|
||
|
4 years ago
|
|
||
|
|
int numt = GenerateRnd(5) + 5;
|
||
|
|
for (int i = 0; i < numt; i++) {
|
||
|
4 years ago
|
PlaceMiniSet(LAMPS, DMAXX * DMAXY, true);
|
||
|
4 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
FillFloor();
|
||
|
5 years ago
|
}
|
||
|
7 years ago
|
|
||
|
4 years ago
|
memcpy(pdungeon, dungeon, sizeof(pdungeon));
|
||
|
7 years ago
|
|
||
|
4 years ago
|
DRLG_CheckQuests(SetPiece.position);
|
||
|
7 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
void Pass3()
|
||
|
5 years ago
|
{
|
||
|
|
DRLG_LPass3(22 - 1);
|
||
|
4 years ago
|
|
||
|
|
if (leveltype == DTYPE_CRYPT)
|
||
|
|
InitCryptPieces();
|
||
|
|
else
|
||
|
|
InitDungeonPieces();
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
5 years ago
|
} // namespace
|
||
|
|
|
||
|
4 years ago
|
void CreateL5Dungeon(uint32_t rseed, lvl_entry entry)
|
||
|
5 years ago
|
{
|
||
|
4 years ago
|
SetRndSeed(rseed);
|
||
|
5 years ago
|
|
||
|
4 years ago
|
UberRow = 0;
|
||
|
|
UberCol = 0;
|
||
|
5 years ago
|
|
||
|
4 years ago
|
GenerateLevel(entry);
|
||
|
5 years ago
|
|
||
|
5 years ago
|
Pass3();
|
||
|
5 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CRYPT) {
|
||
|
|
for (int j = dminPosition.y; j < dmaxPosition.y; j++) {
|
||
|
|
for (int i = dminPosition.x; i < dmaxPosition.x; i++) {
|
||
|
4 years ago
|
if (dPiece[i][j] == 289) {
|
||
|
4 years ago
|
UberRow = i;
|
||
|
|
UberCol = j;
|
||
|
|
}
|
||
|
4 years ago
|
if (dPiece[i][j] == 316) {
|
||
|
4 years ago
|
CornerStone.position = { i, j };
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
|
void LoadPreL1Dungeon(const char *path)
|
||
|
|
{
|
||
|
4 years ago
|
memset(dungeon, 22, sizeof(dungeon));
|
||
|
5 years ago
|
|
||
|
|
auto dunData = LoadFileInMem<uint16_t>(path);
|
||
|
4 years ago
|
PlaceDunTiles(dunData.get(), { 0, 0 }, Tile::Floor);
|
||
|
5 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CATHEDRAL)
|
||
|
|
FillFloor();
|
||
|
5 years ago
|
|
||
|
4 years ago
|
memcpy(pdungeon, dungeon, sizeof(pdungeon));
|
||
|
5 years ago
|
}
|
||
|
|
|
||
|
4 years ago
|
void LoadL1Dungeon(const char *path, Point spawn)
|
||
|
7 years ago
|
{
|
||
|
4 years ago
|
LoadDungeonBase(path, spawn, Tile::Floor, 22);
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CATHEDRAL)
|
||
|
|
FillFloor();
|
||
|
7 years ago
|
|
||
|
4 years ago
|
Pass3();
|
||
|
7 years ago
|
|
||
|
4 years ago
|
if (leveltype == DTYPE_CRYPT)
|
||
|
|
AddCryptObjects(0, 0, MAXDUNX, MAXDUNY);
|
||
|
|
else
|
||
|
|
AddL1Objs(0, 0, MAXDUNX, MAXDUNY);
|
||
|
7 years ago
|
}
|
||
|
7 years ago
|
|
||
|
5 years ago
|
} // namespace devilution
|