X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/19f7eb7da46d4ffc4108b9c76b78476568b735b2..7daf512d5b78e196e4b3ada31ae8c5c9705456d7:/sc.plp
diff --git a/sc.plp b/sc.plp
index c8f508d..2b8112d 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,4 +1,5 @@
<(common.inc.plp)><:
+use List::Util qw(max sum);
my %scver = (
id => 'bw',
@@ -46,7 +47,12 @@ die "Cannot open unit data: $_\n" for $@ || $! || ();
my $patch = shift @{$units}
or die "Cannot open unit data: metadata not found\n";
-print "
Unit properties as seen or measured in $scver{name}\n$patch.\n
\n\n";
+print "Unit properties as seen or measured in $scver{name}\n$patch.\n";
+print "Also see the $_ table.\n" for join(', ',
+ ('StarCraft 2: HotS') x ($scver{major} < 2),
+ ('original SC: Brood War') x ($scver{major} > 1),
+);
+print "
\n\n";
sub addupgrade {
my ($ref, $increase) = @_;
@@ -69,10 +75,10 @@ for my $unit (@{$units}) {
}
sub coltoggle {
- my ($name, $id) = @_;
+ my ($name, $id, $nolink) = @_;
return sprintf(
(defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s â¼'
- : '%s',
+ : $nolink ? '%2$s' : '%s',
$id && "order=$id", $name
);
}
@@ -88,7 +94,7 @@ sub coltoggle {
shield |
⨠|
attack |
- dps |
+ <:= coltoggle(qw'dps attack 1') :> |
range |
sight |
speed |
@@ -130,6 +136,7 @@ sub showrange {
$_ eq 'armored' ? 'unit-l' :
$_ eq 'organic' ? 'unit-o' :
$_ =~ /^massive/ ? 'unit-h' :
+ $_ eq 'shields' ? 'unit-shield' :
'',
} join '_', keys %{ $attack->{bonus} }),
join(', ', map {(
@@ -157,6 +164,11 @@ sub showrange {
}
}
$damage *= ($attack->{count} // 1) / $attack->{cooldown};
+ if (my $bonus = $upattack->{bonus} // $attack->{bonus}) {
+ $maxdamage += $_ for max(
+ map { ref $_ ? $_->[-1] : $_ } values %{$bonus}
+ );
+ }
$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
/ ($upattack->{cooldown} // $attack->{cooldown});
$out .= showrange($damage, $maxdamage);
@@ -273,10 +285,26 @@ sub showrange {
$grouped = 0;
$get{order} ||= '';
if ($get{order} eq 'size') {
- $_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+ $_->{order} = (
+ $_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+ + $_->{hp}/512 + $_->{min}/8192
+ ) for @$units;
}
elsif ($get{order} eq 'cost') {
- $_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
+ $_->{order} = (
+ $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+ ) for @$units;
+ }
+ elsif ($get{order} eq 'attack') {
+ $_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
+ map {
+ ((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+ * ($_->{count} // 1) / ($_->{cooldown} // 1)
+ * ($_->{splash} ? 1.01 : 1)
+ * ($_->{type} eq 'implosive' ? .96 : 1)
+ * ($_->{type} eq 'explosive' ? .98 : 1)
+ } @{ $_->{attack} }
+ ) for @$units;
}
else {
$units->[$_]->{order} = $_ for 0 .. $#$units;