move into misc-data.pl: HS1 array

NFC

diff --git a/generate-board b/generate-board
index 0a3a50b28fb6770ca59bb64f3b931477b2e935db..79c258824ae61ed0272fc1627074594839b60e51 100755 (executable)
--- a/generate-board
+++ b/generate-board
@@ -933,9 +933,9 @@ sub dykes(){
   }
 }
 
-sub hs_initial_1 ($;$$$) {
-  my ($colour) = @_;
-  my $hs1 = $c{HS1}{$colour};
+sub hs_initial_1 ($) {
+  my ($hs1) = @_;
+  my ($colour) = $hs1->{Colour};
   my ($text, $text2);
   if ($hs1->{Water}) {
     ($text,$text2) = ('up to '.$hs1->{Water}, 'fewer');
@@ -978,10 +978,7 @@ sub hs_initial_1 ($;$$$) {
 }
 
 sub hs_initial () {
-  hs_initial_1('red');
-  hs_initial_1('purple');
-  hs_initial_1('green');
-  hs_initial_1('yellow');
+  hs_initial_1($_) foreach @{ $c{HS1} };
 }
 
 sub play_hint () {

diff --git a/misc-data.pl b/misc-data.pl
index 4f068258ca5c6f478425c644fc0403923fff5437..c7d218e89a2980b68859543fea8dbebcecf87d47 100644 (file)
--- a/misc-data.pl
+++ b/misc-data.pl
@@ -77,10 +77,10 @@ END
    { Colour => 'playerdeck', PosAdy => [ 401, 44, 'Bottom' ] },
    { Colour => 'dykefail', PosAdy => [ 242, 1363, 'Top'], Rotate => 90 },
  ],
- HS1 => {
-   'red'    => { XIYI => [0,0] },
-   'purple' => { XIYI => [0,1] },
-   'green'  => { XIYI => [1,0], Water => 6 },
-   'yellow' => { XIYI => [1,1], Dykes => 4 },
- },
+ HS1 => [
+   { Colour => 'red'    , XIYI => [0,0] },
+   { Colour => 'purple' , XIYI => [0,1] },
+   { Colour => 'green'  , XIYI => [1,0], Water => 6 },
+   { Colour => 'yellow' , XIYI => [1,1], Dykes => 4 },
+ ],
 );