diff --git a/landlock.cpp b/landlock.cpp index 690a635ce..ee614ce4e 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -249,7 +249,6 @@ EX int isRandland(eLand l) { } EX bool incompatible1(eLand l1, eLand l2) { - if(isCrossroads(l1) && isCrossroads(l2)) return true; if(l1 == laJungle && l2 == laMotion) return true; if(l1 == laMirrorOld && l2 == laMotion) return true; if(l1 == laPower && l2 == laWineyard) return true; @@ -271,7 +270,6 @@ EX bool incompatible1(eLand l1, eLand l2) { if(l1 == laPrairie && l2 == laCrossroads4) return true; if(l1 == laWet && l2 == laDesert) return true; if(l1 == laFrog && l2 == laMotion) return true; - if(isElemental(l1) && isElemental(l2)) return true; return false; } @@ -298,7 +296,10 @@ EX eLand randomElementalLandWeighted() { } EX bool incompatible(eLand nw, eLand old) { - return (nw == old) || incompatible1(nw, old) || incompatible1(old, nw); + if(isCrossroads(nw) && isCrossroads(old)) return true; + if(isElemental(nw) && isElemental(old)) return true; + if(nw == old) return true; + return incompatible1(nw, old) || incompatible1(old, nw); } EX bool rlyehComplete() {