simon-git: puzzles (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  c108271 Unruly: new 'Trivial' difficulty level.
  6691ad1 Fix benchmark.sh for the new cmake world.

Repository:     https://git.tartarus.org/simon/puzzles.git
On the web:     https://git.tartarus.org/?p=simon/puzzles.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-09-06 11:01:38

commit c108271b44c9607fce88499d794cbf1648213f1d
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=c108271b44c9607fce88499d794cbf1648213f1d;hp=55813ea2fc7ef456d57cb9ddbfed4a802f1bb442
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Sep 6 10:51:01 2021 +0100

    Unruly: new 'Trivial' difficulty level.
    
    A user recently mentioned having found even 'Easy' to be harder than
    they'd like. That difficulty level generates puzzles that can be
    solved by filling in any square for which the other colour would
    immediately generate a run of 3, and spotting rows that have the
    correct total number of one colour and filling in all remaining
    squares in the other colour.
    
    Initially I thought there wasn't much I could do to make the solution
    techniques easier than that. But after a bit of thought, I decided the
    second criterion can be weakened a bit. The new 'Trivial' level
    replaces it with a special case: when a row or column only has _one_
    remaining unfilled square, the remaining square is filled in by
    counting.
    
    That version of the rule doesn't require the player to do any counting
    in order to _spot_ possible applications of it: you can see at a
    glance that a row or column has only one remaining grey square, even
    if having seen it you then have to count to work out which colour to
    fill it in. So it makes a gentler introduction to the game.

 unruly.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 2 deletions(-)

commit 6691ad180cdd6f80673c49392c401ba8d6c5d3e7
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=6691ad180cdd6f80673c49392c401ba8d6c5d3e7;hp=c108271b44c9607fce88499d794cbf1648213f1d
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Sep 6 10:57:40 2021 +0100

    Fix benchmark.sh for the new cmake world.
    
    It relied on reading gamedesc.txt to find a list of puzzle binaries to
    run. But gamedesc.txt is now specific to the Windows build (since it
    contains Windows executable names), and isn't available in the Unix
    cmake build directory.
    
    Fixed by making a simpler gamelist.txt available on all platforms.

 CMakeLists.txt    |  2 +-
 benchmark.sh      |  8 ++++++--
 cmake/setup.cmake | 12 ++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)