sc: simplify code by concatenating all showattack() output

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 4fc00ba3241375c1178a9c4795e19eb38aa8e068..c8be6c7cebb55dfa42a6548661f40572ca54a741 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -48,6 +48,31 @@ my $patch = shift @{$units}
 
 print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\n\n";
 
+for my $unit (@{$units}) {
+       for my $upgrade (@{ $unit->{upgrade} // $unit->{update} // [] }) {
+               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;
+                       }
+               }
+       }
+}
+
 sub coltoggle {
        my ($name, $id) = @_;
        return sprintf(
@@ -77,47 +102,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 ($row->{upgrade}) {
-               for (@{ $row->{upgrade} }) {
-                       my $increase = $_ or next;
-                       $increase = ref $increase eq 'HASH'   ? $increase->{$_}
-                                 : ref $increase eq 'ARRAY' && $increase->[$_] or last for @elements;
-                       $increase = $increase->[-1] if ref $increase eq 'ARRAY';
-                       $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 {
@@ -125,32 +113,48 @@ 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';
+               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') {
-                               $tagbase .= ' unit-l';
+                               $out .= ' unit-l';
                        }
                        elsif ($attack->{type} eq 'implosive') {
-                               $tagbase .= ' unit-s';
+                               $out .= ' unit-s';
                        }
                }
-               $tagbase .= '">';
+               $out .= '">';
 
-               my $out = showval($row, 'attack', $area, 'damage');
+               my $upattack = $row->{upgraded}->{attack}->[$area];
+               my $maxdamage =
+               my $damage = $attack->{damage};
+               ($damage, $maxdamage) = ($damage->[0], $upattack->{damage} // $damage->[-1])
+                       if ref $damage;
+
+               $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};
+                       $maxdamage *= ($upattack->{count} // $attack->{count} // 1)
+                                   / ($upattack->{cooldown} // $attack->{cooldown});
+                       $out .= showrange($damage, $maxdamage);
+               }
+
+               return $out;
        }
 
        sub showmagic {
@@ -233,14 +237,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}