From dc1d3e4ee1f5fc6440109a02bc4df05d65a4aa2f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 21 Aug 2018 16:58:09 +0200 Subject: [PATCH] fixed automatic pseudohept; Warped walls do generate in arcm --- archimedean.cpp | 2 +- barriers.cpp | 2 +- bigstuff.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archimedean.cpp b/archimedean.cpp index 1283fb31..655e186f 100644 --- a/archimedean.cpp +++ b/archimedean.cpp @@ -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; iland, l2); - if(warpv && !pseudohept(c)) return false; + if(warpv && !archimedean && !pseudohept(c)) return false; int ds[8]; for(int i=0; itype; i++) ds[i] = i; diff --git a/bigstuff.cpp b/bigstuff.cpp index 1766ee01..a6f47672 100644 --- a/bigstuff.cpp +++ b/bigstuff.cpp @@ -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()) &&