1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00

selecting a (horo)cyclic/equidistant-based land in the Experiments in Geometry while in standard geometry works now

This commit is contained in:
Zeno Rogue 2019-05-15 18:21:32 +02:00
parent eca59e79fa
commit c4469d9185
3 changed files with 6 additions and 2 deletions

View File

@ -1110,7 +1110,7 @@ void set_euland3(cell *c, int co10, int co11, int alt, int hash) {
bool quickfind(eLand l) { bool quickfind(eLand l) {
if(l == cheatdest) return true; if(l == cheatdest) return true;
if(l == specialland && (weirdhyperbolic || specialland != laIce)) return true; if(l == specialland && (weirdhyperbolic || specialland != laIce || cheater)) return true;
#if CAP_TOUR #if CAP_TOUR
if(tour::on && tour::quickfind(l)) return true; if(tour::on && tour::quickfind(l)) return true;
#endif #endif

View File

@ -305,7 +305,7 @@ eLand getNewLand(eLand old) {
#endif #endif
if(tactic::on && !(tactic::trailer && old == specialland)) return specialland; if(tactic::on && !(tactic::trailer && old == specialland)) return specialland;
if(weirdhyperbolic && specialland != old && specialland != laCrossroads4 && !chaosmode && old != laBarrier) return specialland; if((weirdhyperbolic || cheater) && specialland != old && specialland != laCrossroads4 && specialland != laIce && !chaosmode && old != laBarrier) 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;

View File

@ -150,6 +150,10 @@ void initgame() {
setdist(cwt.at, BARLEV, NULL); setdist(cwt.at, BARLEV, NULL);
if(!use_special_land) {
if(firstland != (princess::challenge ? laPalace : laIce)) cheater++;
}
if((tactic::on || yendor::on || peace::on) && isCyclic(firstland)) { if((tactic::on || yendor::on || peace::on) && isCyclic(firstland)) {
anthraxBonus = items[itHolyGrail]; anthraxBonus = items[itHolyGrail];
cwt.at->move(0)->land = firstland; cwt.at->move(0)->land = firstland;