X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/765cc0dd3089fcc723c69627044c91a845da46ae..84a63eb1d32b332d3b0b2cf290c35b2e0c8d8f07:/sc.plp

diff --git a/sc.plp b/sc.plp
index 08cbc45..0a0f161 100644
--- a/sc.plp
+++ b/sc.plp
@@ -48,27 +48,22 @@ my $patch = shift @{$units}
 
 print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\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} // $unit->{update} // [] }) {
+	for my $upgrade (@{ $unit->{upgrade} }) {
 		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;
-			}
+			addupgrade(\( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase);
 		}
 	}
 }
@@ -113,27 +108,28 @@ sub showrange {
 		my $attack = $row->{attack}->[$area]
 			or return '<td colspan=4 class="hurt">';
 
-		my $tagbase = '';
-		$tagbase .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
-		$tagbase .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
-		$tagbase .= '<td class="val hurt';
+		my $out = '';
+		$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
+		$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
+		$out .= '<td class="val hurt';
 		if (ref $attack and $attack->{type}) {
 			if ($attack->{type} eq 'explosive') {
-				$tagbase .= ' unit-l';
+				$out .= ' unit-l';
 			}
 			elsif ($attack->{type} eq 'implosive') {
-				$tagbase .= ' unit-s';
+				$out .= ' unit-s';
 			}
 		}
-		$tagbase .= '">';
+		$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 $maxdamage = $upattack->{damage} // $damage;
+		$damage = $damage->[0] if ref $damage;
+		$maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
-		my $out = showrange($damage, $maxdamage);
+		$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
+		$out .= showrange($damage, $maxdamage);
 		$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
 			$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
 		) if $attack->{splash};
@@ -154,7 +150,7 @@ sub showrange {
 			$out .= showrange($damage, $maxdamage);
 		}
 
-		return $tagbase . $out;
+		return $out;
 	}
 
 	sub showmagic {