sc: amend hots unit data with special and update details
[sheet.git] / sc-units-hots.inc.pl
index 3ba370aed7a065547d87584f6839143c4d18cf42..b6e7048b3fe177ee9df3cbf8623a3ef379f62567 100644 (file)
@@ -1,7 +1,8 @@
 use utf8;
+use strict;
 
 [
-'patch 2.1.3 BU',
+'patch 2.1.10',
 # http://wiki.teamliquid.net/starcraft2/Unit_Statistics
 # http://wiki.teamliquid.net/starcraft2/User:Roemy/Unit_Statistics_(detailed)
 # http://starcraft.wikia.com/wiki/List_of_StarCraft_II_units
@@ -19,8 +20,10 @@ use utf8;
        armor => 0,
        hp => 20,
        shield => 20,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => 5,
@@ -37,16 +40,17 @@ use utf8;
        race => 'protoss',
        cat => 'base',
        name => 'Photon Cannon',
-       unit => 0,
        min => 150,
        gas => 0,
        build => 40,
-       size => 2x2,
+       size => 2,
        armor => 1,
        hp => 150,
        shield => 150,
-       suit => 3, # armored
-       structure => 1,
+       attr => {
+               armored => 1,
+               structure => 1,
+       },
        attack => {
                ground => {
                        damage => 20,
@@ -58,6 +62,7 @@ use utf8;
        },
        speed => 0,
        sight => 11,
+       detect => 1,
 },
 
 {
@@ -73,9 +78,11 @@ use utf8;
        armor => 1,
        hp => 130,
        shield => 60,
-       suit => 3, # armored
-       organic => 0, # mech
-       psionic => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
                        damage => [8 .. 11],
@@ -87,6 +94,33 @@ use utf8;
        },
        speed => 1.875,
        sight => 9,
+       energy => 200,
+       special => [
+               {
+                       name => 'Photon Overcharge',
+                       abbr => 'po',
+                       desc => 'activate Nexus weapon for 1 minute',
+                       cost => 100,
+                       range => 10,
+               },
+               {
+                       name => 'Mass Recall',
+                       abbr => 'mr',
+                       desc => 'teleports itself and nearby units to targeted Nexus',
+                       cost => 100,
+                       duration => 2,
+                       radius => 7,
+               },
+               {
+                       name => 'Time Warp',
+                       abbr => 'tw',
+                       desc => 'create a temporal field which slows ground units by 50%',
+                       cost => 100,
+                       radius => 3.5,
+                       range => 9,
+                       duration => 30,
+               },
+       ],
 },
 
 {
@@ -101,38 +135,69 @@ use utf8;
        armor => 2,
        hp => 350,
        shield => 350,
-       suit => 3, # armored
-       organic => 0, # mech
-       psionic => 1,
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               psionic => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
-                       damage => [6 .. 9], x6,
+                       damage => [6 .. 9],
                        dps => [16.3, 19.0, 21.7, 24.4],
                        cooldown => 2.21,
+                       count => 6,
                },
                air => 'ground',
                range => 7,
        },
        speed => 1.4062,
        sight => 14,
+       energy => 200,
+       special => [
+               {
+                       name => 'Cloaking Field',
+                       abbr => 'cf',
+                       desc => 'cloaks all nearby friendly units and buildings',
+                       radius => 5,
+                       duration => -1,
+               },
+               {
+                       name => 'Mass Recall',
+                       abbr => 'mr',
+                       desc => 'teleports itself and nearby units to targeted Nexus',
+                       cost => 100,
+                       duration => 2,
+                       radius => 7,
+               },
+               {
+                       name => 'Time Warp',
+                       abbr => 'tw',
+                       desc => 'create a temporal field which slows ground units by 50%',
+                       cost => 100,
+                       radius => 3.5,
+                       range => 9,
+                       duration => 30,
+               },
+       ],
 },
 
 {
        race => 'protoss',
        cat => 'base',
        name => 'Nexus',
-       unit => 0,
        min => 400,
        gas => 0,
        build => 100,
-       size => 5x5,
+       size => 5,
        cargo => 0,
        armor => 1,
        hp => 1000,
        shield => 1000,
-       suit => 3, # armored
-       structure => 1,
+       attr => {
+               armored => 1,
+               structure => 1,
+       },
        attack => {
                ground => {
                        damage => 20,
@@ -144,6 +209,16 @@ use utf8;
        },
        speed => 0,
        sight => 11,
+       energy => 100,
+       special => [
+               {
+                       name => 'Chrono Boost',
+                       abbr => 'cb',
+                       desc => '50% faster production speed at a targeted building',
+                       cost => 25,
+                       duration => 20,
+               },
+       ],
 },
 
 {
@@ -160,23 +235,35 @@ use utf8;
        armor => 1,
        hp => 100,
        shield => 50,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
-                       damage => [8 .. 11], # x2
+                       damage => [8 .. 11],
                        dps => [13.3, 15.0, 16.7, 18.4],
                        cooldown => 1.2,
+                       count => 2,
                },
                range => 0,
        },
        speed => 2.25,
