sc: prefer precalculated dps for aggregate attacks
[sheet.git] / sc.plp
diff --git a/sc.plp b/sc.plp
index 2217dc67d09b634cb84d6ffb377c0fd76d64c466..f1632eeaddfbf513c0fd28a8113feda44f8f39b7 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -1,5 +1,5 @@
 <(common.inc.plp)><:
-use List::Util qw(max);
+use List::Util qw(max sum);
 
 my %scver = (
        id => 'bw',
@@ -55,13 +55,14 @@ print "Also see the $_ table.\n" for join(', ',
 print "</p>\n\n";
 
 sub addupgrade {
-       my ($ref, $increase) = @_;
+       my ($ref, $increase, $org) = @_;
        if (ref $increase eq 'HASH') {
-               addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+               addupgrade(\${$ref}->{$_}, $increase->{$_}, $org->{$_}) for keys %{$increase};
        }
        elsif (ref $increase eq 'ARRAY') {
-               addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+               addupgrade(\${$ref}->[$_], $increase->[$_], $org->[$_]) for 0 .. $#{$increase};
        }
+       ${$ref} //= $org;
        ${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
 }
 
@@ -69,16 +70,24 @@ for my $unit (@{$units}) {
        for my $upgrade (@{ $unit->{upgrade} }) {
                while (my ($col, $increase) = each %{$upgrade}) {
                        defined $unit->{$col} or next;
-                       addupgrade(\( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase);
+                       addupgrade(\$unit->{upgraded}->{$col}, $increase, $unit->{$col});
+               }
+       }
+       for my $special (@{ $unit->{special} }) {
+               for my $upgrade (@{ $special->{upgrade} }) {
+                       while (my ($col, $increase) = each %{$upgrade}) {
+                               defined $special->{$col} or next;
+                               addupgrade(\$special->{upgraded}->{$col}, $increase, $special->{$col});
+                       }
                }
        }
 }
 
 sub coltoggle {
-       my ($name, $id) = @_;
+       my ($name, $id, $nolink) = @_;
        return sprintf(
                (defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s ▼'
-                       : '<a href="?%s">%s</a>',
+                       : $nolink ? '%2$s' : '<a href="?%s">%s</a>',
                $id && "order=$id", $name
        );
 }
@@ -93,9 +102,9 @@ sub coltoggle {
        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</th>
        <th class="val unit-armor" title="armor">⛨</th>
-       <th class="val hurt" colspan=3>attack</th>
-       <th class="hurt hurtrel">dps</th>
-       <th class="val unit-range">range</th>
+       <th class="val hurt">attack</th>
+       <th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
+       <th class="val unit-range" colspan=3>range</th>
        <th class="val unit-sight">sight</th>
        <th class="val unit-speed">speed</th>
        <th class="unit-magic">specials</th>
@@ -112,12 +121,7 @@ sub showrange {
        sub showattack {
                my ($row, $area) = @_;
                my $attack = $row->{attack}->[$area]
-                       or return '<td colspan=4 class="hurt">';
-
-               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">';
+                       or return '<td colspan=5 class="hurt">';
 
                my $upattack = $row->{upgraded}->{attack}->[$area];
                my $damage = $attack->{damage};
@@ -125,6 +129,7 @@ sub showrange {
                $damage = $damage->[0] if ref $damage;
                $maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
+               my $out = '<td class="val hurt">';
                $out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
                $out .= '<span class="unit-l" title="explosive">*</span>'
                        if $attack->{type} eq 'explosive';
@@ -148,13 +153,21 @@ sub showrange {
                                ),
                        )} keys %{ $attack->{bonus} }),
                ) if $attack->{bonus};
+               $out .= '<span class="unit-pdd" title="projectile">•</span>'
+                       if $attack->{type} eq 'projectile';
+
+               $out .= sprintf '<span title="%s">', $attack->{name} if $attack->{name};
                $out .= showrange($damage, $maxdamage);
+               $out .= '</span>' if $attack->{name};
                $out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
-                       $attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
+                       $attack->{splash} eq 'line' ? ('linear', '+') : ('splash', '⁜')
                ) if $attack->{splash};
 
                $out .= '<td class="val hurt hurtrel">';
-               if ($attack->{cooldown}) {
+               if ($attack->{dps}) {
+                       $out .= showrange($attack->{dps}->[0], $attack->{dps}->[-1]);
+               }
+               elsif ($attack->{cooldown}) {
                        if (my $type = $attack->{type}) {
                                if ($type eq 'explosive') {
                                        $damage /= 2;
@@ -174,6 +187,12 @@ sub showrange {
                        $out .= showrange($damage, $maxdamage);
                }
 
+               $out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
+               $out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
+
+               $out .= '<td class="val unit-range">' .
+                       showrange($attack->{range}, $upattack->{range});
+
                return $out;
        }
 
@@ -186,15 +205,17 @@ sub showrange {
                                join('',
                                        $_->{name},
                                        $_->{desc} ? ": $_->{desc}" : '',
-                                       $_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
+                                       (map { $_ && " ($_)" } join ', ',
+                                               #TODO: apply upgrades
                                                $_->{range} ? "range $_->{range}" : (),
                                                $_->{cost} ? sprintf('cost %.0f%%%s',
                                                        100 * $_->{cost} / $row->{energy},
                                                        defined $_->{maint} && sprintf('+%.1f%%/s',
                                                                100 * $_->{maint} / $row->{energy},
                                                        ),
-                                               ) : (),
-                                       ) : '',
+                                               ) :
+                                               $_->{cooldown} ? "cooldown $_->{cooldown}s" : (),
+                                       ),
                                ),
                                sprintf($_->{build} ? '(%s)' : '%s', $_->{abbr}),
                } grep { defined $_->{abbr} } @{$specials};
@@ -260,8 +281,6 @@ sub showrange {
                        ' class="val unit-armor">' .
                                showrange($_->{armor}, $_->{upgraded}->{armor}),
                        showattack($_, 0),
-                       '<td class="val unit-range">' .
-                               showrange(map { $_->{attack}->[0]->{range} } $_, $_->{upgraded}),
                        '<td class="val unit-sight">' . sprintf(
                                $_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
                                showrange($_->{sight}, $_->{upgraded}->{sight})
@@ -274,7 +293,10 @@ sub showrange {
                                && qq'<span class="unit unit-jump" title="flying">↑</span>',
                        '<td class="unit-magic">' . showmagic($_),
                        !$_->{attack}->[1] ? () : (
-                               '<tr><td colspan=12>', showattack($_, 1), '<td colspan=4>'
+                               '<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
+                       ),
+                       !$_->{attack}->[2] ? () : (
+                               '<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
                        ),
                        "\n"
                );
@@ -295,6 +317,17 @@ sub showrange {
                                $_->{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;
                }
@@ -382,33 +415,35 @@ if ($scver{major} > 1) {
        <dd>reduction applies to initial damage, before size penalties
                <small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
 <dt>attack
-       <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><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>splash damage hits all objects nearby <span class="unit-splash"></span>
+               or in a straight line <span class="unit-splash">+</span>.
        <dd><:
 if ($scver{major} > 1) {
                :>does not include <span>&ge;</span>bonus damage
-               dealt to susceptible unit types<:
+               dealt to susceptible unit types
+       <dd><span class="unit-pdd">•</span>projectile shots are negated by
+               Point Defense Drones<:
 } else {
                :><span class="unit-l">*</span>explosive damage does only
                50% damage to small units, 75% to medium, 100% to large
        <dd><span class="unit-s">~</span>concussive/plasma damage does
                25% to large, 50% medium, 100% to small units<:
 } :>
+       <dd>targets <span class="hurt-g">▽</span>&nbsp;ground
+               and/or  <span class="hurt-a">△</span>&nbsp;air
+<dt>range
+       <dd>maximum range of weapon (note siege tank also has a minimum range)
 <dt>sight
        <dd>range in which the unit detects other units
        <dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
-<dt>range
-       <dd>maximum range of weapon (note siege tank also has a minimum range)
 <dt>speed
        <dd>relative speed of movement (when in full motion, startup speed ignored)
 <dt>specials
-       <dd>special abilities are usually casted manually, but some are <span class="magic-perma">always active</span>
        <dd>parentheses () indicate that it needs to be researched first
+       <dd><span class="magic-perma">passive</span> abilities are always enabled
        <dd>hover for description
        <dd>range is maximum range required to activate
        <dd>cost is percentage of total energy lost