equidistant-based lands in weirdhyperbolic are now based off CR4
This commit is contained in:
parent
22a92059b6
commit
d31341b403
13
bigstuff.cpp
13
bigstuff.cpp
|
@ -438,10 +438,10 @@ bool checkInTree(cell *c, int maxv) {
|
||||||
void buildEquidistant(cell *c) {
|
void buildEquidistant(cell *c) {
|
||||||
if(!c) return;
|
if(!c) return;
|
||||||
if(c->landparam) return;
|
if(c->landparam) return;
|
||||||
if(weirdhyperbolic) {
|
/* if(weirdhyperbolic) {
|
||||||
c->landparam = 50;
|
c->landparam = 50;
|
||||||
return;
|
return;
|
||||||
}
|
} */
|
||||||
if(geometry) return;
|
if(geometry) return;
|
||||||
eLand b = c->land;
|
eLand b = c->land;
|
||||||
if(chaosmode && !inmirror(b)) return;
|
if(chaosmode && !inmirror(b)) return;
|
||||||
|
@ -593,10 +593,10 @@ void buildEquidistant(cell *c) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(c->landparam > 30 && b == laOcean && !generatingEquidistant && hrand(10) < 5)
|
if(c->landparam > 30 && b == laOcean && !generatingEquidistant && hrand(10) < 5 && !weirdhyperbolic)
|
||||||
buildAnotherEquidistant(c);
|
buildAnotherEquidistant(c);
|
||||||
|
|
||||||
if(c->landparam > HAUNTED_RADIUS+5 && b == laGraveyard && !generatingEquidistant && hrand(100) < (nonbitrunc?25:5) && items[itBone] >= 10)
|
if(c->landparam > HAUNTED_RADIUS+5 && b == laGraveyard && !generatingEquidistant && hrand(100) < (nonbitrunc?25:5) && items[itBone] >= 10 && !weirdhyperbolic)
|
||||||
buildAnotherEquidistant(c);
|
buildAnotherEquidistant(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -680,13 +680,14 @@ int towerval(cell *c, cellfunction* cf) {
|
||||||
/* other geometries */
|
/* other geometries */
|
||||||
|
|
||||||
void setLandWeird(cell *c) {
|
void setLandWeird(cell *c) {
|
||||||
if(specialland == laIvoryTower || specialland == laEndorian || specialland == laDungeon || specialland == laOcean) {
|
// replaced with standard CR4
|
||||||
|
/* if(specialland == laIvoryTower || specialland == laEndorian || specialland == laDungeon || specialland == laOcean) {
|
||||||
int d = celldist(c) - (getDistLimit() - 2);
|
int d = celldist(c) - (getDistLimit() - 2);
|
||||||
if(d <= 0)
|
if(d <= 0)
|
||||||
c->land = laCrossroads4;
|
c->land = laCrossroads4;
|
||||||
else
|
else
|
||||||
c->land = specialland, c->landparam = d;
|
c->land = specialland, c->landparam = d;
|
||||||
}
|
} */
|
||||||
}
|
}
|
||||||
|
|
||||||
void setLandQuotient(cell *c) {
|
void setLandQuotient(cell *c) {
|
||||||
|
|
|
@ -757,6 +757,7 @@ eLand getNewLand(eLand old) {
|
||||||
if(old == laEFire && lchance(old)) return hrand(2) ? laEEarth : laEAir;
|
if(old == laEFire && lchance(old)) return hrand(2) ? laEEarth : laEAir;
|
||||||
|
|
||||||
if(tactic::on && !(tactic::trailer && old == firstland)) return firstland;
|
if(tactic::on && !(tactic::trailer && old == firstland)) return firstland;
|
||||||
|
if(weirdhyperbolic && specialland != old) return specialland;
|
||||||
|
|
||||||
if(yendor::on && (yendor::clev().flags & YF_WALLS)) {
|
if(yendor::on && (yendor::clev().flags & YF_WALLS)) {
|
||||||
if(old != yendor::clev().l) return yendor::clev().l;
|
if(old != yendor::clev().l) return yendor::clev().l;
|
||||||
|
|
|
@ -99,7 +99,7 @@ void initgame() {
|
||||||
if(firstland == laHauntedWall) firstland = laGraveyard;
|
if(firstland == laHauntedWall) firstland = laGraveyard;
|
||||||
if(firstland == laMercuryRiver) firstland = laTerracotta;
|
if(firstland == laMercuryRiver) firstland = laTerracotta;
|
||||||
if(firstland == laMountain && !tactic::on) firstland = laJungle;
|
if(firstland == laMountain && !tactic::on) firstland = laJungle;
|
||||||
if(isGravityLand(firstland) && !tactic::on) firstland = laCrossroads;
|
if(isGravityLand(firstland) && !tactic::on) firstland = weirdhyperbolic ? laCrossroads4 : laCrossroads;
|
||||||
|
|
||||||
cwt.c = currentmap->gamestart(); cwt.spin = 0; cwt.mirrored = false;
|
cwt.c = currentmap->gamestart(); cwt.spin = 0; cwt.mirrored = false;
|
||||||
cwt.c->land = ((geometry || whirl::whirl) && !safety) ? specialland : firstland;
|
cwt.c->land = ((geometry || whirl::whirl) && !safety) ? specialland : firstland;
|
||||||
|
@ -108,8 +108,8 @@ void initgame() {
|
||||||
|
|
||||||
if(firstland == laElementalWall) cwt.c->land = randomElementalLand();
|
if(firstland == laElementalWall) cwt.c->land = randomElementalLand();
|
||||||
|
|
||||||
if(tactic::on && (isGravityLand(firstland) || firstland == laOcean) && firstland != laMountain)
|
if((tactic::on || weirdhyperbolic) && (isGravityLand(firstland) || firstland == laOcean) && firstland != laMountain)
|
||||||
cwt.c->land = nonbitrunc ? laCrossroads : laCrossroads2;
|
cwt.c->land = weirdhyperbolic ? laCrossroads4 : nonbitrunc ? laCrossroads : laCrossroads2;
|
||||||
createMov(cwt.c, 0);
|
createMov(cwt.c, 0);
|
||||||
|
|
||||||
setdist(cwt.c, BARLEV, NULL);
|
setdist(cwt.c, BARLEV, NULL);
|
||||||
|
|
Loading…
Reference in New Issue