mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed threecolor pattern claiming to work when it does not, or producing weird effects

This commit is contained in:
Zeno Rogue 2018-05-15 23:24:04 +02:00
parent 9b55240d1e
commit eda65399d6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pattern2.cpp
View File

@ -977,12 +977,14 @@ namespace patterns {
} }
int geosupport_threecolor() { int geosupport_threecolor() {
if(!nonbitrunc) { if(!nonbitrunc && S3 == 3) {
if(S7 % 2) return 1; if(S7 % 2) return 1;
return 2; return 2;
} }
if((S7 % 2 == 0) && (S3 == 3)) if((S7 % 2 == 0) && (S3 == 3))
return 2; return 2;
if(a46 && nonbitrunc)
return 1;
return 0; return 0;
} }
@ -1068,7 +1070,7 @@ int pattern_threecolor(cell *c) {
patterns::val46(c, si, 0, patterns::PAT_COLORING); patterns::val46(c, si, 0, patterns::PAT_COLORING);
return si.id; return si.id;
} }
if(S7 == 5 && nonbitrunc) { if(S7 == 5 && nonbitrunc && S3 == 3) {
const int codes[12] = {1, 2, 0, 3, 2, 0, 0, 1, 3, 1, 2, 3}; const int codes[12] = {1, 2, 0, 3, 2, 0, 0, 1, 3, 1, 2, 3};
return codes[c->master->fiftyval]; return codes[c->master->fiftyval];
} }