From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 12 Jun 2015 17:56:00 +0000 (+0200)
Subject: sc: separate interceptor subunit from carrier
X-Git-Tag: v1.8~180
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/38fa2438908dcc08d887972a84225e80fd8bc97c

sc: separate interceptor subunit from carrier
---

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index d2c3b01..af10091 100644
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -434,9 +434,7 @@ shield => 150,
 armor => 4,
 attack => {
 	ground => {
-		damage => [6, 7, 8, 9],
 		dps => [17, undef, undef, 49],
-		min => 25,
 		build => 12.7*$FM,
 		max => 4,
 	},
@@ -445,7 +443,40 @@ attack => {
 },
 sight => 11,
 speed => 10,
-special => [],
+special => [
+	{
+		alt => 'Interceptor',
+		min => 25,
+		build => 20,
+		suit => 1,
+		unit => 0,
+		race => 'protoss',
+		organic => 0,
+		hp => 40,
+		shield => 40,
+		armor => 0,
+		attack => {
+			ground => {
+				damage => [6, 7, 8, 9],
+				dps => [4, 5, 5, 6],
+				cooldown => 37, # approximate, varies
+				build => 12.7*$FM,
+			},
+			air => 'ground',
+			range => 0,
+		},
+		sight => 0,
+		range => 0,
+	},
+],
+upgrade => [
+	{
+		name => 'Carrier Capacity',
+		damage => {
+			max => 4,
+		},
+	},
+],
 counter => ['wraith', 'corsair', 'scourge'],
 },
 
diff --git a/sc.plp b/sc.plp
index 76974c9..25c9863 100644
--- a/sc.plp
+++ b/sc.plp
@@ -262,6 +262,7 @@ sub showrange {
 	sub showunitcols {
 		my ($row) = @_;
 		local $_ = $row;
+		$_->{hp} += $_->{shield} if $_->{shield};
 		my $suitchar = '';
 		if ($_->{suit}) {
 			$suitchar = [qw/? s m l/]->[$_->{suit}];
@@ -325,7 +326,6 @@ sub showrange {
 		printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $race
 			if $grouped and $race ne $_->{race};
 		$_->{cat} = $_->{race} if not $grouped;
-		$_->{hp} += $_->{shield};
 		print(
 			'<tr>',
 			sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),