X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommods.pm;h=3ecb804de2b09e439ba5276de33a0724256e3022;hb=208ca9059b4d502497799a627c7b4541de1a4101;hp=860510e33835e5e1e574ab429862f0563ecf7c2a;hpb=59bee7afb77216585b904bd20f17e71005e9778c;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 860510e..3ecb804 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -36,6 +36,7 @@ BEGIN {
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
 		      &parse_info_serverside &parse_info_serverside_ocean
 		      %oceans %commods %clients %routes %route_mysteries
+		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
 		      &get_our_version &check_tsv_line
 		      &pipethrough_prep &pipethrough_run
@@ -54,6 +55,10 @@ our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources;
 our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ];
 our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources  NB abbrevs!
 our %route_mysteries; # eg $route_mysteries{'Midnight'}{'Norse'}= 3
+our %vessels; # eg $vessels{'War Brig'}{Shot}='medium'
+              #    $vessels{'War Brig'}{Volume}= 81000
+              #    $vessels{'War Brig'}{Mass}= 54000
+our %shotname2damage; # eg $shotname2damage{'medium'}= 3;
 # $sources = 's[l]b';
 #       's' = Special Circumstances; 'l' = local ; B = with Bleach
 
@@ -98,6 +103,24 @@ sub parse_info1 ($$) {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
 	    });
+	} elsif (m/^vessels$/) {
+	    @ctx= (sub {
+		m/^ ([A-Z][a-z\ ]+[a-z]) \t\s*
+		    (small|medium|large) \t\s*
+		    (\d+) \s*\t\s*
+		    (\d+) $/x
+		    or die;
+		$vessels{$1}= {
+		    Shot => $2,
+		    Volume => $3,
+		    Mass => $4,
+		};
+	    });
+	} elsif (m/^shot$/) {
+	    @ctx= (sub {
+		m/^ ([a-z]+) \s+ (\d+) $/x or die;
+		$shotname2damage{$1}= $2;
+	    });
 	} elsif (m/^routes (\w+)$/) {
 	    my $ocean= $1;
 	    @ctx= (sub {