-       upgrade => [
+       sight => 9,
+       special => [
                {
+                       name => 'Charge',
+                       abbr => 'ch',
+                       desc => 'on attack, increases movement speed to 6.05 for 3.5s',
+                       min => 200,
+                       gas => 200,
+                       build => 140,
                        speed => .5,
+                       range => 4,
+                       duration => 3.5,
+                       cooldown => 10,
                },
        ],
-       sight => 9,
 },
 
 {
@@ -193,9 +280,11 @@ use utf8;
        armor => 1,
        hp => 40,
        shield => 40,
-       suit => 1, # light
-       organic => 0, # mech
-       psionic => 1,
+       attr => {
+               light => 1,
+               mech => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
                        damage => [6 .. 9],
@@ -207,6 +296,34 @@ use utf8;
        speed => 2.25,
        range => 5,
        sight => 10,
+       energy => 200,
+       special => [
+               {
+                       name => 'Force Field',
+                       abbr => 'ff',
+                       desc => 'erect a barries that impedes ground movement for 15s',
+                       cost => 50,
+                       range => 9,
+                       radius => 1.7,
+                       duration => 15,
+               },
+               {
+                       name => 'Guardian Shield',
+                       abbr => 'gs',
+                       desc => 'reduces ranged damage by 2 for friendly units within 4 radius',
+                       cost => 75,
+                       radius => 4,
+                       duration => 15,
+               },
+               {
+                       name => 'Hallucination',
+                       abbr => 'hl',
+                       desc => 'create fake replica of a protoss unit for one minute',
+                       cost => 100,
+                       duration => 60,
+                       range => 0,
+               },
+       ],
 },
 
 {
@@ -223,8 +340,10 @@ use utf8;
        armor => 1,
        hp => 80,
        shield => 80,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [10 .. 13],
@@ -238,6 +357,18 @@ use utf8;
        },
        speed => 2.9531,
        sight => 10,
+       special => [
+               {
+                       name => 'Blink',
+                       abbr => 'bl',
+                       desc => 'teleport to visible location',
+                       min => 150,
+                       gas => 150,
+                       build => 170,
+                       range => 8,
+                       cooldown => 10,
+               },
+       ],
 },
 
 {
@@ -254,11 +385,36 @@ use utf8;
        armor => 0,
        hp => 40,
        shield => 40,
-       suit => 1, # light
-       organic => 1,
-       psionic => 1,
+       attr => {
+               light => 1,
+               psionic => 1,
+               organic => 1,
+       },
        speed => 1.875,
        sight => 10,
+       energy => 200,
+       special => [
+               {
+                       name => 'Feedback',
+                       abbr => 'fb',
+                       desc => 'target will lose its energy and receive damage equal to that amount',
+                       cost => 50,
+                       range => 9,
+               },
+               {
+                       name => 'Psionic Storm',
+                       abbr => 'ps',
+                       desc => 'deals 80 damage over 4 seconds to units in targeted area',
+                       cost => 75,
+                       cooldown => 2,
+                       duration => 4,
+                       radius => 1.5,
+                       range => 9,
+                       min => 200,
+                       gas => 200,
+                       build => 110,
+               },
+       ],
 },
 
 {
@@ -275,9 +431,11 @@ use utf8;
        armor => 1,
        hp => 40,
        shield => 80,
-       suit => 1, # light
-       organic => 1,
-       psionic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
                        damage => [45, 50, 55, 60],
@@ -288,14 +446,22 @@ use utf8;
        },
        speed => 2.8125,
        sight => 8,
+       special => [
+               {
+                       name => 'Permanent Cloak',
+                       abbr => 'cl',
+                       desc => 'cloaked at all times',
+                       duration => -1,
+               },
+       ],
 },
 
 {
        race => 'protoss',
        cat => 'gateway',
        name => 'Archon',
-       min => 100,
-       gas => 300,
+       min => 100, # or 175 or 250
+       gas => 300, # or 275 or 250
        unit => 4,
        build => 12,
        base => ['Templar', 'Templar'],
@@ -304,8 +470,10 @@ use utf8;
        armor => 0,
        hp => 10,
        shield => 350,
-       attr => P,
-       massive => 1,
+       attr => {
+               psionic => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
                        damage => [25, 28, 31, 34],
@@ -334,8 +502,10 @@ use utf8;
        armor => 1,
        hp => 200,
        shield => 100,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [20, 22, 24, 26],
@@ -347,6 +517,14 @@ use utf8;
        },
        speed => 2.25,
        sight => 9,
+       special => [
+               {
+                       name => 'Hardened Shield',
+                       abbr => 'hs',
+                       desc => 'reduce all damage on shields to a maximum of 10',
+                       duration => -1,
+               },
+       ],
 },
 
 {
@@ -362,25 +540,42 @@ use utf8;
        armor => 1,
        hp => 200,
        shield => 150,
-       suit => 3, # armored
-       organic => 0, # mech
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
-                       damage => [15, 17, 19, 21], # x2
+                       damage => [15, 17, 19, 21],
                        dps => [18.2, 20.6, 23.0, 25.4],
                        splash => 'line',
                        cooldown => 1.65,
+                       count => 2,
                },
                range => 6,
        },
+       speed => 2.25,
+       sight => 10,
+       special => [
+               {
+                       name => 'Cliff Walk',
+                       abbr => 'cw',
+                       desc => 'can walk up and down cliffs',
+                       duration => -1,
+               },
+       ],
        upgrade => [
                {
-                       range => 3,
+                       name => 'Extended Thermal Lance',
+                       min => 200,
+                       gas => 200,
+                       build => 140,
+                       attack => {
+                               range => 3,
+                       },
                },
        ],
-       speed => 2.25,
-       sight => 10,
 },
 
 {
@@ -396,15 +591,30 @@ use utf8;
        armor => 0,
        hp => 40,
        shield => 20,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        speed => 1.875,
+       sight => 11,
+       detect => 1,
+       special => [
+               {
+                       name => 'Permanent Cloak',
+                       abbr => 'cl',
+                       desc => 'cloaked at all times',
+                       duration => -1,
+               },
+       ],
        upgrade => [
                {
+                       name => 'Gravitic Boosters',
+                       min => 100,
+                       gas => 100,
+                       build => 80,
                        speed => 0.9375,
                },
        ],
-       sight => 11,
 },
 
 {
@@ -416,20 +626,33 @@ use utf8;
        gas => 0,
        build => 50,
        size => 1.75,
-       cargo => 0,
+       cargo => -8,
        armor => 0,
        hp => 100,
        shield => 100,
-       suit => 3, # armored
-       organic => 0, # mech
-       psionic => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               psionic => 1,
+       },
        speed => 2.9531,
+       sight => 10,
+       special => [
+               {
+                       name => 'Phasing Mode',
+                       abbr => 'pm',
+                       desc => 'basically transforms into a hovering pylon',
+               },
+       ],
        upgrade => [
                {
+                       name => 'Gravitic Drive',
+                       min => 100,
+                       gas => 100,
+                       build => 80,
                        speed => 0.422,
                },
        ],
