mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-15 08:44:04 +00:00
Code Issues Releases Wiki Activity

new Crossroads variant: Crossroads VI (Cursed Crossroads)

Browse Source
This commit is contained in:
Zeno Rogue
2025-07-07 11:49:25 +02:00
parent fc63e540f0
commit 26d99c1423
7 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
landlock.cpp
View File

@@ -53,8 +53,7 @@ EX int landMultiplier(eLand l) {
}
EX bool isCrossroads(eLand l) {
return l == laCrossroads || l == laCrossroads2 || l == laCrossroads3 ||
l == laCrossroads4 || l == laCrossroads5;
return among(l, laCrossroads, laCrossroads2, laCrossroads3, laCrossroads4, laCrossroads5, laCrossroads6);
}
EX bool bearsCamelot(eLand l) {
@@ -264,6 +263,8 @@ EX bool landUnlocked(eLand l) {
#define ACCONLY(x)
#define ACCONLY2(x,y)
#define ACCONLY3(x,y,z)
#define ACCONLY4(a,b,c,d)
#define ACCONLY5(a,b,c,d,e)
#define ACCONLYF(x)
#define IFINGAME(land, ok, fallback) if(isLandIngame(land)) { ok } else { fallback }
#define INMODE(x) if(x) return true;
@@ -565,7 +566,7 @@ EX eLand getNewLand(eLand old) {
laDeadCaves, laRedRock, laVariant, laHell, laCocytus, laPower,
laBull, laTerracotta, laRose, laGraveyard, laHive, laDragon, laTrollheim,
laWet, laFrog, laEclectic, laCursed, laDice,
laCrossroads5,
laCrossroads5, laCrossroads6
})
if(landUnlocked(l)) tab[cnt++] = l;
@@ -588,6 +589,7 @@ EX eLand getNewLand(eLand old) {
{laDesert, laRedRock, 5, 5},
{laFrog, laReptile, 2, 2}, {laFrog, laSwitch, 2, 2}, {laFrog, laZebra, 2, 2},
{laEclectic, laStorms, 3, 3}, {laEclectic, laIce, 3, 3}, {laEclectic, laPalace, 3, 3}, {laEclectic, laDeadCaves, 3, 3},
{laCursed, laCrossroads6, 1, 1},
{laEFire, laDragon, 5, 5}, {laEWater, laLivefjord, 5, 5}, {laEEarth, laDeadCaves, 5, 5}, {laEAir, laWhirlwind, 5, 5},
}) {
@@ -735,7 +737,7 @@ EX vector<eLand> land_over = {
laPrairie, laBull, laTerracotta, laRose,
laElementalWall, laTrollheim,
laHell, laCrossroads3, laCocytus, laPower, laCrossroads4,
laCrossroads5,
laCrossroads5, laCrossroads6,
// EXTRA
laWildWest, laHalloween, laDual, laSnakeNest, laMagnetic, laCA, laAsteroids
};