sc: improve hots unit size fallback order

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index c8f508dc66496fa4b94eb2ab1b1e040948e4e320..2217dc67d09b634cb84d6ffb377c0fd76d64c466 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -1,4 +1,5 @@
 <(common.inc.plp)><:
+use List::Util qw(max);
 
 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 "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\n\n";
+print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n";
+print "Also see the $_ table.\n" for join(', ',
+       ('<a href="/sc/2">StarCraft 2: HotS</a>')    x ($scver{major} < 2),
+       ('<a href="/sc">original SC: Brood War</a>') x ($scver{major} > 1),
+);
+print "</p>\n\n";
 
 sub addupgrade {
        my ($ref, $increase) = @_;
@@ -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,15 @@ 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;
                }
                else {
                        $units->[$_]->{order} = $_ for 0 .. $#$units;