X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dda7e4bcad0e3c78e0a06693b90bc97da943fa23..f00c1e5c4de7325c9d5d851a61355fe8638cca95:/sc.plp

diff --git a/sc.plp b/sc.plp
index a7da312..f1632ee 100644
--- a/sc.plp
+++ b/sc.plp
@@ -55,13 +55,14 @@ print "Also see the $_ table.\n" for join(', ',
 print "</p>\n\n";
 
 sub addupgrade {
-	my ($ref, $increase) = @_;
+	my ($ref, $increase, $org) = @_;
 	if (ref $increase eq 'HASH') {
-		addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+		addupgrade(\${$ref}->{$_}, $increase->{$_}, $org->{$_}) for keys %{$increase};
 	}
 	elsif (ref $increase eq 'ARRAY') {
-		addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+		addupgrade(\${$ref}->[$_], $increase->[$_], $org->[$_]) for 0 .. $#{$increase};
 	}
+	${$ref} //= $org;
 	${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
 }
 
@@ -69,7 +70,15 @@ 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);
+			addupgrade(\$unit->{upgraded}->{$col}, $increase, $unit->{$col});
+		}
+	}
+	for my $special (@{ $unit->{special} }) {
+		for my $upgrade (@{ $special->{upgrade} }) {
+			while (my ($col, $increase) = each %{$upgrade}) {
+				defined $special->{$col} or next;
+				addupgrade(\$special->{upgraded}->{$col}, $increase, $special->{$col});
+			}
 		}
 	}
 }
@@ -112,7 +121,7 @@ sub showrange {
 	sub showattack {
 		my ($row, $area) = @_;
 		my $attack = $row->{attack}->[$area]
-			or return '<td colspan=4 class="hurt">';
+			or return '<td colspan=5 class="hurt">';
 
 		my $upattack = $row->{upgraded}->{attack}->[$area];
 		my $damage = $attack->{damage};
@@ -144,16 +153,21 @@ sub showrange {
 				),
 			)} keys %{ $attack->{bonus} }),
 		) if $attack->{bonus};
+		$out .= '<span class="unit-pdd" title="projectile">•</span>'
+			if $attack->{type} eq 'projectile';
 
 		$out .= sprintf '<span title="%s">', $attack->{name} if $attack->{name};
 		$out .= showrange($damage, $maxdamage);
 		$out .= '</span>' if $attack->{name};
 		$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
-			$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
+			$attack->{splash} eq 'line' ? ('linear', '+') : ('splash', '⁜')
 		) if $attack->{splash};
 
 		$out .= '<td class="val hurt hurtrel">';
-		if ($attack->{cooldown}) {
+		if ($attack->{dps}) {
+			$out .= showrange($attack->{dps}->[0], $attack->{dps}->[-1]);
+		}
+		elsif ($attack->{cooldown}) {
 			if (my $type = $attack->{type}) {
 				if ($type eq 'explosive') {
 					$damage /= 2;
@@ -176,6 +190,9 @@ sub showrange {
 		$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
 		$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
 
+		$out .= '<td class="val unit-range">' .
+			showrange($attack->{range}, $upattack->{range});
+
 		return $out;
 	}
 
@@ -264,8 +281,6 @@ sub showrange {
 			' class="val unit-armor">' .
 				showrange($_->{armor}, $_->{upgraded}->{armor}),
 			showattack($_, 0),
-			'<td class="val unit-range">' .
-				showrange(map { $_->{attack}->[0]->{range} } $_, $_->{upgraded}),
 			'<td class="val unit-sight">' . sprintf(
 				$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
 				showrange($_->{sight}, $_->{upgraded}->{sight})
@@ -278,7 +293,10 @@ sub showrange {
 				&& qq'<span class="unit unit-jump" title="flying">↑</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			!$_->{attack}->[1] ? () : (
-				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=4>'
+				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
+			),
+			!$_->{attack}->[2] ? () : (
+				'<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
 			),
 			"\n"
 		);
@@ -400,12 +418,14 @@ if ($scver{major} > 1) {
 	<dd>damage given per single hit
 	<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>splash damage hits all objects nearby <span class="unit-splash">⁜</span>
+		or in a straight line <span class="unit-splash">+</span>.
 	<dd><:
 if ($scver{major} > 1) {
 		:>does not include <span>&ge;</span>bonus damage
-		dealt to susceptible unit types<:
+		dealt to susceptible unit types
+	<dd><span class="unit-pdd">•</span>projectile shots are negated by
+		Point Defense Drones<:
 } else {
 		:><span class="unit-l">*</span>explosive damage does only
 		50% damage to small units, 75% to medium, 100% to large