1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00

fixed automatic pseudohept; Warped walls do generate in arcm

This commit is contained in:
Zeno Rogue 2018-08-21 16:58:09 +02:00
parent 06c57adf4a
commit dc1d3e4ee1
3 changed files with 6 additions and 6 deletions

View File

@ -235,7 +235,7 @@ void archimedean_tiling::prepare() {
if(tilegroup[i] == tilegroup[j]) flags[i] |= nflags[j/2];
if(!have_ph) {
if(nonbitrunc) {
if(true) {
for(int i=0; i<M; i++) if(tilegroup[i] == 0) flags[i] |= sfPH;
}
else {

View File

@ -739,7 +739,7 @@ bool buildBarrierNowall(cell *c, eLand l2, int forced_dir) {
}
bool warpv = warped_version(c->land, l2);
if(warpv && !pseudohept(c)) return false;
if(warpv && !archimedean && !pseudohept(c)) return false;
int ds[8];
for(int i=0; i<c->type; i++) ds[i] = i;

View File

@ -1024,7 +1024,7 @@ void buildBigStuff(cell *c, cell *from) {
}
else if(chaosmode) {
if(pseudohept(c) && hrand(10000) < 9000 && c->land && !inmirror(c) && buildBarrierNowall(c, getNewLand(c->land)))
if((archimedean || pseudohept(c)) && hrand(10000) < 9000 && c->land && !inmirror(c) && buildBarrierNowall(c, getNewLand(c->land)))
{}
else if(ctof(c) && c->land == laMirror && hrand(10000) < 2000 && !weirdhyperbolic) {
int bd = 2 + hrand(2) * 3;
@ -1032,13 +1032,13 @@ void buildBigStuff(cell *c, cell *from) {
}
}
else if(pseudohept(c) && isWarped(c->land) && hrand(10000) < 3000 && c->land &&
else if((archimedean || pseudohept(c)) && isWarped(c->land) && hrand(10000) < 3000 && c->land &&
buildBarrierNowall(c, eLand(c->land ^ laWarpSea ^ laWarpCoast))) ;
else if(pseudohept(c) && c->land == laCrossroads4 && hrand(10000) < 7000 && c->land && !c->master->alt && !tactic::on &&
else if((archimedean || pseudohept(c)) && c->land == laCrossroads4 && hrand(10000) < 7000 && c->land && !c->master->alt && !tactic::on &&
buildBarrierNowall(c, getNewLand(laCrossroads4))) ;
else if(pseudohept(c) && hrand(I10000) < 20 && !generatingEquidistant && !yendor::on && !tactic::on && !isCrossroads(c->land) &&
else if((archimedean || pseudohept(c)) && hrand(I10000) < 20 && !generatingEquidistant && !yendor::on && !tactic::on && !isCrossroads(c->land) &&
gold() >= R200 && !weirdhyperbolic &&
!inmirror(c) && !isSealand(c->land) && !isHaunted(c->land) && !isGravityLand(c->land) &&
(c->land != laRlyeh || rlyehComplete()) &&