sc: option to order by build time

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

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 5d558d101e92bba77ffc8c738408a34b225d79bf..2f024b948af813f702a9d52155ff66f410f1a2fe 100644 (file)
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -11,7 +11,7 @@ use strict;
        race => 'protoss',
        cat => 'base',
        name => 'Probe',
-       unit => 1,
+       pop => 1,
        min => 50,
        gas => 0,
        build => 17,
@@ -27,7 +27,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Particle beam',
+                       name => 'Particle Beam',
                        damage => 5,
                        cooldown => 1.5,
                        range => 0,
@@ -55,7 +55,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Phase disruptor',
+                       name => 'Phase Disruptor',
                        damage => 20,
                        cooldown => 1.25,
                        type => 'projectile',
@@ -71,7 +71,7 @@ use strict;
        race => 'protoss',
        cat => 'base',
        name => 'Mothership Core',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 100,
        build => 30,
@@ -99,7 +99,8 @@ use strict;
        ],
        speed => 1.875,
        sight => 9,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Photon Overcharge',
@@ -132,7 +133,7 @@ use strict;
        race => 'protoss',
        cat => 'base',
        name => 'Mothership',
-       unit => 8,
+       pop => 8,
        min => 300,
        gas => 300,
        build => 100,
@@ -150,7 +151,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Purifier beams',
+                       name => 'Purifier Beams',
                        damage => 6,
                        upgrade => 1,
                        cooldown => 2.21,
@@ -160,7 +161,8 @@ use strict;
        ],
        speed => 1.4062,
        sight => 14,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Cloaking Field',
@@ -193,6 +195,7 @@ use strict;
        race => 'protoss',
        cat => 'base',
        name => 'Nexus',
+       pop => -10,
        min => 400,
        gas => 0,
        build => 100,
@@ -208,7 +211,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Photon overcharge',
+                       name => 'Photon Overcharge',
                        damage => 20,
                        cooldown => 1.25,
                        type => 'projectile',
@@ -217,7 +220,8 @@ use strict;
        ],
        speed => 0,
        sight => 11,
