X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ce2e637541f303d2967f7d424c3ea8240e579172..1b61e5ec2db6d04a6fe5eed35312dd44a9e76b5e:/sc.plp diff --git a/sc.plp b/sc.plp index d1c6fc8..5454b63 100644 --- a/sc.plp +++ b/sc.plp @@ -114,17 +114,30 @@ sub coltoggle { 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 showrangeint { + $_ &&= int($_ + .5) for @_; # round halves up + return showrange(@_); +} + sub showcost { my ($row, $unit) = @_; return join(' ', - sprintf('cost %.0f%%', 100 * $row->{cost} / $unit->{energy}), - !defined $row->{maint} ? () : - sprintf('+%.1f%%/s', 100 * $row->{maint} / $unit->{energy}), + 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}, + ), ); } @@ -142,7 +155,7 @@ sub showrange { $out .= sprintf '¤ ', showcost($attack, $row) if $attack->{cost}; $out .= sprintf('%sà ', - showrange($attack->{count}, $upattack->{count}), + showrangeint($attack->{count}, $upattack->{count}), ) if $attack->{count} > 1; $out .= '*' if $attack->{type} eq 'explosive'; @@ -160,7 +173,7 @@ sub showrange { } join '_', @bonus), join(', ', map {( sprintf('+%s vs %s', - showrange( + showrangeint( $attack->{bonus}->{$_}, $attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3, ), @@ -173,7 +186,7 @@ sub showrange { if $attack->{type} eq 'projectile'; $out .= sprintf '', $attack->{name} if $attack->{name}; - $out .= showrange($damage, $maxdamage); + $out .= showrangeint($damage, $maxdamage); $out .= '' if $attack->{name}; $out .= sprintf('%s', $attack->{splash} eq 'line' ? ('linear', '+') : ('splash', 'â') @@ -182,7 +195,7 @@ sub showrange { $out .= '