mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-18 07:27:40 +00:00
Code Issues Releases Wiki Activity

changed chamfered to bitruncated

Browse Source
This commit is contained in:
Zeno Rogue
2018-01-06 22:34:03 +01:00
parent 1427147fbc
commit 5bf6d54c7d
40 changed files with 357 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
landlock.cpp
View File

@@ -1023,10 +1023,10 @@ int isLandValid(eLand l) {
return 1;
// not enough space
if(l == laStorms && nonchamfered && elliptic)
if(l == laStorms && nonbitrunc && elliptic)
return 0;
if(l == laStorms && nonchamfered && S3 == 3)
if(l == laStorms && nonbitrunc && S3 == 3)
return 0;
// available only in weird geometries
@@ -1046,8 +1046,8 @@ int isLandValid(eLand l) {
if((l == laWildWest || l == laDual) && normalgame)
return 0;
// Crystal World is designed for chamfered geometries
if(l == laDual && nonchamfered)
// Crystal World is designed for bitrunc geometries
if(l == laDual && nonbitrunc)
return 0;
if(l == laHaunted && chaosmode)
@@ -1096,11 +1096,11 @@ int isLandValid(eLand l) {
// works correctly only in some geometries
if(l == laClearing)
if(chaosmode || !(stdeuc || a38 || (a45 && !nonchamfered) || (a47 && !nonchamfered)))
if(chaosmode || !(stdeuc || a38 || (a45 && !nonbitrunc) || (a47 && !nonbitrunc)))
return 0;
// does not work in non-chamfered a4
if(l == laOvergrown && a4 && nonchamfered)
// does not work in non-bitrunc a4
if(l == laOvergrown && a4 && nonbitrunc)
return 0;
// does not work in bounded either
@@ -1119,9 +1119,9 @@ int isLandValid(eLand l) {
if((l == laBlizzard || l == laVolcano) && elliptic && S7 < 5)
return 0;
// Kraken does not really work in odd non-chamfered geometries
// Kraken does not really work in odd non-bitrunc geometries
// (but we do have to allow it in Standard)
if(l == laKraken && nonchamfered && (S7&1)) {
if(l == laKraken && nonbitrunc && (S7&1)) {
if(!geometry) return 1;
return 0;
}
@@ -1132,7 +1132,7 @@ int isLandValid(eLand l) {
// works in most spheres, Zebra quotient, and stdeuc
if(l == laWhirlwind)
if(!(stdeuc || quotient == 1 || (S7 == 4 && !nonchamfered) || (bigsphere && nonchamfered && !elliptic)))
if(!(stdeuc || quotient == 1 || (S7 == 4 && !nonbitrunc) || (bigsphere && nonbitrunc && !elliptic)))
return 0;
// needs standard/Euclidean (needs fractal landscape)
@@ -1154,12 +1154,12 @@ int isLandValid(eLand l) {
if(l == laDragon && bounded)
return 0;
// Graveyard pattern does not work on non-chamfered weird geometries
// Graveyard pattern does not work on non-bitrunc weird geometries
if(l == laGraveyard)
return geosupport_graveyard();
// Warped Coast does not work on non-chamfered S3s (except standard heptagonal where we have to keep it)
if(l == laWarpCoast && (S3==3) && nonchamfered) {
// Warped Coast does not work on non-bitrunc S3s (except standard heptagonal where we have to keep it)
if(l == laWarpCoast && (S3==3) && nonbitrunc) {
if(!geometry) return 1;
return 0;
}
@@ -1177,7 +1177,7 @@ int isLandValid(eLand l) {
if(l == laTrollheim && !stdeuc)
return 1;
if(l == laReptile && (!stdeuc || nonchamfered))
if(l == laReptile && (!stdeuc || nonbitrunc))
return 1;
if(l == laCrossroads && weirdhyperbolic)
@@ -1193,14 +1193,14 @@ int isLandValid(eLand l) {
if(l == laCrossroads4 && !(stdeuc || smallbounded))
return 0;
if(l == laZebra && !(stdeuc || (a4 && nonchamfered) || a46 || quotient == 1))
if(l == laZebra && !(stdeuc || (a4 && nonbitrunc) || a46 || quotient == 1))
return 0;
if(l == laCrossroads3 && euclid)
return 1; // because it is not accurate
if(l == laPrairie) {
if(stdeuc || (bigsphere && !nonchamfered && !elliptic) || (quotient == 2)) ;
if(stdeuc || (bigsphere && !nonbitrunc && !elliptic) || (quotient == 2)) ;
else if(!bounded) return 1;
else return 0;
}