mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed the unlock list in RPM

This commit is contained in:
Zeno Rogue 2018-02-14 11:45:53 +01:00
parent 2961f3a070
commit e311c8d481
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
landlock.cpp
View File

@ -410,12 +410,16 @@ eLand firstland = laIce, specialland = laIce;
bool chaosmode = false; bool chaosmode = false;
bool landUnlockedRPM(eLand n) {
if(isRandland(n) == 2) return true;
if(isRandland(n) == 1)
return (autocheat || cheater || hiitemsMax(treasureType(n)) >= 10);
return false;
}
bool landUnlocked(eLand l) { bool landUnlocked(eLand l) {
if(randomPatternsMode) { if(randomPatternsMode) {
int i = isRandland(l); return landUnlockedRPM(l);
if(i == 2) return true;
if(i == 1) return hiitemsMax(treasureType(l)) >= 10;
return false;
} }
switch(l) { switch(l) {
@ -664,10 +668,7 @@ eLand pickLandRPM(eLand old) {
while(true) { while(true) {
eLand n = randlands[hrand(size(randlands))]; eLand n = randlands[hrand(size(randlands))];
if(incompatible(n, old)) continue; if(incompatible(n, old)) continue;
if(isRandland(n) == 2) return n; if(landUnlockedRPM(n)) return n;
if(!autocheat && !cheater && hiitemsMax(treasureType(n)) < 10)
continue;
return n;
} }
} }
@ -1252,7 +1253,7 @@ int isLandValid(eLand l) {
if(l == laSnakeNest) if(l == laSnakeNest)
return geosupport_threecolor() >= 2 ? 3 : 0; return geosupport_threecolor() >= 2 ? 3 : 0;
if(l == laDocks) if(l == laDocks && !randomPatternsMode)
return a38 ? 3 : 0; return a38 ? 3 : 0;
if(l == laStorms && torus) if(l == laStorms && torus)