mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

3d:: Yendorian Forest

This commit is contained in:
Zeno Rogue 2019-03-23 22:25:35 +01:00
parent 14cf0954ee
commit 0af9df16e4
3 changed files with 93 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
bigstuff.cpp
View File

@ -464,10 +464,13 @@ int coastval(cell *c, eLand base) {
bool checkInTree(cell *c, int maxv) {
if(c->landparam <= 3) return false;
if(!maxv && DIM == 3 && binarytiling) {
forCellEx(c2, c) if(c2->landflags) return true;
}
if(!maxv) return false;
if(c->landflags) return true;
for(int t=0; t<c->type; t++)
if(c->move(t) && c->move(t)->landparam < c->landparam && checkInTree(c->move(t), maxv-1))
forCellEx(c2, c)
if(c2->landparam < c->landparam && checkInTree(c2, maxv-1))
return true;
return false;
}
@ -581,7 +584,76 @@ void buildEquidistant(cell *c) {
if(c->land == laEndorian) {
int ct = c->type;
if(c->landparam == 1 && ctof(c)) {
if(binarytiling) {
int skip = geometry == gHoroRec ? 3 : 2;
if(c->landparam == 1)
c->landflags = (hrand(100) < 20);
else if(DIM == 2 && c->type == 6 && (c->landparam % 2) && c->move(binary::bd_down) && c->move(binary::bd_down)->landflags)
c->landflags = 1;
else if(DIM == 2 && c->type == 7 && (c->landparam % 2 == 0)) {
for(int d: {binary::bd_down_left, binary::bd_down_right})
if(c->move(d) && c->move(d)->landflags)
c->landflags = 1;
}
else if(DIM == 3 && c->landparam % skip != 1 && c->move(S7-1) && c->move(S7-1)->landflags)
c->landflags = 1;
else if(DIM == 3 && c->landparam % skip == 1 && c->move(S7-1) && c->move(S7-1)->c.spin(S7-1) == (c->c.spin(S7-1)) && c->move(S7-1)->move(S7-1)->landflags)
c->landflags = 1;
if(c->landflags) c->wall = (DIM == 3 ? waTrunk3 : waTrunk);
}
else if(DIM == 3 && hyperbolic) {
if(c->landparam == 1)
c->landflags = (hrand(100) < 20);
else if(S7 == 12) {
for(int i=0; i<S7; i++) {
cellwalker cw(c, i);
if(!cw.peek()) continue;
cw += wstep;
if(cw.at->landparam != c->landparam-1) continue;
if(!cw.at->landflags) continue;
if(S7 == 6) c->landflags = 1;
else for(int j=0; j<S7; j++) if(cw.at->move(j) && cw.at->move(j)->landparam == c->landparam - 2 && !reg3::dirs_adjacent[j][cw.spin])
if(c->landparam == 2 ? cw.at->move(j)->land != laEndorian : cw.at->move(j)->landparam)
c->landflags = 1;
}
}
else if(c->landparam == 2) {
for(int i=0; i<S7; i++) {
cellwalker cw(c, i);
if(!cw.peek()) continue;
cw += wstep;
if(cw.at->landparam != 1) continue;
if(!cw.at->landflags) continue;
cw += rev;
if(cw.peek() && cw.peek()->land != laEndorian) c->landflags = 1;
}
}
else if(c->landparam % 2 == 1) {
for(int i=0; i<S7; i++) {
cellwalker cw(c, i);
if(!cw.peek()) continue;
cw += wstep;
if(cw.at->landparam != c->landparam-1) continue;
if(!cw.at->landflags) continue;
if(S7 == 6) c->landflags = 1;
else for(int j=0; j<S7; j++) if(cw.at->move(j) && cw.at->move(j)->landparam == c->landparam - 2 && !reg3::dirs_adjacent[j][cw.spin] && cw.at->move(j)->landflags)
c->landflags = 1;
}
}
else {
for(int i=0; i<S7; i++) {
cellwalker cw(c, i);
if(!cw.peek()) continue;
cw += wstep;
if(cw.at->landparam != c->landparam-1) continue;
if(!cw.at->landflags) continue;
cw += rev;
if(cw.peek() && cw.peek()->landflags) c->landflags = 1;
}
}
if(c->landflags) c->wall = waTrunk3;
}
else if(c->landparam == 1 && ctof(c)) {
for(int i=0; i<ct; i++) {
int i1 = (i+1) % c->type;
if(c->move(i) && c->move(i)->land != laEndorian && c->move(i)->land != laNone)
@ -645,13 +717,12 @@ void buildEquidistant(cell *c) {
}
}
}
if(!c->landflags && checkInTree(c, 5)) {
int lev = hrand(100);
if(lev < 10) c->wall = waSolidBranch;
else if(lev < 20) c->wall = waWeakBranch;
else c->wall = waCanopy;
}
}
if(!c->landflags && checkInTree(c, 5)) {
int lev = hrand(100);
if(lev < 10) c->wall = waSolidBranch;
else if(lev < 20) c->wall = waWeakBranch;
else c->wall = waCanopy;
}
}

11
graph.cpp
View File

@ -3909,6 +3909,7 @@ color_t transcolor(cell *c, cell *c2, color_t wcol) {
if(c->wall == waChasm && c2->wall != waChasm) return 0x606060A0;
if(isWateryOrBoat(c) && !isWateryOrBoat(c2)) return 0x0000C060;
if(isSulphuric(c->wall) && !isSulphuric(c2->wall)) return darkena(winf[c->wall].color, 0, 0x40);
if(among(c->wall, waCanopy, waSolidBranch, waWeakBranch) && !among(c2->wall, waCanopy, waSolidBranch, waWeakBranch)) return 0x00C00060;
if(c->wall == waFloorA && c2->wall == waFloorB && !c->item && !c2->item) return darkena(0xFF00FF, 0, 0x80);
if(realred(c->wall) && realred(c2->wall) && c->wall != c2->wall) {
int l = snakelevel(c) - snakelevel(c2);
@ -4854,8 +4855,14 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
queuepoly(face_the_player(V), shMineMark[0], darkena(minecolors[mines], 0, 0xFF));
}
else if(winf[c->wall].glyph == '.' || among(c->wall, waFloorA, waFloorB, waChasm, waLadder) || isWatery(c) || isSulphuric(c->wall)) ;
else if(winf[c->wall].glyph == '.' || among(c->wall, waFloorA, waFloorB, waChasm, waLadder, waCanopy) || isWatery(c) || isSulphuric(c->wall)) ;
else if(c->wall == waBigBush || c->wall == waSolidBranch)
queuepolyat(face_the_player(V), shSolidBranch, darkena(wcol, 0, 0xFF), PPR::REDWALL+3);
else if(c->wall == waSmallBush || c->wall == waWeakBranch)
queuepolyat(face_the_player(V), shWeakBranch, darkena(wcol, 0, 0xFF), PPR::REDWALL+3);
else
queuepoly(face_the_player(V), chasmgraph(c) ? shSawRing : shRing, darkena(wcol, 0, 0xFF));
}

6
landgen.cpp
View File

@ -2015,11 +2015,11 @@ void giantLandSwitch(cell *c, int d, cell *from) {
case laEndorian:
ONEMPTY {
if(c->wall == waNone && coastval(c, laEndorian) >= 10 && hrand_monster(5000) < 10 + 2 * (items[itApple] + yendor::hardness()))
if(c->wall == waNone && coastval(c, laEndorian) >= 10 && hrand_monster(5000) < 10 + 2 * (items[itApple] + yendor::hardness()) && (DIM == 2 || hrand(100) < 25))
c->monst = moSparrowhawk;
else if(c->wall != waNone && hrand_monster(5000) < 10 + 2 * (items[itApple] + yendor::hardness()))
else if(c->wall != waNone && hrand_monster(DIM == 3 ? 25000 : 5000) < 10 + 2 * (items[itApple] + yendor::hardness()))
c->monst = moResearcher;
else if(c->wall == waCanopy && !checkInTree(c, 3) && hrand_monster(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;
}
break;