X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f00c1e5c4de7325c9d5d851a61355fe8638cca95..f5e535f48dc60fdcaa93b9b6ee523801448b9f82:/sc.plp
diff --git a/sc.plp b/sc.plp
index f1632ee..09ae989 100644
--- a/sc.plp
+++ b/sc.plp
@@ -126,33 +126,37 @@ sub showrange {
my $upattack = $row->{upgraded}->{attack}->[$area];
my $damage = $attack->{damage};
my $maxdamage = $upattack->{damage} // $damage;
- $damage = $damage->[0] if ref $damage;
- $maxdamage = $maxdamage->[-1] if ref $maxdamage;
+ $maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
my $out = '
';
- $out .= "$attack->{count}Ã " if $attack->{count} > 1;
+ $out .= sprintf('%sà ',
+ showrange($attack->{count}, $upattack->{count}),
+ ) if $attack->{count} > 1;
$out .= '*'
if $attack->{type} eq 'explosive';
$out .= '~'
if $attack->{type} eq 'implosive';
+ if (my @bonus = sort grep { !/^-/ } keys %{ $attack->{bonus} }) {
$out .= sprintf('≥',
(map {
- $_ =~ /^light/ ? 'unit-s' :
+ $_ eq 'light' ? 'unit-s' :
$_ eq 'armored' ? 'unit-l' :
$_ eq 'organic' ? 'unit-o' :
- $_ =~ /^massive/ ? 'unit-h' :
+ $_ eq 'massive' ? 'unit-h' :
$_ eq 'shields' ? 'unit-shield' :
'',
- } join '_', keys %{ $attack->{bonus} }),
+ } join '_', @bonus),
join(', ', map {(
sprintf('+%s vs %s',
- (map {
- ref $_ ? showrange($_->[0], $_->[-1]) : $_
- } $attack->{bonus}->{$_}),
+ showrange(
+ $attack->{bonus}->{$_},
+ $attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3,
+ ),
$_,
),
- )} keys %{ $attack->{bonus} }),
- ) if $attack->{bonus};
+ )} @bonus),
+ );
+ }
$out .= 'â¢'
if $attack->{type} eq 'projectile';
@@ -165,7 +169,10 @@ sub showrange {
$out .= ' | ';
if ($attack->{dps}) {
- $out .= showrange($attack->{dps}->[0], $attack->{dps}->[-1]);
+ # precalculated dps, do not touch
+ $out .= showrange($attack->{dps}->[0],
+ $upattack->{dps}->[-1] // $attack->{dps}->[-1]
+ );
}
elsif ($attack->{cooldown}) {
if (my $type = $attack->{type}) {
@@ -179,7 +186,8 @@ sub showrange {
$damage *= ($attack->{count} // 1) / $attack->{cooldown};
if (my $bonus = $upattack->{bonus} // $attack->{bonus}) {
$maxdamage += $_ for max(
- map { ref $_ ? $_->[-1] : $_ } values %{$bonus}
+ map { $bonus->{$_} + $bonus->{"-$_"} * 3 }
+ grep { !/^-/ } keys %{$bonus}
);
}
$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
@@ -257,8 +265,9 @@ sub showrange {
$_->{attr}->{massive}
&& 'â',
),
- ' | ' . (
- defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
+ sprintf(' | %s',
+ defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
+ defined $_->{pop} && $_->{pop} == .5 ? '½' : $_->{pop},
),
' | ' . join('', grep { $_ }
(defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
@@ -308,19 +317,19 @@ sub showrange {
$get{order} ||= '';
if ($get{order} eq 'size') {
$_->{order} = (
- $_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+ $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+ $_->{hp}/512 + $_->{min}/8192
) for @$units;
}
elsif ($get{order} eq 'cost') {
$_->{order} = (
- $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+ $_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
) for @$units;
}
elsif ($get{order} eq 'attack') {
$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
map {
- ((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+ ($_->{damage} + $_->{upgrade} * 3)
* ($_->{count} // 1) / ($_->{cooldown} // 1)
* ($_->{splash} ? 1.01 : 1)
* ($_->{type} eq 'implosive' ? .96 : 1)
|