sc: consistently capitalise given names

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 8b0e5e84ab27a02627c14eec6074be7ca97e7aed..a1dc143746ea42faa616059409d253a9793a4b90 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -95,10 +95,11 @@ sub coltoggle {
 <thead><tr>
        <th></th>
        <th><:= coltoggle('name', '') :></th>
-       <th class="val min"><img src="/minerals.png" alt="min"></th>
-       <th class="val gas"><img src="/gas.png" alt="gas"></th>
+       <th class="val min" title=minerals>cost</th>
+       <th class="val gas">gas</th>
        <th class="val time"><:= coltoggle(qw'build cost') :></th>
-       <th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
+       <th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+       <th class="unit" colspan="2">attr</th>
        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</th>
        <th class="val unit-armor" title="armor">⛨</th>
@@ -114,10 +115,28 @@ sub showrange {
        my ($min, $max) = @_;
        return '' if not defined $min;
        $_ &&= int($_ + .5) for $min, $max;  # round halves up
-       return $min if not defined $max or $min == $max;
+       return $min || '-' if !$max or $min == $max;
        return "$min-$max";
 }
 
+       sub showcost {
+               my ($row, $unit) = @_;
+               return join(' ',
+                       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('+%s%%/s', join '-',
+                               map { sprintf '%.1f', 100 * $row->{maint} / $_ } grep $_,
+                               $unit->{capacity},
+                               $unit->{upgraded}->{capacity},
+                       ),
+               );
+       }
+
        sub showattack {
                my ($row, $area) = @_;
                my $attack = $row->{attack}->[$area]
@@ -129,6 +148,8 @@ sub showrange {
                $maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
                my $out = '<td class="val hurt">';
+               $out .= sprintf '<span title="%s">¤</span> ', showcost($attack, $row)
+                       if $attack->{cost};
                $out .= sprintf('<small>%s× </small>',
                        showrange($attack->{count}, $upattack->{count}),
                ) if $attack->{count} > 1;
@@ -216,12 +237,7 @@ sub showrange {
                                        (map { $_ && " ($_)" } join ', ',
                                                #TODO: apply upgrades
                                                $_->{range} ? "range $_->{range}" : (),
-                                               $_->{cost} ? sprintf('cost %.0f%%%s',
-                                                       100 * $_->{cost} / $row->{energy},
-                                                       defined $_->{maint} && sprintf('+%.1f%%/s',
-                                                               100 * $_->{maint} / $row->{energy},
-                                                       ),
-                                               ) :
+                                               $_->{cost} ? showcost($_, $row) :
                                                $_->{cooldown} ? "cooldown $_->{cooldown}s" : (),
                                        ),
                                ),
@@ -436,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
@@ -447,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>