X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f00c1e5c4de7325c9d5d851a61355fe8638cca95..a691b071501b1ef5239752a1e594a449e8c2d16d:/sc.plp?ds=sidebyside
diff --git a/sc.plp b/sc.plp
index f1632ee..5b7e4a7 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)
@@ -225,25 +233,6 @@ sub showrange {
my ($row) = @_;
local $_ = $row;
$_->{hp} += $_->{shield} if $_->{shield};
- my $suitchar = '';
- if ($_->{attr}->{structure}) {
- $suitchar = 'b';
- }
- elsif ($_->{suit}) {
- $suitchar = [qw/? s m l/]->[$_->{suit}];
- }
- elsif ($_->{cargo} > 0) {
- $suitchar = [qw/? s m l l h h h h/]->[abs $_->{cargo}];
- }
- elsif ($_->{size}) {
- $suitchar = [qw/s m l h h h/]->[$_->{size}];
- }
- elsif ($_->{attr} and $_->{attr}->{light}) {
- $suitchar = 's';
- }
- elsif ($_->{attr} and $_->{attr}->{armored}) {
- $suitchar = 'l';
- }
return (
' | ' . ($_->{min} // ''),
@@ -252,13 +241,15 @@ sub showrange {
!!$_->{base} && '+',
$_->{build} || '0',
),
- !$suitchar ? ' | ' : sprintf(' | %s%s',
- $suitchar, ucfirst $suitchar,
- $_->{attr}->{massive}
- && 'â',
+ sprintf(' | %s',
+ $_->{cargo} < 0 ? ('supply', T => 'transport') :
+ $_->{attr}->{flying} ? ('air', F => 'flying') :
+ $_->{attr}->{structure} ? ('x', B => 'building') :
+ ([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
),
- ' | ' . (
- 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})
@@ -273,6 +264,17 @@ sub showrange {
&& 'A',
$_->{attr}->{light}
&& 'L',
+ $_->{suit} && sprintf(
+ '%s',
+ map { @{$_} } [
+ [qw( x ? unknown )],
+ [qw( s S small )],
+ [qw( m M medium )],
+ [qw( l L large )],
+ ]->[ $_->{suit} ],
+ ),
+ $_->{attr}->{massive}
+ && 'â',
),
' | ' . $_->{hp} // '',
$_->{shield} ? sprintf(' | %.0f%% | {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)
@@ -376,19 +378,9 @@ sub showrange {
excludes construction of dependencies such as buildings
and +parent units
size
- <:
-if ($scver{major} > 1) {
- :>transports can fit 8 Small,
- 4 Medium,
- 2 Large,
- or a single Huge unit
- massive â units
- cannot be lifted or slowed and can break force fields<:
-} else {
- :>affected by Small,
- Medium, or
- Large unit damage<:
-} :>
+ Transports can fit upto
+ 8
+ non-Flying units
number of command points taken per unit
<:
if ($scver{major} > 1) {
@@ -398,9 +390,14 @@ if ($scver{major} > 1) {
Ï(ps)ionic,
Light, and
Armored
- attributes<:
+ attributes
+ massive â units
+ cannot be lifted or slowed and can break force fields<:
} else {
- :>organic/mechanic unit<:
+ :>organic/mechanic unit
+ affected by Small,
+ Medium, or
+ Large unit damage<:
} :>
HP
total number of hitpoints (including shields)
|