From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Mar 2019 20:40:58 +0000 (+0000)
Subject: move into misc-data.pl: HS1 texts
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=34c80da47f138fbcd2f7d8a047297fba8de9d61c;p=pandemic-rising-tide.git

move into misc-data.pl: HS1 texts

NFC
---

diff --git a/generate-board b/generate-board
index 97047dd..484c649 100755
--- a/generate-board
+++ b/generate-board
@@ -934,8 +934,14 @@ sub dykes(){
 }
 
 sub hs_initial_1 ($;$$$) {
-  my ($colour, $text, $text2, $fn) = @_;
+  my ($colour, $fn) = @_;
   my $hs1 = $c{HS1}{$colour};
+  my ($text, $text2);
+  if ($hs1->{Water}) {
+    ($text,$text2) = ('up to '.$hs1->{Water}, 'fewer');
+  } elsif ($hs1->{Dykes}) {
+    ($text,$text2) = ('up to '.$hs1->{Dykes}, '');
+  }
   my $interval = $hs_sz * 1.75;
   my $demo_h = $hs_sz; #water_cubes_sz(3);
   my $demo_x0 = $hs_sz * 0.75 + $dyke_l * 0.60;
@@ -966,12 +972,12 @@ sub hs_initial_1 ($;$$$) {
 sub hs_initial () {
   hs_initial_1('red');
   hs_initial_1('purple');
-  hs_initial_1('green', 'up to 6', 'fewer', sub {
+  hs_initial_1('green', sub {
     o("    ",(water_cubes_sz(1))," 0 translate\n");
     o("    0 ",(-water_cubes_sz(1) * 0.3)," translate\n");
     water_cubes(1, miscpscolour('edge'));
   });
-  hs_initial_1('yellow', 'up to 4', '', sub {
+  hs_initial_1('yellow', sub {
     o("    newpath dykepath\n");
     o("    gsave ",miscpscolour('edge')," stroke grestore\n");
     o("    gsave ",miscpscolour('dykehsadd')," fill grestore\n");
diff --git a/misc-data.pl b/misc-data.pl
index edf1e4d..4f06825 100644
--- a/misc-data.pl
+++ b/misc-data.pl
@@ -80,7 +80,7 @@ END
  HS1 => {
    'red'    => { XIYI => [0,0] },
    'purple' => { XIYI => [0,1] },
-   'green'  => { XIYI => [1,0] },
-   'yellow' => { XIYI => [1,1] },
+   'green'  => { XIYI => [1,0], Water => 6 },
+   'yellow' => { XIYI => [1,1], Dykes => 4 },
  },
 );