-       sight => 10,
 },
 
 {
@@ -445,23 +668,43 @@ use utf8;
        armor => 0,
        hp => 120,
        shield => 60,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        attack => {
                air => {
-                       damage => [5 .. 8], # x2
+                       damage => [5 .. 8],
                        dps => [9, 10.8, 12.6, 14.4],
                        #bonus => +5 L,
                        type => 'projectile',
                        cooldown => 1.11,
+                       count => 2,
                },
                range => 5,
        },
        speed => 4.25,
        sight => 10,
+       energy => 200,
+       special => [
+               {
+                       name => 'Graviton Beam',
+                       abbr => 'gb',
+                       desc => 'lifts a ground unit into the air for 10s',
+                       cost => 50,
+                       range => 4,
+                       duration => 10,
+               },
+       ],
        upgrade => [
                {
-                       range => 2,
+                       name => 'Anion Pulse-Crystals',
+                       min => 150,
+                       gas => 150,
+                       build => 90,
+                       attack => {
+                               range => 2,
+                       },
                },
        ],
 },
@@ -479,8 +722,10 @@ use utf8;
        armor => 0,
        hp => 150,
        shield => 100,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [6 .. 9],
@@ -489,10 +734,19 @@ use utf8;
                        cooldown => 0.5,
                },
                air => 'ground',
-               range => 6,
+               range => 6, # keeps firing until range 8
        },
        speed => 2.25,
        sight => 10,
+       special => [
+               {
+                       name => 'Prismatic Alignment',
+                       abbr => 'pa',
+                       desc => 'increases damage to armored by 6 for 20 seconds',
+                       duration => 20,
+                       cooldown => 60,
+               },
+       ],
 },
 
 {
@@ -508,9 +762,11 @@ use utf8;
        armor => 0,
        hp => 100,
        shield => 60,
-       suit => 1, # light
-       organic => 0, # mech
-       psionic => 1,
+       attr => {
+               light => 1,
+               mech => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
                        name => 'Pulsar Beam',
@@ -519,11 +775,34 @@ use utf8;
                        #bonus => +10 L,
                        dps => 17.4,
                        cooldown => 0.86,
+                       cost => 25,
+                       maint => 1.4,
                },
-               range => 5,
+               range => 5, #XXX 4?
        },
        speed => 4,
        sight => 10,
+       energy => 200,
+       special => [
+               {
+                       name => 'Revelation',
+                       abbr => 'rv',
+                       desc => 'hit enemy units and buildings are revealed for 1 minute',
+                       cost => 75,
+                       range => 9,
+                       cooldown => 3,
+                       duration => 60,
+                       radius => 6,
+               },
+               {
+                       name => 'Envision',
+                       abbr => 'ev',
+                       desc => 'temporary detection within sight range',
+                       cost => 50,
+                       range => 14,
+                       duration => 60,
+               },
+       ],
 },
 
 {
@@ -539,13 +818,15 @@ use utf8;
        armor => 2,
        hp => 120,
        shield => 60,
-       suit => 3, # armored
-       organic => 0, # mech
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
                        damage => [30, 33, 36, 39],
-                       #bonus => +50 (+2) Ma Air,
+                       #bonus => +14 Ma Air,
                        dps => [9.1, 10.0, 10.9, 11.8],
                        type => 'projectile',
                        cooldown => 3.3,
@@ -570,11 +851,13 @@ use utf8;
        armor => 2,
        hp => 300,
        shield => 150,
-       suit => 3, # armored
-       organic => 0, # mech
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               massive => 1,
+       },
        attack => {
-               range => 8,
+               range => 8, # leash range 14
        },
        speed => 1.875,
        sight => 12,
@@ -590,15 +873,18 @@ use utf8;
                        armor => 0,
                        hp => 40,
                        shield => 40,
-                       suit => 1, # light
-                       organic => 0, # mech
+                       attr => {
+                               light => 1,
+                               mech => 1,
+                       },
                        attack => {
                                ground => {
-                                       damage => [5 .. 8], # 2x
+                                       damage => [5 .. 8],
 #                                      dps => 26.7 (+5.3),
                                        dps => [3.3, 4.0, 4.7, 5.4],
 #                                      cooldown => 0.5 (0.125/ 0.25),
                                        cooldown => 3.0,
+                                       count => 2,
                                },
                                air => 'ground',
                                range => 2,
@@ -607,6 +893,15 @@ use utf8;
                        sight => 7,
                },
        ],
+       update => [
+               {
+                       name => 'Graviton Catapult',
+                       min => 150,
+                       gas => 150,
+                       build => 80,
+                       desc => 'increases Interceptor launch speed from 2/s to 4-8/s',
+               },
+       ],
 },
 
 # terran
@@ -623,9 +918,11 @@ use utf8;
        cargo => 1,
        armor => 0,
        hp => 45,
-       suit => 1, # light
-       organic => 1,
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               organic => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => 5,
@@ -648,8 +945,10 @@ use utf8;
        size => 0.75,
        armor => 0,
        hp => 60,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        speed => 2.8,
        sight => 8,
 },
@@ -658,33 +957,47 @@ use utf8;
        race => 'terran',
        cat => 'base',
        name => 'Missile Turret',
-       unit => 0,
        min => 100,
        gas => 0,
        build => 25,
-       size => 2x2,
+       size => 2,
        cargo => 0,
        armor => 0,
        hp => 250,
-       suit => 3, # armored
-       organic => 0, # mech
-       structure => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               structure => 1,
+       },
        attack => {
                air => {
-                       damage => 12, # x2
+                       damage => 12,
                        dps => 27.9,
                        cooldown => 0.8608,
+                       count => 2,
                },
                range => 7,
        },
        speed => 0,
        sight => 11,
+       detect => 1,
        upgrade => [
                {
+                       name => 'Hi-Sec Auto Tracking',
+                       min => 100,
+                       gas => 100,
+                       build => 80,
                        attack => {
                                range => 1,
                        },
                },
+               {
+                       name => 'Building Armor',
+                       min => 150,
+                       gas => 150,
+                       build => 140,
+                       armor => 2,
+               },
        ],
 },
 
@@ -693,17 +1006,19 @@ use utf8;
        cat => 'base',
        name => 'Planetary Fortress',
        base => ['Command Center'],
-       unit => 0,
+       unit => -11,
        min => 150,
        gas => 150,
        build => 50,
-       size => 5x5,
+       size => 5,
        cargo => 0,
        armor => 3,
        hp => 1500,
