sc: minor code cleanup, var renames, css optimisations

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 76974c94ee8f7351faaaeb1d8e76ceb83ffd0954..5607a9a236f076e4ea4adefccb6e0aeb4df1b325 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -44,12 +44,12 @@ Unit properties as seen or measured in Brood War
        }
        tr.alt td {
                font-size: 70%;
-               border-top-style: dashed;
+               padding-left: 0.5em;
        }
        .units tr th:first-child {
                padding-left: 0;
        }
-       .units tr:hover:not(.race) {
+       .units tbody tr:hover:not(.race) {
                background: #EEE;
        }
 
@@ -65,18 +65,10 @@ Unit properties as seen or measured in Brood War
 
        .unit-o {color: #C08} /* organic */
        .unit-u {color: #44C} /* mechanic */
-       img.unit-o, img.unit-u {
-               margin-left: 0.2em;
-               vertical-align: middle;
-       }
        .unit-composed {
                color: #C88;
                font-size: 70%;
        }
-       .unit {
-               text-align: center;
-               white-space: nowrap;
-       }
        .unit.unit-s {color: #770}
        .unit.unit-m {color: #C70}
        .unit.unit-l {color: #D22}
@@ -108,8 +100,12 @@ Unit properties as seen or measured in Brood War
        .unit-magic {
                padding-left: 0.5em;
        }
+       .magic-perma {
+               text-decoration: underline;
+       }
 
        .units .val {
+               white-space: nowrap;
                text-align: right;
        }
 
@@ -125,14 +121,10 @@ Unit properties as seen or measured in Brood War
        .legend dd {
                text-indent: -1em;
                margin-left: 1em;
-               break-before: avoid;
-               -webkit-column-break-before: avoid;
        }
 
-       .units, .legend {
-               display: table-cell;
-       }
        .legend {
+               display: table-cell;
                min-width: 20em;
                text-align: left;
        }
@@ -141,9 +133,6 @@ Unit properties as seen or measured in Brood War
                padding-bottom: 1em;
                margin-right: 2em;
        }
-       .footer {
-               clear: left;
-       }
 </style>
 
 <:
@@ -175,6 +164,12 @@ sub coltoggle {
 </tr></thead>
 <:
 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);
 
@@ -209,36 +204,40 @@ sub showrange {
                        $min /= 4;
                }
        }}
-       $_ = int($_ + .5) for $min, $max;  # round halves up
-
-       return $min == $max ? $min : "$min-$max";
+       return showrange($min, $max);
 }
 
        sub showattack {
                my ($row, $area) = @_;
-               local $_ = $row->{attack}->{$area};
-               if (not ref $_) {
+               my $attack = $row->{attack}->{$area};
+               if (not ref $attack) {
                        # reference to another area
-                       $area = $_;
-                       $_ = $row->{attack}->{$area};
+                       $area = $attack;
+                       $attack = $row->{attack}->{$area};
                }
 
-               return '<td colspan="2" class="hurt">' unless $_;
+               return '<td colspan="2" class="hurt">' unless $attack;
 
                my $tagbase = '<td class="val hurt';
-               if (ref $_ and $_->{type}) {
-                       if ($_->{type} eq 'explosive') {
+               if (ref $attack and $attack->{type}) {
+                       if ($attack->{type} eq 'explosive') {
                                $tagbase .= ' unit-l';
                        }
-                       elsif ($_->{type} eq 'implosive') {
+                       elsif ($attack->{type} eq 'implosive') {
                                $tagbase .= ' unit-s';
                        }
                }
                $tagbase .= '">';
 
-               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, 'dps');
+               my $out = showval($row, 'attack', $area, 'damage');
+               $out .= '<span class="unit-splash">+</span>' if $attack->{splash};
+               $attack->{dps} = $attack->{cooldown} && [
+                       map { 24 * $_ / $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;
        }
 
@@ -246,22 +245,26 @@ sub showrange {
                my ($row) = @_;
                my $specials = $row->{special} or return '';
                return join ' ', map {
-                       sprintf '<span title="%s">%s</span>',
+                       sprintf '<span%s title="%s">%s</span>',
+                               $_->{duration} < 0 && ' class="magic-perma"',
                                join('',
                                        $_->{name},
                                        $_->{desc} ? ": $_->{desc}" : '',
-                                       $_->{range} ? sprintf(' (%s)', join ', ',
-                                               "range $_->{range}",
-#                                              "cost $_->{cost}",
+                                       $_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
+                                               $_->{range} ? "range $_->{range}" : (),
+                                               $_->{cost} ? sprintf('cost %.0f%%',
+                                                       100 * $_->{cost} / $row->{energy}
+                                               ) : (),
                                        ) : '',
                                ),
-                               $_->{abbr},
-               } @$specials;
+                               sprintf($_->{build} ? '(%s)' : '%s', $_->{abbr}),
+               } grep { defined $_->{abbr} } @{$specials};
        }
 
        sub showunitcols {
                my ($row) = @_;
                local $_ = $row;
+               $_->{hp} += $_->{shield} if $_->{shield};
                my $suitchar = '';
                if ($_->{suit}) {
                        $suitchar = [qw/? s m l/]->[$_->{suit}];
@@ -288,15 +291,15 @@ sub showrange {
                        '<td class="val unit-shield">' . (
                                $_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
                        ),
-                       '<td class="val unit-armor">' . showrange($_, 'armor'),
+                       '<td class="val unit-armor">' . showval($_, 'armor'),
                        showattack($_, 'ground'),
                        showattack($_, 'air'),
-                       '<td class="val unit-range">' . showrange($_, 'attack', 'range'),
+                       '<td class="val unit-range">' . showval($_, 'attack', 'range'),
                        '<td class="val unit-sight">' . sprintf(
                                $_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
-                               showrange($_, 'sight')
+                               showval($_, 'sight')
                        ),
-                       '<td class="val unit-speed">' . showrange($_, 'speed'),
+                       '<td class="val unit-speed">' . showval($_, 'speed'),
                        '<td class="unit-magic">' . showmagic($_),
                        "\n"
                );
@@ -304,8 +307,9 @@ sub showrange {
 
        my $units = do $datafile;
        die "Cannot open unit data: $_\n" for $@ || $! || ();
-       my $grouped = !exists $get{order};
+       my $grouped = 1;  # race headers
        if (exists $get{order}) {
+               $grouped = 0;
                $get{order} ||= '';
                if ($get{order} eq 'size') {
                        $_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
@@ -317,26 +321,34 @@ sub showrange {
                        $units->[$_]->{order} = $_ for 0 .. $#$units;
                }
        }
-       my @rows = $grouped ? @$units : sort {$a->{order} <=> $b->{order}} @$units;
+       my @rows = @{$units};
+       @rows = sort {$a->{order} <=> $b->{order}} @rows unless $grouped;
 
        my ($race, $cat) = ('', '');
        for (@rows) {
-               $race = $_->{race},
-               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};
+               if ($grouped) {
+                       printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+                               $race = $_->{race}, ucfirst $race
+                                       unless $race eq $_->{race};
+               }
+               else {
+                       $_->{cat} = $_->{race};
+               }
+
                print(
                        '<tr>',
-                       sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
+                       sprintf('<t%s class="cat">%s',
+                               $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')
+                       ),
                        '<td>' . $_->{name},
                        showunitcols($_),
                );
 
-               for my $alt (grep { $_->{alt} } @{ $_->{special} }) {
+               for my $subrow (@{ $_->{special} }) {
+                       $subrow->{alt} or next;
                        print(
-                               '<tr class="alt"><td class="cat"><td>' . $alt->{alt},
-                               showunitcols($alt),
+                               '<tr class="alt"><td class="cat"><td>' . $subrow->{alt},
+                               showunitcols($subrow),
                        );
                }
        }
@@ -374,8 +386,7 @@ sub showrange {
 <dt>ground/air
        <dd>damage done per single attack against ground/air units
        <dd>2nd column indicates relative amount of damage done in
-               <span title="the time in which a dragoon fires a shot">a certain
-               amount</span> of time
+               1 second of fastest game time
        <dd>splash damage<span class="unit-splash">+</span> hits nearby objects as well
        <dd><span class="hurt unit-l">explosive</span> damage does only
                50% damage to small units, 75% to medium, 100% to large
@@ -389,7 +400,7 @@ sub showrange {
 <dt>speed
        <dd>relative speed of movement (when in full motion, startup speed ignored)
 <dt>specials
-       <dd>special abilities
+       <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>hover for description
        <dd>range is maximum range required to activate