mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-13 04:13:03 +00:00
Code Issues Releases Wiki Activity

Fix edge cases in Hell/CR3 unlock

Browse Source 
If Mirror Land and Hall of Mirrors are both in-game, only one counts, and
Camelot, Palace Quest, and Cellular Automaton don't count at all.
This commit is contained in:
Joseph C. Sible
2025-10-17 21:14:48 -04:00
parent 7c21e9c3d5
commit 12954c8c10
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
landlock.cpp
View File

@@ -222,13 +222,15 @@ EX bool landUnlockedRPM(eLand n) {
EX int lands_for_hell() { EX int lands_for_hell() {
int desired = casual ? 40 : 9; int desired = casual ? 40 : 9;
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !among(l, laHell, laCocytus, laPower) && !isCrossroads(l) && isLandIngame(l); }); int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !among(l, laHell, laCocytus, laPower) && !isCrossroads(l) && iinf[linf[l].treasure].itemclass == IC_TREASURE && isLandIngame(l); });
if(isLandIngame(laMirror) && isLandIngame(laMirrorOld)) --available;
return min(desired, available); return min(desired, available);
} }
EX int lands_for_cr3() { EX int lands_for_cr3() {
int desired = casual ? 20 : 9; int desired = casual ? 20 : 9;
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !isCrossroads(l) && isLandIngame(l); }); int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !isCrossroads(l) && iinf[linf[l].treasure].itemclass == IC_TREASURE && isLandIngame(l); });
if(isLandIngame(laMirror) && isLandIngame(laMirrorOld)) --available;
return min(desired, available); return min(desired, available);
} }