sc: improve hots unit size fallback order

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 0a0f16173be95073323877a3b213622b9aff0e0a..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) = @_;
@@ -111,16 +117,7 @@ sub showrange {
                my $out = '';
                $out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
                $out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
-               $out .= '<td class="val hurt';
-               if (ref $attack and $attack->{type}) {
-                       if ($attack->{type} eq 'explosive') {
-                               $out .= ' unit-l';
-                       }
-                       elsif ($attack->{type} eq 'implosive') {
-                               $out .= ' unit-s';
-                       }
-               }
-               $out .= '">';
+               $out .= '<td class="val hurt">';
 
                my $upattack = $row->{upgraded}->{attack}->[$area];
                my $damage = $attack->{damage};
@@ -129,6 +126,28 @@ sub showrange {
                $maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
                $out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
+               $out .= '<span class="unit-l" title="explosive">*</span>'
+                       if $attack->{type} eq 'explosive';
+               $out .= '<span class="unit-s" title="implosive">~</span>'
+                       if $attack->{type} eq 'implosive';
+               $out .= sprintf('<span class="%s" title="%s">&ge;</span>',
+                       (map {
+                               $_ =~ /^light/ ? 'unit-s' :
+                               $_ eq 'armored' ? 'unit-l' :
+                               $_ eq 'organic' ? 'unit-o' :
+                               $_ =~ /^massive/ ? 'unit-h' :
+                               $_ eq 'shields' ? 'unit-shield' :
+                               '',
+                       } join '_', keys %{ $attack->{bonus} }),
+                       join(', ', map {(
+                               sprintf('+%s vs %s',
+                                       (map {
+                                               ref $_ ? showrange($_->[0], $_->[-1]) : $_
+                                       } $attack->{bonus}->{$_}),
+                                       $_,
+                               ),
+                       )} keys %{ $attack->{bonus} }),
+               ) if $attack->{bonus};
                $out .= showrange($damage, $maxdamage);
                $out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
                        $attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
@@ -145,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);
@@ -261,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;
@@ -356,14 +385,20 @@ if ($scver{major} > 1) {
        <dd>targets <span class="hurt-g">▽</span>&nbsp;ground
                and/or  <span class="hurt-a">△</span>&nbsp;air
        <dd>damage given per single hit
-       <dd><em>dps</em> indicates relative amount of damage done in
-               1 second of in-game time
+       <dd><span class="hurtrel">dps</span> indicates relative amount of damage
+               done in 1 second of in-game time
        <dd>splash damage hits all objects nearby <span class="unit-splash">+</span>
                or in a straight line <span class="unit-splash">×</span>.
-       <dd><span class="hurt unit-l">explosive</span> damage does only
+       <dd><:
+if ($scver{major} > 1) {
+               :>does not include <span>&ge;</span>bonus damage
+               dealt to susceptible unit types<:
+} else {
+               :><span class="unit-l">*</span>explosive damage does only
                50% damage to small units, 75% to medium, 100% to large
-       <dd><span class="hurt unit-s">concussive/plasma</span> damage does
-               25% to large, 50% medium, 100% to small units
+       <dd><span class="unit-s">~</span>concussive/plasma damage does
+               25% to large, 50% medium, 100% to small units<:
+} :>
 <dt>sight
        <dd>range in which the unit detects other units
        <dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units