sc: prefer precalculated dps for aggregate attacks

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index e426a6e5ae6f5c822c5386fdf4c33839d5e17cf5..f1632eeaddfbf513c0fd28a8113feda44f8f39b7 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -73,6 +73,14 @@ for my $unit (@{$units}) {
                        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 {
@@ -152,11 +160,14 @@ sub showrange {
                $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;
@@ -407,8 +418,8 @@ if ($scver{major} > 1) {
        <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