sc: single attack column with indicator for target

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 840e08208e7dc3e166d5e8ae02c902040ed63209..4fc00ba3241375c1178a9c4795e19eb38aa8e068 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -67,9 +67,7 @@ sub coltoggle {
        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</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="val hurt" colspan=3>attack</th>
        <th class="hurt hurtrel">dps</th>
        <th class="val unit-range">range</th>
        <th class="val unit-sight">sight</th>
@@ -88,7 +86,8 @@ sub showval {
        my ($min, $max);
 
        my $value = $row;
-       $value = ref $value eq 'HASH' && $value->{$_} or last for @elements;
+       $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];
@@ -101,15 +100,15 @@ sub showval {
        if ($row->{upgrade}) {
                for (@{ $row->{upgrade} }) {
                        my $increase = $_ or next;
-                       $increase = ref $increase eq 'HASH' && $increase->{$_} or last for @elements;
+                       $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[1] ne 'range' and $elements[2] eq 'dps') {{
-               my $attack = $row->{ $elements[0] }->{ $elements[1] };
-               ref $attack or $attack = $row->{ $elements[0] }->{$attack}; # follow
+       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;
@@ -123,16 +122,13 @@ sub showval {
 
        sub showattack {
                my ($row, $area) = @_;
-               my $attack = $row->{attack}->{$area};
-               if (not ref $attack) {
-                       # reference to another area
-                       $area = $attack;
-                       $attack = $row->{attack}->{$area};
-               }
-
-               return '<td colspan="2" class="hurt">' unless $attack;
+               my $attack = $row->{attack}->[$area]
+                       or return '<td colspan=4 class="hurt">';
 
-               my $tagbase = '<td class="val 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';
@@ -211,7 +207,11 @@ 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}
                        ),
@@ -234,17 +234,21 @@ sub showval {
                                100 * $_->{shield} / $_->{hp}
                        ) : '<td colspan=2',
                        ' class="val unit-armor">' . showval($_, 'armor'),
-                       showattack($_, 'ground'),
-                       showattack($_, 'air'),
-                       '<td class="val unit-range">' . showval($_, 'attack', 'range'),
+                       showattack($_, 0),
+                       '<td class="val unit-range">' . showval($_, 'attack', 0, 'range'),
                        '<td class="val unit-sight">' . sprintf(
                                $_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
                                showval($_, 'sight')
                        ),
                        '<td class="val unit-speed">' . showval($_, 'speed'),
-                       $_->{attr}->{massive}
-                               && '<span class="unit-massive" title="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($_),
+                       !$_->{attack}->[1] ? () : (
+                               '<tr><td colspan=12>', showattack($_, 1), '<td colspan=4>'
+                       ),
                        "\n"
                );
        }
@@ -287,7 +291,7 @@ sub showval {
                for my $subrow (@{ $_->{special} }) {
                        $subrow->{alt} or next;
                        print(
-                               '<tr class="alt"><td class="cat"><td>', $subrow->{alt},
+                               '<tr class="alt"><th class="cat"><td>', $subrow->{alt},
                                showunitcols($subrow),
                        );
                }
@@ -312,7 +316,9 @@ 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
@@ -341,11 +347,14 @@ if ($scver{major} > 1) {
        <dd>base unit armor
        <dd>can be increased by upto 3 at various facilities
        <dd>each point decreases damage per hit by one, upto a minimum of ½
-       <dd>reduction applies to initial damage, before size penalties <small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
-<dt>ground/air
-       <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>reduction applies to initial damage, before size penalties
+               <small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
+<dt>attack
+       <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>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