X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3553bfad44ded8de93e288d7c73bd397c9d8a95a..f1c776e1a305b40451b2e66410beeb904f53a3ef:/sc.plp

diff --git a/sc.plp b/sc.plp
index 2a748dc..ac78eb6 100644
--- a/sc.plp
+++ b/sc.plp
@@ -95,10 +95,11 @@ sub coltoggle {
 <thead><tr>
 	<th></th>
 	<th><:= coltoggle('name', '') :></th>
-	<th class="val min"><img src="/minerals.png" alt="min"></th>
-	<th class="val gas"><img src="/gas.png" alt="gas"></th>
+	<th class="val min" title=minerals>cost</th>
+	<th class="val gas">gas</th>
 	<th class="val time"><:= coltoggle(qw'build cost') :></th>
-	<th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="2">attr</th>
 	<th class="val unit-hp">HP</th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">⛨</th>
@@ -113,11 +114,33 @@ sub coltoggle {
 sub showrange {
 	my ($min, $max) = @_;
 	return '' if not defined $min;
-	$_ &&= int($_ + .5) for $min, $max;  # round halves up
-	return $min if not defined $max or $min == $max;
+	return $min || '-' if !$max or $min == $max;
 	return "$min-$max";
 }
 
+sub showrangeint {
+	$_ &&= int($_ + .5) for @_;  # round halves up
+	return showrange(@_);
+}
+
+	sub showcost {
+		my ($row, $unit) = @_;
+		return join(' ',
+			sprintf('cost %s%%', join '-',
+				map { $_ && sprintf '%.0f', 100 * $row->{cost} / $_ } grep { defined $_ }
+				$unit->{energy},
+				$unit->{upgraded}->{energy},
+				$unit->{capacity},
+				$unit->{upgraded}->{capacity},
+			),
+			!defined $row->{maint} ? () : sprintf('+%s%%/s', join '-',
+				map { sprintf '%.1f', 100 * $row->{maint} / $_ } grep $_,
+				$unit->{capacity},
+				$unit->{upgraded}->{capacity},
+			),
+		);
+	}
+
 	sub showattack {
 		my ($row, $area) = @_;
 		my $attack = $row->{attack}->[$area]
@@ -129,8 +152,10 @@ sub showrange {
 		$maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
 		my $out = '<td class="val hurt">';
+		$out .= sprintf '<span title="%s">¤</span> ', showcost($attack, $row)
+			if $attack->{cost};
 		$out .= sprintf('<small>%s× </small>',
-			showrange($attack->{count}, $upattack->{count}),
+			showrangeint($attack->{count}, $upattack->{count}),
 		) if $attack->{count} > 1;
 		$out .= '<span class="unit-l" title="explosive">*</span>'
 			if $attack->{type} eq 'explosive';
@@ -148,7 +173,7 @@ sub showrange {
 			} join '_', @bonus),
 			join(', ', map {(
 				sprintf('+%s vs %s',
-					showrange(
+					showrangeint(
 						$attack->{bonus}->{$_},
 						$attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3,
 					),
@@ -161,7 +186,7 @@ sub showrange {
 			if $attack->{type} eq 'projectile';
 
 		$out .= sprintf '<span title="%s">', $attack->{name} if $attack->{name};
-		$out .= showrange($damage, $maxdamage);
+		$out .= showrangeint($damage, $maxdamage);
 		$out .= '</span>' if $attack->{name};
 		$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
 			$attack->{splash} eq 'line' ? ('linear', '+') : ('splash', '⁜')
@@ -170,7 +195,7 @@ sub showrange {
 		$out .= '<td class="val hurt hurtrel">';
 		if ($attack->{dps}) {
 			# precalculated dps, do not touch
-			$out .= showrange($attack->{dps}->[0],
+			$out .= showrangeint($attack->{dps}->[0],
 				$upattack->{dps}->[-1] // $attack->{dps}->[-1]
 			);
 		}
@@ -192,14 +217,14 @@ sub showrange {
 			}
 			$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
 			            / ($upattack->{cooldown} // $attack->{cooldown});
-			$out .= showrange($damage, $maxdamage);
+			$out .= showrangeint($damage, $maxdamage);
 		}
 
 		$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});
+			showrangeint($attack->{range}, $upattack->{range});
 
 		return $out;
 	}
@@ -216,12 +241,7 @@ sub showrange {
 					(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},
-							),
-						) :
+						$_->{cost} ? showcost($_, $row) :
 						$_->{cooldown} ? "cooldown $_->{cooldown}s" : (),
 					),
 				),
@@ -241,12 +261,17 @@ sub showrange {
 				!!$_->{base} && '<span class="unit-composed">+</span>',
 				$_->{build} || '0',
 			),
-			sprintf('<td class="unit unit-%s" title="%3$s">%s',
+			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}->{structure} ? ('x',   B => 'building') :
-				([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
+				(
+					[qw( x s m l l h h h h )]->[ $_->{cargo} ],
+					$_->{cargo} || '-',
+					$_->{cargo} ? 'transportable' : 'untransportable',
+				),
+				defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
 			),
 			sprintf('<td class="val unit%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
@@ -282,14 +307,26 @@ sub showrange {
 				100 * $_->{shield} / $_->{hp}
 			) : '<td colspan=2',
 			' class="val unit-armor">' .
-				showrange($_->{armor}, $_->{upgraded}->{armor}),
+				showrangeint($_->{armor}, $_->{upgraded}->{armor}),
 			showattack($_, 0),
 			'<td class="val unit-sight">' . sprintf(
 				$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
-				showrange($_->{sight}, $_->{upgraded}->{sight})
+				showrangeint($_->{sight}, $_->{upgraded}->{sight})
+			),
+			sprintf('<td class="val unit-speed"%2$s>%s',
+				showrange(
+					map { $_ && sprintf '%.1f', $_ }
+					$_->{speed}, $_->{upgraded}->{speed}
+				),
+				defined $_->{creep} && sprintf(' title="%s on creep"',
+					$_->{creep} == 1 ? 'same' : showrange(
+						map { $_ && sprintf '%.1f', $_ }
+						$_->{speed} * $_->{creep},
+						$_->{upgraded}->{speed} && $_->{upgraded}->{speed} *
+							($_->{upgraded}->{creep} // $_->{creep}),
+					),
+				),
 			),
-			'<td class="val unit-speed">' .
-				showrange($_->{speed}, $_->{upgraded}->{speed}),
 			$_->{attr}->{jump}
 				&& qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
 			'<td class="unit-magic">' . showmagic($_),
@@ -413,7 +450,8 @@ if ($scver{major} > 1) {
 <dt>attack
 	<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
+		done in 1 second of <:= $scver{major} > 1 ? '<em>Normal</em> in-game time' :
+		'time on <em>Fast</em> game speed' :>
 	<dd>splash damage hits all objects nearby <span class="unit-splash">⁜</span>
 		or in a straight line <span class="unit-splash">+</span>.
 	<dd><:
@@ -431,18 +469,19 @@ if ($scver{major} > 1) {
 	<dd>targets <span class="hurt-g">▽</span>&nbsp;ground
 		and/or  <span class="hurt-a">△</span>&nbsp;air
 <dt>range
-	<dd>maximum range of weapon (note siege tank also has a minimum range)
+	<dd>maximum range of weapon (note Sieged Tank also has a minimum range)
 <dt>sight
 	<dd>range in which the unit detects other units
 	<dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
 <dt>speed
-	<dd>relative speed of movement (when in full motion, startup speed ignored)
+	<dd>top movement speed in hex per second
+	<dd>acceleration and deceleration ignored
 <dt>specials
 	<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
+	<dd>cost is energy loss percentage on spawn and when fully charged
 </dl>
 
 <p>