X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/011f00a2bb1ee8611b9fc8e4a1598c167f673c5f..f5120824b11b754bdd9182d285ec81a3c001b350:/sc.plp diff --git a/sc.plp b/sc.plp index 28d22d7..5f18477 100644 --- a/sc.plp +++ b/sc.plp @@ -114,24 +114,29 @@ sub coltoggle { sub showrange { my ($min, $max) = @_; return '' if not defined $min; - $_ &&= int($_ + .5) for $min, $max; # round halves up 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) = @_; - my $minmult = 100 / $unit->{energy}; # cost multiplier - my $maxmult = $unit->{upgraded}->{energy} && - 100 / $unit->{upgraded}->{energy}; - 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}, ), ); } @@ -150,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'; @@ -168,7 +173,7 @@ sub showrange { } join '_', @bonus), join(', ', map {( sprintf('+%s vs %s', - showrange( + showrangeint( $attack->{bonus}->{$_}, $attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3, ), @@ -181,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', 'â') @@ -190,7 +195,7 @@ sub showrange { $out .= '