-       suit => 3, # armored
-       organic => 0, # mech
-       structure => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               structure => 1,
+       },
        attack => {
                ground => {
                        damage => 40,
@@ -717,9 +1032,24 @@ use utf8;
        sight => 11,
        upgrade => [
                {
+                       name => 'Neosteel Frame',
+                       min => 100,
+                       gas => 100,
+                       build => 110,
+                       desc => 'increase load space by 5',
+               },
+               {
+                       name => 'Building Armor',
+                       min => 150,
+                       gas => 150,
+                       build => 140,
                        armor => 2,
                },
                {
+                       name => 'Hi-Sec Auto Tracking',
+                       min => 100,
+                       gas => 100,
+                       build => 80,
                        attack => {
                                range => 1,
                        },
@@ -739,10 +1069,13 @@ use utf8;
        cargo => 1,
        armor => 0,
        hp => 45,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
+                       name => 'C-14 rifle',
                        damage => [6 .. 9],
                        dps => [7, 8.2, 9.4, 10.6],
                        cooldown => 0.8608,
@@ -753,16 +1086,23 @@ use utf8;
        speed => 2.25,
        upgrade => [
                {
+                       name => 'Combat Shield',
+                       min => 100,
+                       gas => 100,
+                       build => 110,
                        hp => 10,
                },
        ],
        special => [
                {
-                       name => 'stim pack',
+                       name => 'Stim Pack',
                        abbr => 'sp',
                        alt => 'Stimmed Marine',
-                       desc => 'increases attack and movement speed for a few seconds at the cost of 10 health',
-                       speed => 2.25 + 1.125,
+                       desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
+                       speed => 1.125,
+                       min => 100,
+                       gas => 100,
+                       build => 170,
                        attack => {
                                ground => {
                                        dps => [10.5, 12.2, 13.9, 15.6],
@@ -770,7 +1110,7 @@ use utf8;
                                },
                                air => 'ground',
                        },
-                       duration => undef, #XXX
+                       duration => 15,
                },
        ],
        sight => 9,
@@ -788,8 +1128,10 @@ use utf8;
        cargo => 2,
        armor => 1,
        hp => 125,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [10 .. 13],
@@ -802,17 +1144,33 @@ use utf8;
        },
        special => [
                {
-                       name => 'stim pack',
+                       name => 'Stim Pack',
                        abbr => 'sp',
-                       desc => 'increases attack and movement speed for a few seconds at the cost of 10 health',
-                       speed => 2.25 + 1.125,
+                       alt => 'Stimmed Marauder',
+                       desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
+                       speed => 1.125,
+                       min => 100,
+                       gas => 100,
+                       build => 170,
                        attack => {
                                ground => {
                                        dps => [10 .. 13],
                                        cooldown => 1.0,
                                },
+                               air => 'ground',
                        },
-                       duration => undef, #XXX
+                       duration => 15,
+               },
+       ],
+       update => [
+               {
+                       name => 'Concussive Shells',
+                       abbr => 'cs',
+                       desc => 'slows non-massive enemy movement speed by 50% for 1.5s when hit',
+                       min => 50,
+                       gas => 50,
+                       build => 60,
+                       duration => -1,
                },
        ],
        speed => 2.25,
@@ -831,18 +1189,33 @@ use utf8;
        cargo => 1,
        armor => 0,
        hp => 60,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
-                       damage => [4 .. 7], # x2
+                       damage => [4 .. 7],
                        dps => [7.3, 9.1, 10.9, 12.7],
                        cooldown => 1.1,
+                       count => 2,
                },
                range => 4.5,
        },
        speed => 3.75,
        sight => 9,
+       special => [
+               {
+                       name => 'Jet Pack',
+                       abbr => 'jp',
+                       desc => 'jump up and down cliffs',
+               },
+               {
+                       name => 'Combat Drugs',
+                       abbr => 'cd',
+                       desc => 'heal 2 HP per second after 10 seconds out of combat',
+               },
+       ],
 },
 
 {
@@ -857,8 +1230,10 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 100,
-       organic => 1,
-       psionic => 1,
+       attr => {
+               organic => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
                        damage => [10 .. 13],
@@ -871,6 +1246,41 @@ use utf8;
        },
        speed => 2.25,
        sight => 11,
+       energy => 200,
+       special => [
+               {
+                       name => 'Sniper Round',
+                       abbr => 'sr',
+                       desc => '25 damage to a single biological unit, or 50 to psionic',
+                       cost => 25,
+                       range => 10,
+               },
+               {
+                       name => 'EMP Round',
+                       abbr => 'ep',
+                       desc => 'reveals cloaked units and removes up to 100 shields and energy',
+                       cost => 75,
+                       range => 10,
+                       radius => 1.5,
+               },
+               {
+                       name => 'Personal Cloaking',
+                       abbr => 'cl',
+                       desc => 'has the ability to cloak',
+                       cost => 25,
+                       maint => .9, # /s
+                       min => 150,
+                       gas => 150,
+                       build => 120,
+               },
+               {
+                       name => 'Nuclear Strike',
+                       abbr => 'ns',
+                       desc => 'guides a nuclear missile which will do 300 damage plus 200 to buildings',
+                       duration => 20,
+                       range => 12,
+               },
+       ],
 },
 
 {
@@ -885,13 +1295,14 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 90,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [8 .. 11],
                        dps => [3.2, 3.6, 4.0, 4.4],
-                       #bonus => +6 (+1), +11 (+1) L,
                        splash => 'line',
                        cooldown => 2.5,
                },
@@ -899,6 +1310,27 @@ use utf8;
        },
        speed => 4.25,
        sight => 10,
+       special => [
+               {
+                       name => 'Hellbat Mode',
+                       abbr => 'hm',
+                       desc => 'transform to Hellbat',
+                       duration => 4,
+               },
+       ],
+       update => [
+               {
+                       name => 'Infernal Pre-Igniter',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+                       attack => {
+                               ground => {
+                                       #bonus => +6 (+1), +11 (+1) L,
+                               },
+                       },
+               },
+       ],
 },
 
 {
@@ -913,13 +1345,14 @@ use utf8;
        cargo => 4,
        armor => 0,
        hp => 135,
-       suit => 1, # light
-       organic => 1,
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               organic => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [18, 20, 22, 24],
-                       #bonus => +12 (+1) L,
                        dps => [9 .. 12],
                        splash => 1,
                        cooldown => 2,
@@ -928,6 +1361,27 @@ use utf8;
        },
        speed => 2.25,
        sight => 10,
