Started work on new update
Added some small new map generation features Added "NPCs" and "Quests" (atleast a first experiment for them) Added magic compass to make search for stairs leass annoying Added mostly visual season and weather effects
This commit is contained in:
Andre Schweiger
parent
f6e2d30ab6
commit
3699414dcd
19 changed files with 1324 additions and 253 deletions
568
source/MapGen.c
568
source/MapGen.c
|
|
@ -3,6 +3,9 @@
|
|||
int w = 0;
|
||||
int h = 0;
|
||||
|
||||
u8 randomTile[] = {0, 0, 0, 0, 0, 0, 0, 1, 1, 2};
|
||||
int randomTileSize = 10;
|
||||
|
||||
float nextFloat(){
|
||||
return (float)rand()/RAND_MAX;
|
||||
}
|
||||
|
|
@ -64,9 +67,14 @@ void newSeed(){
|
|||
srand(time(NULL));
|
||||
}
|
||||
|
||||
void createAndValidateTopMap(int w, int h, u8 * map, u8 * data) {
|
||||
//TODO: Will need to reset entity manager if generation is retried
|
||||
void createAndValidateTopMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
do {
|
||||
createTopMap(w, h, map, data);
|
||||
//reset Entities
|
||||
(&eManager)->lastSlot[level] = 0;
|
||||
(&eManager)->entities[level][0] = nullEntity;
|
||||
|
||||
createTopMap(w, h, level, map, data);
|
||||
|
||||
int count[256]={[0 ... 255] = 0};
|
||||
int i;
|
||||
|
|
@ -81,9 +89,13 @@ void createAndValidateTopMap(int w, int h, u8 * map, u8 * data) {
|
|||
} while (true);
|
||||
}
|
||||
|
||||
void createAndValidateUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 * data) {
|
||||
void createAndValidateUndergroundMap(int w, int h, int depthLevel, int level, u8 * map, u8 * data) {
|
||||
do {
|
||||
createUndergroundMap(w, h, depthLevel, map, data);
|
||||
//reset Entities
|
||||
(&eManager)->lastSlot[level] = 0;
|
||||
(&eManager)->entities[level][0] = nullEntity;
|
||||
|
||||
createUndergroundMap(w, h, depthLevel, level, map, data);
|
||||
|
||||
int count[256]={[0 ... 255] = 0};
|
||||
int i = 0;
|
||||
|
|
@ -92,7 +104,7 @@ void createAndValidateUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 *
|
|||
if (count[TILE_DIRT & 0xff] < 100) continue;
|
||||
switch(depthLevel){
|
||||
case 1: if (count[TILE_IRONORE & 0xff] < 20) continue; break;
|
||||
case 2: if (count[TILE_GOLDORE & 0xff] < 20) continue; break;
|
||||
case 2: if (count[TILE_GOLDORE & 0xff] < 20 || count[TILE_MYCELIUM & 0xff] < 40) continue; break;
|
||||
case 3: if (count[TILE_GEMORE & 0xff] < 20) continue; break;
|
||||
}
|
||||
if (depthLevel < 3) if (count[TILE_STAIRS_DOWN & 0xff] < 2) continue;
|
||||
|
|
@ -101,9 +113,13 @@ void createAndValidateUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 *
|
|||
} while (true);
|
||||
}
|
||||
|
||||
void createAndValidateDungeonMap(int w, int h, u8 * map, u8 * data) {
|
||||
void createAndValidateDungeonMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
do {
|
||||
createDungeonMap(w, h, map, data);
|
||||
//reset Entities
|
||||
(&eManager)->lastSlot[level] = 0;
|
||||
(&eManager)->entities[level][0] = nullEntity;
|
||||
|
||||
createDungeonMap(w, h, level, map, data);
|
||||
|
||||
int count[256]={[0 ... 255] = 0};
|
||||
int i = 0;
|
||||
|
|
@ -115,9 +131,13 @@ void createAndValidateDungeonMap(int w, int h, u8 * map, u8 * data) {
|
|||
} while (true);
|
||||
}
|
||||
|
||||
void createAndValidateSkyMap(int w, int h, u8 * map, u8 * data) {
|
||||
void createAndValidateSkyMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
do {
|
||||
createSkyMap(w, h, map, data);
|
||||
//reset Entities
|
||||
(&eManager)->lastSlot[level] = 0;
|
||||
(&eManager)->entities[level][0] = nullEntity;
|
||||
|
||||
createSkyMap(w, h, level, map, data);
|
||||
|
||||
int count[256]={[0 ... 255] = 0};
|
||||
int i = 0;
|
||||
|
|
@ -131,7 +151,7 @@ void createAndValidateSkyMap(int w, int h, u8 * map, u8 * data) {
|
|||
|
||||
|
||||
|
||||
void createTopMap(int w, int h, u8 * map, u8 * data) {
|
||||
void createTopMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
double* mnoise1 = Noise(w, h, 16);
|
||||
double* mnoise2 = Noise(w, h, 16);
|
||||
double* mnoise3 = Noise(w, h, 16);
|
||||
|
|
@ -185,6 +205,8 @@ void createTopMap(int w, int h, u8 * map, u8 * data) {
|
|||
}
|
||||
}
|
||||
|
||||
createVillage(w, h, level, map, data);
|
||||
|
||||
for (i = 0; i < w * h / 400; ++i) {
|
||||
x = rand()%w;
|
||||
y = rand()%h;
|
||||
|
|
@ -254,7 +276,7 @@ void createTopMap(int w, int h, u8 * map, u8 * data) {
|
|||
return;
|
||||
}
|
||||
|
||||
void createUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 * data) {
|
||||
void createUndergroundMap(int w, int h, int depthLevel, int level, u8 * map, u8 * data) {
|
||||
double* mnoise1 = Noise(w, h, 16);
|
||||
double* mnoise2 = Noise(w, h, 16);
|
||||
double* mnoise3 = Noise(w, h, 16);
|
||||
|
|
@ -270,7 +292,8 @@ void createUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 * data) {
|
|||
double* noise1 = Noise(w, h, 32);
|
||||
double* noise2 = Noise(w, h, 32);
|
||||
|
||||
int x, y;
|
||||
int x,y,i,j,k,xx,yy;
|
||||
|
||||
for(x = 0; x < w; ++x){
|
||||
for(y = 0; y < w; ++y){
|
||||
int i = x + y * w;
|
||||
|
|
@ -307,7 +330,37 @@ void createUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 * data) {
|
|||
}
|
||||
}
|
||||
}
|
||||
int i,j;
|
||||
|
||||
if(depthLevel==3) {
|
||||
createDwarfHouse(w, h, level, map, data);
|
||||
} else if(depthLevel==2) {
|
||||
for (i = 0; i < w * h / 5400; ++i) {
|
||||
int xs = rand()%w;
|
||||
int ys = rand()%h;
|
||||
for (k = 0; k < 10; ++k) {
|
||||
x = xs + (rand()%13) - 6;
|
||||
y = ys + (rand()%13) - 6;
|
||||
for (j = 0; j < 100; ++j) {
|
||||
int xo = x + (rand()%5) - (rand()%5);
|
||||
int yo = y + (rand()%5) - (rand()%5);
|
||||
for (yy = yo - 1;yy <= yo + 1; ++yy){
|
||||
for(xx = xo - 1; xx <= xo + 1; ++xx){
|
||||
if (xx >= 0 && yy >= 0 && xx < w && yy < h) {
|
||||
if (map[xx + yy * w] == TILE_DIRT) {
|
||||
map[xx + yy * w] = TILE_MYCELIUM;
|
||||
if(rand()%20==0) {
|
||||
map[xx + yy * w] = TILE_MUSHROOM_BROWN + rand()%2; //BROWN or RED (=BROWN+1)
|
||||
data[xx + yy * w] = rand()%2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < w * h / 400; ++i) {
|
||||
int x = rand()%w;
|
||||
int y = rand()%h;
|
||||
|
|
@ -357,145 +410,9 @@ void createUndergroundMap(int w, int h,int depthLevel, u8 * map, u8 * data) {
|
|||
|
||||
}
|
||||
|
||||
void createDungeonRoom(int w, int h, bool dragon, u8 * map, u8 * data) {
|
||||
int tries;
|
||||
|
||||
for(tries=0; tries<100; ++tries) {
|
||||
int x = 5+(rand()%(w-10 -10));
|
||||
int y = 5+(rand()%(h-10 -10));
|
||||
int xr;
|
||||
int yr;
|
||||
int wr = 10+(rand()%11);
|
||||
int hr = 10+(rand()&11);
|
||||
int xp;
|
||||
int yp;
|
||||
int i;
|
||||
|
||||
//create Dragonroom
|
||||
if(dragon) {
|
||||
wr = 20;
|
||||
hr = 20;
|
||||
x = 5 + (rand()%2)*(w-5*2-wr);
|
||||
y = 5 + (rand()%2)*(h-5*2-hr);
|
||||
}
|
||||
|
||||
if(x+wr > w-5) wr = (w-5) - x;
|
||||
if(y+hr > h-5) hr = (h-5) - y;
|
||||
|
||||
//check instersection
|
||||
bool allowed = true;
|
||||
for(xr = x-1; xr < x+wr+1; ++xr) {
|
||||
for(yr = y-1; yr < y+hr+1; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
//255 for paths so rooms can overlap paths
|
||||
if(map[i]!=TILE_DUNGEON_WALL && map[i]!=255) {
|
||||
allowed = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!allowed) break;
|
||||
}
|
||||
if(!allowed) continue;
|
||||
|
||||
//create room
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
map[i] = TILE_DUNGEON_FLOOR;
|
||||
}
|
||||
}
|
||||
|
||||
//Create path back to existing stuff
|
||||
xp = x + wr/2;
|
||||
yp = y + hr/2;
|
||||
i = xp + yp * w;
|
||||
bool checkForFloor = false;
|
||||
bool xFirst = (rand()%2)==0;
|
||||
while((checkForFloor && (map[i]!=TILE_DUNGEON_FLOOR && map[i]!=255)) || (!checkForFloor && (map[i]==TILE_DUNGEON_FLOOR || map[i]==255))) {
|
||||
if(checkForFloor) {
|
||||
//make connection
|
||||
map[i] = 255;
|
||||
}
|
||||
|
||||
//move
|
||||
if(xFirst) {
|
||||
if(xp > w/2) --xp;
|
||||
else if(xp < w/2) ++xp;
|
||||
else if(yp > h/2) --yp;
|
||||
else if(yp < h/2) ++yp;
|
||||
else break;
|
||||
} else {
|
||||
if(yp > h/2) --yp;
|
||||
else if(yp < h/2) ++yp;
|
||||
else if(xp > w/2) --xp;
|
||||
else if(xp < w/2) ++xp;
|
||||
else break;
|
||||
}
|
||||
|
||||
i = xp + yp * w;
|
||||
|
||||
//search for end of current room
|
||||
if(!checkForFloor && (map[i]!=TILE_DUNGEON_FLOOR && map[i]!=255)) checkForFloor = true;
|
||||
}
|
||||
|
||||
//dekorate dragon room
|
||||
if(dragon) {
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
if((xr==x+1 || xr==x+wr-2 || yr==y+1 || yr==y+hr-2) && (xr!=x && xr!=x+wr-1 && yr!=y && yr!=y+hr-1)) {
|
||||
map[i] = TILE_MAGIC_BARRIER;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//add Dragon Entity
|
||||
addEntityToList(newDragonEntity((x+wr/2) << 4, (y+hr/2) << 4, 5), &eManager);
|
||||
break;
|
||||
}
|
||||
|
||||
//dekorate room
|
||||
bool lava = (rand()%4)==0;
|
||||
bool pillars = (rand()%4)==0;
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
if(lava && xr > x+1 && xr < x+wr-2 && yr > y+1 && yr < y+hr-2) {
|
||||
map[i] = TILE_LAVA;
|
||||
} else if(pillars && xr > x && xr < x+wr-1 && yr > y && yr < y+hr-1 && xr%2 == 0 && yr%2 == 0) {
|
||||
map[i] = TILE_DUNGEON_WALL;
|
||||
} else {
|
||||
//add magic pillars for dragon barrier
|
||||
if(xr==x+wr/2 && yr==y+hr/2) {
|
||||
int pcount = 0;
|
||||
int i = 0;
|
||||
for (i = 0; i < eManager.lastSlot[5]; ++i) {
|
||||
Entity * e = &eManager.entities[5][i];
|
||||
|
||||
if(e->type == ENTITY_MAGIC_PILLAR) {
|
||||
++pcount;
|
||||
}
|
||||
}
|
||||
if(pcount<8) {
|
||||
addEntityToList(newMagicPillarEntity((xr << 4) + 8, (yr << 4) + 8, 5), &eManager);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if(rand()%50==0) map[i] = TILE_IRONORE + (rand()%3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void createDungeonMap(int w, int h, u8 * map, u8 * data) {
|
||||
void createDungeonMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
hasNPC = false;
|
||||
|
||||
int i, x, y;
|
||||
for(x = 0; x < w; ++x){
|
||||
for(y = 0; y < w; ++y){
|
||||
|
|
@ -504,18 +421,19 @@ void createDungeonMap(int w, int h, u8 * map, u8 * data) {
|
|||
//Startroom
|
||||
if (x >= (w/2-5) && x <= (w/2+5) && y >= (h/2-5) && y <= (h/2+5) ) {
|
||||
map[i] = TILE_DUNGEON_FLOOR;
|
||||
data[i] = randomTile[rand()%randomTileSize];
|
||||
} else {
|
||||
map[i] = TILE_DUNGEON_WALL;
|
||||
data[i] = 0;
|
||||
}
|
||||
data[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//create dragon chamber(only call once and before other rooms)
|
||||
createDungeonRoom(w, h, true, map, data);
|
||||
createDungeonRoom(w, h, true, level, map, data);
|
||||
|
||||
for(i = 0; i < 40; ++i) {
|
||||
createDungeonRoom(w, h, false, map, data);
|
||||
createDungeonRoom(w, h, false, level, map, data);
|
||||
}
|
||||
|
||||
//replace paths with actual dungeon floor
|
||||
|
|
@ -525,6 +443,7 @@ void createDungeonMap(int w, int h, u8 * map, u8 * data) {
|
|||
|
||||
if (map[i]==255) {
|
||||
map[i] = TILE_DUNGEON_FLOOR;
|
||||
data[i] = randomTile[rand()%randomTileSize];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -543,7 +462,7 @@ void createDungeonMap(int w, int h, u8 * map, u8 * data) {
|
|||
map[w/2-1 + (h/2-1) * w] = TILE_DUNGEON_WALL;
|
||||
}
|
||||
|
||||
void createSkyMap(int w, int h, u8 * map, u8 * data) {
|
||||
void createSkyMap(int w, int h, int level, u8 * map, u8 * data) {
|
||||
double* noise1 = Noise(w, h, 8);
|
||||
double* noise2 = Noise(w, h, 8);
|
||||
int x, y;
|
||||
|
|
@ -602,4 +521,341 @@ void createSkyMap(int w, int h, u8 * map, u8 * data) {
|
|||
free(noise1);
|
||||
free(noise2);
|
||||
}
|
||||
|
||||
//"Subgenerators"
|
||||
void findFeatureLocation(int fw, int fh, int * accepted, int aLength, int maxTries, int w, int h, u8 * map, u8 * data) {
|
||||
int leastNonFitting = fw * fh;
|
||||
int tries;
|
||||
|
||||
//find the location with the least non fitting tiles out of some randomly tried ones
|
||||
for(tries=0; tries<maxTries; ++tries) {
|
||||
int x = rand()%(w-fw);
|
||||
int y = rand()%(h-fh);
|
||||
int nonFitting = 0;
|
||||
int xp;
|
||||
int yp;
|
||||
int i;
|
||||
int a;
|
||||
bool fits;
|
||||
|
||||
for(xp=x; xp<x+fw; ++xp) {
|
||||
for(yp=y; yp<y+fh; ++yp) {
|
||||
i = xp + yp * w;
|
||||
|
||||
fits = false;
|
||||
for(a=0; a<aLength; ++a) {
|
||||
if(map[i]==accepted[a]) {
|
||||
fits = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(!fits) {
|
||||
nonFitting++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(nonFitting<leastNonFitting) {
|
||||
featureX = x;
|
||||
featureY = y;
|
||||
leastNonFitting = nonFitting;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void createVillageHouse(int hid, int x, int y, int hw, int hh, int ex, int ey, int w, int h, int level, u8 * map, u8 * data) {
|
||||
//create wall and floor
|
||||
int xp = x;
|
||||
int yp = y;
|
||||
for(xp=x; xp<x+hw; ++xp) {
|
||||
for(yp=y; yp<y+hh; ++yp) {
|
||||
if(xp==x || xp==x+hw-1 || yp==y || yp==y+hh-1) map[xp + yp * w] = TILE_WOOD_WALL;
|
||||
else map[xp + yp * w] = TILE_WOOD_FLOOR;
|
||||
}
|
||||
}
|
||||
|
||||
//recreate entrance
|
||||
map[ex + ey * w] = TILE_WOOD_FLOOR;
|
||||
|
||||
//create npcs
|
||||
if(hid==0) {
|
||||
addEntityToList(newNPCEntity(NPC_GIRL, (x+hw/2) << 4, (y+hh/2) << 4, level), &eManager);
|
||||
} else if(hid==1) {
|
||||
addEntityToList(newNPCEntity(NPC_PRIEST, (x+hw/2) << 4, (y+hh/2) << 4, level), &eManager);
|
||||
} else if(hid==2) {
|
||||
addEntityToList(newNPCEntity(NPC_FARMER, (x+hw/2) << 4, (y+hh/2) << 4, level), &eManager);
|
||||
//TODO: maybe create farm?
|
||||
for(xp=x; xp<x+hw; ++xp) {
|
||||
map[xp + yp * w] = TILE_WHEAT;
|
||||
map[xp + (yp+1) * w] = TILE_WHEAT;
|
||||
}
|
||||
}
|
||||
|
||||
//add Latern Entity
|
||||
int loffx = -12;
|
||||
int loffy = -12;
|
||||
if(hid==2) loffx = 12;
|
||||
addEntityToList(newFurnitureEntity(ITEM_LANTERN, NULL, ((x+hw/2) << 4) + loffx, ((y+hh/2) << 4) + loffy, level), &eManager);
|
||||
}
|
||||
|
||||
void createVillage(int w, int h, int level, u8 * map, u8 * data) {
|
||||
int vw = 17;
|
||||
int vh = 17;
|
||||
int accepted[] = {TILE_GRASS};
|
||||
findFeatureLocation(vw, vh, accepted, 1, 500, w, h, map, data);
|
||||
|
||||
int x = featureX;
|
||||
int y = featureY;
|
||||
int cx = x + vw/2;
|
||||
int cy = y + vh/2;
|
||||
int px;
|
||||
int py;
|
||||
|
||||
int hw;
|
||||
int hh;
|
||||
int hx;
|
||||
int hy;
|
||||
int ex;
|
||||
int ey;
|
||||
|
||||
//"well" in the middle
|
||||
map[(cx-1) + (cy-1) * w] = TILE_SAND;
|
||||
map[(cx+0) + (cy-1) * w] = TILE_SAND;
|
||||
map[(cx+1) + (cy-1) * w] = TILE_SAND;
|
||||
map[(cx-1) + (cy+0) * w] = TILE_SAND;
|
||||
map[(cx+0) + (cy+0) * w] = TILE_WATER;
|
||||
map[(cx+1) + (cy+0) * w] = TILE_SAND;
|
||||
map[(cx-1) + (cy+1) * w] = TILE_SAND;
|
||||
map[(cx+0) + (cy+1) * w] = TILE_SAND;
|
||||
map[(cx+1) + (cy+1) * w] = TILE_SAND;
|
||||
|
||||
//"paths" outwards leading to the "houses"
|
||||
//left
|
||||
px = cx-1;
|
||||
py = cy-1 + rand()%3;
|
||||
while(px>x) {
|
||||
map[px + py * w] = TILE_SAND;
|
||||
--px;
|
||||
}
|
||||
hw = 4 + rand()%2;
|
||||
hh = 4 + rand()%2;
|
||||
hx = px + 1;
|
||||
hy = py - hh + 2 + rand()%(hh-2);
|
||||
ex = px + hw;
|
||||
ey = py;
|
||||
createVillageHouse(0, hx, hy, hw, hh, ex, ey, w, h, level, map, data);
|
||||
|
||||
//top
|
||||
px = cx-1 + rand()%3;
|
||||
py = cy-1;
|
||||
while(py>y) {
|
||||
map[px + py * w] = TILE_SAND;
|
||||
--py;
|
||||
}
|
||||
hw = 5 + rand()%2;
|
||||
hh = 4 + rand()%2;
|
||||
hx = px - hw + 2 + rand()%(hw-2);
|
||||
hy = py + 1;
|
||||
ex = px;
|
||||
ey = py+hh;
|
||||
createVillageHouse(1, hx, hy, hw, hh, ex, ey, w, h, level, map, data);
|
||||
|
||||
//right
|
||||
px = cx+1;
|
||||
py = cy-1 + rand()%3;
|
||||
while(px<x+vw) {
|
||||
map[px + py * w] = TILE_SAND;
|
||||
++px;
|
||||
}
|
||||
hw = 4 + rand()%2;
|
||||
hh = 4 + rand()%2;
|
||||
hx = px - hw;
|
||||
hy = py - hh + 2 + rand()%(hh-2);
|
||||
ex = px - hw;
|
||||
ey = py;
|
||||
createVillageHouse(2, hx, hy, hw, hh, ex, ey, w, h, level, map, data);
|
||||
}
|
||||
|
||||
void createDwarfHouse(int w, int h, int level, u8 * map, u8 * data) {
|
||||
int vw = 7;
|
||||
int vh = 7;
|
||||
int accepted[] = {TILE_ROCK};
|
||||
findFeatureLocation(vw, vh, accepted, 1, 500, w, h, map, data);
|
||||
|
||||
int x = featureX;
|
||||
int y = featureY;
|
||||
int xp;
|
||||
int yp;
|
||||
|
||||
for(xp=x; xp<x+vw; ++xp) {
|
||||
for(yp=y; yp<y+vh; ++yp) {
|
||||
if(xp==x || xp==x+vw-1 || yp==y || yp==y+vh-1) map[xp + yp * w] = TILE_STONE_WALL;
|
||||
else map[xp + yp * w] = TILE_DIRT;
|
||||
}
|
||||
}
|
||||
|
||||
//entrance
|
||||
xp = x+vw/2;
|
||||
map[xp + (yp-1) * w] = TILE_DIRT;
|
||||
|
||||
//pillars
|
||||
map[(x+2) + (y+2) * w] = TILE_STONE_WALL;
|
||||
map[(x+vw-1-2) + (y+2) * w] = TILE_STONE_WALL;
|
||||
|
||||
addEntityToList(newNPCEntity(NPC_DWARF, ((x+vw/2) << 4) + 8, (y+vh/2) << 4, level), &eManager);
|
||||
|
||||
|
||||
addEntityToList(newFurnitureEntity(ITEM_LANTERN, NULL, (x+1+1) << 4, (y+1+3) << 4, level), &eManager);
|
||||
addEntityToList(newFurnitureEntity(ITEM_LANTERN, NULL, (x+vw-1-1) << 4, (y+1+3) << 4, level), &eManager);
|
||||
}
|
||||
|
||||
void createDungeonRoom(int w, int h, bool dragon, int level, u8 * map, u8 * data) {
|
||||
int tries;
|
||||
|
||||
for(tries=0; tries<100; ++tries) {
|
||||
int x = 5+(rand()%(w-10 -10));
|
||||
int y = 5+(rand()%(h-10 -10));
|
||||
int xr;
|
||||
int yr;
|
||||
int wr = 10+(rand()%11);
|
||||
int hr = 10+(rand()&11);
|
||||
int xp;
|
||||
int yp;
|
||||
int i;
|
||||
|
||||
//create Dragonroom
|
||||
if(dragon) {
|
||||
wr = 20;
|
||||
hr = 20;
|
||||
x = 5 + (rand()%2)*(w-5*2-wr);
|
||||
y = 5 + (rand()%2)*(h-5*2-hr);
|
||||
}
|
||||
|
||||
if(x+wr > w-5) wr = (w-5) - x;
|
||||
if(y+hr > h-5) hr = (h-5) - y;
|
||||
|
||||
//check instersection
|
||||
bool allowed = true;
|
||||
for(xr = x-1; xr < x+wr+1; ++xr) {
|
||||
for(yr = y-1; yr < y+hr+1; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
//255 for paths so rooms can overlap paths
|
||||
if(map[i]!=TILE_DUNGEON_WALL && map[i]!=255) {
|
||||
allowed = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!allowed) break;
|
||||
}
|
||||
if(!allowed) continue;
|
||||
|
||||
//create room
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
map[i] = TILE_DUNGEON_FLOOR;
|
||||
data[i] = randomTile[rand()%randomTileSize];
|
||||
}
|
||||
}
|
||||
|
||||
//Create path back to existing stuff
|
||||
xp = x + wr/2;
|
||||
yp = y + hr/2;
|
||||
i = xp + yp * w;
|
||||
bool checkForFloor = false;
|
||||
bool xFirst = (rand()%2)==0;
|
||||
while((checkForFloor && (map[i]!=TILE_DUNGEON_FLOOR && map[i]!=255)) || (!checkForFloor && (map[i]==TILE_DUNGEON_FLOOR || map[i]==255))) {
|
||||
if(checkForFloor) {
|
||||
//make connection
|
||||
map[i] = 255;
|
||||
}
|
||||
|
||||
//move
|
||||
if(xFirst) {
|
||||
if(xp > w/2) --xp;
|
||||
else if(xp < w/2) ++xp;
|
||||
else if(yp > h/2) --yp;
|
||||
else if(yp < h/2) ++yp;
|
||||
else break;
|
||||
} else {
|
||||
if(yp > h/2) --yp;
|
||||
else if(yp < h/2) ++yp;
|
||||
else if(xp > w/2) --xp;
|
||||
else if(xp < w/2) ++xp;
|
||||
else break;
|
||||
}
|
||||
|
||||
i = xp + yp * w;
|
||||
|
||||
//search for end of current room
|
||||
if(!checkForFloor && (map[i]!=TILE_DUNGEON_FLOOR && map[i]!=255)) checkForFloor = true;
|
||||
}
|
||||
|
||||
//dekorate dragon room
|
||||
if(dragon) {
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
if((xr==x+1 || xr==x+wr-2 || yr==y+1 || yr==y+hr-2) && (xr!=x && xr!=x+wr-1 && yr!=y && yr!=y+hr-1)) {
|
||||
map[i] = TILE_MAGIC_BARRIER;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//add Dragon Entity
|
||||
addEntityToList(newDragonEntity((x+wr/2) << 4, (y+hr/2) << 4, level), &eManager);
|
||||
break;
|
||||
}
|
||||
|
||||
//dekorate room
|
||||
bool lava = (rand()%4)==0;
|
||||
bool pillars = (rand()%4)==0;
|
||||
bool books = (rand()%4)==0;
|
||||
for(xr = x; xr < x+wr; ++xr) {
|
||||
for(yr = y; yr < y+hr; ++yr) {
|
||||
i = xr + yr * w;
|
||||
|
||||
if(lava && xr > x+1 && xr < x+wr-2 && yr > y+1 && yr < y+hr-2) {
|
||||
map[i] = TILE_LAVA;
|
||||
data[i] = 0;
|
||||
} else if(pillars && xr > x && xr < x+wr-1 && yr > y && yr < y+hr-1 && xr%2 == 0 && yr%2 == 0) {
|
||||
map[i] = TILE_DUNGEON_WALL;
|
||||
data[i] = 0;
|
||||
} else if(books && (xr>x && xr<x+wr-1 && yr>y && yr<y+hr-1 && yr%2==0)) {
|
||||
map[i] = TILE_BOOKSHELVES;
|
||||
data[i] = rand()%3;
|
||||
if(!hasNPC && rand()%50) {
|
||||
hasNPC = true;
|
||||
addEntityToList(newNPCEntity(NPC_LIBRARIAN, (xr << 4) + 8, ((yr+1) << 4) + 8, level), &eManager);
|
||||
}
|
||||
} else {
|
||||
//add magic pillars for dragon barrier
|
||||
if(xr==x+wr/2 && yr==y+hr/2) {
|
||||
int pcount = 0;
|
||||
int i = 0;
|
||||
for (i = 0; i < eManager.lastSlot[5]; ++i) {
|
||||
Entity * e = &eManager.entities[5][i];
|
||||
|
||||
if(e->type == ENTITY_MAGIC_PILLAR) {
|
||||
++pcount;
|
||||
}
|
||||
}
|
||||
if(pcount<8) {
|
||||
addEntityToList(newMagicPillarEntity((xr << 4) + 8, (yr << 4) + 8, level), &eManager);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if(rand()%50==0) map[i] = TILE_IRONORE + (rand()%3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue