sc: reference shared attacks in data

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 873c75b6964c71a95ec178e9c507ceacd92dcac2..d6ccaf62e8f72e3c0f8797726aa75ad2e1099e53 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -192,8 +192,10 @@ sub showrange {
                }
        }
 
-       if ($elements[0] eq 'attack' and $elements[1] ne 'range' and $elements[2] eq 'cmp') {{
-               my $type = $row->{$elements[0]}->{$elements[1]}->{type} or next;
+       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
+               my $type = $attack->{type} or next;
                if ($type eq 'explosive') {
                        $min /= 2;
                }
@@ -209,6 +211,11 @@ sub showrange {
        sub showattack {
                my ($row, $area) = @_;
                local $_ = $row->{attack}->{$area};
+               if (not ref $_) {
+                       # reference to another area
+                       $area = $_;
+                       $_ = $row->{attack}->{$area};
+               }
 
                return '<td colspan="2" class="hurt">' unless $_;
 
@@ -225,7 +232,7 @@ sub showrange {
 
                my $out = showrange($row, 'attack', $area, 'damage');
                $out .= '<span class="unit-splash">+</span>' if $_->{splash};
-               $out .= '<td class="val hurt hurtrel">' . showrange($row, 'attack', $area, 'cmp');
+               $out .= '<td class="val hurt hurtrel">' . showrange($row, 'attack', $area, 'dps');
                return $tagbase . $out;
        }
 
@@ -269,6 +276,7 @@ sub showrange {
                printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $race
                        if $grouped and $race ne $_->{race};
                $_->{cat} = $_->{race} if not $grouped;
+               $_->{hp} += $_->{shield};
                my $suitchar = [qw/? s m l/]->[$_->{suit}];
                print(
                        '<tr>',
@@ -291,7 +299,9 @@ sub showrange {
                                ),
                        ),
                        '<td class="val unit-hp">' . $_->{hp},
-                       '<td class="val unit-shield">' . ($_->{shield} ? $_->{shield}.'%' : '&nbsp;'),
+                       '<td class="val unit-shield">' . (
+                               $_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
+                       ),
                        '<td class="val unit-armor">' . showrange($_, 'armor'),
                        showattack($_, 'ground'),
                        showattack($_, 'air'),