Update to game plugins by Mark Bright (FS#5095)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9620 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 177 insertions, 34 deletions

diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index f14817beb5..4b01ff05b9 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -1,9 +1,68 @@
 \subsection{Jewels}
 \screenshot{plugins/images/ss-jewels}{Jewels}{img:jewels}
-Jewels is a simple yet addicting game which involves swapping pairs of jewels in order to form connected segments of three or more of the same type.
-The goal of the game is to score as many points as possible before running out of available moves. Higher points are awarded to larger combos. The game advances to the next level after every one hundred points and randomly clears several jewels.\\
-\opt{recorder,recorderv2fm}{Use the direction keys to move the cursor, press Play to select a jewel, press down long on Play to show the menu and press Off to cancel.}
-\opt{ondio}{Use the direction keys to move the cursor, press MENU to select a jewel, press down long on MENU to show the menu and press OFF to cancel.}
-\opt{h1xx}{Use the joystick to move the cursor, press down the joystick to select a jewel, press down long on the joystick to show the menu and press STOP to cancel.}
-\opt{h300}{Use the direction keys to move the cursor, press NAVI to select a jewel, press down long on NAVI to show the menu and press STOP to cancel.}
-\opt{ipodcolor,ipodnano}{Use the directions on the scrollwheel to move the cursor, press SELECT to select a jewel and press down long on SELECT to show the menu.}
+
+Jewels is a simple yet addicting game which involves swapping 
+pairs of jewels in order to form connected segments of three 
+or more of the same type.
+
+The goal of the game is to score as many points as possible 
+before running out of available moves. Higher points are 
+awarded to larger combos. The game advances to the next level 
+after every one hundred points and randomly clears several jewels.
+
+\opt{RECORDER_PAD}{
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      & Move the cursor around the jewels \\
+      \ButtonPlay 
+      & Select a jewel \\
+      Hold \ButtonPlay 
+      & Show the in-game menu\\
+      \ButtonOff 
+      & Exit\\
+    \end{btnmap}
+  \end{table}
+}
+\opt{ONDIO_PAD}{
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      & Move the cursor around the jewels \\
+      \ButtonMenu 
+      & Select a jewel \\
+      Hold \ButtonMenu 
+      & Show the in-game menu\\
+      \ButtonOff 
+      & Exit\\
+    \end{btnmap}
+  \end{table}
+}
+\opt{h1xx,h300}{
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      & Move the cursor around the jewels \\
+      \ButtonSelect 
+      & Select a jewel \\
+      Hold \ButtonSelect 
+      & Show the in-game menu\\
+      \ButtonOff 
+      & Exit\\
+    \end{btnmap}
+  \end{table}
+}
+\opt{IPOD_4G_PAD}{
+  \begin{table}
+    \begin{btnmap}{}{}
+      \fixme{ButtonLeft, ButtonRight, ButtonUp\ and ButtonDown }
+      & Move the cursor around the jewels \\
+      \ButtonSelect 
+      & Select a jewel \\
+      Hold \ButtonSelect 
+      & Show the in-game menu\\
+      \fixme{TBD} 
+      & Exit\\
+    \end{btnmap}
+  \end{table}
+}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index bd8bc6e1b8..8831ce25e0 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -2,19 +2,27 @@
 \screenshot{plugins/images/ss-rockblox}{Rockblox plugin}%
 {img:rockblox}
 
-This well{}-known game will probably be familiar. The aim of the game is
+This well-known game will probably be familiar. The aim of the game is
 to complete rows with the given pieces (blocks). Pieces can be rotated
 to make them fit into the rows.  Once you complete a row, it gets
 cleared, but if the blocks reach the top row then you lose.
 
-The controls for this game (with the Jukebox turned so that the buttons
-are to the right of the screen) are:
+As this game is played with the Jukebox turned so that the buttons
+are to the right of the screen, the controls may seem a little confusing:
 
 \begin{table}
-\begin{btnmap}{}{}
-UP & Rotate piece \\
-LEFT/RIGHT & Move piece to the left/right \\
-DOWN & Move faster the piece downwards \\
-OFF & Exit Rockblox\\
-\end{btnmap}
+  \begin{btnmap}{}{}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}%
+      {\ButtonUp\ and \ButtonDown} 
+    \opt{IPOD_4G_Pad}%
+      {\ButtonScrollFwd\ and \ButtonScrollback} & Move block Left/Right \\
+    \ButtonRight & Rotate piece \\
+    \ButtonLeft & Move the piece downwards faster \\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}%
+      {\ButtonOff}
+    \opt{IAUDIO_X5_PAD}
+      {\fixme{TBD}}
+    \opt{IPOD_4G_Pad}%
+      {\Buttonmenu}  & Exit Rockblox\\
+  \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 41c6284fe7..dd72cdb71d 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -2,15 +2,34 @@
 \screenshot{plugins/images/ss-sliding}{Sliding puzzle}{img:slidingpuzzle}
 
 The classic sliding puzzle game.  Rearrange the pieces so that you can
