sc: tertiary attack row

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index c86ef0bc47bd33c2d9f55bbdc8974b37bb3fa83c..a85788435866cb120fc6a95f27a395ec1d48581f 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -112,7 +112,7 @@ sub showrange {
        sub showattack {
                my ($row, $area) = @_;
                my $attack = $row->{attack}->[$area]
-                       or return '<td colspan=4 class="hurt">';
+                       or return '<td colspan=5 class="hurt">';
 
                my $upattack = $row->{upgraded}->{attack}->[$area];
                my $damage = $attack->{damage};
@@ -144,8 +144,12 @@ 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', '+')
                ) if $attack->{splash};
@@ -174,6 +178,9 @@ sub showrange {
                $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 +193,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 +269,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 +281,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"
                );
@@ -401,7 +411,9 @@ if ($scver{major} > 1) {
        <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
@@ -418,8 +430,8 @@ if ($scver{major} > 1) {
 <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