From 765cc0dd3089fcc723c69627044c91a845da46ae Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 19 Jun 2015 02:54:12 +0200
Subject: [PATCH] sc: write out implicit showval() formatting

Replace automated data traversion by explicit showrange() using
precalculated and transparent upgraded values.
Inline specific damage calculation in showattack().
---
 sc.plp | 84 ++++++++++++++++++++++++----------------------------------
 1 file changed, 35 insertions(+), 49 deletions(-)

diff --git a/sc.plp b/sc.plp
index 45a9f7b..08cbc45 100644
--- a/sc.plp
+++ b/sc.plp
@@ -102,43 +102,10 @@ sub coltoggle {
 <:
 sub showrange {
 	my ($min, $max) = @_;
-	$_ = int($_ + .5) for $min, $max;  # round halves up
-	return $min == $max ? $min : "$min-$max";
-}
-
-sub showval {
-	my ($row, @elements) = @_;
-	my ($min, $max);
-
-	my $value = $row;
-	$value = ref $value eq 'HASH'   ? $value->{$_}
-	       : ref $value eq 'ARRAY' && $value->[$_] or last for @elements;
-	if (ref $value eq 'ARRAY') {
-		$min = $value->[0];
-		$max = $value->[-1];
-	}
-	else {
-		$min = $max = $value;
-	}
-	defined $min or return '';
-
-	if (my $increase = $row->{upgraded}) {
-			$increase = ref $increase eq 'HASH'   ? $increase->{$_}
-			          : ref $increase eq 'ARRAY' && $increase->[$_] or last for @elements;
-			$max = $increase if $increase;
-	}
-
-	if ($elements[0] eq 'attack' and $elements[2] eq 'dps') {{
-		my $attack = $row->{ $elements[0] }->[ $elements[1] ];
-		my $type = $attack->{type} or next;
-		if ($type eq 'explosive') {
-			$min /= 2;
-		}
-		elsif ($type eq 'implosive') {
-			$min /= 4;
-		}
-	}}
-	return showrange($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-$max";
 }
 
 	sub showattack {
@@ -160,17 +127,33 @@ sub showval {
 		}
 		$tagbase .= '">';
 
-		my $out = showval($row, 'attack', $area, 'damage');
+		my $upattack = $row->{upgraded}->{attack}->[$area];
+		my $maxdamage =
+		my $damage = $attack->{damage};
+		($damage, $maxdamage) = ($damage->[0], $upattack->{damage} // $damage->[-1])
+			if ref $damage;
+
+		my $out = showrange($damage, $maxdamage);
 		$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
 			$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
 		) if $attack->{splash};
-		$attack->{dps} = $attack->{cooldown} && [
-			map { $_ / $attack->{cooldown} * ($attack->{count} // 1) }
-			map { ref $_ ? @{$_} : $_ }
-			$attack->{damage}
-			#TODO: upgrade (zergling)
-		];
-		$out .= '<td class="val hurt hurtrel">' . showval($row, 'attack', $area, 'dps');
+
+		$out .= '<td class="val hurt hurtrel">';
+		if ($attack->{cooldown}) {
+			if (my $type = $attack->{type}) {
+				if ($type eq 'explosive') {
+					$damage /= 2;
+				}
+				elsif ($type eq 'implosive') {
+					$damage /= 4;
+				}
+			}
+			$damage *= ($attack->{count} // 1) / $attack->{cooldown};
+			$maxdamage *= ($upattack->{count} // $attack->{count} // 1)
+			            / ($upattack->{cooldown} // $attack->{cooldown});
+			$out .= showrange($damage, $maxdamage);
+		}
+
 		return $tagbase . $out;
 	}
 
@@ -254,14 +237,17 @@ sub showval {
 			$_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
 				100 * $_->{shield} / $_->{hp}
 			) : '<td colspan=2',
-			' class="val unit-armor">' . showval($_, 'armor'),
+			' class="val unit-armor">' .
+				showrange($_->{armor}, $_->{upgraded}->{armor}),
 			showattack($_, 0),
-			'<td class="val unit-range">' . showval($_, 'attack', 0, 'range'),
+			'<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',
-				showval($_, 'sight')
+				showrange($_->{sight}, $_->{upgraded}->{sight})
 			),
-			'<td class="val unit-speed">' . showval($_, 'speed'),
+			'<td class="val unit-speed">' .
+				showrange($_->{speed}, $_->{upgraded}->{speed}),
 			$_->{attr}->{jump}
 				&& qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
 			$_->{attr}->{flying}
-- 
2.30.0