-see the whole picture.
+see the whole picture, or switch to number tiles if you like it a little easier
 
 Key controls:
 
 \begin{table}
-\begin{btnmap}{}{}
-UP/DOWN/LEFT/RIGHT & Moves \\
-F1 & Shuffle \\
-F2 & Change the picture \\
-OFF & Stop the game \\
-\end{btnmap}
+  \begin{btnmap}{}{}
+  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}
+    {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
+  \opt{IPOD_4G_PAD}{\fixme{tbd}}
+  & Move Tile \\
+  %
+  \opt{RECORDER_PAD}{\ButtonFOne}
+  \opt{ONDIO_PAD}{Hold \ButtonMenu}
+  \opt{h1xx,h300}{\ButtonSelect} 
+  \opt{x5}{\fixme{TBD}}
+  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  & Shuffle \\
+  %
+  \opt{RECORDER_PAD}{\ButtonFTwo}
+  \opt{ONDIO_PAD}{\ButtonMenu}
+  \opt{h1xx,h300}{\ButtonOn} 
+  \opt{x5}{\fixme{TBD}}
+  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  & Change between picture and numbered tiles \\
+  %
+  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+  \opt{x5}{\fixme{TBD}}
+  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  & Stop the game \\
+  \end{btnmap}
 \end{table}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 4b572e0459..bc49642826 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -1,9 +1,56 @@
 \subsection{Solitaire}
 \screenshot{plugins/images/ss-solitaire}{Klondike solitaire}{fig:solitaire}
 
-This is the classic Klondike solitaire game
-for Rockbox.  Select \emph{help} from the game menu to get an
-explanation of what the keys do.  Rules for Klondike solitaire are
-available from \url{http://www.solitairecentral.com/rules/klondike.html}.
+This is the classic Klondike solitaire game for Rockbox.
+This is probably the best-known solitaire in the world. Many people 
+don't even realize that other games exist. Though the name may not 
+be familiar, the game itself certainly is. This is due in no small 
+part to Microsoft's inclusion of the the game in every version of 
+Windows. Though popular, the odds of winning are rather low, perhaps 
+one in thirty hands.
+
+For the full set of rules to the game, and other facinating information
+visit\\
+\url{http://www.solitairecentral.com/rules/klondike.html}
+
+\begin{table}
+  \begin{btnmap}{}{}
+    \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}
+      {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
+    \opt{IPOD_4G_PAD}{\fixme{tbd}}
+    & Move Cursor around.\\
+    %
+    \opt{RECORDER_PAD}{\ButtonOn}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
+    \opt{ONDIO_PAD}{\ButtonMenu} %
+      & Select cards, move cards, reveal hidden cards...\\
+    %
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu} %
+      & If a card was selected -- unselect it, else\\
+      & Draw 3 new cards from the remains stack\\
+    %
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
+    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
+    \opt{ONDIO_PAD}{Hold \ButtonLeft} %
+      & Put the card from the top of the remains stack on top of the cursor\\
+    %
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
+    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
+    \opt{ONDIO_PAD}{Hold \ButtonRight} %
+      & Put the card under the cursor on one of the 4 final colour stacks.\\
+    %
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
+    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
+    \opt{ONDIO_PAD}{Hold \ButtonUp} %
+      & Put the card on top of the remains stack on one of the final colour stacks.\\
+  \end{btnmap}
+ \end{table}
 
 
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 9d77378705..1cfb4c7c39 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -11,11 +11,21 @@ wall to allow your filled circle to get to places on the screen it
 could not otherwise reach. The block cannot take ``o''s.
 
 \begin{table}
-\begin{btnmap}{}{}
-ON & Toggle control \\
-F1 & Previous level \\
-F2 & Reset level \\
-F3 & Next level \\
-OFF & Exit the game \\
-\end{btnmap}
+  \begin{btnmap}{}{}
+    \opt{RECORDER_PAD}{\ButtonOn}
+    \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}%
+      {\fixme{TBD}} & Toggle control \\
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}%
+      {\fixme{TBD}} & Previous level \\
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}%
+      {\fixme{TBD}}  & Reset level \\
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}%
+      {\fixme{TBD}}  & Next level \\
+    \opt{RECORDER_PAD}{\ButtonOff}
+    \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}%
+      {\fixme{TBD}}  & Exit the game \\
+  \end{btnmap}
 \end{table}