X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/92599fd64e5807f0af90406e02385d3be7001379..424c0dbea2a9dbe423c269bc7619546688fbd6f4:/sc.plp

diff --git a/sc.plp b/sc.plp
index c86ef0b..e426a6e 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,7 @@ 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});
 		}
 	}
 }
@@ -112,7 +113,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,8 +145,12 @@ 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', '+')
 		) if $attack->{splash};
@@ -174,6 +179,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;
 	}
 
@@ -186,15 +194,17 @@ sub showrange {
 				join('',
 					$_->{name},
 					$_->{desc} ? ": $_->{desc}" : '',
-					$_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
+					(map { $_ && " ($_)" } join ', ',
+						#TODO: apply upgrades
 						$_->{range} ? "range $_->{range}" : (),
 						$_->{cost} ? sprintf('cost %.0f%%%s',
 							100 * $_->{cost} / $row->{energy},
 							defined $_->{maint} && sprintf('+%.1f%%/s',
 								100 * $_->{maint} / $row->{energy},
 							),
-						) : (),
-					) : '',
+						) :
+						$_->{cooldown} ? "cooldown $_->{cooldown}s" : (),
+					),
 				),
 				sprintf($_->{build} ? '(%s)' : '%s', $_->{abbr}),
 		} grep { defined $_->{abbr} } @{$specials};
@@ -260,8 +270,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})
@@ -274,7 +282,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"
 		);
@@ -401,7 +412,9 @@ if ($scver{major} > 1) {
 	<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
@@ -418,8 +431,8 @@ if ($scver{major} > 1) {
 <dt>speed
 	<dd>relative speed of movement (when in full motion, startup speed ignored)
 <dt>specials
-	<dd>special abilities are usually casted manually, but some are <span class="magic-perma">always active</span>
 	<dd>parentheses () indicate that it needs to be researched first
+	<dd><span class="magic-perma">passive</span> abilities are always enabled
 	<dd>hover for description
 	<dd>range is maximum range required to activate
 	<dd>cost is percentage of total energy lost