X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/53663289d87a1a07c0ff8789776029cd554fa293..e75dbcba340459a1bef997680a7d1bf152039a32:/sc.plp

diff --git a/sc.plp b/sc.plp
index 7f40dd2..dc32a47 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});
+			}
 		}
 	}
 }
@@ -117,33 +126,37 @@ sub showrange {
 		my $upattack = $row->{upgraded}->{attack}->[$area];
 		my $damage = $attack->{damage};
 		my $maxdamage = $upattack->{damage} // $damage;
-		$damage = $damage->[0] if ref $damage;
-		$maxdamage = $maxdamage->[-1] if ref $maxdamage;
+		$maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
 		my $out = '<td class="val hurt">';
-		$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
+		$out .= sprintf('<small>%s× </small>',
+			showrange($attack->{count}, $upattack->{count}),
+		) 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';
+	if (my @bonus = sort grep { !/^-/ } keys %{ $attack->{bonus} }) {
 		$out .= sprintf('<span class="%s" title="%s">&ge;</span>',
 			(map {
-				$_ =~ /^light/ ? 'unit-s' :
+				$_ eq 'light' ? 'unit-s' :
 				$_ eq 'armored' ? 'unit-l' :
 				$_ eq 'organic' ? 'unit-o' :
-				$_ =~ /^massive/ ? 'unit-h' :
+				$_ eq 'massive' ? 'unit-h' :
 				$_ eq 'shields' ? 'unit-shield' :
 				'',
-			} join '_', keys %{ $attack->{bonus} }),
+			} join '_', @bonus),
 			join(', ', map {(
 				sprintf('+%s vs %s',
-					(map {
-						ref $_ ? showrange($_->[0], $_->[-1]) : $_
-					} $attack->{bonus}->{$_}),
+					showrange(
+						$attack->{bonus}->{$_},
+						$attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3,
+					),
 					$_,
 				),
-			)} keys %{ $attack->{bonus} }),
-		) if $attack->{bonus};
+			)} @bonus),
+		);
+	}
 		$out .= '<span class="unit-pdd" title="projectile">•</span>'
 			if $attack->{type} eq 'projectile';
 
@@ -151,11 +164,17 @@ sub showrange {
 		$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}) {
+			# precalculated dps, do not touch
+			$out .= showrange($attack->{dps}->[0],
+				$upattack->{dps}->[-1] // $attack->{dps}->[-1]
+			);
+		}
+		elsif ($attack->{cooldown}) {
 			if (my $type = $attack->{type}) {
 				if ($type eq 'explosive') {
 					$damage /= 2;
@@ -167,7 +186,8 @@ sub showrange {
 			$damage *= ($attack->{count} // 1) / $attack->{cooldown};
 			if (my $bonus = $upattack->{bonus} // $attack->{bonus}) {
 				$maxdamage += $_ for max(
-					map { ref $_ ? $_->[-1] : $_ } values %{$bonus}
+					map { $bonus->{$_} + $bonus->{"-$_"} * 3 }
+					grep { !/^-/ } keys %{$bonus}
 				);
 			}
 			$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
@@ -283,6 +303,9 @@ sub showrange {
 			!$_->{attack}->[1] ? () : (
 				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
 			),
+			!$_->{attack}->[2] ? () : (
+				'<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
+			),
 			"\n"
 		);
 	}
@@ -305,7 +328,7 @@ sub showrange {
 		elsif ($get{order} eq 'attack') {
 			$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
 				map {
-					((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+					($_->{damage} + $_->{upgrade} * 3)
 					* ($_->{count} // 1) / ($_->{cooldown} // 1)
 					* ($_->{splash} ? 1.01 : 1)
 					* ($_->{type} eq 'implosive' ? .96 : 1)
@@ -403,8 +426,8 @@ 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