commodity ordering: support @..+ in main entries too

[ypp-sc-tools.web-live.git] / yarrg / Commods.pm

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 74c52f036d4742ae226b7a2d816122ce5b29a44a..0d45c5ea70367945bb997c8cdc409ef4caf3afcc 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -92,6 +92,7 @@ our %commods;
 # eg $commods{'Fine black cloth'}{Srcs}= $sources;
 # eg $commods{'Fine black cloth'}{Mass}= 700 [g]
 # eg $commods{'Fine black cloth'}{Volume}= 1000 [ml]
+# eg $commods{'Fine black cloth'}{Ordval}= 203921
 
 our (%pctb_commodmap,@pctb_commodmap);
 
@@ -120,11 +121,13 @@ sub parse_info1 ($$$) {
        if (m/^\%(\w+)$/) {
            my $colourkind= $1;
            @ctx= (sub {
-               m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die;
+               m/^(\S[^\t@]*\S)(?:\t+\@(\d+\+?))?$/ or die "$_ ?";
                my ($colour,$order)=($1,$2);
                $colours{$colourkind}{$colour} .= $src;
-               $colour_ordvals{$colourkind}{$colour}= $order
-                   if defined $order;
+               if (defined $order) {
+                   $order =~ s/^(\d+)\+$/ $1  + $. * 10 /e;
+                   $colour_ordvals{$colourkind}{$colour}= $order;
+               }
            });
        } elsif (m/^commods$/) {
            @ctx= (sub { push @rawcm, lc $_; });
@@ -189,6 +192,7 @@ sub parse_info1 ($$$) {
        
     %commods= ();
     my $ca;
+    my $lnoix=0;
     $ca= sub {
        my ($s,$ss,$ordbase) = @_;
 #print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
@@ -210,9 +214,10 @@ sub parse_info1 ($$$) {
                } elsif ($prop =~ m/^\*([-a-z]+)$/) {
                    $c->{Class}= $1;
                    die "$1" unless exists $commodclasses{$1};
-                   $ordclassval= $commodclasses{$1} * 1000000;
-               } elsif ($prop =~ m/^\@(\d+)$/) {
+                   $ordclassval= 1e7 + $commodclasses{$1} * 1e7;
+               } elsif ($prop =~ m/^\@(\d+\+?)$/) {
                    $ordval= $1;
+                   $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
                } else {
                    die "unknown property $prop for $ucname";
                }
@@ -220,9 +225,9 @@ sub parse_info1 ($$$) {
            if (defined $ordbase && defined $ordval && defined $ordclassval) {
                my $ordvalout= $ordbase + $ordval + $ordclassval;
                $c->{Ordval}= $ordvalout;
-print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
            } else {
-print STDERR "ordval NONE $name\n";
+#print STDERR "ordval NONE $name\n";
             }
            return;
        }
@@ -236,7 +241,7 @@ print STDERR "ordval NONE $name\n";
                     ? $ordbase+$ordcolour : undef);
        }
     };
-    foreach (@rawcm) { &$ca($_,$src,0); }
+    foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
 }
 
 sub parse_info_clientside () {