X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e3dac38771fe8c06e4c19c42403f7fb9b7f09da8..19f7eb7da46d4ffc4108b9c76b78476568b735b2:/sc.plp

diff --git a/sc.plp b/sc.plp
index c8be6c7..c8f508d 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);
 		}
 	}
 }
@@ -116,23 +111,36 @@ sub showrange {
 		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') {
-				$out .= ' unit-l';
-			}
-			elsif ($attack->{type} eq 'implosive') {
-				$out .= ' unit-s';
-			}
-		}
-		$out .= '">';
+		$out .= '<td class="val hurt">';
 
 		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;
 
+		$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
+		$out .= '<span class="unit-l" title="explosive">*</span>'
+			if $attack->{type} eq 'explosive';
+		$out .= '<span class="unit-s" title="implosive">~</span>'
+			if $attack->{type} eq 'implosive';
+		$out .= sprintf('<span class="%s" title="%s">&ge;</span>',
+			(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('<span class="unit-splash" title="%s">%s</span>',
 			$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
@@ -360,14 +368,20 @@ if ($scver{major} > 1) {
 	<dd>targets <span class="hurt-g">▽</span>&nbsp;ground
 		and/or  <span class="hurt-a">△</span>&nbsp;air
 	<dd>damage given per single hit
-	<dd><em>dps</em> indicates relative amount of damage done in
-		1 second of in-game time
+	<dd><span class="hurtrel">dps</span> indicates relative amount of damage
+		done in 1 second of in-game time
 	<dd>splash damage hits all objects nearby <span class="unit-splash">+</span>
 		or in a straight line <span class="unit-splash">×</span>.
-	<dd><span class="hurt unit-l">explosive</span> damage does only
+	<dd><:
+if ($scver{major} > 1) {
+		:>does not include <span>&ge;</span>bonus damage
+		dealt to susceptible unit types<:
+} else {
+		:><span class="unit-l">*</span>explosive damage does only
 		50% damage to small units, 75% to medium, 100% to large
-	<dd><span class="hurt unit-s">concussive/plasma</span> damage does
-		25% to large, 50% medium, 100% to small units
+	<dd><span class="unit-s">~</span>concussive/plasma damage does
+		25% to large, 50% medium, 100% to small units<:
+} :>
 <dt>sight
 	<dd>range in which the unit detects other units
 	<dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units