sc: list specific immunities in massive description

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 0534c04ed3659278b6e51ed6b01d4c96cf9a353e..3ebc4f1ea7fdd72c45bbc9f6a9239e6a352e2940 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -66,9 +66,11 @@ sub coltoggle {
        <th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</th>
-       <th class="val unit-armor">armor</th>
-       <th class="val hurt" colspan="2">ground</th>
-       <th class="val hurt" colspan="2">air</th>
+       <th class="val unit-armor" title="armor">⛨</th>
+       <th class="val hurt">ground</th>
+       <th class="hurt hurtrel">dps</th>
+       <th class="val hurt">air</th>
+       <th class="hurt hurtrel">dps</th>
        <th class="val unit-range">range</th>
        <th class="val unit-sight">sight</th>
        <th class="val unit-speed">speed</th>
@@ -142,9 +144,11 @@ sub showval {
                $tagbase .= '">';
 
                my $out = showval($row, 'attack', $area, 'damage');
-               $out .= '<span class="unit-splash">+</span>' if $attack->{splash};
+               $out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
+                       $attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
+               ) if $attack->{splash};
                $attack->{dps} = $attack->{cooldown} && [
-                       map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) }
+                       map { $_ / $attack->{cooldown} * ($attack->{count} // 1) }
                        map { ref $_ ? @{$_} : $_ }
                        $attack->{damage}
                        #TODO: upgrade (zergling)
@@ -164,8 +168,11 @@ sub showval {
                                        $_->{desc} ? ": $_->{desc}" : '',
                                        $_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
                                                $_->{range} ? "range $_->{range}" : (),
-                                               $_->{cost} ? sprintf('cost %.0f%%',
-                                                       100 * $_->{cost} / $row->{energy}
+                                               $_->{cost} ? sprintf('cost %.0f%%%s',
+                                                       100 * $_->{cost} / $row->{energy},
+                                                       defined $_->{maint} && sprintf('+%.1f%%/s',
+                                                               100 * $_->{maint} / $row->{energy},
+                                                       ),
                                                ) : (),
                                        ) : '',
                                ),
@@ -178,7 +185,10 @@ sub showval {
                local $_ = $row;
                $_->{hp} += $_->{shield} if $_->{shield};
                my $suitchar = '';
-               if ($_->{suit}) {
+               if ($_->{attr}->{structure}) {
+                       $suitchar = 'b';
+               }
+               elsif ($_->{suit}) {
                        $suitchar = [qw/? s m l/]->[$_->{suit}];
                }
                elsif ($_->{cargo} > 0) {
@@ -201,15 +211,19 @@ sub showval {
                                !!$_->{base} && '<span class="unit-composed">+</span>',
                                $_->{build} || '0',
                        ),
-                       !$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
+                       !$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s%s',
+                               $suitchar, ucfirst $suitchar,
+                               $_->{attr}->{massive}
+                                       && '<span class="unit-massive" title="massive">⚓</span>',
+                       ),
                        '<td class="val unit">' . (
                                defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
                        ),
                        '<td class="unit unit-type">' . join('', grep { $_ }
-                               (defined $_->{organic} || $_->{attr}->{organic})
-                                       && '<span class="unit-o" title="organic">o</span>',
                                (defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
                                        && '<span class="unit-u" title="mechanic">m</span>',
+                               ($_->{organic} || $_->{attr}->{organic})
+                                       && '<span class="unit-o" title="organic">o</span>',
                                $_->{attr}->{psionic}
                                        && '<span class="unit-p" title="psionic">ψ</span>',
                        ),
@@ -220,10 +234,10 @@ sub showval {
                                        && '<span class="unit unit-s" title="light">L</span>',
                        ),
                        '<td class="val unit-hp">' . $_->{hp} // '',
-                       '<td class="val unit-shield">' . (
-                               $_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
-                       ),
-                       '<td class="val unit-armor">' . showval($_, 'armor'),
+                       $_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
+                               100 * $_->{shield} / $_->{hp}
+                       ) : '<td colspan=2',
+                       ' class="val unit-armor">' . showval($_, 'armor'),
                        showattack($_, 'ground'),
                        showattack($_, 'air'),
                        '<td class="val unit-range">' . showval($_, 'attack', 'range'),
@@ -232,7 +246,10 @@ sub showval {
                                showval($_, 'sight')
                        ),
                        '<td class="val unit-speed">' . showval($_, 'speed'),
-                       $_->{attr}->{massive} && '<span class="unit-massive">☇</span>',
+                       $_->{attr}->{jump}
+                               && qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
+                       $_->{attr}->{flying}
+                               && qq'<span class="unit unit-jump" title="flying">↑</span>',
                        '<td class="unit-magic">' . showmagic($_),
                        "\n"
                );
@@ -301,14 +318,27 @@ if ($scver{major} > 1) {
                :>transports can fit 8 <span class="unit unit-s">S</span>mall,
                4 <span class="unit unit-m">M</span>edium,
                2 <span class="unit unit-l">L</span>arge,
-               or a single <span class="unit unit-h">H</span>uge unit<:
+               or a single <span class="unit unit-h">H</span>uge unit
+       <dd>massive <span class="unit-massive">⚓</span> units
+               cannot be lifted or slowed and can break force fields<:
 } else {
                :>affected by <span class="unit unit-s">S</span>mall,
-               <span class="unit unit-m">M</span>edium,
-               or <span class="unit unit-l">L</span>arge unit damage<:
+               <span class="unit unit-m">M</span>edium, or
+               <span class="unit unit-l">L</span>arge unit damage<:
 } :>
        <dd>number of command points taken per unit
-       <dd><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
+       <dd><:
+if ($scver{major} > 1) {
+               :>received damage depends on
+               <span class="unit unit-o">o</span>rganic,
+               <span class="unit unit-u">m</span>echanic,
+               <span class="unit unit-p">ψ</span>(ps)ionic,
+               <span class="unit unit-s">L</span>ight, and
+               <span class="unit unit-l">A</span>rmored
+               attributes<:
+} else {
+               :><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit<:
+} :>
 <dt>HP<dd>
        total number of hitpoints (including shields)
 <dt>shield
@@ -324,7 +354,8 @@ if ($scver{major} > 1) {
        <dd>damage done per single attack against ground/air units
        <dd>2nd column indicates relative amount of damage done in
                1 second of fastest game time
-       <dd>splash damage<span class="unit-splash">+</span> hits nearby objects as well
+       <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
                50% damage to small units, 75% to medium, 100% to large
        <dd><span class="hurt unit-s">concussive/plasma</span> damage does