From 56f01f1582ffb22d9069fb538d61121daba7a2d9 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Mar 2019 20:34:30 +0000
Subject: [PATCH] move into misc-data.pl: HS1 XIYI

NFC
---
 generate-board | 16 +++++++++-------
 misc-data.pl   |  6 ++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/generate-board b/generate-board
index ba4aad2..97047dd 100755
--- a/generate-board
+++ b/generate-board
@@ -933,8 +933,9 @@ sub dykes(){
   }
 }
 
-sub hs_initial_1 ($$$;$$$) {
-  my ($colour, $xi,$yi, $text, $text2, $fn) = @_;
+sub hs_initial_1 ($;$$$) {
+  my ($colour, $text, $text2, $fn) = @_;
+  my $hs1 = $c{HS1}{$colour};
   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;
@@ -942,7 +943,8 @@ sub hs_initial_1 ($$$;$$$) {
   o("  % HS I $colour\n");
   o("  gsave\n");
   o("    ".pos_plus_dy_adjunct($c{PA}{HS1_initials})."\n");
-  o("    ", ($xi*$interval), " ", (($yi-1)*$interval), " translate\n");
+  o("    ", ($hs1->{XIYI}[0]*$interval), " ",
+           (($hs1->{XIYI}[1]-1)*$interval), " translate\n");
   if ($fn) {
     o("  gsave\n");
     o("        $demo_h setlinewidth 0 0 moveto $demo_w 0 rlineto\n");
@@ -962,14 +964,14 @@ sub hs_initial_1 ($$$;$$$) {
 }
 
 sub hs_initial () {
-  hs_initial_1('red',     0,0);
-  hs_initial_1('purple',  0,1);
-  hs_initial_1('green',   1,0, 'up to 6', 'fewer', sub {
+  hs_initial_1('red');
+  hs_initial_1('purple');
+  hs_initial_1('green', 'up to 6', 'fewer', 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',  1,1, 'up to 4', '', sub {
+  hs_initial_1('yellow', 'up to 4', '', 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 3bd6111..edf1e4d 100644
--- a/misc-data.pl
+++ b/misc-data.pl
@@ -77,4 +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] },
+   'yellow' => { XIYI => [1,1] },
+ },
 );
-- 
2.30.2