sc: separate interceptor subunit from carrier

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

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index 2bdc7154608c079a314d59e79e73f312ceeb0f59..af100913b7c062b3c192eeebc6fcc901481db7c4 100644 (file)
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -10,18 +10,18 @@ name => 'Probe',
 min => 50,
 gas => 0,
 build => 12.7*$FM, # 20
-size => 1,
+suit => 1,
 unit => 1,
 race => 'protoss',
 organic => 0,
-hp => 40,
-shield => 50,
+hp => 20,
+shield => 20,
 armor => 0,
 attack => {
        ground => {
                name => "Particle Beam",
                damage => 5,
-               cmp => 7,
+               dps => 7,
        },
        range => 1,
 },
@@ -41,21 +41,17 @@ trans => {
 min => 150,
 gas => 0,
 build => 50,
-size => 3,
-unit => 0,
+suit => 3,
 race => 'protoss',
-hp => 200,
-shield => 50,
+hp => 100,
+shield => 100,
 armor => 0,
 attack => {
        ground => {
                damage => 20,
-               cmp => 27,
-       },
-       air => {
-               damage => 20,
-               cmp => 27,
+               dps => 27,
        },
+       air => 'ground',
        range => 7,
 },
 sight => 11,
@@ -75,18 +71,18 @@ trans => {
 min => 100,
 gas => 0,
 build => 25*$FM, # 40
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 160,
-shield => 38,
+hp => 100,
+shield => 60,
 armor => 1,
 attack => {
        ground => {
                name => "Psi Blades",
                damage => [16, 18, 20, 22],
-               cmp => [22, undef, undef, 30],
+               dps => [22, undef, undef, 30],
        },
        range => 1,
 },
@@ -112,25 +108,21 @@ trans => {
 min => 125,
 gas => 50,
 build => 32*$FM, # 40
-size => 3,
+suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 1,
 attack => {
        ground => {
                name => "Phase Disruptor",
                damage => [20, 22, 24, 26],
-               cmp => [20, 22, 24, 26],
-               type => 'explosive',
-       },
-       air => {
-               damage => [20, 22, 24, 26],
-               cmp => [20, 22, 24, 26],
+               dps => [20, 22, 24, 26],
                type => 'explosive',
        },
+       air => 'ground',
        range => 4,
 },
 sight => 8,
@@ -156,12 +148,12 @@ trans => {
 min => 50,
 gas => 150,
 build => 31.7*$FM, # 50
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 80,
-shield => 50,
+hp => 40,
+shield => 40,
 armor => 0,
 attack => {
 },
@@ -217,18 +209,18 @@ trans => {
 min => 125,
 gas => 100,
 build => 34*$FM, # 50
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 120,
-shield => 33,
+hp => 80,
+shield => 40,
 armor => 1,
 attack => {
        ground => {
                name => "Warp Blades",
                damage => [40, 43, 46, 49],
-               cmp => [40, 43, 46, 49],
+               dps => [40, 43, 46, 49],
        },
        range => 1,
 },
@@ -249,25 +241,21 @@ min => 100,
 gas => 300,
 build => 13*$FM, # 20
 base => ['templar', 'templar'],
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 360,
-shield => 97,
+hp => 10,
+shield => 350,
 armor => 0,
 attack => {
        ground => {
                name => "Psionic Shockwave",
                damage => [30, 33, 36, 39],
-               cmp => [45, undef, undef, 59],
-               splash => 1,
-       },
-       air => {
-               damage => [30, 33, 36, 39],
-               cmp => [45, undef, undef, 59],
+               dps => [45, undef, undef, 59],
                splash => 1,
        },
+       air => 'ground',
        range => 2,
 },
 sight => 8,
@@ -286,12 +274,12 @@ min => 250,
 gas => 200,
 build => 13*$FM, # 20
 base => ['dark templar', 'dark templar'],
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 225,
-shield => 89,
+hp => 25,
+shield => 200,
 armor => 1,
 attack => {
 },
@@ -354,22 +342,22 @@ trans => {
 min => 275,
 gas => 125,
 build => 50.5*$FM, # 80
-size => 3,
+suit => 3,
 unit => 3,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 250,
-shield => 40,
+hp => 150,
+shield => 100,
 armor => 0,
 attack => {
        ground => {
                damage => [8, 9, 10, 11],
-               cmp => [8, 9, 10, 11],
+               dps => [8, 9, 10, 11],
        },
        air => {
                damage => [28, 30, 32, 34],
-               cmp => [38, undef, undef, 46],
+               dps => [38, undef, undef, 46],
                type => 'explosive',
        },
        range => 4,
@@ -396,18 +384,18 @@ trans => {
 min => 150,
 gas => 100,
 build => 25.3*$FM, # 40
-size => 2,
+suit => 2,
 unit => 2,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 1,
 attack => {
        air => {
                damage => [5, 6, 7, 8],
-               cmp => [19, undef, undef, 30],
+               dps => [19, undef, undef, 30],
                splash => 1,
                type => 'explosive',
        },
@@ -437,33 +425,58 @@ trans => {
 min => 350,
 gas => 250,
 build => 88.5*$FM, # 140
-size => 3,
+suit => 3,
 unit => 6,
 race => 'protoss',
 organic => 0,
-hp => 450,
-shield => 33,
+hp => 300,
+shield => 150,
 armor => 4,
 attack => {
        ground => {
-               damage => [6, 7, 8, 9],
-               cmp => [17, undef, undef, 49],
-               min => 25,
-               build => 12.7*$FM,
-               max => 4,
-       },
-       air => {
-               damage => [6, 7, 8, 9],
-               cmp => [17, undef, undef, 49],
-               min => 25,
+               dps => [17, undef, undef, 49],
                build => 12.7*$FM,
                max => 4,
        },
+       air => 'ground',
        range => 8,
 },
 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'],
 },
 
@@ -476,25 +489,21 @@ trans => {
 min => 100,
 gas => 350,
 build => 131, # 160
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 350,
-shield => 43,
+hp => 200,
+shield => 150,
 armor => 1,
 attack => {
        ground => {
                damage => [10, 11, 12, 13],
-               cmp => [7, undef, undef, 9],
-               type => 'explosive',
-       },
-       air => {
-               damage => [10, 11, 12, 13],
-               cmp => [7, undef, undef, 9],
+               dps => [7, undef, undef, 9],
                type => 'explosive',
        },
+       air => 'ground',
        range => 5,
 },
 sight => 9,
@@ -536,17 +545,17 @@ name => 'Reaver',
 min => 200,
 gas => 100,
 build => 44.5*$FM, # 70
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 0,
 attack => {
        ground => {
                damage => 100,
-               cmp => 50,
+               dps => 50,
                splash => 1,
                cost => 15,
                build => 4.54*$FM,
@@ -561,7 +570,7 @@ upgrade => [
                attack => {
                        ground => {
                                damage => 125 - 100,
-                               cmp => 63 - 50,
+                               dps => 63 - 50,
                        },
                },
        },
@@ -592,13 +601,13 @@ trans => {
 min => 25,
 gas => 75,
 build => 25.35*$FM, # 40
-size => 1,
+suit => 1,
 unit => 1,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 60,
-shield => 33,
+hp => 40,
+shield => 20,
 armor => 0,
 attack => {
 },
@@ -632,12 +641,12 @@ trans => {
 min => 200,
 gas => 0,
 build => 38*$FM, # 60
-size => 3,
+suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
-hp => 140,
-shield => 43,
+hp => 80,
+shield => 60,
 armor => 1,
 attack => {
 },
@@ -659,17 +668,16 @@ name => 'SCV', # T-280 Space Construction Vehicle
 min => 50,
 gas => 0,
 build => 20,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 0,
 hp =>  60,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => 5,
-               cmp => 10,
+               dps => 10,
        },
        range => 1,
 },
@@ -687,16 +695,14 @@ trans => {
 min => 75,
 gas => 0,
 build => 30,
-size => 3,
-unit => 0,
+suit => 3,
 race => 'terran',
 hp => 200,
-shield => 0,
 armor => 0,
 attack => {
        air => {
                damage => 20,
-               cmp => 40,
+               dps => 40,
                type => 'explosive',
        },
        range => 7,
@@ -716,22 +722,18 @@ trans => {
 min => 50,
 gas => 0,
 build => 24,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  40,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [6, 7, 8, 9],
-               cmp => [12, undef, undef, 18],
-       },
-       air => {
-               damage => [6, 7, 8, 9],
-               cmp => [12, undef, undef, 18],
+               dps => [12, undef, undef, 18],
        },
+       air => 'ground',
        range => 4,
 },
 sight => 7,
@@ -751,11 +753,9 @@ special => [
                speed => 17,
                attack => {
                        ground => {
-                               cmp => [24, undef, undef, 36],
-                       },
-                       air => {
-                               cmp => [24, undef, undef, 36],
+                               dps => [24, undef, undef, 36],
                        },
+                       air => 'ground',
                },
                duration => undef, #XXX
        },
@@ -768,17 +768,16 @@ name => 'Firebat',
 min => 50,
 gas => 25,
 build => 24,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  50,
-shield => 0,
 armor => 1,
 attack => {
        ground => {
                damage => [16, 18, 20, 22],
-               cmp => [22, undef, undef, 30],
+               dps => [22, undef, undef, 30],
                splash => 1,
                type => 'implosive',
        },
@@ -793,7 +792,7 @@ special => [
                desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
                speed => 17,
                attack => {
-                       cmp => [44, undef, undef, 60],
+                       dps => [44, undef, undef, 60],
                },
                duration => undef, #XXX
        },
@@ -809,24 +808,19 @@ trans => {
 min => 25,
 gas => 75,
 build => 50,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  45,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [10, 11, 12, 13],
-               cmp => [14, undef, undef, 18],
-               type => 'implosive',
-       },
-       air => {
-               damage => [10, 11, 12, 13],
-               cmp => [14, undef, undef, 18],
+               dps => [14, undef, undef, 18],
                type => 'implosive',
        },
+       air => 'ground',
        range => 7,
 },
 sight => 9,
@@ -867,12 +861,11 @@ name => 'Medic',
 min => 50,
 gas => 25,
 build => 30,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  60,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -915,17 +908,16 @@ trans => {
 min => 75,
 gas => 0,
 build => 19*$FM, # 30
-size => 2,
+suit => 2,
 unit => 2,
 race => 'terran',
 organic => 0,
 hp =>  80,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [20, 22, 24, 26],
-               cmp => [20, 22, 24, 26],
+               dps => [20, 22, 24, 26],
                type => 'implosive',
        },
        range => 5,
@@ -961,17 +953,16 @@ trans => {
 min => 150,
 gas => 100,
 build => 50,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
 hp => 150,
-shield => 0,
 armor => 1,
 attack => {
        ground => {
                damage => [30, 33, 36, 39],
-               cmp => [24, undef, undef, 32],
+               dps => [24, undef, undef, 32],
                type => 'explosive',
        },
        range => 7,
@@ -986,7 +977,7 @@ special => [
                attack => {
                        ground => {
                                damage => [70, 75, 80, 85],
-                               cmp => [28, 30, 32, 34],
+                               dps => [28, 30, 32, 34],
                                splash => 1,
                                type => 'explosive',
                        },
@@ -1007,21 +998,20 @@ trans => {
 min => 100,
 gas => 50,
 build => 40,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
 hp => 125,
-shield => 0,
 armor => 1,
 attack => {
        ground => {
                damage => [12, 13, 14, 15],
-               cmp => [16, undef, undef, 20],
+               dps => [16, undef, undef, 20],
        },
        air => {
                damage => [20, 24, 28, 32],
-               cmp => [27, undef, undef, 44],
+               dps => [27, undef, undef, 44],
                type => 'explosive',
        },
        range => 5,
@@ -1046,22 +1036,21 @@ name => 'Wraith',
 min => 150,
 gas => 100,
 build => 60,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [8, 9, 10, 11],
-               cmp => [8, 9, 10, 11],
+               dps => [8, 9, 10, 11],
        },
        air => {
                damage => [20, 22, 24, 26],
-               cmp => [27, undef, undef, 35],
+               dps => [27, undef, undef, 35],
                type => 'explosive',
        },
        range => 5,
@@ -1088,23 +1077,19 @@ trans => {
 min => 400,
 gas => 300,
 build => 160,
-size => 3,
+suit => 3,
 unit => 6,
 race => 'terran',
 organic => 0,
 air => 1,
 hp => 500,
-shield => 0,
 armor => 3,
 attack => {
        ground => {
                damage => [25, 28, 31, 34],
-               cmp => [25, 28, 31, 34],
-       },
-       air => {
-               damage => [25, 28, 31, 34],
-               cmp => [25, 28, 31, 34],
+               dps => [25, 28, 31, 34],
        },
+       air => 'ground',
        range => 6,
 },
 sight => 11,
@@ -1132,13 +1117,12 @@ trans => {
 min => 100,
 gas => 225,
 build => 80,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1185,18 +1169,17 @@ trans => {
 min => 250,
 gas => 125,
 build => 60,
-size => 3,
+suit => 3,
 unit => 3,
 race => 'terran',
 organic => 0,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 2,
 attack => {
        air => {
                damage => [6, 7, 8, 9],
-               cmp => [23, undef, undef, 25],
+               dps => [23, undef, undef, 25],
                splash => 1,
                type => 'explosive',
        },
@@ -1213,13 +1196,12 @@ name => 'Dropship',
 min => 100,
 gas => 100,
 build => 50,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
 air => 1,
 hp => 150,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1236,17 +1218,16 @@ name => 'Drone',
 min => 50,
 gas => 0,
 build => 13*$FM, # 20
-size => 1,
+suit => 1,
 unit => (1),
 race => 'zerg',
 organic => 1,
 hp => 40,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => 5,
-               cmp => 7,
+               dps => 7,
        },
        range => 1,
 },
@@ -1261,13 +1242,12 @@ name => 'Overlord',
 min => 100,
 gas => 0,
 build => 26*$FM, # 40
-size => 3,
+suit => 3,
 unit => -9,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 0,
 attack => {
 },
@@ -1292,44 +1272,36 @@ name => 'Larva',
 trans => {
        nl => 'larve',
 },
-min => 0,
-gas => 0,
 build => 14.3*$FM, # = 21.5
-size => 1,
+suit => 1,
 unit => 0,
 race => 'zerg',
 organic => 1,
 hp => 25,
-shield => 0,
 armor => 10,
 attack => {
 },
 sight => 4,
 speed => 0.1, #XXX
-special => [],
-},
-
-{
-cat => 'creep',
-name => 'Egg',
-trans => {
-       nl => 'ei',
-},
-min => 0,
-gas => 0,
-build => 0,
-size => 3,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 200,
-shield => 0,
-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 => [],
+       },
+],
 },
 
 {
@@ -1338,16 +1310,14 @@ name => 'Sunken Colony',
 min => 175,
 gas => 0,
 build => 20,
-size => 3,
-unit => 0,
+suit => 3,
 race => 'zerg',
 hp => 300,
-shield => 0,
 armor => 2,
 attack => {
        ground => {
                damage => 40,
-               cmp => 38,
+               dps => 38,
                type => 'explosive',
        },
        range => 7,
@@ -1363,16 +1333,14 @@ name => 'Spore Colony',
 min => 175,
 gas => 0,
 build => 20,
-size => 3,
-unit => 0,
+suit => 3,
 race => 'zerg',
 hp => 400,
-shield => 0,
 armor => 0,
 attack => {
        air => {
                damage => 15,
-               cmp => 30,
+               dps => 30,
        },
        range => 7,
 },
@@ -1388,17 +1356,16 @@ name => 'Zergling',
 min => 25,
 gas => 0,
 build => 19*$FM, # 14
-size => 1,
+suit => 1,
 unit => 0.5,
 race => 'zerg',
 organic => 1,
 hp => 35,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [5, 6, 7, 8],
-               cmp => [18, undef, undef, 29], # 29 is an estimate
+               dps => [18, undef, undef, 29], # 29 is an estimate
        },
        range => 1,
 },
@@ -1411,7 +1378,7 @@ upgrade => [
        {
                attack => {
                        ground => {
-                               cmp => [undef, undef, undef, 42 - 29],
+                               dps => [undef, undef, undef, 42 - 29],
                        },
                },
        },
@@ -1426,24 +1393,19 @@ name => 'Hydralisk',
 min => 75,
 gas => 25,
 build => 18.5*$FM, # 28
-size => 2,
+suit => 2,
 unit => 1,
 race => 'zerg',
 organic => 1,
 hp => 80,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [10, 11, 12, 13],
-               cmp => [20, 22, 24, 26],
-               type => 'explosive',
-       },
-       air => {
-               damage => [10, 11, 12, 13],
-               cmp => [20, 22, 24, 26],
+               dps => [20, 22, 24, 26],
                type => 'explosive',
        },
+       air => 'ground',
        range => 4,
 },
 sight => 6,
@@ -1468,17 +1430,16 @@ min => 125,
 gas => 125,
 base => 'hydralisk',
 build => 25.5*$FM, # 40
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
 hp => 125,
-shield => 0,
 armor => 1,
 attack => {
        ground => {
                damage => [20, 22, 24, 26],
-               cmp => [16, undef, undef, 21],
+               dps => [16, undef, undef, 21],
                splash => 1,
        },
        range => 6,
@@ -1494,13 +1455,12 @@ name => 'Queen',
 min => 100,
 gas => 100,
 build => 42.5*$FM, # 50
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
 },
@@ -1529,38 +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,
-size => 1,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 30,
-shield => 0,
-armor => 0,
-attack => {
-       ground => {
-               damage => [4, 5, 6, 7],
-               cmp => [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 => [],
+],
 },
 
 {
@@ -1569,12 +1520,11 @@ name => 'Infested Terran',
 min => 100,
 gas => 50,
 build => 40,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'zerg',
 organic => 1,
 hp => 60,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
@@ -1595,13 +1545,12 @@ name => 'Scourge',
 min => 12,
 gas => 38,
 build => 20*$FM, # 15
-size => 1,
+suit => 1,
 unit => 0.5,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 25,
-shield => 0,
 armor => 0,
 attack => {
        air => {
@@ -1620,30 +1569,25 @@ name => 'Mutalisk',
 min => 100,
 gas => 100,
 build => 26*$FM, # 40
-size => 1,
+suit => 1,
 unit => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
        ground => {
                damage => [9, 10, 11, 12],
-               cmp => [9, 10, 11, 12],
-               splash => 1,
-       },
-       air => {
-               damage => [9, 10, 11, 12],
-               cmp => [9, 10, 11, 12],
+               dps => [9, 10, 11, 12],
                splash => 1,
        },
+       air => 'ground',
        range => 3,
 },
 sight => 7,
 speed => 18,
-special => [],
+special => [], #TODO: glaive
 counter => ['templar', 'corsair', 'valkyrie'],
 },
 
@@ -1654,18 +1598,17 @@ min => 150,
 gas => 200,
 build => 25.6*$FM, # 40
 base => 'mutalisk',
-size => 3,
+suit => 3,
 unit => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 150,
-shield => 0,
 armor => 2,
 attack => {
        ground => {
                damage => [20, 22, 24, 26],
-               cmp => [20, 22, 24, 26],
+               dps => [20, 22, 24, 26],
        },
        range => 8,
 },
@@ -1681,18 +1624,17 @@ min => 250,
 gas => 150,
 build => 25.6*$FM, # 40
 base => 'mutalisk',
-size => 3,
+suit => 3,
 unit => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
 hp => 250,
-shield => 0,
 armor => 2,
 attack => {
        air => {
                damage => [25, 27, 29, 31],
-               cmp => [8, undef, undef, 9],
+               dps => [8, undef, undef, 9],
                type => 'explosive',
        },
        range => 6,
@@ -1708,12 +1650,11 @@ name => 'Defiler',
 min => 50,
 gas => 150,
 build => 32.5*$FM, # 50
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
 hp => 80,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1753,17 +1694,16 @@ name => 'Ultralisk',
 min => 200,
 gas => 200,
 build => 38.8*$FM, # 60
-size => 3,
+suit => 3,
 unit => 4,
 race => 'zerg',
 organic => 1,
 hp => 400,
-shield => 0,
 armor => 1,
 attack => {
        ground => {
                damage => [20, 23, 26, 29],
-               cmp => [40, 46, 52, 58],
+               dps => [40, 46, 52, 58],
        },
        range => 1,
 },