X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/de64283eddcfa5e620386896983841f47b1de8d4..7a40f1f224a88326e17fe5ce1a2e7059ebf93ef4:/sc.plp
diff --git a/sc.plp b/sc.plp
index 45a9f7b..69b6a51 100644
--- a/sc.plp
+++ b/sc.plp
@@ -102,43 +102,10 @@ sub coltoggle {
<:
sub showrange {
my ($min, $max) = @_;
- $_ = int($_ + .5) for $min, $max; # round halves up
- return $min == $max ? $min : "$min-$max";
-}
-
-sub showval {
- my ($row, @elements) = @_;
- my ($min, $max);
-
- my $value = $row;
- $value = ref $value eq 'HASH' ? $value->{$_}
- : ref $value eq 'ARRAY' && $value->[$_] or last for @elements;
- if (ref $value eq 'ARRAY') {
- $min = $value->[0];
- $max = $value->[-1];
- }
- else {
- $min = $max = $value;
- }
- defined $min or return '';
-
- if (my $increase = $row->{upgraded}) {
- $increase = ref $increase eq 'HASH' ? $increase->{$_}
- : ref $increase eq 'ARRAY' && $increase->[$_] or last for @elements;
- $max = $increase if $increase;
- }
-
- if ($elements[0] eq 'attack' and $elements[2] eq 'dps') {{
- my $attack = $row->{ $elements[0] }->[ $elements[1] ];
- my $type = $attack->{type} or next;
- if ($type eq 'explosive') {
- $min /= 2;
- }
- elsif ($type eq 'implosive') {
- $min /= 4;
- }
- }}
- return showrange($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-$max";
}
sub showattack {
@@ -146,32 +113,49 @@ sub showval {
my $attack = $row->{attack}->[$area]
or return '
';
- my $tagbase = '';
- $tagbase .= ' | ' . 'â½' x !!($attack->{anti} & 1);
- $tagbase .= ' | ' . 'â³' x !!($attack->{anti} & 2);
- $tagbase .= ' | ' . 'â½' x !!($attack->{anti} & 1);
+ $out .= ' | ' . 'â³' x !!($attack->{anti} & 2);
+ $out .= ' | ';
+ $out .= '">';
+
+ my $upattack = $row->{upgraded}->{attack}->[$area];
+ my $maxdamage =
+ my $damage = $attack->{damage};
+ ($damage, $maxdamage) = ($damage->[0], $upattack->{damage} // $damage->[-1])
+ if ref $damage;
- my $out = showval($row, 'attack', $area, 'damage');
+ $out .= "$attack->{count}Ã " if $attack->{count} > 1;
+ $out .= showrange($damage, $maxdamage);
$out .= sprintf('%s',
$attack->{splash} eq 'line' ? ('linear', 'Ã') : ('splash', '+')
) if $attack->{splash};
- $attack->{dps} = $attack->{cooldown} && [
- map { $_ / $attack->{cooldown} * ($attack->{count} // 1) }
- map { ref $_ ? @{$_} : $_ }
- $attack->{damage}
- #TODO: upgrade (zergling)
- ];
- $out .= ' | ' . showval($row, 'attack', $area, 'dps');
- return $tagbase . $out;
+
+ $out .= ' | ';
+ if ($attack->{cooldown}) {
+ if (my $type = $attack->{type}) {
+ if ($type eq 'explosive') {
+ $damage /= 2;
+ }
+ elsif ($type eq 'implosive') {
+ $damage /= 4;
+ }
+ }
+ $damage *= ($attack->{count} // 1) / $attack->{cooldown};
+ $maxdamage *= ($upattack->{count} // $attack->{count} // 1)
+ / ($upattack->{cooldown} // $attack->{cooldown});
+ $out .= showrange($damage, $maxdamage);
+ }
+
+ return $out;
}
sub showmagic {
@@ -254,14 +238,17 @@ sub showval {
$_->{shield} ? sprintf(' | %.0f%% | {shield} / $_->{hp}
) : ' | ' . showval($_, 'armor'),
+ ' class="val unit-armor">' .
+ showrange($_->{armor}, $_->{upgraded}->{armor}),
showattack($_, 0),
- ' | ' . showval($_, 'attack', 0, 'range'),
+ ' | ' .
+ showrange(map { $_->{attack}->[0]->{range} } $_, $_->{upgraded}),
' | ' . sprintf(
$_->{detect} ? '%s' : '%s',
- showval($_, 'sight')
+ showrange($_->{sight}, $_->{upgraded}->{sight})
),
- ' | ' . showval($_, 'speed'),
+ ' | ' .
+ showrange($_->{speed}, $_->{upgraded}->{speed}),
$_->{attr}->{jump}
&& qq'â',
$_->{attr}->{flying}
|