X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/3220eba4ad23a856bc83d0e5d5aea04ae76e154b..3af70dd4f3397d605fe59bddfd89baf95047ea7d:/solo.c diff --git a/solo.c b/solo.c index eb35e00..f074a9c 100644 --- a/solo.c +++ b/solo.c @@ -116,7 +116,7 @@ static game_params *default_params(void) ret->c = ret->r = 3; ret->symm = SYMM_ROT2; /* a plausible default */ - ret->diff = DIFF_SIMPLE; /* so is this */ + ret->diff = DIFF_BLOCK; /* so is this */ return ret; } @@ -141,9 +141,11 @@ static int game_fetch_preset(int i, char **name, game_params **params) } presets[] = { { "2x2 Trivial", { 2, 2, SYMM_ROT2, DIFF_BLOCK } }, { "2x3 Basic", { 2, 3, SYMM_ROT2, DIFF_SIMPLE } }, + { "3x3 Trivial", { 3, 3, SYMM_ROT2, DIFF_BLOCK } }, { "3x3 Basic", { 3, 3, SYMM_ROT2, DIFF_SIMPLE } }, { "3x3 Intermediate", { 3, 3, SYMM_ROT2, DIFF_INTERSECT } }, { "3x3 Advanced", { 3, 3, SYMM_ROT2, DIFF_SET } }, + { "3x3 Unreasonable", { 3, 3, SYMM_ROT2, DIFF_RECURSIVE } }, { "3x4 Basic", { 3, 4, SYMM_ROT2, DIFF_SIMPLE } }, { "4x4 Basic", { 4, 4, SYMM_ROT2, DIFF_SIMPLE } }, }; @@ -157,12 +159,9 @@ static int game_fetch_preset(int i, char **name, game_params **params) return TRUE; } -static game_params *decode_params(char const *string) +static void decode_params(game_params *ret, char const *string) { - game_params *ret = default_params(); - ret->c = ret->r = atoi(string); - ret->symm = SYMM_ROT2; while (*string && isdigit((unsigned char)*string)) string++; if (*string == 'x') { string++; @@ -193,23 +192,33 @@ static game_params *decode_params(char const *string) string++, ret->diff = DIFF_INTERSECT; else if (*string == 'a') /* advanced */ string++, ret->diff = DIFF_SET; + else if (*string == 'u') /* unreasonable */ + string++, ret->diff = DIFF_RECURSIVE; } else string++; /* eat unknown character */ } - - return ret; } -static char *encode_params(game_params *params) +static char *encode_params(game_params *params, int full) { char str[80]; - /* - * Symmetry is a game generation preference and hence is left - * out of the encoding. Users can add it back in as they see - * fit. - */ sprintf(str, "%dx%d", params->c, params->r); + if (full) { + switch (params->symm) { + case SYMM_REF4: strcat(str, "m4"); break; + case SYMM_ROT4: strcat(str, "r4"); break; + /* case SYMM_ROT2: strcat(str, "r2"); break; [default] */ + case SYMM_NONE: strcat(str, "a"); break; + } + switch (params->diff) { + /* case DIFF_BLOCK: strcat(str, "dt"); break; [default] */ + case DIFF_SIMPLE: strcat(str, "db"); break; + case DIFF_INTERSECT: strcat(str, "di"); break; + case DIFF_SET: strcat(str, "da"); break; + case DIFF_RECURSIVE: strcat(str, "du"); break; + } + } return dupstr(str); } @@ -239,7 +248,7 @@ static config_item *game_configure(game_params *params) ret[3].name = "Difficulty"; ret[3].type = C_CHOICES; - ret[3].sval = ":Trivial:Basic:Intermediate:Advanced"; + ret[3].sval = ":Trivial:Basic:Intermediate:Advanced:Unreasonable"; ret[3].ival = params->diff; ret[4].name = NULL; @@ -1356,7 +1365,7 @@ struct game_aux_info { digit *grid; }; -static char *new_game_seed(game_params *params, random_state *rs, +static char *new_game_desc(game_params *params, random_state *rs, game_aux_info **aux) { int c = params->c, r = params->r, cr = c*r; @@ -1365,10 +1374,10 @@ static char *new_game_seed(game_params *params, random_state *rs, struct xy { int x, y; } *locs; int nlocs; int ret; - char *seed; + char *desc; int coords[16], ncoords; int xlim, ylim; - int maxdiff; + int maxdiff, recursing; /* * Adjust the maximum difficulty level to be consistent with @@ -1416,6 +1425,7 @@ static char *new_game_seed(game_params *params, random_state *rs, * while preserving solubility. */ symmetry_limit(params, &xlim, &ylim, params->symm); + recursing = FALSE; while (1) { int x, y, i, j; @@ -1452,6 +1462,8 @@ static char *new_game_seed(game_params *params, random_state *rs, * nsolve. */ for (i = 0; i < nlocs; i++) { + int ret; + x = locs[i].x; y = locs[i].y; @@ -1460,7 +1472,12 @@ static char *new_game_seed(game_params *params, random_state *rs, for (j = 0; j < ncoords; j++) grid2[coords[2*j+1]*cr+coords[2*j]] = 0; - if (nsolve(c, r, grid2) <= maxdiff) { + if (recursing) + ret = (rsolve(c, r, grid2, NULL, 2) == 1); + else + ret = (nsolve(c, r, grid2) <= maxdiff); + + if (ret) { for (j = 0; j < ncoords; j++) grid[coords[2*j+1]*cr+coords[2*j]] = 0; break; @@ -1469,29 +1486,36 @@ static char *new_game_seed(game_params *params, random_state *rs, if (i == nlocs) { /* - * There was nothing we could remove without destroying - * solvability. + * There was nothing we could remove without + * destroying solvability. If we're trying to + * generate a recursion-only grid and haven't + * switched over to rsolve yet, we now do; + * otherwise we give up. */ - break; + if (maxdiff == DIFF_RECURSIVE && !recursing) { + recursing = TRUE; + } else { + break; + } } } memcpy(grid2, grid, area); - } while (nsolve(c, r, grid2) != maxdiff); + } while (nsolve(c, r, grid2) < maxdiff); sfree(grid2); sfree(locs); /* * Now we have the grid as it will be presented to the user. - * Encode it in a game seed. + * Encode it in a game desc. */ { char *p; int run, i; - seed = snewn(5 * area, char); - p = seed; + desc = snewn(5 * area, char); + p = desc; run = 0; for (i = 0; i <= area; i++) { int n = (i < area ? grid[i] : -1); @@ -1513,7 +1537,7 @@ static char *new_game_seed(game_params *params, random_state *rs, * bottom right, there's no point putting an * unnecessary _ before or after it. */ - if (p > seed && n > 0) + if (p > desc && n > 0) *p++ = '_'; } if (n > 0) @@ -1521,14 +1545,14 @@ static char *new_game_seed(game_params *params, random_state *rs, run = 0; } } - assert(p - seed < 5 * area); + assert(p - desc < 5 * area); *p++ = '\0'; - seed = sresize(seed, p - seed, char); + desc = sresize(desc, p - desc, char); } sfree(grid); - return seed; + return desc; } static void game_free_aux_info(game_aux_info *aux) @@ -1537,23 +1561,23 @@ static void game_free_aux_info(game_aux_info *aux) sfree(aux); } -static char *validate_seed(game_params *params, char *seed) +static char *validate_desc(game_params *params, char *desc) { int area = params->r * params->r * params->c * params->c; int squares = 0; - while (*seed) { - int n = *seed++; + while (*desc) { + int n = *desc++; if (n >= 'a' && n <= 'z') { squares += n - 'a' + 1; } else if (n == '_') { /* do nothing */; } else if (n > '0' && n <= '9') { squares++; - while (*seed >= '0' && *seed <= '9') - seed++; + while (*desc >= '0' && *desc <= '9') + desc++; } else - return "Invalid character in game specification"; + return "Invalid character in game description"; } if (squares < area) @@ -1565,7 +1589,7 @@ static char *validate_seed(game_params *params, char *seed) return NULL; } -static game_state *new_game(game_params *params, char *seed) +static game_state *new_game(game_params *params, char *desc) { game_state *state = snew(game_state); int c = params->c, r = params->r, cr = c*r, area = cr * cr; @@ -1581,8 +1605,8 @@ static game_state *new_game(game_params *params, char *seed) state->completed = state->cheated = FALSE; i = 0; - while (*seed) { - int n = *seed++; + while (*desc) { + int n = *desc++; if (n >= 'a' && n <= 'z') { int run = n - 'a' + 1; assert(i + run <= area); @@ -1593,9 +1617,9 @@ static game_state *new_game(game_params *params, char *seed) } else if (n > '0' && n <= '9') { assert(i < area); state->immutable[i] = TRUE; - state->grid[i++] = atoi(seed-1); - while (*seed >= '0' && *seed <= '9') - seed++; + state->grid[i++] = atoi(desc-1); + while (*desc >= '0' && *desc <= '9') + desc++; } else { assert(!"We can't get here"); } @@ -1761,6 +1785,8 @@ static game_state *make_move(game_state *from, game_ui *ui, int x, int y, int tx, ty; game_state *ret; + button &= ~MOD_NUM_KEYPAD; /* we treat this the same as normal */ + tx = (x + TILE_SIZE - BORDER) / TILE_SIZE - 1; ty = (y + TILE_SIZE - BORDER) / TILE_SIZE - 1; @@ -2020,9 +2046,9 @@ const struct game thegame = { dup_params, TRUE, game_configure, custom_params, validate_params, - new_game_seed, + new_game_desc, game_free_aux_info, - validate_seed, + validate_desc, new_game, dup_game, free_game, @@ -2083,7 +2109,7 @@ int main(int argc, char **argv) game_params *p; game_state *s; int recurse = TRUE; - char *id = NULL, *seed, *err; + char *id = NULL, *desc, *err; int y, x; int grade = FALSE; @@ -2112,20 +2138,21 @@ int main(int argc, char **argv) return 1; } - seed = strchr(id, ':'); - if (!seed) { + desc = strchr(id, ':'); + if (!desc) { fprintf(stderr, "%s: game id expects a colon in it\n", argv[0]); return 1; } - *seed++ = '\0'; + *desc++ = '\0'; - p = decode_params(id); - err = validate_seed(p, seed); + p = default_params(); + decode_params(p, id); + err = validate_desc(p, desc); if (err) { fprintf(stderr, "%s: %s\n", argv[0], err); return 1; } - s = new_game(p, seed); + s = new_game(p, desc); if (recurse) { int ret = rsolve(p->c, p->r, s->grid, NULL, 2);