sc: indicate weapon cost [of oracle beam]

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 2a748dcd8d0b8dc34da42a19d29a7f2d9f46ab2c..e4633107554db5d1d72501bb57b006ca84b6f14b 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,7 +115,7 @@ 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 not defined $max or $min == $max;
        return "$min-$max";
 }
 
@@ -129,6 +130,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;
@@ -241,12 +244,17 @@ sub showrange {
                                !!$_->{base} && '<span class="unit-composed">+</span>',
                                $_->{build} || '0',
                        ),
-                       sprintf('<td class="unit unit-%s" title="%3$s">%s',
+                       sprintf('<td class="unit unit-%s" title="%4$s%3$s">%s',
                                $_->            {cargo} < 0 ? ('supply',           T => 'transport') :
                                $_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') :
                                $_->{attr}->{flying}    ? ('air', F => 'flying') :
                                $_->{attr}->{structure} ? ('x',   B => 'building') :
-                               ([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
+                               (
+                                       [qw( x s m l l h h h h )]->[ $_->{cargo} ],
+                                       $_->{cargo} || '-',
+                                       $_->{cargo} ? 'transportable' : 'untransportable',
+                               ),
+                               defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
                        ),
                        sprintf('<td class="val unit%s">%s',
                                defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',