From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Mar 2019 16:23:50 +0000 (+0000)
Subject: break out darkerpscolour (really)
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=88e953e5eb834e3c04ea35f4e58bea4719648c98;p=pandemic-rising-tide.git

break out darkerpscolour (really)
---

diff --git a/generate-board b/generate-board
index bbadc29..c807be0 100755
--- a/generate-board
+++ b/generate-board
@@ -342,11 +342,17 @@ sub lighterpscolour ($$) {
 	   sub { $_ = 1.0 - $retain * (1.0 - $_) foreach @_ })
 }
 
+sub darkerpscolour ($$) {
+  my ($colourname, $retain) = @_;
+  pscolour($c{Colours}{$colourname},
+	   sub { $_ = $retain * $_ foreach @_ })
+}
+
 sub facepscolour ($) {
   my ($colourname) = @_;
   $xopts =~ m/W/ ? '1 setgray' : lighterpscolour($colourname, 0.75);
 }
-    
+
 sub fill_faces() {
   o("clippath ", facepscolour('land'), " fill\n");
   foreach my $rr (values %region) {
@@ -410,8 +416,7 @@ sub one_hs ($$) {
   my ($colour, $hspos) = @_;
   token_circle("HS - $colour",
 	       $hspos,
-	       pscolour($c{Colours}{$colour},
-			sub { $_ = 0.75 * $_ foreach @_ }),
+	       darkerpscolour($colour, 0.75),
 	       '0 setgray');
 }