X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f288c2ae9def10f90b5f8c0a84b1e1c17d55f38c..7daf512d5b78e196e4b3ada31ae8c5c9705456d7:/sc.plp

diff --git a/sc.plp b/sc.plp
index 4481b92..2b8112d 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,4 +1,5 @@
 <(common.inc.plp)><:
+use List::Util qw(max sum);
 
 my %scver = (
 	id => 'bw',
@@ -46,7 +47,12 @@ die "Cannot open unit data: $_\n" for $@ || $! || ();
 my $patch = shift @{$units}
 	or die "Cannot open unit data: metadata not found\n";
 
-print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\n\n";
+print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n";
+print "Also see the $_ table.\n" for join(', ',
+	('<a href="/sc/2">StarCraft 2: HotS</a>')    x ($scver{major} < 2),
+	('<a href="/sc">original SC: Brood War</a>') x ($scver{major} > 1),
+);
+print "</p>\n\n";
 
 sub addupgrade {
 	my ($ref, $increase) = @_;
@@ -69,10 +75,10 @@ for my $unit (@{$units}) {
 }
 
 sub coltoggle {
-	my ($name, $id) = @_;
+	my ($name, $id, $nolink) = @_;
 	return sprintf(
 		(defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s ▼'
-			: '<a href="?%s">%s</a>',
+			: $nolink ? '%2$s' : '<a href="?%s">%s</a>',
 		$id && "order=$id", $name
 	);
 }
@@ -88,7 +94,7 @@ sub coltoggle {
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">⛨</th>
 	<th class="val hurt" colspan=3>attack</th>
-	<th class="hurt hurtrel">dps</th>
+	<th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
 	<th class="val unit-range">range</th>
 	<th class="val unit-sight">sight</th>
 	<th class="val unit-speed">speed</th>
@@ -130,6 +136,7 @@ sub showrange {
 				$_ eq 'armored' ? 'unit-l' :
 				$_ eq 'organic' ? 'unit-o' :
 				$_ =~ /^massive/ ? 'unit-h' :
+				$_ eq 'shields' ? 'unit-shield' :
 				'',
 			} join '_', keys %{ $attack->{bonus} }),
 			join(', ', map {(
@@ -157,6 +164,11 @@ sub showrange {
 				}
 			}
 			$damage *= ($attack->{count} // 1) / $attack->{cooldown};
+			if (my $bonus = $upattack->{bonus} // $attack->{bonus}) {
+				$maxdamage += $_ for max(
+					map { ref $_ ? $_->[-1] : $_ } values %{$bonus}
+				);
+			}
 			$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
 			            / ($upattack->{cooldown} // $attack->{cooldown});
 			$out .= showrange($damage, $maxdamage);
@@ -273,10 +285,26 @@ sub showrange {
 		$grouped = 0;
 		$get{order} ||= '';
 		if ($get{order} eq 'size') {
-			$_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+			$_->{order} = (
+				$_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+				+ $_->{hp}/512 + $_->{min}/8192
+			) for @$units;
 		}
 		elsif ($get{order} eq 'cost') {
-			$_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
+			$_->{order} = (
+				$_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+			) for @$units;
+		}
+		elsif ($get{order} eq 'attack') {
+			$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
+				map {
+					((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+					* ($_->{count} // 1) / ($_->{cooldown} // 1)
+					* ($_->{splash} ? 1.01 : 1)
+					* ($_->{type} eq 'implosive' ? .96 : 1)
+					* ($_->{type} eq 'explosive' ? .98 : 1)
+				} @{ $_->{attack} }
+			) for @$units;
 		}
 		else {
 			$units->[$_]->{order} = $_ for 0 .. $#$units;
@@ -368,14 +396,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="unit-l">*</span>explosive 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="unit-s">~</span>concussive/plasma damage does
-		25% to large, 50% medium, 100% to small units
+		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