move into misc-data.pl: HS1 XIYI

[pandemic-rising-tide.git] / generate-board

diff --git a/generate-board b/generate-board
index ba4aad265c84f5c97dc6ed94be4a568ecfcfbd1e..97047ddd73d51081c079bf28ed9e9f33965a386e 100755 (executable)
--- 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");