From: Ian Jackson Date: Sun, 10 Mar 2019 18:35:28 +0000 (+0000) Subject: Move OuterfaceRe and SpecialRegions knowledge to %c X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=919666660ec453db0d7ce4acb1db166190c8b240;p=pandemic-rising-tide.git Move OuterfaceRe and SpecialRegions knowledge to %c NFC --- diff --git a/generate-board b/generate-board index 96d83c7..0e217ae 100755 --- a/generate-board +++ b/generate-board @@ -57,7 +57,7 @@ our $sre = qr{(?:(\")|(?=\w))(.*)\1$}; # 2 captures, $2 is the name sub prs2r ($) { # bodgery for the sea and land - return 'NZ' if m/ \| / && !grep { !m{^(?:NZ|L2?)$} } split / \| /, $_[0]; + return 'NZ' if m/ \| / && !grep { !m{^$c{OuterfaceRe}$} } split / \| /, $_[0]; $prs2region{$_[0]} // confess "@_ ?" } sub prs2rr ($) { $region{prs2r($_[0])} } @@ -142,7 +142,7 @@ sub read_faces () { } $process_rr->(); - $region{$_}{Special} = 1 foreach qw(NZ L L2); + $region{$_}{Special} = 1 foreach @{ $c{SpecialRegions} }; } #----- geometry mangling ----- diff --git a/misc-data.pl b/misc-data.pl index 48bb0e5..ca3d259 100644 --- a/misc-data.pl +++ b/misc-data.pl @@ -26,6 +26,8 @@ our %c = hinttext => '000', }, Sea => 'NZ', + OuterfaceRe => qr{(?:NZ|L2?)}, + SpecialRegions => [qw(NZ L L2)], DisplayNames => { ZZ => 'Zuiderzee', NZ => 'Noordzee',