X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8ad63ee2484b0c1f344e6f8ff5fbd4ccbd963e1b..1fcc0d8d5a8c54a917c862ffea4bd41a723360ad:/sc.plp diff --git a/sc.plp b/sc.plp index 76974c9..b14e04f 100644 --- a/sc.plp +++ b/sc.plp @@ -250,18 +250,21 @@ sub showrange { 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}]; @@ -325,7 +328,6 @@ sub showrange { printf '

%s

'."\n", $race, ucfirst $race if $grouped and $race ne $_->{race}; $_->{cat} = $_->{race} if not $grouped; - $_->{hp} += $_->{shield}; print( '', sprintf('%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', ' ')),