-       energy => 100,
+       energy => 0,
+       capacity => 100,
        special => [
                {
                        name => 'Chrono Boost',
@@ -233,7 +237,7 @@ use strict;
        race => 'protoss',
        cat => 'gateway',
        name => 'Zealot',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 0,
        build => 38,
@@ -250,7 +254,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Psi blades',
+                       name => 'Psi Blades',
                        damage => 8,
                        upgrade => 1,
                        cooldown => 1.2,
@@ -280,7 +284,7 @@ use strict;
        race => 'protoss',
        cat => 'gateway',
        name => 'Sentry',
-       unit => 2,
+       pop => 2,
        min => 50,
        gas => 100,
        build => 37,
@@ -298,7 +302,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Disruption beam',
+                       name => 'Disruption Beam',
                        damage => 6,
                        upgrade => 1,
                        cooldown => 1.0,
@@ -307,7 +311,8 @@ use strict;
        ],
        speed => 2.25,
        sight => 10,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Force Field',
@@ -341,7 +346,7 @@ use strict;
        race => 'protoss',
        cat => 'gateway',
        name => 'Stalker',
-       unit => 2,
+       pop => 2,
        min => 125,
        gas => 50,
        build => 42,
@@ -358,7 +363,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Particle disruptors',
+                       name => 'Particle Disruptors',
                        damage => 10,
                        upgrade => 1,
                        bonus => {
@@ -389,7 +394,7 @@ use strict;
        race => 'protoss',
        cat => 'gateway',
        name => 'High Templar',
-       unit => 2,
+       pop => 2,
        min => 50,
        gas => 150,
        build => 55,
@@ -406,7 +411,8 @@ use strict;
        },
        speed => 1.875,
        sight => 10,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Feedback',
@@ -435,7 +441,7 @@ use strict;
        race => 'protoss',
        cat => 'gateway',
        name => 'Dark Templar',
-       unit => 2,
+       pop => 2,
        min => 125,
        gas => 125,
        build => 55,
@@ -453,7 +459,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Warp blade',
+                       name => 'Warp Blade',
                        damage => 45,
                        upgrade => 5,
                        cooldown => 1.694,
@@ -478,7 +484,7 @@ use strict;
        name => 'Archon',
        min => 100, # or 175 or 250
        gas => 300, # or 275 or 250
-       unit => 4,
+       pop => 4,
        build => 12,
        base => ['Templar', 'Templar'],
        size => 1.5,
@@ -493,7 +499,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Psionic shockwave',
+                       name => 'Psionic Shockwave',
                        damage => 25,
                        upgrade => 3,
                        bonus => {
@@ -513,7 +519,7 @@ use strict;
        race => 'protoss',
        cat => 'robotic',
        name => 'Immortal',
-       unit => 4,
+       pop => 4,
        min => 250,
        gas => 100,
        build => 55,
@@ -529,7 +535,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Phase disruptors',
+                       name => 'Phase Disruptors',
                        damage => 20,
                        upgrade => 2,
                        bonus => {
@@ -556,7 +562,7 @@ use strict;
        race => 'protoss',
        cat => 'robotic',
        name => 'Colossus',
-       unit => 6,
+       pop => 6,
        min => 300,
        gas => 200,
        build => 75,
@@ -604,7 +610,7 @@ use strict;
        race => 'protoss',
        cat => 'robotic',
        name => 'Observer',
-       unit => 1,
+       pop => 1,
        min => 25,
        gas => 75,
        build => 30,
@@ -644,7 +650,7 @@ use strict;
        race => 'protoss',
        cat => 'robotic',
        name => 'Warp Prism',
-       unit => 2,
+       pop => 2,
        min => 200,
        gas => 0,
        build => 50,
@@ -683,7 +689,7 @@ use strict;
        race => 'protoss',
        cat => 'stargate',
        name => 'Phoenix',
-       unit => 2,
+       pop => 2,
        min => 150,
        gas => 100,
        build => 35,
@@ -714,7 +720,8 @@ use strict;
        ],
        speed => 4.25,
        sight => 10,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Graviton Beam',
@@ -744,7 +751,7 @@ use strict;
        race => 'protoss',
        cat => 'stargate',
        name => 'Void Ray',
-       unit => 4,
+       pop => 4,
        min => 250,
        gas => 150,
        build => 60,
@@ -761,7 +768,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Prismatic beam',
+                       name => 'Prismatic Beam',
                        damage => 6,
                        upgrade => 1,
                        bonus => {
@@ -796,7 +803,7 @@ use strict;
        race => 'protoss',
        cat => 'stargate',
        name => 'Oracle',
-       unit => 3,
+       pop => 3,
        min => 150,
        gas => 150,
        build => 50,
@@ -828,7 +835,8 @@ use strict;
        ],
        speed => 4,
        sight => 10,
-       energy => 200,
+       energy => 50, #XXX
+       capacity => 200,
        special => [
                {
                        name => 'Revelation',
@@ -855,7 +863,7 @@ use strict;
        race => 'protoss',
        cat => 'stargate',
        name => 'Tempest',
-       unit => 4,
+       pop => 4,
        min => 300,
        gas => 200,
        build => 60,
@@ -902,7 +910,7 @@ use strict;
        race => 'protoss',
        cat => 'stargate',
        name => 'Carrier',
-       unit => 6,
+       pop => 6,
        min => 350,
        gas => 250,
        build => 120,
@@ -931,7 +939,7 @@ use strict;
        special => [
                {
                        alt => 'Interceptor',
-                       unit => 0,
+                       pop => 0,
                        min => 25,
                        gas => 0,
                        build => 8,
@@ -982,7 +990,7 @@ use strict;
        race => 'terran',
        cat => 'base',
        name => 'SCV', # T-280 Space Construction Vehicle
-       unit => 1,
+       pop => 1,
        min => 50,
        gas => 0,
        build => 17,
@@ -998,7 +1006,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Fusion cutter',
+                       name => 'Fusion Cutter',
                        damage => 5,
                        cooldown => 1.5,
                        range => 0,
@@ -1012,7 +1020,8 @@ use strict;
        race => 'terran',
        cat => 'base',
        name => 'Mule',
-       unit => 0,
+       pop => 0,
+       cargo => 0,
        min => 0,
        build => 0,
        size => 0.75,
@@ -1045,7 +1054,7 @@ use strict;
        attack => [
                {
                        anti => 2,
-                       name => 'Longbolt missiles',
+                       name => 'Longbolt Missiles',
                        damage => 12,
                        cooldown => 0.8608,
                        count => 2,
@@ -1083,7 +1092,7 @@ use strict;
        cat => 'base',
        name => 'Planetary Fortress',
        base => ['Command Center'],
-       unit => -11,
+       pop => -11,
        min => 150,
        gas => 150,
        build => 50,
@@ -1099,7 +1108,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Ibiks cannon',
+                       name => 'Ibiks Cannon',
                        damage => 40,
                        splash => 1,
                        cooldown => 2,
@@ -1141,7 +1150,7 @@ use strict;
        race => 'terran',
        cat => 'barracks',
        name => 'Marine',
-       unit => 1,
+       pop => 1,
        min => 50,
        gas => 0,
        build => 25,
@@ -1156,7 +1165,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'C-14 rifle',
+                       name => 'C-14 Rifle',
                        damage => 6,
                        upgrade => 1,
                        cooldown => 0.8608,
@@ -1201,7 +1210,7 @@ use strict;
        race => 'terran',
        cat => 'barracks',
        name => 'Marauder',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 25,
        build => 30,
@@ -1216,7 +1225,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Punisher grenades',
+                       name => 'Punisher Grenades',
                        damage => 10,
                        upgrade => 1,
                        bonus => {
@@ -1273,7 +1282,7 @@ use strict;
        race => 'terran',
        cat => 'barracks',
        name => 'Reaper',
-       unit => 1,
+       pop => 1,
        min => 50,
        gas => 50,
        build => 40,
@@ -1289,7 +1298,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'P-45 Reaper pistol',
+                       name => 'P-45 Reaper Pistol',
                        damage => 4,
                        upgrade => 1,
                        cooldown => 1.1,
@@ -1313,7 +1322,7 @@ use strict;
        race => 'terran',
        cat => 'barracks',
        name => 'Ghost',
-       unit => 2,
+       pop => 2,
        min => 200,
        gas => 100,
        build => 40,
@@ -1328,7 +1337,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'C-10 rifle',
+                       name => 'C-10 Rifle',
                        damage => 10,
                        upgrade => 1,
                        bonus => {
@@ -1341,7 +1350,8 @@ use strict;
        ],
        speed => 2.25,
        sight => 11,
-       energy => 200,
+       energy => 75,
+       capacity => 200,
        special => [
                {
                        name => 'Sniper Round',
@@ -1382,7 +1392,7 @@ use strict;
        race => 'terran',
        cat => 'factory',
        name => 'Hellion',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 0,
        build => 30,
@@ -1397,7 +1407,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Infernal flamethrower',
+                       name => 'Infernal Flamethrower',
                        damage => 8,
                        upgrade => 1,
                        bonus => {
@@ -1443,7 +1453,7 @@ use strict;
        race => 'terran',
        cat => 'factory',
        name => 'Hellbat',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 0,
        build => 30,
@@ -1499,7 +1509,7 @@ use strict;
        race => 'terran',
        cat => 'factory',
        name => 'Widow Mine',
-       unit => 2,
+       pop => 2,
        min => 75,
        gas => 25,
        build => 40,
@@ -1542,7 +1552,7 @@ use strict;
        race => 'terran',
        cat => 'factory',
        name => 'Siege Tank',
-       unit => 3,
+       pop => 3,
        min => 150,
        gas => 125,
        build => 45,
@@ -1557,7 +1567,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => '90 mm twin cannon',
+                       name => '90 mm Twin Cannon',
                        damage => 15,
                        upgrade => 2,
                        bonus => {
@@ -1577,7 +1587,7 @@ use strict;
                        attack => [
                                {
                                        anti => 1,
-                                       name => '120 mm shock cannon',
+                                       name => '120 mm Shock Cannon',
                                        damage => 35,
                                        upgrade => 3,
                                        bonus => {
@@ -1601,7 +1611,7 @@ use strict;
        race => 'terran',
        cat => 'factory',
        name => 'Thor',
-       unit => 6,
+       pop => 6,
        min => 300,
        gas => 200,
        build => 60,
@@ -1658,7 +1668,7 @@ use strict;
        race => 'terran',
        cat => 'starport',
        name => 'Viking',
-       unit => 2,
+       pop => 2,
        min => 150,
        gas => 75,
        build => 42,
@@ -1674,7 +1684,7 @@ use strict;
        attack => [
                {
                        anti => 2,
-                       name => 'Lanzer torpedoes',
+                       name => 'Lanzer Torpedoes',
                        damage => 10,
                        upgrade => 1,
                        bonus => {
@@ -1696,7 +1706,7 @@ use strict;
                        attack => [
                                {
                                        anti => 1,
-                                       name => 'Twin gatling cannon',
+                                       name => 'Twin Gatling Cannon',
                                        damage => 12,
                                        upgrade => 1,
                                        cooldown => 1,
@@ -1713,7 +1723,7 @@ use strict;
        race => 'terran',
        cat => 'starport',
        name => 'Medivac',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 100,
        build => 42,
@@ -1727,7 +1737,8 @@ use strict;
                flying => 1,
        },
        speed => 2.5,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Heal',
@@ -1752,7 +1763,7 @@ use strict;
                        min => 100,
                        gas => 100,
                        build => 80,
-                       starting_energy => 25,
+                       energy => 25,
                },
        ],
 },
@@ -1761,7 +1772,7 @@ use strict;
        race => 'terran',
        cat => 'starport',
        name => 'Banshee', # AH/G-24
-       unit => 3,
+       pop => 3,
        min => 150,
        gas => 100,
        build => 60,
@@ -1777,7 +1788,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'Backlash rockets',
+                       name => 'Backlash Rockets',
                        damage => 12,
                        upgrade => 1,
                        type => 'projectile',
@@ -1788,7 +1799,8 @@ use strict;
        ],
        speed => 2.75,
        sight => 10,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Cloak',
@@ -1807,7 +1819,7 @@ use strict;
        race => 'terran',
        cat => 'starport',
        name => 'Raven',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 200,
        build => 60,
@@ -1823,7 +1835,8 @@ use strict;
        speed => 2.25,
        sight => 11,
        detect => 1,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        alt => 'Auto-Turret',
@@ -1841,7 +1854,7 @@ use strict;
                        attack => [
                                {
                                        anti => 3,
-                                       name => '12 mm gauss cannon',
+                                       name => '12 mm Gauss Cannon',
                                        damage => 8,
                                        cooldown => 0.8,
                                        range => 6,
@@ -1887,7 +1900,7 @@ use strict;
                        cooldown => 0,
                        attack => [
                                {
-                                       name => 'Point defense laser',
+                                       name => 'Point Defense Laser',
                                        range => 8,
                                },
                        ],
@@ -1949,7 +1962,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 110,
-                       starting_energy => 25,
+                       energy => 25,
                },
        ],
 },
@@ -1958,7 +1971,7 @@ use strict;
        race => 'terran',
        cat => 'starport',
        name => 'Battlecruiser',
-       unit => 6,
+       pop => 6,
        min => 400,
        gas => 300,
        build => 90,
@@ -1975,7 +1988,7 @@ use strict;
        attack => [
                {
                        anti => 1,
-                       name => 'ATS laser batteries',
+                       name => 'ATS Laser Batteries',
                        damage => 8,
                        upgrade => 1,
                        cooldown => 0.225,
@@ -1984,7 +1997,7 @@ use strict;
                },
                {
                        anti => 2,
-                       name => 'ATS laser batteries',
+                       name => 'ATS Laser Batteries',
                        damage => 6,
                        upgrade => 1,
                        cooldown => 0.225,
@@ -1994,7 +2007,8 @@ use strict;
        ],
        speed => 1.875,
        sight => 12,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Yamato Cannon',
@@ -2019,7 +2033,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 80,
-                       starting_energy => 25,
+                       energy => 25,
                },
        ],
 },
@@ -2030,7 +2044,7 @@ use strict;
        race => 'zerg',
        cat => 'base',
        name => 'Drone',
-       unit => 1,
+       pop => 1,
        min => 50,
        gas => 0,
        build => 17,
@@ -2060,7 +2074,7 @@ use strict;
        race => 'zerg',
        cat => 'base',
        name => 'Queen',
-       unit => 2,
+       pop => 2,
        min => 150,
        gas => 0,
        build => 50,
@@ -2096,7 +2110,8 @@ use strict;
        speed => 0.9375,
        creep => 2.7,
        sight => 9,
-       energy => 200,
+       energy => 25,
+       capacity => 200,
        special => [
                {
                        name => 'Spawn Larva',
@@ -2130,7 +2145,7 @@ use strict;
        race => 'zerg',
        cat => 'base',
        name => 'Overlord',
-       unit => -9,
+       pop => -9,
        min => 100,
        gas => 0,
        build => 25,
@@ -2144,7 +2159,6 @@ use strict;
                flying => 1,
        },
        speed => 0.586,
-       creep => 0,
        sight => 11,
        special => [
                {
@@ -2180,7 +2194,7 @@ use strict;
        cat => 'base',
        name => 'Overseer',
        base => ['Overlord'],
-       unit => -9,
+       pop => -9,
        min => 100+50,
        gas => 50,
        build => 17,
@@ -2194,10 +2208,10 @@ use strict;
                flying => 1,
        },
        speed => 1.875,
-       creep => 0,
        sight => 11,
        detect => 1,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Spawn Changeling',
@@ -2241,7 +2255,7 @@ use strict;
        race => 'zerg',
        cat => 'creep',
        name => 'Larva',
-       unit => 0,
+       pop => 0,
        build => 15,
        size => 0.25,
        cargo => 0,
@@ -2341,7 +2355,7 @@ use strict;
        race => 'zerg',
        cat => 'hatchery',
        name => 'Zergling',
-       unit => 0.5,
+       pop => 0.5,
        min => 25,
        gas => 0,
        build => 24,
@@ -2395,7 +2409,7 @@ use strict;
        cat => 'hatchery',
        name => 'Baneling',
        base => ['Zergling'],
-       unit => 0.5,
+       pop => 0.5,
        min => 25+25,
        gas => 25,
        build => 20,
@@ -2441,7 +2455,7 @@ use strict;
        race => 'zerg',
        cat => 'hatchery',
        name => 'Roach',
-       unit => 2,
+       pop => 2,
        min => 75,
        gas => 25,
        build => 27,
@@ -2500,7 +2514,7 @@ use strict;
        race => 'zerg',
        cat => 'lair',
        name => 'Hydralisk',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 50,
        build => 33,
@@ -2515,7 +2529,7 @@ use strict;
        attack => [
                {
                        anti => 3,
-                       name => 'Needle spines', # Scythe melee
+                       name => 'Needle Spines', # Scythe melee
                        damage => 12,
                        upgrade => 1,
                        type => 'projectile', # except melee
@@ -2553,7 +2567,7 @@ use strict;
        race => 'zerg',
        cat => 'lair',
        name => 'Infestor',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 150,
        build => 50,
@@ -2569,7 +2583,8 @@ use strict;
        speed => 2.25,
        creep => 1.3,
        sight => 10,
-       energy => 200,
+       energy => 50,
+       capacity => 200,
        special => [
                {
                        name => 'Neural Parasite',
@@ -2624,7 +2639,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 80,
-                       starting_energy => 25,
+                       energy => 25,
                },
        ],
 },
@@ -2653,7 +2668,7 @@ use strict;
        race => 'zerg',
        cat => 'lair',
        name => 'Swarm Host',
-       unit => 4,
+       pop => 4,
        min => 100,
        gas => 200,
        build => 40,
@@ -2727,7 +2742,7 @@ use strict;
        race => 'zerg',
        cat => 'lair',
        name => 'Mutalisk',
-       unit => 2,
+       pop => 2,
        min => 100,
        gas => 100,
        build => 33,
@@ -2747,6 +2762,7 @@ use strict;
                        damage => 9,
                        upgrade => 1,
                        splash => 'bounce',
+                       type => 'projectile',
                        psionic => 1,
                        cooldown => 1.5246,
                        range => 3,
@@ -2767,7 +2783,7 @@ use strict;
        race => 'zerg',
        cat => 'lair',
        name => 'Corruptor',
-       unit => 2,
+       pop => 2,
        min => 150,
        gas => 100,
        build => 40,
@@ -2813,7 +2829,7 @@ use strict;
        cat => 'hive',
        name => 'Brood Lord',
        base => ['Corruptor'],
-       unit => 4,
+       pop => 4,
        min => 150+150,
        gas => 100+150,
        build => 34,
@@ -2846,7 +2862,7 @@ use strict;
                        desc => 'Broodlings are spawned upon each attack',
                        duration => -1,
                        alt => 'Broodling',
-                       unit => 0,
+                       pop => 0,
 #                      build => 1,
                        size => 0.75,
                        cargo => 0,
@@ -2883,7 +2899,7 @@ use strict;
        race => 'zerg',
        cat => 'hive',
        name => 'Viper',
-       unit => 3,
+       pop => 3,
        min => 100,
        gas => 200,
        build => 40,
@@ -2899,7 +2915,8 @@ use strict;
        },
        speed => 2.9531,
        sight => 11,
-       energy => 200,
+       energy => 50, #XXX
+       capacity => 200,
        special => [
                {
                        name => 'Blinding Cloud',
@@ -2934,7 +2951,7 @@ use strict;
        race => 'zerg',
        cat => 'hive',
        name => 'Ultralisk',
-       unit => 6,
+       pop => 6,
        min => 300,
        gas => 200,
        build => 55,