my %colours; # eg $colours{'c'}{'black'}= $sources
my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
+my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
+my %commodclasses; # $commodclasses{'dye'}= '3';
+
# IMPORTANT
# when extending the format of source-info in a non-backward
# compatible way, be sure to update update-master-info too.
s/\s+$//;
if (m/^\%(\w+)$/) {
my $colourkind= $1;
- @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; });
+ @ctx= (sub {
+ 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;
+ });
} elsif (m/^commods$/) {
@ctx= (sub { push @rawcm, lc $_; });
} elsif (m/^nocommods$/) {
@ctx= (sub { push @nocm, lc $_; });
+ } elsif (m/^commodclasses$/) {
+ @ctx= (sub {
+ die unless m/^\*([-a-z]+)$/;
+ $commodclasses{$1}= scalar keys %commodclasses;
+ });
} elsif (m/^ocean (\w+)$/) {
my $ocean= $1;
keys %{ $oceans{$ocean} };
%commods= ();
my $ca;
$ca= sub {
- my ($s,$ss) = @_;
-#print "ca($s)\n";
+ my ($s,$ss,$ordbase) = @_;
+#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
if ($s !~ m/\%(\w+)/) {
my ($name, $props) = $s =~
- /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
+ /^(\S[^\t]*\S)(?:\t+(\S.*\S))?$/
or die "bad commodspec $s";
return if grep { $name eq $_ } @nocm;
my $ucname= ucfirst $name;
$commods{$ucname}{Srcs} .= $ss;
my $c= $commods{$ucname};
$c->{Volume}= 1000;
+ my ($ordval, $ordclassval);
foreach my $prop (defined $props ? split /\s+/, $props : ()) {
if ($prop =~ m/^([1-9]\d*)(k?)g$/) {
$c->{Mass}= $1 * ($2 ? 1000 : 1);
- } elsif ($prop =~m/^([1-9]\d*)l$/) {
+ } elsif ($prop =~ m/^([1-9]\d*)l$/) {
$c->{Volume}= $1 * 1000;
+ } elsif ($prop =~ m/^\*([-a-z]+)$/) {
+ $c->{Class}= $1;
+ die "$1" unless exists $commodclasses{$1};
+ $ordclassval= $commodclasses{$1} * 1000000;
+ } elsif ($prop =~ m/^\@(\d+)$/) {
+ $ordval= $1;
} else {
die "unknown property $prop for $ucname";
}
}
+ 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";
+ } else {
+print STDERR "ordval NONE $name\n";
+ }
return;
}
die "unknown $&" unless defined $colours{$1};
my ($lhs,$pctlet,$rhs)= ($`,$1,$');
foreach my $c (keys %{ $colours{$pctlet} }) {
- &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c});
+ my $ordcolour= $colour_ordvals{$pctlet}{$c};
+ &$ca($lhs.$c.$rhs,
+ $ss .'%'. $colours{$pctlet}{$c},
+ defined($ordbase) && defined($ordcolour)
+ ? $ordbase+$ordcolour : undef);
}
};
- foreach (@rawcm) { &$ca($_,$src); }
+ foreach (@rawcm) { &$ca($_,$src,0); }
}
sub parse_info_clientside () {
medium 3
large 4
+commodclasses
+ *dye
+ *cloth
+ *forageables
+ *paint
+ *ship-supplies
+ *basic-commodities
+ *enamel
+ *minerals
+ *herbs
+
commods
kraken's blood 1kg
- %c dye 1kg
- %c enamel 5kg
- %c paint 1200g 1l
+ %c dye 1kg *dye
+ %c enamel 5kg *enamel
+ %c paint 1200g 1l *paint
- %c cloth 700g
- fine %c cloth 700g
- sail cloth 700g
+ %c cloth 700g *cloth
+ fine %c cloth 700g *cloth
+ sail cloth 700g *cloth
nocommods
black dye
yellow
commods
- %g gems 10kg
- diamonds 10kg
- emeralds 10kg
- moonstones 10kg
- opals 10kg
- pearls 10kg
- rubies 10kg
- sapphires 10kg
- topazes 10kg
+ %g gems 10kg *forageables @0
+ diamonds 10kg *forageables @9200
+ emeralds 10kg *forageables @9210
+ moonstones 10kg *forageables @9220
+ opals 10kg *forageables @9230
+ pearls 10kg *forageables @9240
+ rubies 10kg *forageables @9250
+ sapphires 10kg *forageables @9260
+ topazes 10kg *forageables @9270
%g
- amber
- amethyst
- beryl
- coral
- jade
- jasper
- jet
- lapis lazuli
- quartz
- tigereye
+ amber @9100
+ amethyst @9110
+ beryl @9120
+ coral @9130
+ jade @9140
+ jasper @9150
+ jet @9160
+ lapis lazuli @9170
+ quartz @9180
+ tigereye @9190
commods
- swill 1kg
- grog 1kg
- fine rum 1kg
-
- broom flower 200g
- butterfly weed 100g
- cowslip 700g
- elderberries 700g
- indigo 700g
- iris root 300g
- lily of the valley 300g
- lobelia 200g
- madder 400g
- nettle 300g
- old man's beard 800g
- pokeweed berries 300g
- sassafras 500g
- weld 300g
- yarrow 200g
-
- bananas 125kg 100l
- coconuts 125kg 100l
- limes 125kg 100l
- mangos 125kg 100l
- pineapples 125kg 100l
-
- carambolas 125kg 100l
- durians 125kg 100l
- passion fruit 125kg 100l
- pomegranates 125kg 100l
- rambutan 125kg 100l
-
- chalcocite 5700g
- cubanite 4700g
- gold nuggets 400g
- leushite 4400g
- lorandite 5500g
- masuyite 5100g
- papagoite 3300g
- serandite 3400g
- sincosite 3000g
- tellurium 6200g
- thorianite 100g
-
- small cannon balls 7100g
- medium cannon balls 14200g 2l
- large cannon balls 21300g 3l
-
- hemp 125kg 250l
- hemp oil 1kg
- iron 7800g
- lacquer 1kg
- stone 2600g
- sugar cane 50kg 100l
- varnish 1kg
- wood 175kg 250l
+ swill 1kg *ship-supplies @10
+ grog 1kg *ship-supplies @20
+ fine rum 1kg *ship-supplies @30
+
+ small cannon balls 7100g *ship-supplies @60
+ medium cannon balls 14200g 2l *ship-supplies @70
+ large cannon balls 21300g 3l *ship-supplies @80
+
+ broom flower 200g *herbs
+ butterfly weed 100g *herbs
+ cowslip 700g *herbs
+ elderberries 700g *herbs
+ indigo 700g *herbs
+ iris root 300g *herbs
+ lily of the valley 300g *herbs
+ lobelia 200g *herbs
+ madder 400g *herbs
+ nettle 300g *herbs
+ old man's beard 800g *herbs
+ pokeweed berries 300g *herbs
+ sassafras 500g *herbs
+ weld 300g *herbs
+ yarrow 200g *herbs
+
+ bananas 125kg 100l *forageables
+ coconuts 125kg 100l *forageables
+ limes 125kg 100l *forageables
+ mangos 125kg 100l *forageables
+ pineapples 125kg 100l *forageables
+
+ carambolas 125kg 100l *forageables
+ durians 125kg 100l *forageables
+ passion fruit 125kg 100l *forageables
+ pomegranates 125kg 100l *forageables
+ rambutan 125kg 100l *forageables
+
+ chalcocite 5700g *minerals
+ cubanite 4700g *minerals
+ gold nuggets 400g *minerals
+ leushite 4400g *minerals
+ lorandite 5500g *minerals
+ masuyite 5100g *minerals
+ papagoite 3300g *minerals
+ serandite 3400g *minerals
+ sincosite 3000g *minerals
+ tellurium 6200g *minerals
+ thorianite 100g *minerals
+
+ hemp 125kg 250l *basic-commodities
+ hemp oil 1kg *basic-commodities
+ iron 7800g *basic-commodities
+ lacquer 1kg *basic-commodities
+ stone 2600g *basic-commodities
+ sugar cane 50kg 100l *basic-commodities
+ varnish 1kg *basic-commodities
+ wood 175kg 250l *basic-commodities
client ypp-sc-tools yarrg
~yarrgweb / ypp-sc-tools.db-test.git / commitdiff