zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Oops. Uncomment the difficulty exceptions! (Also add another

Browse Source 
constraint in validate_params.)

[originally from svn r8824]
This commit is contained in:
Simon Tatham
2010-01-09 17:21:36 +00:00
parent 572a746937
commit 6776b0afba
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
unfinished/group.c
View File

@ -242,6 +242,17 @@ static char *validate_params(game_params *params, int full)
*/ */
return "Trivial puzzles must have an identity"; return "Trivial puzzles must have an identity";
} }
if (!params->id && params->w == 3) {
/*
* We can't have a 3x3 puzzle without an identity either,
* because 3x3 puzzles can't ever be harder than Trivial
* (there are no 3x3 latin squares which aren't also valid
* group tables, so enabling group-based deductions doesn't
* rule out any possible solutions) and - as above - Trivial
* puzzles can't not have an identity.
*/
return "3x3 puzzles must have an identity";
}
return NULL; return NULL;
} }
@ -602,7 +613,6 @@ done
* _out_, so as to detect exceptions that should be removed as * _out_, so as to detect exceptions that should be removed as
* well as those which should be added. * well as those which should be added.
*/ */
#if 0
if (w < 5 && diff == DIFF_UNREASONABLE) if (w < 5 && diff == DIFF_UNREASONABLE)
diff--; diff--;
if ((w < 5 || ((w == 6 || w == 8) && params->id)) && diff == DIFF_EXTREME) if ((w < 5 || ((w == 6 || w == 8) && params->id)) && diff == DIFF_EXTREME)
@ -611,7 +621,6 @@ done
diff--; diff--;
if ((w < 4 || (w == 4 && params->id)) && diff == DIFF_NORMAL) if ((w < 4 || (w == 4 && params->id)) && diff == DIFF_NORMAL)
diff--; diff--;
#endif
grid = snewn(a, digit); grid = snewn(a, digit);
soln = snewn(a, digit); soln = snewn(a, digit);