#define COORD(x) ( (x) * TILE_SIZE + BORDER )
#define FROMCOORD(x) ( ((x) - BORDER + TILE_SIZE) / TILE_SIZE - 1 )
-#define PI 3.141592653589793238462643383279502884197169399
-
#define ANIM_PER_RADIUS_UNIT 0.13F
#define FLASH_FRAME 0.13F
int w, h, n;
int rowsonly;
int orientable;
+ int movetarget;
};
struct game_state {
int completed;
int just_used_solve; /* used to suppress undo animation */
int used_solve; /* used to suppress completion flash */
- int movecount;
+ int movecount, movetarget;
int lastx, lasty, lastr; /* coordinates of last rotation */
};
ret->w = ret->h = 3;
ret->n = 2;
ret->rowsonly = ret->orientable = FALSE;
+ ret->movetarget = 0;
return ret;
}
return TRUE;
}
-static game_params *decode_params(char const *string)
+static void decode_params(game_params *ret, char const *string)
{
- game_params *ret = snew(game_params);
-
ret->w = ret->h = atoi(string);
ret->n = 2;
ret->rowsonly = ret->orientable = FALSE;
+ ret->movetarget = 0;
while (*string && isdigit(*string)) string++;
if (*string == 'x') {
string++;
ret->rowsonly = TRUE;
} else if (*string == 'o') {
ret->orientable = TRUE;
+ } else if (*string == 'm') {
+ string++;
+ ret->movetarget = atoi(string);
+ while (string[1] && isdigit(string[1])) string++;
}
string++;
}
-
- return ret;
}
-static char *encode_params(game_params *params)
+static char *encode_params(game_params *params, int full)
{
char buf[256];
sprintf(buf, "%dx%dn%d%s%s", params->w, params->h, params->n,
params->rowsonly ? "r" : "",
params->orientable ? "o" : "");
+ /* Shuffle limit is part of the limited parameters, because we have to
+ * supply the target move count. */
+ if (params->movetarget)
+ sprintf(buf + strlen(buf), "m%d", params->movetarget);
return dupstr(buf);
}
config_item *ret;
char buf[80];
- ret = snewn(6, config_item);
+ ret = snewn(7, config_item);
ret[0].name = "Width";
ret[0].type = C_STRING;
ret[4].sval = NULL;
ret[4].ival = params->orientable;
- ret[5].name = NULL;
- ret[5].type = C_END;
- ret[5].sval = NULL;
+ ret[5].name = "Number of shuffling moves";
+ ret[5].type = C_STRING;
+ sprintf(buf, "%d", params->movetarget);
+ ret[5].sval = dupstr(buf);
ret[5].ival = 0;
+ ret[6].name = NULL;
+ ret[6].type = C_END;
+ ret[6].sval = NULL;
+ ret[6].ival = 0;
+
return ret;
}
ret->n = atoi(cfg[2].sval);
ret->rowsonly = cfg[3].ival;
ret->orientable = cfg[4].ival;
+ ret->movetarget = atoi(cfg[5].sval);
return ret;
}
return ok;
}
-static char *new_game_seed(game_params *params, random_state *rs,
- game_aux_info **aux)
+static char *new_game_desc(game_params *params, random_state *rs,
+ game_aux_info **aux, int interactive)
{
int *grid;
int w = params->w, h = params->h, n = params->n, wh = w*h;
* and simply shuffle the grid by making a long sequence of
* randomly chosen moves.
*/
- total_moves = w*h*n*n*2 + random_upto(rs, 1);
- for (i = 0; i < total_moves; i++) {
- int x, y;
+ total_moves = params->movetarget;
+ if (!total_moves)
+ /* Add a random move to avoid parity issues. */
+ total_moves = w*h*n*n*2 + random_upto(rs, 2);
+
+ do {
+ int *prevmoves;
+ int rw, rh; /* w/h of rotation centre space */
+
+ rw = w - n + 1;
+ rh = h - n + 1;
+ prevmoves = snewn(rw * rh, int);
+ for (i = 0; i < rw * rh; i++)
+ prevmoves[i] = 0;
+
+ for (i = 0; i < total_moves; i++) {
+ int x, y, r, oldtotal, newtotal, dx, dy;
+
+ do {
+ x = random_upto(rs, w - n + 1);
+ y = random_upto(rs, h - n + 1);
+ r = 2 * random_upto(rs, 2) - 1;
+
+ /*
+ * See if any previous rotations has happened at
+ * this point which nothing has overlapped since.
+ * If so, ensure we haven't either undone a
+ * previous move or repeated one so many times that
+ * it turns into fewer moves in the inverse
+ * direction (i.e. three identical rotations).
+ */
+ oldtotal = prevmoves[y*rw+x];
+ newtotal = oldtotal + r;
+ } while (abs(newtotal) < abs(oldtotal) || abs(newtotal) > 2);
+
+ do_rotate(grid, w, h, n, params->orientable, x, y, r);
+
+ /*
+ * Log the rotation we've just performed at this point,
+ * for inversion detection in the next move.
+ *
+ * Also zero a section of the prevmoves array, because
+ * any rotation area which _overlaps_ this one is now
+ * entirely safe to perform further moves in.
+ *
+ * Two rotation areas overlap if their top left
+ * coordinates differ by strictly less than n in both
+ * directions
+ */
+ prevmoves[y*rw+x] += r;
+ for (dy = -n+1; dy <= n-1; dy++) {
+ if (y + dy < 0 || y + dy >= rh)
+ continue;
+ for (dx = -n+1; dx <= n-1; dx++) {
+ if (x + dx < 0 || x + dx >= rw)
+ continue;
+ if (dx == 0 && dy == 0)
+ continue;
+ prevmoves[(y+dy)*rw+(x+dx)] = 0;
+ }
+ }
+ }
- x = random_upto(rs, w - n + 1);
- y = random_upto(rs, h - n + 1);
- do_rotate(grid, w, h, n, params->orientable,
- x, y, 1 + random_upto(rs, 3));
+ sfree(prevmoves);
- /*
- * Optionally one more move in case the entire grid has
- * happened to come out solved.
- */
- if (i == total_moves - 1 && grid_complete(grid, wh,
- params->orientable))
- i--;
- }
+ } while (grid_complete(grid, wh, params->orientable));
/*
- * Now construct the game seed, by describing the grid as a
- * simple sequence of integers. They're comma-separated, unless
- * the puzzle is orientable in which case they're separated by
- * orientation letters `u', `d', `l' and `r'.
+ * Now construct the game description, by describing the grid
+ * as a simple sequence of integers. They're comma-separated,
+ * unless the puzzle is orientable in which case they're
+ * separated by orientation letters `u', `d', `l' and `r'.
*/
ret = NULL;
retlen = 0;
assert(!"Shouldn't happen");
}
-static char *validate_seed(game_params *params, char *seed)
+static char *validate_desc(game_params *params, char *desc)
{
char *p, *err;
int w = params->w, h = params->h, wh = w*h;
int i;
- p = seed;
+ p = desc;
err = NULL;
for (i = 0; i < wh; i++) {
return NULL;
}
-static game_state *new_game(game_params *params, char *seed)
+static game_state *new_game(midend_data *me, game_params *params, char *desc)
{
game_state *state = snew(game_state);
int w = params->w, h = params->h, n = params->n, wh = w*h;
state->completed = 0;
state->used_solve = state->just_used_solve = FALSE;
state->movecount = 0;
+ state->movetarget = params->movetarget;
state->lastx = state->lasty = state->lastr = -1;
state->grid = snewn(wh, int);
- p = seed;
+ p = desc;
for (i = 0; i < wh; i++) {
state->grid[i] = 4 * atoi(p);
ret->orientable = state->orientable;
ret->completed = state->completed;
ret->movecount = state->movecount;
+ ret->movetarget = state->movetarget;
ret->lastx = state->lastx;
ret->lasty = state->lasty;
ret->lastr = state->lastr;
for (i = 0; i < ret->w*ret->h; i++)
ret->grid[i] &= ~3;
ret->used_solve = ret->just_used_solve = TRUE;
- ret->completed = ret->movecount;
+ ret->completed = ret->movecount = 1;
return ret;
}
*/
maxlen = state->h * state->w * (col+o+1);
- ret = snewn(maxlen, char);
+ ret = snewn(maxlen+1, char);
p = ret;
for (y = 0; y < state->h; y++) {
{
}
-static game_state *make_move(game_state *from, game_ui *ui, int x, int y,
- int button)
+static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
+ int x, int y, int button)
{
int w = from->w, h = from->h, n = from->n, wh = w*h;
game_state *ret;
int dir;
+ button = button & (~MOD_MASK | MOD_NUM_KEYPAD);
+
if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
/*
* Determine the coordinates of the click. We offset by n-1
y -= (n-1) * TILE_SIZE / 2;
x = FROMCOORD(x);
y = FROMCOORD(y);
- if (x < 0 || x > w-n || y < 0 || y > w-n)
+ dir = (button == LEFT_BUTTON ? 1 : -1);
+ if (x < 0 || x > w-n || y < 0 || y > h-n)
return NULL;
+ } else if (button == 'a' || button == 'A' || button==MOD_NUM_KEYPAD+'7') {
+ x = y = 0;
+ dir = (button == 'A' ? -1 : +1);
+ } else if (button == 'b' || button == 'B' || button==MOD_NUM_KEYPAD+'9') {
+ x = w-n;
+ y = 0;
+ dir = (button == 'B' ? -1 : +1);
+ } else if (button == 'c' || button == 'C' || button==MOD_NUM_KEYPAD+'1') {
+ x = 0;
+ y = h-n;
+ dir = (button == 'C' ? -1 : +1);
+ } else if (button == 'd' || button == 'D' || button==MOD_NUM_KEYPAD+'3') {
+ x = w-n;
+ y = h-n;
+ dir = (button == 'D' ? -1 : +1);
+ } else if (button==MOD_NUM_KEYPAD+'8' && (w-n) % 2 == 0) {
+ x = (w-n) / 2;
+ y = 0;
+ dir = +1;
+ } else if (button==MOD_NUM_KEYPAD+'2' && (w-n) % 2 == 0) {
+ x = (w-n) / 2;
+ y = h-n;
+ dir = +1;
+ } else if (button==MOD_NUM_KEYPAD+'4' && (h-n) % 2 == 0) {
+ x = 0;
+ y = (h-n) / 2;
+ dir = +1;
+ } else if (button==MOD_NUM_KEYPAD+'6' && (h-n) % 2 == 0) {
+ x = w-n;
+ y = (h-n) / 2;
+ dir = +1;
+ } else if (button==MOD_NUM_KEYPAD+'5' && (w-n) % 2 == 0 && (h-n) % 2 == 0){
+ x = (w-n) / 2;
+ y = (h-n) / 2;
+ dir = +1;
+ } else {
+ return NULL; /* no move to be made */
+ }
- /*
- * This is a valid move. Make it.
- */
- ret = dup_game(from);
- ret->just_used_solve = FALSE; /* zero this in a hurry */
- ret->movecount++;
- dir = (button == LEFT_BUTTON ? 1 : -1);
- do_rotate(ret->grid, w, h, n, ret->orientable, x, y, dir);
- ret->lastx = x;
- ret->lasty = y;
- ret->lastr = dir;
+ /*
+ * This is a valid move. Make it.
+ */
+ ret = dup_game(from);
+ ret->just_used_solve = FALSE; /* zero this in a hurry */
+ ret->movecount++;
+ do_rotate(ret->grid, w, h, n, ret->orientable, x, y, dir);
+ ret->lastx = x;
+ ret->lasty = y;
+ ret->lastr = dir;
- /*
- * See if the game has been completed. To do this we simply
- * test that the grid contents are in increasing order.
- */
- if (!ret->completed && grid_complete(ret->grid, wh, ret->orientable))
- ret->completed = ret->movecount;
- return ret;
- }
- return NULL;
+ /*
+ * See if the game has been completed. To do this we simply
+ * test that the grid contents are in increasing order.
+ */
+ if (!ret->completed && grid_complete(ret->grid, wh, ret->orientable))
+ ret->completed = ret->movecount;
+ return ret;
}
/* ----------------------------------------------------------------------
int coords[8];
char str[40];
+ /*
+ * If we've been passed a rotation region but we're drawing a
+ * tile which is outside it, we must draw it normally. This can
+ * occur if we're cleaning up after a completion flash while a
+ * new move is also being made.
+ */
+ if (rot && (x < rot->cx || y < rot->cy ||
+ x >= rot->cx+rot->cw || y >= rot->cy+rot->ch))
+ rot = NULL;
+
if (rot)
clip(fe, rot->cx, rot->cy, rot->cw, rot->ch);
}
/*
- * Next, the colour bars for orientation.
+ * Next, the triangles for orientation.
*/
if (state->orientable) {
int xdx, xdy, ydx, ydy;
}
static float game_anim_length(game_state *oldstate, game_state *newstate,
- int dir)
+ int dir, game_ui *ui)
{
if ((dir > 0 && newstate->just_used_solve) ||
(dir < 0 && oldstate->just_used_solve))
}
static float game_flash_length(game_state *oldstate, game_state *newstate,
- int dir)
+ int dir, game_ui *ui)
{
if (!oldstate->completed && newstate->completed &&
!oldstate->used_solve && !newstate->used_solve)
*/
if (oldstate) {
float angle;
- float anim_max = game_anim_length(oldstate, state, dir);
+ float anim_max = game_anim_length(oldstate, state, dir, ui);
if (dir > 0) {
lastx = state->lastx;
if (state->used_solve)
sprintf(statusbuf, "Moves since auto-solve: %d",
state->movecount - state->completed);
- else
+ else {
sprintf(statusbuf, "%sMoves: %d",
(state->completed ? "COMPLETED! " : ""),
(state->completed ? state->completed : state->movecount));
+ if (state->movetarget)
+ sprintf(statusbuf+strlen(statusbuf), " (target %d)",
+ state->movetarget);
+ }
status_bar(fe, statusbuf);
}
return TRUE;
}
+static int game_timing_state(game_state *state)
+{
+ return TRUE;
+}
+
#ifdef COMBINED
#define thegame twiddle
#endif
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,
game_anim_length,
game_flash_length,
game_wants_statusbar,
+ FALSE, game_timing_state,
};
~mdw / sgt / puzzles / blobdiff