+       special => [
+               {
+                       name => 'Hellion Mode',
+                       abbr => 'hm',
+                       desc => 'transform to Hellion',
+                       duration => 4,
+               },
+       ],
+       update => [
+               {
+                       name => 'Infernal Pre-Igniter',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+                       attack => {
+                               ground => {
+                                       #bonus => +12 (+1) L,
+                               },
+                       },
+               },
+       ],
 },
 
 {
@@ -942,8 +1396,10 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 90,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => 125,
@@ -955,6 +1411,16 @@ use utf8;
        },
        speed => 2.8125,
        sight => 7,
+       update => [
+               {
+                       name => 'Drilling Claws',
+                       abbr => 'dc',
+                       desc => 'decreases burrow time from 3 to 1 second',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+               },
+       ],
 },
 
 {
@@ -969,8 +1435,10 @@ use utf8;
        cargo => 4,
        armor => 1,
        hp => 160,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
                        damage => [15, 17, 19, 21],
@@ -997,6 +1465,7 @@ use utf8;
                                range => 13,
                        },
                        speed => 0,
+                       duration => 4,
                },
        ],
        speed => 2.25,
@@ -1015,25 +1484,29 @@ use utf8;
        cargo => 8,
        armor => 1,
        hp => 400,
-       suit => 3, # armored
-       organic => 0, # mech
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
-                       damage => [30, 33, 36, 39], # x2,
+                       damage => [30, 33, 36, 39],
                        dps => [46.9, 51.6, 56.3, 61.0],
                        cooldown => 1.28,
                        range => 7,
