X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e3a4e7122f945a204fadfc845e83e0d6d6ad36fa..de64283eddcfa5e620386896983841f47b1de8d4:/sc.plp
diff --git a/sc.plp b/sc.plp
index 06e377f..45a9f7b 100644
--- a/sc.plp
+++ b/sc.plp
@@ -48,6 +48,31 @@ my $patch = shift @{$units}
print "
Unit properties as seen or measured in $scver{name}\n$patch.\n
\n\n";
+for my $unit (@{$units}) {
+ for my $upgrade (@{ $unit->{upgrade} // $unit->{update} // [] }) {
+ while (my ($col, $increase) = each %{$upgrade}) {
+ defined $unit->{$col} or next;
+
+ if (ref $increase eq 'ARRAY') {
+ for my $incrow (0 .. $#{$increase}) {
+ while (my ($inccol, $subinc) = each %{ $increase->[$incrow] }) {
+ $unit->{upgraded}->{$col}->[$incrow]->{$inccol}
+ //= ref $unit->{$col}->[$incrow]->{$inccol}
+ ? $unit->{$col}->[$incrow]->{$inccol}->[-1]
+ : $unit->{$col}->[$incrow]->{$inccol};
+ $unit->{upgraded}->{$col}->[$incrow]->{$inccol}
+ += ref $subinc ? $subinc->[-1] : $subinc;
+ }
+ }
+ }
+ elsif ($increase =~ /^-?[0-9.]+/) {
+ $unit->{upgraded}->{$col} //= $unit->{$col};
+ $unit->{upgraded}->{$col} += $increase;
+ }
+ }
+ }
+}
+
sub coltoggle {
my ($name, $id) = @_;
return sprintf(
@@ -67,9 +92,7 @@ sub coltoggle {
HP |
shield |
⨠|
- ground |
- dps |
- air |
+ attack |
dps |
range |
sight |
@@ -88,7 +111,8 @@ sub showval {
my ($min, $max);
my $value = $row;
- $value = ref $value eq 'HASH' && $value->{$_} or last for @elements;
+ $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];
@@ -98,18 +122,14 @@ sub showval {
}
defined $min or return '';
- if ($row->{upgrade}) {
- for (@{ $row->{upgrade} }) {
- my $increase = $_ or next;
- $increase = ref $increase eq 'HASH' && $increase->{$_} or last for @elements;
- $increase = $increase->[-1] if ref $increase eq 'ARRAY';
- $max += $increase if $increase;
- }
+ 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[1] ne 'range' and $elements[2] eq 'dps') {{
- my $attack = $row->{ $elements[0] }->{ $elements[1] };
- ref $attack or $attack = $row->{ $elements[0] }->{$attack}; # follow
+ 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;
@@ -123,16 +143,13 @@ sub showval {
sub showattack {
my ($row, $area) = @_;
- my $attack = $row->{attack}->{$area};
- if (not ref $attack) {
- # reference to another area
- $area = $attack;
- $attack = $row->{attack}->{$area};
- }
+ my $attack = $row->{attack}->[$area]
+ or return '';
- return ' | ' unless $attack;
-
- my $tagbase = ' | ' . 'â½' x !!($attack->{anti} & 1);
+ $tagbase .= ' | ' . 'â³' x !!($attack->{anti} & 2);
+ $tagbase .= ' | +',
$_->{build} || '0',
),
- !$suitchar ? ' | ' : sprintf(' | %s', $suitchar, ucfirst $suitchar),
+ !$suitchar ? ' | ' : sprintf(' | %s%s',
+ $suitchar, ucfirst $suitchar,
+ $_->{attr}->{massive}
+ && 'â',
+ ),
' | ' . (
defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
),
@@ -234,17 +255,21 @@ sub showval {
100 * $_->{shield} / $_->{hp}
) : ' | ' . showval($_, 'armor'),
- showattack($_, 'ground'),
- showattack($_, 'air'),
- ' | ' . showval($_, 'attack', 'range'),
+ showattack($_, 0),
+ ' | ' . showval($_, 'attack', 0, 'range'),
' | ' . sprintf(
$_->{detect} ? '%s' : '%s',
showval($_, 'sight')
),
' | ' . showval($_, 'speed'),
- $_->{attr}->{massive}
- && 'â',
+ $_->{attr}->{jump}
+ && qq'â',
+ $_->{attr}->{flying}
+ && qq'â',
' | ' . showmagic($_),
+ !$_->{attack}->[1] ? () : (
+ ' | ', showattack($_, 1), ' | '
+ ),
"\n"
);
}
@@ -287,7 +312,7 @@ sub showval {
for my $subrow (@{ $_->{special} }) {
$subrow->{alt} or next;
print(
- ' |
| ', $subrow->{alt},
+ ' |
| ', $subrow->{alt},
showunitcols($subrow),
);
}
@@ -312,7 +337,9 @@ if ($scver{major} > 1) {
:>transports can fit 8 Small,
4 Medium,
2 Large,
- or a single Huge unit<:
+ or a single Huge unit
+ massive â units
+ cannot be lifted or slowed and can break force fields<:
} else {
:>affected by Small,
Medium, or
@@ -341,11 +368,14 @@ if ($scver{major} > 1) {
base unit armor
can be increased by upto 3 at various facilities
each point decreases damage per hit by one, upto a minimum of ½
- reduction applies to initial damage, before size penalties (so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)
-ground/air
- damage done per single attack against ground/air units
- 2nd column indicates relative amount of damage done in
- 1 second of fastest game time
+ reduction applies to initial damage, before size penalties
+ (so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)
+attack
+ targets â½ ground
+ and/or â³ air
+ 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 Ã.
explosive damage does only
|
---|