mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 23:50:27 +00:00
Code Issues Releases Wiki Activity

2d3d:: fixed DIM to WDIM in landgen.cpp

Browse Source
This commit is contained in:
Zeno Rogue 2019-05-09 23:06:11 +02:00
parent 0ecd8a058a
commit 01207a0e87
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
landgen.cpp
View File

@ -154,7 +154,7 @@ void place_elemental_wall(cell *c) {
} }
int hrand_monster(int x) { int hrand_monster(int x) {
if(DIM == 3 && !sphere) { if(WDIM == 3 && !sphere) {
int t = isize(gmatrix); int t = isize(gmatrix);
if(t > 300) x = ((long long)(x)) * t / 300; if(t > 300) x = ((long long)(x)) * t / 300;
} }
@ -220,7 +220,7 @@ void giantLandSwitch(cell *c, int d, cell *from) {
case laPalace: // ------------------------------------------------------------- case laPalace: // -------------------------------------------------------------
if(hyperbolic_not37 || fulltorus || S7 < 5 || archimedean || DIM == 3) { if(hyperbolic_not37 || fulltorus || S7 < 5 || archimedean || WDIM == 3) {
if(fargen) { if(fargen) {
int i = hrand(100); int i = hrand(100);
if(i < 10) if(i < 10)
@ -424,10 +424,10 @@ void giantLandSwitch(cell *c, int d, cell *from) {
else if(fulltorus) { else if(fulltorus) {
c->wall = waCavefloor; c->wall = waCavefloor;
} }
else if(DIM == 3 && hyperbolic && !binarytiling) else if(WDIM == 3 && hyperbolic && !binarytiling)
c->wall = (c->master->zebraval & 1) ? waCavewall : waCavefloor; c->wall = (c->master->zebraval & 1) ? waCavewall : waCavefloor;
#if MAXMDIM >= 4 #if MAXMDIM >= 4
else if(euclid && DIM == 3) else if(euclid && WDIM == 3)
c->wall = euclid3::get_emerald(c) ? waCavewall : waCavefloor; c->wall = euclid3::get_emerald(c) ? waCavewall : waCavefloor;
#endif #endif
else if(euclid) { else if(euclid) {
@ -621,7 +621,7 @@ void giantLandSwitch(cell *c, int d, cell *from) {
int dy = gmod(y, 3); int dy = gmod(y, 3);
if(dy == 1) c->wall = waVinePlant; if(dy == 1) c->wall = waVinePlant;
} }
else if(DIM == 3 && hyperbolic && !binarytiling) else if(WDIM == 3 && hyperbolic && !binarytiling)
c->wall = (c->master->zebraval & 2) ? waVinePlant : waNone; c->wall = (c->master->zebraval & 2) ? waVinePlant : waNone;
else if(a4 || sphere || archimedean) else if(a4 || sphere || archimedean)
c->wall = hrand(100) < 50 ? waNone : waVinePlant; c->wall = hrand(100) < 50 ? waNone : waVinePlant;
@ -1397,7 +1397,7 @@ void giantLandSwitch(cell *c, int d, cell *from) {
else { else {
// int d0 = d % TEMPLE_EACH; // int d0 = d % TEMPLE_EACH;
// if(d0<0) d0=-d0; // if(d0<0) d0=-d0;
if(hrand(100) < (peace::on ? 15 : 30) && DIM == 2) if(hrand(100) < (peace::on ? 15 : 30) && WDIM == 2)
c->wall = waBigStatue; c->wall = waBigStatue;
else if(hrand_monster(20000) < -d) else if(hrand_monster(20000) < -d)
c->monst = hrand(3) ? moCultist : moPyroCultist; c->monst = hrand(3) ? moCultist : moPyroCultist;
@ -2018,9 +2018,9 @@ void giantLandSwitch(cell *c, int d, cell *from) {
case laEndorian: case laEndorian:
ONEMPTY { ONEMPTY {
if(c->wall == waNone && coastval(c, laEndorian) >= 10 && hrand_monster(5000) < 10 + 2 * (items[itApple] + yendor::hardness()) && (DIM == 2 || hrand(100) < 25)) if(c->wall == waNone && coastval(c, laEndorian) >= 10 && hrand_monster(5000) < 10 + 2 * (items[itApple] + yendor::hardness()) && (WDIM == 2 || hrand(100) < 25))
c->monst = moSparrowhawk; c->monst = moSparrowhawk;
else if(c->wall != waNone && hrand_monster(DIM == 3 ? 25000 : 5000) < 10 + 2 * (items[itApple] + yendor::hardness())) else if(c->wall != waNone && hrand_monster(WDIM == 3 ? 25000 : 5000) < 10 + 2 * (items[itApple] + yendor::hardness()))
c->monst = moResearcher; c->monst = moResearcher;
else if(c->wall == waCanopy && !checkInTree(c, 3) && hrand(5000) < PT(300 + 5 * (kills[moSparrowhawk] + kills[moResearcher]), 750)) else if(c->wall == waCanopy && !checkInTree(c, 3) && hrand(5000) < PT(300 + 5 * (kills[moSparrowhawk] + kills[moResearcher]), 750))
c->item = itApple; c->item = itApple;
@ -2429,7 +2429,7 @@ void repairLandgen(cell *c) {
} }
if(passable(c, NULL, 0)) { if(passable(c, NULL, 0)) {
if(c->land == laBarrier && DIM != 3) c->wall = waBarrier; if(c->land == laBarrier && WDIM != 3) c->wall = waBarrier;
if(c->land == laOceanWall) if(c->land == laOceanWall)
c->wall = c->type == 7 ? waBarrier : waSea; c->wall = c->type == 7 ? waBarrier : waSea;
} }
@ -2451,7 +2451,7 @@ void setdist(cell *c, int d, cell *from) {
// this fixes the following problem: // this fixes the following problem:
// http://steamcommunity.com/app/342610/discussions/0/1470840994970724215/ // http://steamcommunity.com/app/342610/discussions/0/1470840994970724215/
if(!generatingEquidistant && from && d >= 7 && c->land && !binarytiling && !archimedean && geometry != gCrystal && DIM == 2) { if(!generatingEquidistant && from && d >= 7 && c->land && !binarytiling && !archimedean && geometry != gCrystal && WDIM == 2) {
int cdi = celldist(c); int cdi = celldist(c);
if(celldist(from) > cdi) { if(celldist(from) > cdi) {
forCellCM(c2, c) if(celldist(c2) < cdi) { forCellCM(c2, c) if(celldist(c2) < cdi) {