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

diff --git a/sc.plp b/sc.plp
index 78c1a2d..c969185 100644
--- a/sc.plp
+++ b/sc.plp
@@ -31,7 +31,7 @@ my $datafile = "sc-units-$Request.inc.pl";
 
 Html({
 	title => "$scver{title} unit cheat sheet",
-	version => '1.1',
+	version => '1.2',
 	description => [
 		"Reference of $scver{game} unit properties,"
 		. " comparing various statistics of all the units in $scver{name}"
@@ -45,8 +45,8 @@ Html({
 		$scver{major} < 2 ? qw' bw broodwar brood war ' :
 		qw' starcraft2 lotv hots wol ',
 	],
-	stylesheet => [qw'light'],
-	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.1" title="light">',
+	stylesheet => [qw( light dark )],
+	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.2">',
 	data => [$datafile],
 });
 
@@ -103,12 +103,12 @@ sub coltoggle {
 :><table class="units">
 <thead><tr>
 	<th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
-	<th><:= coltoggle(name => 'name') :></th>
-	<th class="val min" title=minerals><:= coltoggle(cost => 'cost') :></th>
-	<th class="val gas">gas</th>
+	<th class="unit-name"><:= coltoggle(name => 'name') :></th>
+	<th class="val unit-min" title=minerals><:= coltoggle(cost => 'cost') :></th>
+	<th class="val unit-gas">gas</th>
 	<th class="val time"><:= coltoggle(build => 'build') :></th>
 	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
-	<th class="unit" colspan="2">attr</th>
+	<th class="unit unit-attr" colspan="2">attr</th>
 	<th class="val unit-hp"><:= coltoggle(HP => 'hp') :></th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">â¨</th>
@@ -264,8 +264,11 @@ sub showrangeint {
 		$_->{hp} += $_->{shield} if $_->{shield};
 
 		return (
-			'<td class="val min">' . ($_->{min} // ''),
-			'<td class="val gas">' . ($_->{gas} || ''),
+			'<td class="val unit-min">' . ($_->{min} // ''),
+			'<td class="val unit-gas">' . ($_->{gas} || ''),
+			defined $_->{transform} ? sprintf('<td class="val time">%.0f',
+				$_->{transform},
+			) :
 			!defined $_->{build} ? '<td>' : sprintf('<td class="val time"%s>%s%.0f',
 				defined $_->{warp} && qq(title="$_->{build} without warpgate"),
 				!!$_->{base} && sprintf(
@@ -277,7 +280,8 @@ sub showrangeint {
 			sprintf('<td class="unit unit-%s" title="%4$s%3$s">%s',
 				$_->            {cargo} < 0 ? ('supply',           T => 'transport') :
 				$_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') :
-				$_->{attr}->{flying}    ? ('air', F => 'flying') :
+				$_->            {attr}->{flying} ? ('air',           F => 'flying') :
+				$_->{upgraded}->{attr}->{flying} ? ('air magic-opt', F => 'potentially flying') :
 				$_->{attr}->{structure} ? ('x',   B => 'building') :
 				(
 					[qw( x s m l l h h h h )]->[ $_->{cargo} ],
@@ -286,7 +290,7 @@ sub showrangeint {
 				),
 				defined $_->{size} && sprintf('â%.1f ', $_->{size}),
 			),
-			sprintf('<td class="val unit%s">%s',
+			sprintf('<td class="val unit unit-pop%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
 				defined $_->{pop} && $_->{pop} == .5 ? 'Â½' : $_->{pop},
 			),
@@ -315,7 +319,8 @@ sub showrangeint {
 				$_->{attr}->{massive}
 					&& '<span class="unit-massive" title="massive">â</span>',
 			),
-			'<td class="val unit-hp">' . $_->{hp} // '',
+			$_->{hp} < 0 ? '<td class="val unit-hp" title="invulnerable">â' :
+			'<td class="val unit-hp">' . showrangeint($_->{hp}, $_->{upgraded}->{hp}),
 			$_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
 				100 * $_->{shield} / $_->{hp}
 			) : '<td colspan=2',
@@ -344,10 +349,10 @@ sub showrangeint {
 				&& qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">â</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			!$_->{attack}->[1] ? () : (
-				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
+				'<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 1), '<td colspan=3>'
 			),
 			!$_->{attack}->[2] ? () : (
-				'<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
+				'<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 2), '<td colspan=3>'
 			),
 			"\n"
 		);
@@ -442,7 +447,8 @@ sub showrangeint {
 
 <dl>
 <dt>cost
-	<dd>minerals and gas required to create one unit
+	<dd><span class="unit-min">minerals</span> and
+		<span class="unit-gas">gas</span> required to create one unit
 	<dd>includes total expenses if based on existing units
 <dt>build
 	<dd>relative time needed to create at least one unit

<:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :>	<:= coltoggle(name => 'name') :>	<:= coltoggle(cost => 'cost') :>	gas	<:= coltoggle(name => 'name') :>	<:= coltoggle(cost => 'cost') :>	gas	<:= coltoggle(build => 'build') :>	<:= coltoggle(qw'size size') :>	attr	attr	<:= coltoggle(HP => 'hp') :>	shield	â¨	' . ($_->{min} // ''), - '	' . ($_->{gas} \|\| ''), + '	' . ($_->{min} // ''), + '	' . ($_->{gas} \|\| ''), + defined $_->{transform} ? sprintf('	%.0f', + $_->{transform}, + ) : !defined $_->{build} ? '	' : sprintf('	%s%.0f', defined $_->{warp} && qq(title="$_->{build} without warpgate"), !!$_->{base} && sprintf( @@ -277,7 +280,8 @@ sub showrangeint { sprintf('	%s', $_-> {cargo} < 0 ? ('supply', T => 'transport') : $_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') : - $_->{attr}->{flying} ? ('air', F => 'flying') : + $_-> {attr}->{flying} ? ('air', F => 'flying') : + $_->{upgraded}->{attr}->{flying} ? ('air magic-opt', F => 'potentially flying') : $_->{attr}->{structure} ? ('x', B => 'building') : ( [qw( x s m l l h h h h )]->[ $_->{cargo} ], @@ -286,7 +290,7 @@ sub showrangeint { ), defined $_->{size} && sprintf('â%.1f ', $_->{size}), ), - sprintf('	%s', + sprintf('	%s', defined $_->{pop} && $_->{pop} < 0 && ' unit-supply', defined $_->{pop} && $_->{pop} == .5 ? 'Â½' : $_->{pop}, ), @@ -315,7 +319,8 @@ sub showrangeint { $_->{attr}->{massive} && 'â', ), - '	' . $_->{hp} // '', + $_->{hp} < 0 ? '	â' : + '	' . showrangeint($_->{hp}, $_->{upgraded}->{hp}), $_->{shield} ? sprintf('	%.0f%%{shield} / $_->{hp} ) : '	â', '	' . showmagic($_), !$_->{attack}->[1] ? () : ( - '
', showattack($_, 1), '										' + '
		', showattack($_, 1), '								' ), !$_->{attack}->[2] ? () : ( - '
', showattack($_, 2), '										' + '
		', showattack($_, 2), '								' ), "\n" ); @@ -442,7 +447,8 @@ sub showrangeint { cost - minerals and gas required to create one unit + minerals and + gas required to create one unit includes total expenses if based on existing units build relative time needed to create at least one unit