X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/0b17bd18ae642a22d7c9fd5411d85ab08f36b61d..fca15486bf1ed0fec0d792d34783bbe3c41d4ff8:/sc.plp?ds=inline
diff --git a/sc.plp b/sc.plp
index 4fc00ba..aa14604 100644
--- a/sc.plp
+++ b/sc.plp
@@ -48,6 +48,26 @@ my $patch = shift @{$units}
print "
Unit properties as seen or measured in $scver{name}\n$patch.\n
\n\n";
+sub addupgrade {
+ my ($ref, $increase) = @_;
+ if (ref $increase eq 'HASH') {
+ addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+ }
+ elsif (ref $increase eq 'ARRAY') {
+ addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+ }
+ ${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
+}
+
+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);
+ }
+ }
+}
+
sub coltoggle {
my ($name, $id) = @_;
return sprintf(
@@ -77,47 +97,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 ($row->{upgrade}) {
- for (@{ $row->{upgrade} }) {
- my $increase = $_ or next;
- $increase = ref $increase eq 'HASH' ? $increase->{$_}
- : ref $increase eq 'ARRAY' && $increase->[$_] or last for @elements;
- $increase = $increase->[-1] if ref $increase eq 'ARRAY';
- $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 {
@@ -125,32 +108,61 @@ sub showval {
my $attack = $row->{attack}->[$area]
or return '';
- my $tagbase = '';
- $tagbase .= ' | ' . 'â½' x !!($attack->{anti} & 1);
- $tagbase .= ' | ' . 'â³' x !!($attack->{anti} & 2);
- $tagbase .= ' | ';
+ my $out = '';
+ $out .= ' | ' . 'â½' x !!($attack->{anti} & 1);
+ $out .= ' | ' . 'â³' x !!($attack->{anti} & 2);
+ $out .= ' | ';
+
+ 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;
- my $out = showval($row, 'attack', $area, 'damage');
+ $out .= "$attack->{count}Ã " if $attack->{count} > 1;
+ $out .= '*'
+ if $attack->{type} eq 'explosive';
+ $out .= '~'
+ if $attack->{type} eq 'implosive';
+ $out .= sprintf('≥',
+ (map {
+ $_ =~ /^light/ ? 'unit-s' :
+ $_ eq 'armored' ? 'unit-l' :
+ $_ eq 'organic' ? 'unit-o' :
+ $_ =~ /^massive/ ? 'unit-h' :
+ '',
+ } join '_', keys %{ $attack->{bonus} }),
+ join(', ', map {(
+ sprintf('+%s vs %s',
+ (map {
+ ref $_ ? showrange($_->[0], $_->[-1]) : $_
+ } $attack->{bonus}->{$_}),
+ $_,
+ ),
+ )} keys %{ $attack->{bonus} }),
+ ) if $attack->{bonus};
+ $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 {
@@ -233,14 +245,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}
@@ -353,13 +368,13 @@ if ($scver{major} > 1) {
targets â½ ground
and/or â³ air
damage given per single hit
- dps indicates relative amount of damage done in
- 1 second of in-game time
+ 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 Ã.
- explosive damage does only
+ *explosive damage does only
50% damage to small units, 75% to medium, 100% to large
- concussive/plasma damage does
+ ~concussive/plasma damage does
25% to large, 50% medium, 100% to small units
sight
range in which the unit detects other units
|