1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 09:30:35 +00:00

Merge pull request #379 from jlmjlm/cr_in_chaos

Treat crossroads as locked by HS eligibility in Chaos.
This commit is contained in:
Zeno Rogue 2024-06-06 12:22:37 +02:00 committed by GitHub
commit d059eb028c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -242,6 +242,10 @@ EX bool landUnlocked(eLand l) {
if(princess::challenge) return among(l, laPalace, laPrincessQuest); if(princess::challenge) return among(l, laPalace, laPrincessQuest);
if(ls::any_chaos() && isCrossroads(l)) {
return hyperstonesUnlocked();
}
switch(l) { switch(l) {
#define LAND(a,b,c,d,e,f,g) case c: #define LAND(a,b,c,d,e,f,g) case c:
#define REQ(x) x return true; #define REQ(x) x return true;
@ -1334,9 +1338,6 @@ EX land_validity_t& land_validity(eLand l) {
if(INVERSE) return not_implemented; if(INVERSE) return not_implemented;
} }
if(ls::any_chaos() && isCrossroads(l))
return not_in_chaos;
// this pattern does not work on elliptic and small spheres // this pattern does not work on elliptic and small spheres
if((l == laBlizzard || l == laVolcano) && elliptic && S7 < 5 && !arcm::in()) if((l == laBlizzard || l == laVolcano) && elliptic && S7 < 5 && !arcm::in())
return not_enough_space; return not_enough_space;