X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dbda1fd17884ef74775772f730f4fa9e46661ab8..dc1ab5f00eed170e75fe40687b381369a35760b8:/sc.plp

diff --git a/sc.plp b/sc.plp
index 1c9e7b6..b3c27fc 100644
--- a/sc.plp
+++ b/sc.plp
@@ -20,13 +20,20 @@ my %scvers = (
 		game => 'StarCraft II LotV',
 		major => 2,
 	},
+	index => 'bw',
+	1     => 'bw',
+	2     => 'lotv',
 );
 
-$Request ||= 'bw';
-$Request = 'lotv' if $Request eq '2';
-my %scver = %{ $scvers{$Request} // {} }
+my $requestver = $scvers{$Request ||= 'index'}
 	or Html(), Abort("Requested version <q>$Request</q> not available", '404 request not found');
 
+if (ref $requestver ne 'HASH') {
+	$header{Location} = $requestver;
+	Abort("Canonical URL for $Request is at $requestver", '302 subpage alias');
+}
+
+my %scver = %{$requestver};
 my $datafile = "sc-units-$Request.inc.pl";
 
 Html({
@@ -184,7 +191,8 @@ sub showrangeint {
 				sprintf('+%s vs %s',
 					showrangeint(
 						$attack->{bonus}->{$_},
-						$attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3,
+						($upattack->{bonus} // $attack->{bonus})->{$_}
+							+ ($upattack->{bonus} // $attack->{bonus})->{"-$_"} * 3,
 					),
 					$_,
 				),