enabled the chaos mode in weird hyperbolic

This commit is contained in:
Zeno Rogue 2017-10-30 10:52:48 +01:00
parent f69d538e08
commit 060075f605
2 changed files with 5 additions and 4 deletions

View File

@ -758,7 +758,7 @@ eLand getNewLand(eLand old) {
// the intermediate lands
if(gold() >= R30) {
tab[cnt++] = laCrossroads;
tab[cnt++] = laMirror;
tab[cnt++] = geometry ? laMirrorOld : laMirror;
tab[cnt++] = laOcean;
tab[cnt++] = laLivefjord;
tab[cnt++] = laMinefield;
@ -787,7 +787,7 @@ eLand getNewLand(eLand old) {
// the advanced lands
if(gold() >= R60) {
tab[cnt++] = laStorms;
tab[cnt++] = laWhirlwind;
if(!weirdhyperbolic) tab[cnt++] = laWhirlwind;
tab[cnt++] = laCrossroads;
if(!generatingEquidistant) tab[cnt++] = laCrossroads2;
if(items[itRuby] >= U10) {

View File

@ -1071,7 +1071,8 @@ void restartGame(char switchWhat, bool push) {
randomPatternsMode = peace::on = false;
}
if(switchWhat == 'C') {
geometry = gNormal;
if(euclid || sphere)
geometry = gNormal;
if(tactic::on) firstland = laIce;
yendor::on = tactic::on = princess::challenge = false;
resetGeometry();
@ -1095,7 +1096,7 @@ void restartGame(char switchWhat, bool push) {
if(switchWhat == 'g') {
if(geometry == targetgeometry) geometry = gNormal;
else geometry = targetgeometry;
if(chaosmode && geometry != gNormal) chaosmode = false;
if(chaosmode && (euclid || sphere)) chaosmode = false;
if(purehepta && euclid) purehepta = false;
resetGeometry();
}