Skip to content

Move land check functions to the top #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move land check functions to the top #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bffb57
Move land check functions to the top.
Jul 10, 2021
42bcdf7
Move symmetric checks to incompatible().
Jul 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions landlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand All @@ -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() {
Expand Down