mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 09:00:34 +00:00
Code Issues Releases Wiki Activity

new lands appear in land lists, implemented land validity

Browse Source
This commit is contained in:
Zeno Rogue 2019-01-03 02:08:09 +01:00
parent 7817c8bc47
commit 6e549ebc54
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
landlock.cpp
View File

@ -1038,15 +1038,15 @@ vector<eLand> land_over = {
laIce, laCaves, laDesert, laHunting, laMotion, laJungle, laAlchemist, laIce, laCaves, laDesert, laHunting, laMotion, laJungle, laAlchemist,
laCrossroads, laCrossroads,
laMirror, laMirrorOld, laMinefield, laPalace, laPrincessQuest, laZebra, laSwitch, laReptile, laMirror, laMirrorOld, laMinefield, laPalace, laPrincessQuest, laZebra, laSwitch, laReptile,
laOcean, laDocks, laWarpCoast, laLivefjord, laKraken, laCaribbean, laWhirlpool, laRlyeh, laTemple, laOcean, laDocks, laWarpCoast, laLivefjord, laKraken, laCaribbean, laBrownian, laWhirlpool, laRlyeh, laTemple,
laIvoryTower, laEndorian, laDungeon, laMountain, laIvoryTower, laEndorian, laWestWall, laDungeon, laMountain,
laCrossroads2, laCrossroads2,
laDryForest, laWineyard, laDeadCaves, laGraveyard, laHaunted, laHive, laDryForest, laWineyard, laDeadCaves, laGraveyard, laHaunted, laHive,
laRedRock, laVolcano, laRedRock, laVolcano,
laDragon, laTortoise, laDragon, laTortoise,
laOvergrown, laClearing, laStorms, laBurial, laWhirlwind, laOvergrown, laClearing, laStorms, laBurial, laWhirlwind,
laBlizzard, laBlizzard,
laRuins, laEmerald, laCamelot, laRuins, laEmerald, laVariant, laCamelot,
laPrairie, laBull, laTerracotta, laRose, laPrairie, laBull, laTerracotta, laRose,
laElementalWall, laTrollheim, laElementalWall, laTrollheim,
laHell, laCrossroads3, laCocytus, laPower, laCrossroads4, laHell, laCrossroads3, laCocytus, laPower, laCrossroads4,
@ -1116,8 +1116,8 @@ namespace lv {
land_validity_t ok = {2, q2 &~ lv::display_in_help, "No comments."}; land_validity_t ok = {2, q2 &~ lv::display_in_help, "No comments."};
land_validity_t not_in_ptm = {0, q0, "Does not work in pure tactics mode."}; land_validity_t not_in_ptm = {0, q0, "Does not work in pure tactics mode."};
land_validity_t technical = {0, q0 &~ lv::appears_in_geom_exp, "Technical."}; land_validity_t technical = {0, q0 &~ lv::appears_in_geom_exp, "Technical."};
land_validity_t full_game = {3, q3, "Full game."}; land_validity_t full_game = {3, q3 &~ lv::display_in_help, "Full game."};
land_validity_t inaccurate = {1, q1, "Somewhat inaccurate."}; land_validity_t inaccurate = {1, q1, "Somewhat inaccurate."};
land_validity_t great_walls_missing = {1, q1 | one_and_half, "Mercury rivers not implemented (or could not work) in this geometry."}; land_validity_t great_walls_missing = {1, q1 | one_and_half, "Mercury rivers not implemented (or could not work) in this geometry."};
land_validity_t pattern_compatibility = {3, qm3, "Patterns compatible."}; land_validity_t pattern_compatibility = {3, qm3, "Patterns compatible."};
land_validity_t pattern_defined = {3, qm3, "Pattern defined."}; land_validity_t pattern_defined = {3, qm3, "Pattern defined."};
@ -1149,6 +1149,10 @@ land_validity_t& land_validity(eLand l) {
using namespace lv; using namespace lv;
if(l == laBrownian) {
if(quotient || !hyperbolic || geometry == gCrystal) return dont_work;
}
if(binarytiling) { if(binarytiling) {
if(among(l, laMountain, laTemple)) return lv::pattern_compatibility_sole; if(among(l, laMountain, laTemple)) return lv::pattern_compatibility_sole;
if(among(l, laDungeon, laIvoryTower, laOcean, laEndorian)) return lv::pattern_compatibility; if(among(l, laDungeon, laIvoryTower, laOcean, laEndorian)) return lv::pattern_compatibility;
@ -1351,7 +1355,7 @@ land_validity_t& land_validity(eLand l) {
} }
// needs standard/Euclidean (needs fractal landscape) // needs standard/Euclidean (needs fractal landscape)
if(l == laTortoise && !stdeuc) if(among(l, laTortoise, laVariant) && !stdeuc)
return not_implemented; return not_implemented;
// technical lands do not count // technical lands do not count
@ -1518,7 +1522,7 @@ land_validity_t& land_validity(eLand l) {
if(l == laStorms && fulltorus) if(l == laStorms && fulltorus)
return interesting; return interesting;
if(l == laMagnetic || l == laBrownian) if(l == laMagnetic)
return land_not_implemented; return land_not_implemented;
if(shmup::on && among(l, laMirror, laMirrorOld) && among(geometry, gElliptic, gZebraQuotient, gKleinQuartic, gBolza, gBolza2, gMinimal)) if(shmup::on && among(l, laMirror, laMirrorOld) && among(geometry, gElliptic, gZebraQuotient, gKleinQuartic, gBolza, gBolza2, gMinimal))