From 56cb3618d431b0127225a0f9c39d96609cdabf54 Mon Sep 17 00:00:00 2001
From: Jacob Mandelson <jlm@ofb.net>
Date: Mon, 3 Jun 2024 14:57:20 -0700
Subject: [PATCH] Treat crossroads as locked by HS eligability in Chaos.

---
 landlock.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/landlock.cpp b/landlock.cpp
index cb2c4e7e..73b8c9a8 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -241,6 +241,10 @@ EX bool landUnlocked(eLand l) {
   back:
   
   if(princess::challenge) return among(l, laPalace, laPrincessQuest);
+
+  if(ls::any_chaos() && isCrossroads(l)) {
+    return hyperstonesUnlocked();
+    }
   
   switch(l) {
     #define LAND(a,b,c,d,e,f,g) case c:
@@ -1333,10 +1337,7 @@ EX land_validity_t& land_validity(eLand l) {
     if(closed_or_bounded) return unbounded_only;
     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
   if((l == laBlizzard || l == laVolcano) && elliptic && S7 < 5 && !arcm::in())
     return not_enough_space;