New puzzle from James H: 'Magnets'.

[originally from svn r8836]

icons/Makefile

@@ -1,8 +1,8 @@
 # Makefile for Puzzles icons.
 
 PUZZLES = blackbox bridges cube dominosa fifteen filling flip galaxies guess \
-	  inertia keen lightup loopy map mines net netslide pattern pegs \
-	  rect samegame singles sixteen slant solo tents towers twiddle \
+	  inertia keen lightup loopy magnets map mines net netslide pattern \
+	  pegs rect samegame singles sixteen slant solo tents towers twiddle \
 	  unequal untangle
 
 BASE = $(patsubst %,%-base.png,$(PUZZLES))
@@ -64,6 +64,7 @@ inertia-ibase.png : override CROP=321x321 128x128+193+0
 keen-ibase.png : override CROP=288x288 96x96+24+120
 lightup-ibase.png : override CROP=256x256 112x112+144+0
 loopy-ibase.png : override CROP=257x257 113x113+0+0
+magnets-ibase.png : override CROP=264x232 96x96+36+100
 mines-ibase.png : override CROP=240x240 110x110+130+130
 net-ibase.png : override CROP=193x193 113x113+0+80
 netslide-ibase.png : override CROP=289x289 144x144+0+0

icons/magnets.sav

@@ -0,0 +1,33 @@
+SAVEFILE:41:Simon Tatham's Portable Puzzle Collection
+VERSION :1:1
+GAME    :7:Magnets
+PARAMS  :6:6x5dtS
+CPARAMS :6:6x5dtS
+SEED    :15:705856238774945
+DESC    :56:2.2..1,.3.2.,2.21..,2..0.,TLRTLRBLRBTTLRLRBBLRTTTTLRBBBB
+AUXINFO :60:ebae280db3eec279c628b6cfe4aca5a03ba24d7eba91169f1bdf275fce3f
+NSTATES :2:24
+STATEPOS:2:15
+MOVE    :4:.1,3
+MOVE    :4:.0,1
+MOVE    :4:?0,1
+MOVE    :4:.2,1
+MOVE    :4:?2,1
+MOVE    :4:.2,4
+MOVE    :4:?2,4
+MOVE    :4:+2,3
+MOVE    :4:.3,3
+MOVE    :4:.0,2
+MOVE    :4:?0,2
+MOVE    :4:+1,4
+MOVE    :4:+0,2
+MOVE    :4:+0,0
+MOVE    :4:+1,1
+MOVE    :4:.2,2
+MOVE    :4:+2,0
+MOVE    :4:+3,1
+MOVE    :4:.4,0
+MOVE    :4:+5,1
+MOVE    :4:.5,3
+MOVE    :4:+4,3
+MOVE    :4:.4,2

magnets.R

@@ -0,0 +1,24 @@
+# -*- makefile -*-
+
+MAGNETS_EXTRA = laydomino
+
+magnets      : [X] GTK COMMON magnets MAGNETS_EXTRA magnets-icon|no-icon
+
+magnets      : [G] WINDOWS COMMON magnets MAGNETS_EXTRA magnets.res|noicon.res
+
+magnetssolver :     [U] magnets[STANDALONE_SOLVER] MAGNETS_EXTRA STANDALONE m.lib
+magnetssolver :     [C] magnets[STANDALONE_SOLVER] MAGNETS_EXTRA STANDALONE
+
+ALL += magnets[COMBINED] MAGNETS_EXTRA
+
+!begin gtk
+GAMES += magnets
+!end
+
+!begin >list.c
+    A(magnets) \
+!end
+
+!begin >wingames.lst
+magnets.exe:magnets
+!end

puzzles.but

@@ -2705,6 +2705,76 @@ These parameters are available from the \q{Custom...} option on the
 \dd Controls the difficulty of the generated puzzle.
 
 
+\C{magnets} \i{Magnets}
+
+\cfg{winhelp-topic}{games.magnets}
+
+A rectangular grid has been filled with a mixture of magnets (that is,
+dominoes with one positive end and one negative end) and blank dominoes
+(that is, dominoes with two neutral poles).
+These dominoes are initially only seen in silhouette. Around the grid
+are placed a number of clues indicating the number of positive and
+negative poles contained in certain columns and rows.
+
+Your aim is to correctly place the magnets and blank dominoes such that
+all the clues are satisfied, with the additional constraint that no two
+similar magnetic poles may be orgothonally adjacent (since they repel).
+Neutral poles do not repel, and can be adjacacent to any other pole. 
+
+Credit for this puzzle goes to \i{Janko} \k{janko-magnets}.
+
+Magnets was contributed to this collection by James Harvey.
+
+\B{janko-magnets}
+\W{http://www.janko.at/Raetsel/Magnete/index.htm}\cw{http://www.janko.at/Raetsel/Magnete/index.htm}
+
+\H{magnets-controls} \i{Magnets controls}
+
+\IM{Magnets controls} controls, for Magnets
+
+Left-clicking on an empty square places a magnet at that position with
+the positive pole on the square and the negative pole on the other half
+of the magnet; left-clicking again reverses the polarity, and a third
+click removes the magnet.
+
+Right-clicking on an empty square places a blank domino there.
+Right-clicking again places two question marks on the domino, signifying
+'this cannot be blank' (which can be useful to note deductions while
+solving, and right-clicking again empties the domino. 
+
+You can also use the cursor keys to move a cursor around the grid. 
+Pressing the return key will lay a domino with a positive pole at that
+position; pressing again reverses the polarity and then removes the
+domino, as with left-clicking. Using the space bar allows placement
+of blank dominoes and cannot-be-blank hints, as for right-clicking. 
+
+(All the actions described in \k{common-actions} are also available.)
+
+\H{magnets-parameters} \I{parameters, for Magnets}Magnets parameters
+
+These parameters are available from the \q{Custom...} option on the
+\q{Type} menu.
+
+\dt \e{Width}, \e{Height}
+
+\dd Size of grid in squares. There will be half \e{Width} \by \e{Height}
+dominoes in the grid: if this number is odd then one square will be blank.
+
+(Grids with at least one odd dimension tend to be easier to solve)
+
+\dt \e{Difficulty}
+
+\dd Controls the difficulty of the generated puzzle. At Tricky level,
+you are required to make more deductions about empty dominoes and
+row/column counts. 
+
+\dt \e{Strip clues}
+
+\dd If true, some of the clues around the grid are removed at generation
+time, making the puzzle more difficult.
+
+
+
 \A{licence} \I{MIT licence}\ii{Licence}
 
 This software is \i{copyright} 2004-2010 Simon Tatham.