X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=9c8281876f334b99578e73622cf95f00e9ec6259;hp=b58471ce43a9370a74aa8a6ec8eb11f51822ff62;hb=555b3391b3cd9967a29b219fff242b583137d2b8;hpb=991427d6209887f957d818367cf7643352093f1f

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index b58471c..9c82818 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -35,7 +35,8 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
 		      &parse_info_serverside &parse_info_serverside_ocean
-		      %oceans %commods %clients %routes %route_mysteries
+		      %oceans %commods %clients
+		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
 		      &get_our_version &check_tsv_line
 		      &pipethrough_prep &pipethrough_run
@@ -52,8 +53,10 @@ our $masterinfoversion= 2; # version we understand
 
 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
 
@@ -102,11 +105,24 @@ sub parse_info1 ($$$) {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
 	    });
-	} elsif (m/^routes (\w+)$/) {
-	    my $ocean= $1;
+	} elsif (m/^vessels$/) {
+	    @ctx= (sub {
+		return if m/^[-+|]+$/;
+		m/^ \| \s* ([A-Z][a-z\ ]+[a-z]) \s*
+		    \| \s* (small|medium|large) \s*
+		    \| \s* ([1-9][0-9,]+) \s*
+		    \| \s* ([1-9][0-9,]+) \s*
+		    \| $/x
+		    or die;
+		my $name= $1;
+		my $v= { Shot => $2, Volume => $3, Mass => $4 };
+		foreach my $vm (qw(Volume Mass)) { $v->{$vm} =~ s/,//g; }
+		$vessels{$name}= $v;
+	    });
+	} elsif (m/^shot$/) {
 	    @ctx= (sub {
-		m/^(\S[^\t]*\S),\s*(\S[^\t]*\S),\s*([1-9][0-9]{0,2})$/ or die;
-		$routes{$ocean}{$1}{$2}= $3;
+		m/^ ([a-z]+) \s+ (\d+) $/x or die;
+		$shotname2damage{$1}= $2;
 	    });
 	} elsif (m/^client (\S+.*\S)$/) {
 	    my $client= $1;
@@ -161,22 +177,6 @@ sub parse_info1 ($$$) {
 	}
     };
     foreach (@rawcm) { &$ca($_,$src); }
-
-    foreach my $on (keys %routes) {
-	my $routes= $routes{$on};
-	my $ocean= $oceans{$on};
-	die unless defined $ocean;
-	
-	my @allislands;
-	foreach my $an (sort keys %$ocean) {
-	    my $arch= $ocean->{$an};
-	    push @allislands, sort keys %$arch;
-	}
-	parse_info_maproutes($on, \@allislands, $routes);
-	foreach my $route (values %$routes) {
-	    parse_info_maproutes($on, \@allislands, $route);
-	}
-    }
 }
 
 sub parse_info_clientside () {
@@ -201,21 +201,6 @@ sub fetch_with_rsync ($) {
     return $local;
 }
 
-sub parse_info_maproutes ($$$) {
-    my ($on, $allislands, $routemap) = @_;;
-    foreach my $k (sort keys %$routemap) {
-	my @ok= grep { index($_,$k) >= 0 } @$allislands;
-	die "ambiguous $k" if @ok>1;
-	if (!@ok) {
-	    $route_mysteries{$on}{$k}++;
-	    delete $routemap->{$k};
-	} elsif ($ok[0] ne $k) {
-	    $routemap->{$ok[0]}= $routemap->{$k};
-	    delete $routemap->{$k};
-	}
-    }
-}
-
 sub parse_info_serverside () {
     parse_info1('source-info.txt','s',0);
 }