+                       count => 2,
                },
                air => {
                        name => 'Explosive Payload',
-                       damage => [6 .. 9], # x4
+                       damage => [6 .. 9],
                        #bonus => +6 (+1) L Air,
                        dps => [8, 9.3, 10.6, 11.9],
                        splash => 1,
                        type => 'projectile',
                        cooldown => 3,
                        range => 10,
+                       count => 4,
                },
                air => {
                        name => 'High Impact Payload',
@@ -1059,15 +1532,18 @@ use utf8;
        cargo => 0,
        armor => 0,
        hp => 125,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        attack => {
                air => {
-                       damage => [10 .. 13], # x2
+                       damage => [10 .. 13],
                        #bonus => +4A,
                        dps => [10 .. 13],
                        type => 'projectile',
                        cooldown => 2,
+                       count => 2,
                },
                range => 9,
        },
@@ -1101,18 +1577,42 @@ use utf8;
        gas => 100,
        build => 42,
        size => 1.5,
-       cargo => 0,
+       cargo => -8,
        armor => 1,
        hp => 150,
-       suit => 3, # armored
-       organic => 0, # mech
+       attr => {
+               armored => 1,
+               mech => 1,
+       },
        speed => 2.5,
-       upgrade => [
+       energy => 200,
+       special => [
                {
+                       name => 'Heal',
+                       abbr => 'hl',
+                       desc => 'automatically heals nearby biological allies for 9 HP per second',
+                       range => 4,
+                       cost => 3,
+               },
+               {
+                       name => 'Ignite Afterburners',
+                       abbr => 'ia',
+                       desc => 'boost speed and accelleration to 4.25 for 8s',
                        speed => 4.25,
+                       duration => 8,
+                       cooldown => 20,
                },
        ],
        sight => 11,
+       upgrade => [
+               {
+                       name => 'Caduceus Reactor',
+                       min => 100,
+                       gas => 100,
+                       build => 80,
+                       starting_energy => 25,
+               },
+       ],
 },
 
 {
@@ -1127,19 +1627,35 @@ use utf8;
        cargo => 0,
        armor => 0,
        hp => 140,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        attack => {
                ground => {
-                       damage => [12 .. 15], # x2
+                       damage => [12 .. 15],
                        dps => [19.2, 20.8, 22.4, 24.0],
                        type => 'projectile',
                        cooldown => 1.25,
+                       count => 2,
                },
                range => 6,
        },
        speed => 2.75,
        sight => 10,
+       energy => 200,
+       special => [
+               {
+                       name => 'Cloak',
+                       abbr => 'cl',
+                       desc => 'has the ability to cloak',
+                       cost => 25,
+                       maint => .9,
+                       min => 100,
+                       gas => 100,
+                       build => 110,
+               },
+       ],
 },
 
 {
@@ -1154,20 +1670,28 @@ use utf8;
        cargo => 0,
        armor => 1,
        hp => 140,
-       suit => 1, # light
-       organic => 0, # mech
+       attr => {
+               light => 1,
+               mech => 1,
+       },
        speed => 2.25,
        sight => 11,
+       detect => 1,
+       energy => 200,
        special => [
                {
                        alt => 'Auto-Turret',
-                       size => 2x2,
+#                      abbr => 'at',
+                       cost => 50,
+                       size => 2,
                        cargo => 0,
                        armor => 1,
                        hp => 150,
-                       suit => 3, # armored
-                       organic => 0, # mech
-                       structure => 1,
+                       attr => {
+                               armored => 1,
+                               mech => 1,
+                               structure => 1,
+                       },
                        attack => {
                                ground => {
                                        damage => 8,
@@ -1181,21 +1705,36 @@ use utf8;
                        sight => 7,
                        upgrade => [
                                {
+                                       name => 'Hi-Sec Auto Tracking',
+                                       min => 100,
+                                       gas => 100,
+                                       build => 80,
                                        attack => {
                                                range => 1,
                                        },
                                },
+                               {
+                                       name => 'Building Armor',
+                                       min => 150,
+                                       gas => 150,
+                                       build => 140,
+                                       armor => 2,
+                               },
                        ],
                },
                {
                        alt => 'Point Defense Drone',
+#                      abbr => 'pd',
+                       cost => 100,
                        size => 1.2,
                        cargo => 0,
                        armor => 0,
                        hp => 50,
-                       suit => 1, # light
-                       organic => 0, # mech
-                       structure => 1,
+                       attr => {
+                               light => 1,
+                               mech => 1,
+                               structure => 1,
+                       },
                        cooldown => 0,
                        attack => {
                                range => 8,
@@ -1203,11 +1742,58 @@ use utf8;
                        sight => 7,
                        upgrade => [
                                {
+                                       name => 'Hi-Sec Auto Tracking',
+                                       min => 100,
+                                       gas => 100,
+                                       build => 80,
                                        attack => {
                                                range => 1,
                                        },
                                },
+                               {
+                                       name => 'Building Armor',
+                                       min => 150,
+                                       gas => 150,
+                                       build => 140,
+                                       armor => 2,
+                               },
                        ],
+                       duration => 20,
+               },
+               {
+                       name => 'Seeker Missile',
+                       abbr => 'sm',
+                       desc => 'launches missile to do 100 damage plus splash'
+                               . ' unless targeted unit moves to 13 range within 5 seconds of charging',
+                       range => 10,
+                       attack => {
+                               damage => 100,
+                               splash => 1,
+                       },
+                       cost => 75,
+               },
+       ],
+       update => [
+               {
+                       name => 'Durable Materials',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+                       special => {
+                               at => {
+                                       duration => 240,
+                               },
+                               pd => {
+                                       duration => 30,
+                               },
+                       },
+               },
+               {
+                       name => 'Corvid Reactor',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+                       starting_energy => 25,
                },
        ],
 },
@@ -1224,9 +1810,11 @@ use utf8;
        cargo => 0,
        armor => 3,
        hp => 550,
-       suit => 3, # armored
-       organic => 0, # mech
-       massive => 1,
+       attr => {
+               armored => 1,
+               mech => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
                        damage => [8 .. 11],
@@ -1242,6 +1830,32 @@ use utf8;
        },
        speed => 1.875,
        sight => 12,
+       energy => 200,
+       special => [
+               {
+                       name => 'Yamato Cannon',
+                       abbr => 'yc',
+                       desc => '300 damage to a single target',
+                       min => 150,
+                       gas => 150,
+                       build => 60,
+                       duration => 3,
+                       range => 10,
+                       cost => 100,
+                       attack => {
+                               damage => 300,
+                       },
+               },
+       ],
+       update => [
+               {
+                       name => 'Behemoth Reactor',
+                       min => 150,
+                       gas => 150,
+                       build => 80,
+                       starting_energy => 25,
+               },
+       ],
 },
 
 # zerg
@@ -1258,8 +1872,10 @@ use utf8;
        cargo => 1,
        armor => 0,
        hp => 40,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => 5,
@@ -1285,15 +1901,18 @@ use utf8;
        cargo => 2,
        armor => 1,
        hp => 175,
-       organic => 1,
-       psionic => 1,
+       attr => {
+               organic => 1,
+               psionic => 1,
+       },
        attack => {
                ground => {
-                       damage => [4 .. 7], # x2
+                       damage => [4 .. 7],
                        dps => [8, 10, 12, 14],
                        cooldown => 1.0,
                        type => 'projectile',
                        range => 5,
+                       count => 2,
                },
                air => {
                        damage => [9 .. 12],
@@ -1306,6 +1925,34 @@ use utf8;
        speed => 0.9375,
        creep => 2.7,
        sight => 9,
+       energy => 200,
+       special => [
+               {
+                       name => 'Spawn Larva',
+                       abbr => 'sl',
+                       desc => 'injects a Hatchery to produce 4 Larvae after 40 seconds',
+                       cost => 25,
+                       range => 1,
+                       cooldown => 2.5,
+                       duration => 40,
+               },
+               {
+                       name => 'Spawn Creep Tumor',
+                       abbr => 'sc',
+                       desc => 'place a tumor on creep which will expand it',
+                       cost => 25,
+                       range => 1,
+                       duration => 15,
+               },
+               {
+                       name => 'Transfusion',
+                       abbr => 'tf',
+                       desc => 'heal a friendly biological unit or building for 125 HP',
+                       cost => 50,
+                       range => 7,
+                       cooldown => 1,
+               },
+       ],
 },
 
 {
@@ -1317,18 +1964,42 @@ use utf8;
        gas => 0,
        build => 25,
        size => 0,
-       cargo => -8,
+       cargo => 0,
        armor => 0,
        hp => 200,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        speed => 0.586,
        creep => 0,
        sight => 11,
+       special => [
+               {
+                       name => 'Generate Creep',
+                       abbr => 'gc',
+                       desc => 'place Zerg creep at current location',
+                       duration => 15,
+                       radius => 2,
+                       req => 'Lair',
+               },
+       ],
        upgrade => [
                {
+                       name => 'Pneumatized Carapace',
+                       min => 100,
+                       gas => 100,
+                       build => 60,
                        speed => 1.294,
                },
+               {
+                       name => 'Ventral Sacs',
+                       min => 200,
+                       gas => 200,
+                       build => 130,
+                       cargo => -8,
+                       req => 'Lair',
+               },
        ],
 },
 
@@ -1345,28 +2016,49 @@ use utf8;
        cargo => 0,
        armor => 1,
        hp => 200,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        speed => 1.875,
        creep => 0,
        sight => 11,
+       detect => 1,
+       energy => 200,
        special => [
                {
+                       name => 'Spawn Changeling',
                        alt => 'Changeling',
+                       cost => 50,
+                       duration => 150,
                        build => 1,
                        size => 0.75,
                        cargo => 0,
                        armor => 0,
                        hp => 5,
-                       suit => 1, # light
-                       organic => 1,
+                       attr => {
+                               light => 1,
+                               organic => 1,
+                       },
                        speed => 2.25,
                        creep => 1.0,
                        sight => 8,
                },
+               {
+                       name => 'Contaminate',
+                       abbr => 'ct',
+                       desc => 'covers an enemy structure in slime, preventing production and research for 30 seconds',
+                       cost => 125,
+                       range => 3,
+                       duration => 30,
+               },
        ],
        upgrade => [
                {
+                       name => 'Pneumatized Carapace',
+                       min => 100,
+                       gas => 100,
+                       build => 60,
                        speed => 0.875,
                },
        ],
@@ -1382,28 +2074,44 @@ use utf8;
        cargo => 0,
        armor => 10,
        hp => 25,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        speed => 0.5625,
        creep => 1.0,
        sight => 5,
+       special => [
+               {
+                       alt => 'Cocoon',
+                       attr => {
+                               organic => 1,
+                       },
+                       hp => 200,
+                       armor => 10,
+                       size => 0.75,
+                       sight => 5,
+                       speed => 0,
+               },
+       ],
 },
 
 {
        race => 'zerg',
        cat => 'creep',
        name => 'Spine Crawler',
-       unit => 0,
        min => 100,
        gas => 0,
        build => 50,
-       size => 2x2,
+       size => 2,
        cargo => 0,
        armor => 2,
        hp => 300,
-       suit => 3, # armored
-       organic => 1,
-       structure => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               structure => 1,
+       },
        attack => {
                ground => {
                        damage => 25,
@@ -1422,17 +2130,18 @@ use utf8;
        race => 'zerg',
        cat => 'creep',
        name => 'Spore Crawler',
-       unit => 0,
        min => 75,
        gas => 0,
        build => 30,
-       size => 2x2,
+       size => 2,
        cargo => 0,
        armor => 1,
        hp => 400,
-       suit => 3, # armored
-       organic => 1,
-       structure => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               structure => 1,
+       },
        attack => {
                air => {
                        damage => 15,
@@ -1446,6 +2155,7 @@ use utf8;
        speed => (1.0),
        creep => 2.5,
        sight => 11,
+       detect => 1,
 },
 
 {
@@ -1460,8 +2170,10 @@ use utf8;
        cargo => 1,
        armor => 0,
        hp => 35,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [5 .. 8],
@@ -1475,14 +2187,23 @@ use utf8;
        sight => 8,
        upgrade => [
                {
+                       name => 'Adrenal Glands',
+                       min => 200,
+                       gas => 200,
+                       build => 130,
                        attack => {
                                ground => {
                                        dps => [8.5, 10.2, 11.9, 13.6],
-                                       cooldown => 0.587,
+                                       cooldown => -0.109,
                                },
                        },
+                       req => 'Hive',
                },
                {
+                       name => 'Metabolic Boost',
+                       min => 100,
+                       gas => 100,
+                       build => 110,
                        speed => 1.746,
                },
        ],
@@ -1501,7 +2222,9 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 30,
-       organic => 1,
+       attr => {
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [20, 22, 24, 26],
@@ -1515,7 +2238,12 @@ use utf8;
        sight => 8,
        upgrade => [
                {
+                       name => 'Centrifugal Hooks',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
                        speed => 0.4531,
+                       req => 'Lair',
                },
        ],
 },
@@ -1532,8 +2260,10 @@ use utf8;
        cargo => 2,
        armor => 1,
        hp => 145,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [16, 18, 20, 22],
@@ -1545,9 +2275,32 @@ use utf8;
        creep => 1.3,
        range => 4,
        sight => 9,
+       special => [
+               {
+                       name => 'Rapid Regeneration',
+                       abbr => 'rr',
+                       desc => 'regenerates health at 5 HP/s while burrowed',
+                       duration => -1,
+               },
+               {
+                       name => 'Tunneling Claws',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+                       abbr => 'tc',
+                       desc => 'move while burrowed at speed of 2.0 and increase regeneration to 10 HP/s',
+                       duration => -1,
+                       req => 'Lair',
+               },
+       ],
        upgrade => [
                {
+                       name => 'Glial Reconstitution',
+                       min => 100,
+                       gas => 100,
+                       build => 110,
                        speed => 0.75,
+                       req => 'Lair',
                },
        ],
 },
@@ -1564,8 +2317,10 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 80,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [12 .. 15],
@@ -1581,14 +2336,22 @@ use utf8;
        sight => 9,
        upgrade => [
                {
-                       speed => 0.5625,
-                       creep => -0.302,
-               },
-               {
+                       name => 'Grooved Spines',
+                       min => 150,
+                       gas => 150,
+                       build => 80,
                        attack => {
                                range => 1,
                        },
                },
+               {
+                       name => 'Muscular Augments',
+                       min => 150,
+                       gas => 150,
+                       build => 100,
+                       speed => 0.5625,
+                       creep => -0.302,
+               },
        ],
 },
 
@@ -1604,22 +2367,50 @@ use utf8;
        cargo => 2,
        armor => 0,
        hp => 90,
-       suit => 3, # armored
-       organic => 1,
-       psionic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               psionic => 1,
+       },
        speed => 2.25,
        creep => 1.3,
        sight => 10,
+       energy => 200,
        special => [
+               {
+                       name => 'Neural Parasite',
+                       abbr => 'np',
+                       desc => 'take control of target enemy unit for 15s (while within 14 range)',
+                       cost => 100,
+                       range => 7,
+                       duration => 15,
+                       min => 150,
+                       gas => 150,
+                       build => 110,
+               },
+               {
+                       name => 'Fungal Growth',
+                       abbr => 'fg',
+                       desc => 'for 4 seconds, immobilize enemy units in target area and deal 30 damage',
+                       cost => 75,
+                       range => 10,
+                       duration => 4,
+                       radius => 2.0,
+               },
                {
                        alt => 'Infested Terran',
+                       cost => 25,
+                       range => 9,
+                       duration => 30,
                        build => 5,
                        size => 0.75,
                        cargo => 0,
                        armor => 0,
                        hp => 50,
-                       suit => 1, # light
-                       organic => 1,
+                       attr => {
+                               light => 1,
+                               organic => 1,
+                       },
                        attack => {
                                ground => {
                                        damage => 8,
@@ -1634,23 +2425,33 @@ use utf8;
                        sight => 9,
                },
        ],
+       update => [
+               {
+                       name => 'Pathogen Glands',
+                       min => 150,
+                       gas => 150,
+                       build => 80,
+                       starting_energy => 25,
+               },
+       ],
 },
 
 {
        race => 'zerg',
        cat => 'lair',
        name => 'Nydus Worm',
-       unit => 0,
        min => 100,
        gas => 100,
        build => 20,
-       size => 3x3,
+       size => 3,
        cargo => 0,
        armor => 1,
        hp => 200,
-       suit => 3, # armored
-       organic => 1,
-       structure => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               structure => 1,
+       },
        speed => 0,
        sight => 10,
 },
@@ -1659,16 +2460,18 @@ use utf8;
        race => 'zerg',
        cat => 'lair',
        name => 'Swarm Host',
-       unit => 3,
-       min => 200,
-       gas => 100,
+       unit => 4,
+       min => 100,
+       gas => 200,
        build => 40,
        size => 1.625,
        cargo => 4,
        armor => 1,
        hp => 160,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        dps => [27.9, 30.2, 32.5, 34.8],
@@ -1676,7 +2479,7 @@ use utf8;
                        cooldown => 0.86,
                },
        },
-       speed => 2.25,
+       speed => 2.95,
        creep => 1.3,
        sight => 10,
        special => [
@@ -1687,20 +2490,33 @@ use utf8;
                        cargo => 0,
                        armor => 0,
                        hp => 65,
-                       suit => 1, # light
-                       organic => 1,
+                       attr => {
+                               light => 1,
+                               organic => 1,
+                       },
                        attack => {
                                ground => {
                                        damage => [12 .. 15],
                                        dps => [14.0, 15.2, 16.4, 17.6],
                                        type => 'projectile',
-                                       cooldown => 0.86,
+                                       cooldown => 0.6,
                                },
                                range => 3,
                        },
                        speed => 1.875,
                        creep => 1.4,
                        sight => 6,
+                       duration => 25,
+                       cooldown => 60,
+                       count => 2,
+               },
+       ],
+       update => [
+               {
+                       name => 'Flying Locusts',
+                       min => 200,
+                       gas => 200,
+                       build => 160,
                },
        ],
 },
