sc: add best case bonus damage to maximum dps
[sheet.git] / sc.plp
diff --git a/sc.plp b/sc.plp
index 45a9f7b4a8c8fd79bf55a9260620f4b6f19b7829..e5a5b44b6a6af851496a74fa528230a00f6a531c 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -1,4 +1,5 @@
 <(common.inc.plp)><:
+use List::Util qw(max);
 
 my %scver = (
        id => 'bw',
@@ -48,27 +49,22 @@ my $patch = shift @{$units}
 
 print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\n\n";
 
+sub addupgrade {
+       my ($ref, $increase) = @_;
+       if (ref $increase eq 'HASH') {
+               addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+       }
+       elsif (ref $increase eq 'ARRAY') {
+               addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+       }
+       ${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
+}
+
 for my $unit (@{$units}) {
-       for my $upgrade (@{ $unit->{upgrade} // $unit->{update} // [] }) {
+       for my $upgrade (@{ $unit->{upgrade} }) {
                while (my ($col, $increase) = each %{$upgrade}) {
                        defined $unit->{$col} or next;
-
-                       if (ref $increase eq 'ARRAY') {
-                               for my $incrow (0 .. $#{$increase}) {
-                                       while (my ($inccol, $subinc) = each %{ $increase->[$incrow] }) {
-                                               $unit->{upgraded}->{$col}->[$incrow]->{$inccol}
-                                                       //= ref $unit->{$col}->[$incrow]->{$inccol}
-                                                                 ? $unit->{$col}->[$incrow]->{$inccol}->[-1]
-                                                                 : $unit->{$col}->[$incrow]->{$inccol};
-                                               $unit->{upgraded}->{$col}->[$incrow]->{$inccol}
-                                                       += ref $subinc ? $subinc->[-1] : $subinc;
-                                       }
-                               }
-                       }
-                       elsif ($increase =~ /^-?[0-9.]+/) {
-                               $unit->{upgraded}->{$col} //= $unit->{$col};
-                               $unit->{upgraded}->{$col}  += $increase;
-                       }
+                       addupgrade(\( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase);
                }
        }
 }
@@ -102,43 +98,10 @@ sub coltoggle {
 <:
 sub showrange {
        my ($min, $max) = @_;
-       $_ = int($_ + .5) for $min, $max;  # round halves up
-       return $min == $max ? $min : "$min-$max";
-}
-
-sub showval {
-       my ($row, @elements) = @_;
-       my ($min, $max);
-
-       my $value = $row;
-       $value = ref $value eq 'HASH'   ? $value->{$_}
-              : ref $value eq 'ARRAY' && $value->[$_] or last for @elements;
-       if (ref $value eq 'ARRAY') {
-               $min = $value->[0];
-               $max = $value->[-1];
-       }
-       else {
-               $min = $max = $value;
-       }
-       defined $min or return '';
-
-       if (my $increase = $row->{upgraded}) {
-                       $increase = ref $increase eq 'HASH'   ? $increase->{$_}
-                                 : ref $increase eq 'ARRAY' && $increase->[$_] or last for @elements;
-                       $max = $increase if $increase;
-       }
-
-       if ($elements[0] eq 'attack' and $elements[2] eq 'dps') {{
-               my $attack = $row->{ $elements[0] }->[ $elements[1] ];
-               my $type = $attack->{type} or next;
-               if ($type eq 'explosive') {
-                       $min /= 2;
-               }
-               elsif ($type eq 'implosive') {
-                       $min /= 4;
-               }
-       }}
-       return showrange($min, $max);
+       return '' if not defined $min;
+       $_ &&= int($_ + .5) for $min, $max;  # round halves up
+       return $min if not defined $max or $min == $max;
+       return "$min-$max";
 }
 
        sub showattack {
@@ -146,32 +109,66 @@ sub showval {
                my $attack = $row->{attack}->[$area]
                        or return '<td colspan=4 class="hurt">';
 
-               my $tagbase = '';
-               $tagbase .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
-               $tagbase .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
-               $tagbase .= '<td class="val hurt';
-               if (ref $attack and $attack->{type}) {
-                       if ($attack->{type} eq 'explosive') {
-                               $tagbase .= ' unit-l';
-                       }
-                       elsif ($attack->{type} eq 'implosive') {
-                               $tagbase .= ' unit-s';
-                       }
-               }
-               $tagbase .= '">';
+               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">';
+
+               my $upattack = $row->{upgraded}->{attack}->[$area];
+               my $damage = $attack->{damage};
+               my $maxdamage = $upattack->{damage} // $damage;
+               $damage = $damage->[0] if ref $damage;
+               $maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
-               my $out = showval($row, 'attack', $area, 'damage');
+               $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' :
+                               '',
+                       } 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', '+')
                ) if $attack->{splash};
-               $attack->{dps} = $attack->{cooldown} && [
-                       map { $_ / $attack->{cooldown} * ($attack->{count} // 1) }
-                       map { ref $_ ? @{$_} : $_ }
-                       $attack->{damage}
-                       #TODO: upgrade (zergling)
-               ];
-               $out .= '<td class="val hurt hurtrel">' . showval($row, 'attack', $area, 'dps');
-               return $tagbase . $out;
+
+               $out .= '<td class="val hurt hurtrel">';
+               if ($attack->{cooldown}) {
+                       if (my $type = $attack->{type}) {
+                               if ($type eq 'explosive') {
+                                       $damage /= 2;
+                               }
+                               elsif ($type eq 'implosive') {
+                                       $damage /= 4;
+                               }
+                       }
+                       $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);
+               }
+
+               return $out;
        }
 
        sub showmagic {
@@ -254,14 +251,17 @@ sub showval {
                        $_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
                                100 * $_->{shield} / $_->{hp}
                        ) : '<td colspan=2',
-                       ' class="val unit-armor">' . showval($_, 'armor'),
+                       ' class="val unit-armor">' .
+                               showrange($_->{armor}, $_->{upgraded}->{armor}),
                        showattack($_, 0),
-                       '<td class="val unit-range">' . showval($_, 'attack', 0, 'range'),
+                       '<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',
-                               showval($_, 'sight')
+                               showrange($_->{sight}, $_->{upgraded}->{sight})
                        ),
-                       '<td class="val unit-speed">' . showval($_, 'speed'),
+                       '<td class="val unit-speed">' .
+                               showrange($_->{speed}, $_->{upgraded}->{speed}),
                        $_->{attr}->{jump}
                                && qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
                        $_->{attr}->{flying}
@@ -374,14 +374,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