X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/ffc7dd1d5f9a1b703991994df40620408a9c9ccd..f5e535f48dc60fdcaa93b9b6ee523801448b9f82:/sc.plp
diff --git a/sc.plp b/sc.plp
index a857884..09ae989 100644
--- a/sc.plp
+++ b/sc.plp
@@ -55,13 +55,14 @@ print "Also see the $_ table.\n" for join(', ',
print "
\n\n";
sub addupgrade {
- my ($ref, $increase) = @_;
+ my ($ref, $increase, $org) = @_;
if (ref $increase eq 'HASH') {
- addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+ addupgrade(\${$ref}->{$_}, $increase->{$_}, $org->{$_}) for keys %{$increase};
}
elsif (ref $increase eq 'ARRAY') {
- addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+ addupgrade(\${$ref}->[$_], $increase->[$_], $org->[$_]) for 0 .. $#{$increase};
}
+ ${$ref} //= $org;
${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
}
@@ -69,7 +70,15 @@ for my $unit (@{$units}) {
for my $upgrade (@{ $unit->{upgrade} }) {
while (my ($col, $increase) = each %{$upgrade}) {
defined $unit->{$col} or next;
- addupgrade(\( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase);
+ addupgrade(\$unit->{upgraded}->{$col}, $increase, $unit->{$col});
+ }
+ }
+ for my $special (@{ $unit->{special} }) {
+ for my $upgrade (@{ $special->{upgrade} }) {
+ while (my ($col, $increase) = each %{$upgrade}) {
+ defined $special->{$col} or next;
+ addupgrade(\$special->{upgraded}->{$col}, $increase, $special->{$col});
+ }
}
}
}
@@ -117,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';
@@ -151,11 +164,17 @@ sub showrange {
$out .= showrange($damage, $maxdamage);
$out .= '' if $attack->{name};
$out .= sprintf('%s',
- $attack->{splash} eq 'line' ? ('linear', 'Ã') : ('splash', '+')
+ $attack->{splash} eq 'line' ? ('linear', '+') : ('splash', 'â')
) if $attack->{splash};
$out .= ' | ';
- if ($attack->{cooldown}) {
+ if ($attack->{dps}) {
+ # precalculated dps, do not touch
+ $out .= showrange($attack->{dps}->[0],
+ $upattack->{dps}->[-1] // $attack->{dps}->[-1]
+ );
+ }
+ elsif ($attack->{cooldown}) {
if (my $type = $attack->{type}) {
if ($type eq 'explosive') {
$damage /= 2;
@@ -167,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)
@@ -245,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})
@@ -296,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)
@@ -406,8 +427,8 @@ if ($scver{major} > 1) {
damage given per single hit
dps indicates relative amount of damage
done in 1 second of in-game time
- splash damage hits all objects nearby +
- or in a straight line Ã.
+ splash damage hits all objects nearby â
+ or in a straight line +.
<:
if ($scver{major} > 1) {
:>does not include ≥bonus damage
|