sc: consistently capitalise given names

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index c367da074bccbf4c19e2ecfebc1fae8cafa0e082..a1dc143746ea42faa616059409d253a9793a4b90 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -121,17 +121,18 @@ sub showrange {
 
        sub showcost {
                my ($row, $unit) = @_;
-               my $minmult = 100 / $unit->{capacity};  # cost multiplier
-               my $maxmult =       $unit->{upgraded}->{capacity} &&
-                             100 / $unit->{upgraded}->{capacity};
-
                return join(' ',
-                       sprintf('cost %s%%',
-                               showrange($row->{cost} * $minmult, $row->{cost} * $maxmult),
+                       sprintf('cost %s%%', join '-',
+                               map { $_ && sprintf '%.0f', 100 * $row->{cost} / $_ } grep { defined $_ }
+                               $unit->{energy},
+                               $unit->{upgraded}->{energy},
+                               $unit->{capacity},
+                               $unit->{upgraded}->{capacity},
                        ),
-                       !defined $row->{maint} ? () : sprintf('+%.1f%s%%/s',
-                               $row->{maint} * $minmult,
-                               !!$maxmult && sprintf('-%.1f', $row->{maint} * $maxmult),
+                       !defined $row->{maint} ? () : sprintf('+%s%%/s', join '-',
+                               map { sprintf '%.1f', 100 * $row->{maint} / $_ } grep $_,
+                               $unit->{capacity},
+                               $unit->{upgraded}->{capacity},
                        ),
                );
        }
@@ -451,7 +452,7 @@ if ($scver{major} > 1) {
        <dd>targets <span class="hurt-g">▽</span>&nbsp;ground
                and/or  <span class="hurt-a">△</span>&nbsp;air
 <dt>range
-       <dd>maximum range of weapon (note siege tank also has a minimum range)
+       <dd>maximum range of weapon (note Sieged Tank also has a minimum range)
 <dt>sight
        <dd>range in which the unit detects other units
        <dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
@@ -462,7 +463,7 @@ if ($scver{major} > 1) {
        <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
+       <dd>cost is energy loss percentage on spawn and when fully charged
 </dl>
 
 <p>