move into misc-data.pl: NZ from generate-plag

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

diff --git a/generate-board b/generate-board
index 0a3a50b28fb6770ca59bb64f3b931477b2e935db..a5d2cdb6f6245108823d0898683af901e8bd879e 100755 (executable)
--- a/generate-board
+++ b/generate-board
@@ -248,8 +248,8 @@ sub transform_coordinates () {
 sub pos_plus_dy_adjunct ($) {
   my ($cval) = @_;
   my ($x,$y,$whadjunct) = @$cval;
-  my $adjunct = $adjuncts_dy_from_boundings{ $whadjunct };
-  return "$x $y ".( defined $adjunct and "$adjunct add translate" );
+  my $adjunct = $adjuncts_dy_from_boundings{ $whadjunct//'' };
+  return "$x $y".( defined $adjunct and " $adjunct add translate" );
 }
 
 sub adjust_sea() {
@@ -794,7 +794,7 @@ sub decks(){
 
 sub sea_track(){
   o("% sea level track\n");
-  o("  gsave 11 700 translate\n");
+  o("  gsave ",pos_plus_dy_adjunct($c{PA}{SeaTrack})," translate\n");
   my $track = $c{SeaTrack};
   my $token_sz = $hs_sz;
   my $dy = $token_sz * 1.25;
@@ -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,16 +978,13 @@ 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 () {
   my $sz = 20;
   o("  gsave ",miscpscolour('hinttext'),
-    " 260 1715 $adjuncts_dy_from_boundings{$c{PlayHintdyAdjunct}} add translate\n");
+    " ",pos_plus_dy_adjunct($c{PA}{PlayHint}),"\n");
   o("  /Helvetica-Bold findfont $sz scalefont setfont\n");
   my @t = split /\n/, $c{PlayHint};
   foreach my $i (0..$#t) {