mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-23 18:07:41 +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

16
achievement.cpp
View File

@@ -84,7 +84,7 @@ vector<string> achievementsReceived;
bool wrongMode(char flags) {
if(cheater) return true;
if(flags == 'x') return false;
if(nonchamfered != (flags == '7')) return true;
if(nonbitrunc != (flags == '7')) return true;
if(euclid != (flags == 'e')) return true;
if(flags == 'E' && S7 < 5) return false;
if(sphere != (flags == 'E')) return true;
@@ -496,7 +496,7 @@ void achievement_score(int cat, int number) {
if(sphere && cat != LB_HALLOWEEN) return;
if(quotient) return;
if(elliptic && cat != LB_HALLOWEEN) return;
if(nonchamfered) return;
if(nonbitrunc) return;
if(randomPatternsMode) return;
if(shmup::on && cat != LB_PURE_TACTICS_SHMUP && cat != LB_PURE_TACTICS_COOP) return;
if(yendor::on && cat != LB_YENDOR_CHALLENGE) return;
@@ -584,7 +584,7 @@ void achievement_final(bool really_final) {
}
if(sphere && specialland == laHalloween) {
if(shmup::on || chaosmode || nonchamfered || numplayers() > 1 || tactic::on || randomPatternsMode)
if(shmup::on || chaosmode || nonbitrunc || numplayers() > 1 || tactic::on || randomPatternsMode)
return;
achievement_score(LB_HALLOWEEN, items[itTreat]);
}
@@ -598,21 +598,21 @@ void achievement_final(bool really_final) {
int specials = 0;
if(shmup::on) specials++;
if(chaosmode) specials++;
if(nonchamfered) specials++;
if(nonbitrunc) specials++;
if(inv::on) specials++;
if(specials > 1) return;
if(numplayers() > 1 && chaosmode) return;
if(numplayers() > 1 && nonchamfered) return;
if(numplayers() > 1 && nonbitrunc) return;
if(numplayers() > 1 && inv::on) return;
int total_improved = 0;
specific_improved = 0;
specific_what = 0;
if(!shmup::on && !chaosmode && !nonchamfered && numplayers() == 1 && !inv::on) improveItemScores();
if(!shmup::on && !chaosmode && !nonbitrunc && numplayers() == 1 && !inv::on) improveItemScores();
int sid = nonchamfered ? 57 : chaosmode ? 53 : shmup::on ? (numplayers() > 1 ? 44 : 28) :
int sid = nonbitrunc ? 57 : chaosmode ? 53 : shmup::on ? (numplayers() > 1 ? 44 : 28) :
inv::on ? 69 :
(numplayers() > 1 ? 61 : 0);
@@ -671,7 +671,7 @@ void achievement_victory(bool hyper) {
if(euclid) return;
if(sphere) return;
if(quotient) return;
if(nonchamfered) return;
if(nonbitrunc) return;
if(randomPatternsMode) return;
if(hyper && shmup::on) return;
if(yendor::on) return;