@@ -1717,8 +2533,10 @@ use utf8;
        cargo => 0,
        armor => 0,
        hp => 120,
-       suit => 1, # light
-       organic => 1,
+       attr => {
+               light => 1,
+               organic => 1,
+       },
        attack => {
                ground => {
                        damage => [9 .. 12],
@@ -1732,6 +2550,13 @@ use utf8;
        },
        speed => 4,
        sight => 11,
+       update => [
+               {
+                       name => 'Tissue Regeneration',
+                       abbr => 'tr',
+                       desc => 'health regeneration rate increased to 1 HP per second',
+               },
+       ],
 },
 
 {
@@ -1746,8 +2571,10 @@ use utf8;
        cargo => 0,
        armor => 2,
        hp => 200,
-       suit => 3, # armored
-       organic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+       },
        attack => {
                air => {
                        damage => [14 .. 17],
@@ -1760,6 +2587,15 @@ use utf8;
        },
        speed => 2.9531,
        sight => 10,
+       special => [
+               {
+                       name => 'Corruption',
+                       desc => 'target unit takes 20% more damage for 30 seconds',
+                       cooldown => 45,
+                       range => 6,
+                       duration => 40,
+               },
+       ],
 },
 
 {
@@ -1775,9 +2611,11 @@ use utf8;
        cargo => 0,
        armor => 1,
        hp => 225,
-       suit => 3, # armored
-       organic => 1,
-       massive => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
                        damage => [20, 22, 24, 26],
@@ -1790,16 +2628,21 @@ use utf8;
        sight => 12,
        special => [
                {
+                       name => 'Swarm Seeds',
+                       abbr => 'ss',
+                       desc => 'Broodlings are spawned upon each attack',
+                       duration => -1,
                        alt => 'Broodling',
                        unit => 0,
-                       min => 0,
-                       build => 1,
+#                      build => 1,
                        size => 0.75,
                        cargo => 0,
                        armor => 0,
                        hp => 30,
-                       suit => 1, # light
-                       organic => 1,
+                       attr => {
+                               light => 1,
+                               organic => 1,
+                       },
                        attack => {
                                ground => {
                                        damage => [4 .. 7],
@@ -1812,6 +2655,12 @@ use utf8;
                        creep => 1.0,
                        sight => 7,
                },
+               {
+                       name => 'Frenzied',
+                       abbr => 'fz',
+                       desc => 'immune to snare, stun, mind control, and movement altering effects',
+                       duration => -1,
+               },
        ],
 },
 
@@ -1827,11 +2676,41 @@ use utf8;
        cargo => 0,
        armor => 1,
        hp => 150,
-       suit => 3, # armored
-       organic => 1,
-       psionic => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               psionic => 1,
+       },
        speed => 2.9531,
        sight => 11,
+       energy => 200,
+       special => [
+               {
+                       name => 'Blinding Cloud',
+                       abbr => 'bc',
+                       desc => 'all attacks from within cloud are reduced to melee range',
+                       cost => 100,
+                       range => 11,
+                       duration => 14,
+                       radius => 2,
+               },
+               {
+                       name => 'Abduct',
+                       abbr => 'ad',
+                       desc => 'pull target unit to Viper\'s location',
+                       cost => 75,
+                       range => 9,
+                       duration => 10,
+               },
+               {
+                       name => 'Consume',
+                       abbr => 'cs',
+                       desc => 'leaches 200 life of friendly building over 20s to gain 50 energy',
+                       duration => 20,
+                       range => 7,
+                       cooldown => 1,
+               },
+       ],
 },
 
 {
@@ -1846,9 +2725,11 @@ use utf8;
        cargo => 8,
        armor => 1,
        hp => 500,
-       suit => 3, # armored
-       organic => 1,
-       massive => 1,
+       attr => {
+               armored => 1,
+               organic => 1,
+               massive => 1,
+       },
        attack => {
                ground => {
                        damage => [35, 38, 41, 44],
@@ -1861,8 +2742,20 @@ use utf8;
        speed => 2.9531,
        creep => 1.3,
        sight => 9,
+       special => [
+               {
+                       name => 'Frenzied',
+                       abbr => 'fz',
+                       desc => 'immune to snare, stun, mind control, and movement altering effects',
+                       duration => -1,
+               },
+       ],
        upgrade => [
                {
+                       name => 'Chitinous Plating',
+                       min => 150,
+                       gas => 150,
+                       build => 110,
                        armor => 2,
                },
        ],