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

Allow more general cross-shaped boards in Pegs

Browse Source 
I found a plausible looking Web page claiming that various different
sizes of cross are soluble, and some of them are quite widespread.  I've
enabled the ones that are symmetric enough that the existing game
generator can lay them out.
This commit is contained in:
Ben Harris
2023-02-12 01:24:58 +00:00
parent 97b03cc67a
commit c139aba078
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pegs.c
View File

@ -71,7 +71,11 @@ static game_params *default_params(void)
} }
static const struct game_params pegs_presets[] = { static const struct game_params pegs_presets[] = {
{5, 7, TYPE_CROSS},
{7, 7, TYPE_CROSS}, {7, 7, TYPE_CROSS},
{5, 9, TYPE_CROSS},
{7, 9, TYPE_CROSS},
{9, 9, TYPE_CROSS},
{7, 7, TYPE_OCTAGON}, {7, 7, TYPE_OCTAGON},
{5, 5, TYPE_RANDOM}, {5, 5, TYPE_RANDOM},
{7, 7, TYPE_RANDOM}, {7, 7, TYPE_RANDOM},
@ -90,7 +94,7 @@ static bool game_fetch_preset(int i, char **name, game_params **params)
*ret = pegs_presets[i]; *ret = pegs_presets[i];
strcpy(str, pegs_titletypes[ret->type]); strcpy(str, pegs_titletypes[ret->type]);
if (ret->type == TYPE_RANDOM) if (ret->type == TYPE_CROSS || ret->type == TYPE_RANDOM)
sprintf(str + strlen(str), " %dx%d", ret->w, ret->h); sprintf(str + strlen(str), " %dx%d", ret->w, ret->h);
*name = dupstr(str); *name = dupstr(str);
@ -189,12 +193,32 @@ static const char *validate_params(const game_params *params, bool full)
return "Width times height must not be unreasonably large"; return "Width times height must not be unreasonably large";
/* /*
* It might be possible to implement generalisations of Cross * At http://www.gibell.net/pegsolitaire/GenCross/GenCrossBoards0.html
* and Octagon, but only if I can find a proof that they're all * George I. Bell asserts that various generalised cross-shaped
* soluble. For the moment, therefore, I'm going to disallow * boards are soluble starting (and finishing) with the centre
* them at any size other than the standard one. * hole. We permit the symmetric ones. Bell's notation for each
* soluble board is listed.
*/ */
if (full && (params->type == TYPE_CROSS || params->type == TYPE_OCTAGON)) { if (full && params->type == TYPE_CROSS) {
if (!((params->w == 9 && params->h == 5) || /* (3,1,3,1) */
(params->w == 5 && params->h == 9) || /* (1,3,1,3) */
(params->w == 9 && params->h == 9) || /* (3,3,3,3) */
(params->w == 7 && params->h == 5) || /* (2,1,2,1) */
(params->w == 5 && params->h == 7) || /* (1,2,1,2) */
(params->w == 9 && params->h == 7) || /* (3,2,3,2) */
(params->w == 7 && params->h == 9) || /* (2,3,2,3) */
(params->w == 7 && params->h == 7))) /* (2,2,2,2) */
return "This board type is only supported at "
"5x7, 5x9, 7x7, 7x9, and 9x9";
}
/*
* It might be possible to implement generalisations of
* Octagon, but only if I can find a proof that they're all
* soluble. For the moment, therefore, I'm going to disallow
* it at any size other than the standard one.
*/
if (full && params->type == TYPE_OCTAGON) {
if (params->w != 7 || params->h != 7) if (params->w != 7 || params->h != 7)
return "This board type is only supported at 7x7"; return "This board type is only supported at 7x7";
} }

5
puzzles.but
View File

@ -1446,8 +1446,9 @@ These parameters are available from the \q{Custom...} option on the
\dd Controls whether you are given a board of a standard shape or a \dd Controls whether you are given a board of a standard shape or a
randomly generated shape. The two standard shapes currently randomly generated shape. The two standard shapes currently
supported are \q{Cross} and \q{Octagon} (also commonly known as the supported are \q{Cross} (in various sizes) and \q{Octagon}.
English and European traditional board layouts respectively). The 7\by\.7 Cross is the traditional English board layout.
The Octagon is the traditional French one.
Selecting \q{Random} will give you a different board shape every Selecting \q{Random} will give you a different board shape every
time (but always one that is known to have a solution). time (but always one that is known to have a solution).