sc: reorder and improve starcraft2 units

[sheet.git] / sc-units.inc.pl

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index b32e5ef4f9c5426854cacdb0cbb68ad8539d2dda..af100913b7c062b3c192eeebc6fcc901481db7c4 100644 (file)
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -42,7 +42,6 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
-unit => 0,
 race => 'protoss',
 hp => 100,
 shield => 100,
@@ -435,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,
        },
@@ -446,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'],
 },
 
@@ -666,7 +696,6 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
-unit => 0,
 race => 'terran',
 hp => 200,
 armor => 0,
@@ -1243,8 +1272,6 @@ name => 'Larva',
 trans => {
        nl => 'larve',
 },
-min => 0,
-gas => 0,
 build => 14.3*$FM, # = 21.5
 suit => 1,
 unit => 0,
@@ -1256,29 +1283,25 @@ attack => {
 },
 sight => 4,
 speed => 0.1, #XXX
-special => [],
-},
-
-{
-cat => 'creep',
-name => 'Egg',
-trans => {
-       nl => 'ei',
-},
-min => 0,
-gas => 0,
-build => 0,
-suit => 3,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 200,
-armor => 10,
-attack => {
-},
-sight => 4,
-speed => 0,
-special => [],
+special => [
+       {
+               name => 'transform',
+               alt => 'Egg',
+               trans => {
+                       nl => 'ei',
+               },
+               suit => 3,
+               race => 'zerg',
+               organic => undef, # unchanged from parent
+               hp => 200,
+               armor => 10,
+               attack => {
+               },
+               sight => 4,
+               speed => 0,
+               special => [],
+       },
+],
 },
 
 {
@@ -1288,7 +1311,6 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 300,
 armor => 2,
@@ -1312,7 +1334,6 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 400,
 armor => 0,
@@ -1468,37 +1489,29 @@ special => [
                duration => undef,
        },
        {
-               name => 'Broodling',
+               name => 'Spawn Broodling',
                abbr => 'sb',
                desc => 'spawn one inside an enemy unit killing it',
                range => 9,
                cost => 75-60,
-       },
-],
-},
 
-{
-cat => 'lair',
-name => 'Broodling',
-min => 0,
-gas => 0,
-build => 0,
-suit => 1,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 30,
-armor => 0,
-attack => {
-       ground => {
-               damage => [4, 5, 6, 7],
-               dps => [8, 10, 12, 14],
+               alt => 'Broodling',
+               suit => 1,
+               unit => undef,
+               organic => undef,
+               hp => 30,
+               armor => 0,
+               attack => {
+                       ground => {
+                               damage => [4, 5, 6, 7],
+                               dps => [8, 10, 12, 14],
+                       },
+                       range => 1,
+               },
+               sight => 5,
+               speed => 19,
        },
-       range => 1,
-},
-sight => 5,
-speed => 19,
-special => [],
+],
 },
 
 {