mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-21 10:22:49 +00:00
Code Issues Releases Wiki Activity

Canvas now includes celldistAlt

Browse Source
This commit is contained in:
Zeno Rogue 2018-09-27 22:11:37 +02:00
parent 3904b9d11e
commit 5e8a42629c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bigstuff.cpp
View File

@ -1108,6 +1108,9 @@ void buildBigStuff(cell *c, cell *from) {
if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt) if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt)
createAlternateMap(c, 2, hsA); createAlternateMap(c, 2, hsA);
if(c->land == laCanvas && horo_ok() && ctof(c) && !c->master->alt)
createAlternateMap(c, 2, hsA);
if(c->land == laPalace && ctof(c) && !princess::generating && !shmup::on && multi::players == 1 && horo_ok() && !weirdhyperbolic && if(c->land == laPalace && ctof(c) && !princess::generating && !shmup::on && multi::players == 1 && horo_ok() && !weirdhyperbolic &&
(princess::forceMouse ? canReachPlayer(from, moMouse) : (princess::forceMouse ? canReachPlayer(from, moMouse) :
(hrand(2000) < (peace::on ? 100 : 20))) && (hrand(2000) < (peace::on ? 100 : 20))) &&
@ -1166,6 +1169,9 @@ void moreBigStuff(cell *c) {
if(d <= PRADIUS1) generateAlts(c->master); if(d <= PRADIUS1) generateAlts(c->master);
} }
if(c->land == laCanvas && c->master->alt)
generateAlts(c->master);
if(c->land == laStorms) if(c->land == laStorms)
if(!eubinary && !quotient && !sphere) { if(!eubinary && !quotient && !sphere) {
if(c->master->alt && c->master->alt->distance <= 2) { if(c->master->alt && c->master->alt->distance <= 2) {

2
expansion.cpp
View File

@ -399,7 +399,7 @@ int curr_dist(cell *c) {
case dfStart: case dfStart:
return celldist(c); return celldist(c);
case dfWorld: case dfWorld:
if(!mod_allowed() && !among(c->land, laOcean, laIvoryTower, laEndorian, laDungeon, laTemple, laWhirlpool)) if(!mod_allowed() && !among(c->land, laOcean, laIvoryTower, laEndorian, laDungeon, laTemple, laWhirlpool, laCanvas))
return 0; return 0;
if(c->master->alt) return celldistAlt(c); if(c->master->alt) return celldistAlt(c);
return inmirror(c) ? (c->landparam & 255) : c->landparam; return inmirror(c) ? (c->landparam & 255) : c->landparam;