X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0b686d7436dbdb50f0bf8547f845af6bc334a9e4..72b206b172f32b65161b0377ea01fb4e7afa4df3:/sc-units.inc.pl

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index b32e5ef..47658d1 100644
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -1,15 +1,18 @@
-my $FM = 1.58; # 1s at fast speed
-# toss shield += .65 per $FM
-# zerg regen  += .37 per $FM
+# time in fastest game seconds
+my $FPS = 24;  # frames per second
+# toss shield += .65 per second
+# zerg regen  += .37 per second
 [
 
+# protoss
+
 {
 cat => 'base',
-req => ['nexus'], #TODO
+req => ['nexus'],
 name => 'Probe',
 min => 50,
 gas => 0,
-build => 12.7*$FM, # 20
+build => 20,
 suit => 1,
 unit => 1,
 race => 'protoss',
@@ -21,20 +24,19 @@ attack => {
 	ground => {
 		name => "Particle Beam",
 		damage => 5,
-		dps => 7,
+		cooldown => 22,
 	},
 	range => 1,
 },
 sight => 8,
 speed => 14,
-special => [],
 counter => ['vulture', 'dark templar'],
 },
 
 {
 cat => 'base',
 req => ['forge'],
-name => 'Cannon',
+name => 'Photon Cannon',
 trans => {
 	nl => 'kanon',
 },
@@ -42,7 +44,6 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
-unit => 0,
 race => 'protoss',
 hp => 100,
 shield => 100,
@@ -50,7 +51,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 20,
-		dps => 27,
+		cooldown => 22,
 	},
 	air => 'ground',
 	range => 7,
@@ -58,7 +59,6 @@ attack => {
 sight => 11,
 detect => 1,
 speed => 0,
-special => [],
 counter => ['zergling', 'tank'],
 },
 
@@ -71,7 +71,7 @@ trans => {
 },
 min => 100,
 gas => 0,
-build => 25*$FM, # 40
+build => 40,
 suit => 1,
 unit => 2,
 race => 'protoss',
@@ -83,7 +83,7 @@ attack => {
 	ground => {
 		name => "Psi Blades",
 		damage => [16, 18, 20, 22],
-		dps => [22, undef, undef, 30],
+		cooldown => 22,
 	},
 	range => 1,
 },
@@ -91,11 +91,13 @@ sight => 7,
 speed => 11,
 upgrade => [
 	{
-#		name => 'leg',
+		name => 'Leg Enhancements',
 		speed => 16 - 11,
+		min => 150,
+		gas => 150,
+		build => 133,
 	},
 ],
-special => [],
 counter => ['vulture'],
 },
 
@@ -108,7 +110,7 @@ trans => {
 },
 min => 125,
 gas => 50,
-build => 32*$FM, # 40
+build => 50,
 suit => 3,
 unit => 2,
 race => 'protoss',
@@ -120,8 +122,8 @@ attack => {
 	ground => {
 		name => "Phase Disruptor",
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
 		type => 'explosive',
+		cooldown => 30,
 	},
 	air => 'ground',
 	range => 4,
@@ -130,12 +132,15 @@ sight => 8,
 speed => 15,
 upgrade => [
 	{
+		name => 'Singularity Charge',
+		min => 150,
+		gas => 150,
+		build => 166,
 		attack => {
 			range => 6 - 4,
 		},
 	},
 ],
-special => [],
 counter => ['zergling', 'zealot', 'tank'],
 },
 
@@ -148,7 +153,7 @@ trans => {
 },
 min => 50,
 gas => 150,
-build => 31.7*$FM, # 50
+build => 50,
 suit => 1,
 unit => 2,
 race => 'protoss',
@@ -156,45 +161,39 @@ organic => 1,
 hp => 40,
 shield => 40,
 armor => 0,
-attack => {
-},
 sight => 7,
 speed => 9,
 energy => 200,
 upgrade => [
-	{
-		name => "Psionic Storm",
-		min => 200,
-		gas => 200,
-	},
-	{
-		name => "Hallucination",
-		min => 150,
-		gas => 150,
-	},
 	{
 		name => "Khaydarin Amulet",
 		min => 150,
 		gas => 150,
-		energy => 250,
+		energy => 250-200,
 	},
 ],
 special => [
 	{
 		name => 'Psionic Storm',
 		abbr => 'ps',
-		desc => 'units in the area will receive upto 115 damage',
+		min => 200,
+		gas => 200,
+		build => 120,
+		desc => 'units in the area will receive upto 112 damage', # 14*8
 		range => 9,
-		cost => undef,
-		duration => 2, #XXX
+		cost => 75,
+		duration => 3,
 	},
 	{
 		name => 'Hallucination',
 		abbr => 'hl',
+		min => 150,
+		gas => 150,
+		build => 80,
 		desc => 'creates two illusionary duplicates of a unit for 3 minutes',
 		range => 7,
-		cost => undef,
-		duration => 180,
+		cost => 80,
+		duration => 3*60,
 	},
 ],
 counter => ['vulture', 'ultralisk'],
@@ -209,7 +208,7 @@ trans => {
 },
 min => 125,
 gas => 100,
-build => 34*$FM, # 50
+build => 50,
 suit => 1,
 unit => 2,
 race => 'protoss',
@@ -221,14 +220,20 @@ attack => {
 	ground => {
 		name => "Warp Blades",
 		damage => [40, 43, 46, 49],
-		dps => [40, 43, 46, 49],
+		cooldown => 30,
 	},
 	range => 1,
 },
 sight => 7,
 speed => 15,
-cloak => 1,
-special => [],
+special => [
+	{
+		name => 'Cloaked',
+		abbr => 'cl',
+		desc => 'cloaked at all times',
+		duration => -1,
+	},
+],
 },
 
 {
@@ -240,7 +245,7 @@ trans => {
 },
 min => 100,
 gas => 300,
-build => 13*$FM, # 20
+build => 20,
 base => ['templar', 'templar'],
 suit => 3,
 unit => 4,
@@ -253,7 +258,7 @@ attack => {
 	ground => {
 		name => "Psionic Shockwave",
 		damage => [30, 33, 36, 39],
-		dps => [45, undef, undef, 59],
+		cooldown => 20,
 		splash => 1,
 	},
 	air => 'ground',
@@ -261,7 +266,6 @@ attack => {
 },
 sight => 8,
 speed => 14,
-special => [],
 },
 
 {
@@ -273,7 +277,7 @@ trans => {
 },
 min => 250,
 gas => 200,
-build => 13*$FM, # 20
+build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
 unit => 4,
@@ -288,21 +292,12 @@ sight => 10,
 speed => 14,
 energy => 200,
 upgrade => [
-	{
-		name => "Maelstrom",
-		min => 100,
-		gas => 100,
-	},
-	{
-		name => "Mind Control",
-		min => 200,
-		gas => 200,
-	},
 	{
 		name => "Argus Talisman",
 		min => 150,
 		gas => 150,
-		energy => 250,
+		build => 166,
+		energy => 250-200,
 	},
 ],
 special => [
@@ -317,18 +312,24 @@ special => [
 	{
 		name => 'Mind Control',
 		abbr => 'mc',
+		min => 200,
+		gas => 200,
+		build => 120,
 		desc => 'permanently gives you control over any unit',
 		range => 8,
 		cost => 150,
-		duration => -1,
+		duration => 0,
 	},
 	{
 		name => 'Maelstrom',
 		abbr => 'ms',
+		min => 100,
+		gas => 100,
+		build => 100,
 		desc => 'field stunning all organic units for a few seconds',
 		range => 10,
 		cost => 100,
-		duration => undef, #XXX
+		duration => 180 / $FPS, # 7.5s fastest
 	},
 ],
 },
@@ -342,7 +343,7 @@ trans => {
 },
 min => 275,
 gas => 125,
-build => 50.5*$FM, # 80
+build => 80,
 suit => 3,
 unit => 3,
 race => 'protoss',
@@ -354,12 +355,12 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		dps => [8, 9, 10, 11],
+		cooldown => 30,
 	},
 	air => {
 		damage => [28, 30, 32, 34],
-		dps => [38, undef, undef, 46],
 		type => 'explosive',
+		cooldown => 22,
 	},
 	range => 4,
 },
@@ -367,13 +368,20 @@ sight => 8,
 speed => 13,
 upgrade => [
 	{
+		name => 'Apial Sensors',
+		min => 100,
+		gas => 100,
+		build => 166,
 		sight => 10 - 8,
 	},
 	{
+		name => 'Gravitic Thrusters',
+		min => 200,
+		gas => 200,
+		build => 166,
 		speed => 18 - 13,
 	},
 ],
-special => [],
 },
 
 {
@@ -384,7 +392,7 @@ trans => {
 },
 min => 150,
 gas => 100,
-build => 25.3*$FM, # 40
+build => 40,
 suit => 2,
 unit => 2,
 race => 'protoss',
@@ -396,7 +404,7 @@ armor => 1,
 attack => {
 	air => {
 		damage => [5, 6, 7, 8],
-		dps => [19, undef, undef, 30],
+		cooldown => 8,
 		splash => 1,
 		type => 'explosive',
 	},
@@ -404,10 +412,23 @@ attack => {
 },
 sight => 9,
 speed => 17,
+energy => 200,
+upgrade => [
+	{
+		name => 'Argus Jewel',
+		min => 100,
+		gas => 100,
+		build => 166,
+		energy => 250-200,
+	},
+],
 special => [
 	{
 		name => 'Disruption web',
 		abbr => 'dw',
+		min => 200,
+		gas => 200,
+		build => 80,
 		desc => 'creates a field in which no ground unit/structure can attack',
 		range => 9,
 		cost => 62-50,
@@ -425,7 +446,7 @@ trans => {
 },
 min => 350,
 gas => 250,
-build => 88.5*$FM, # 140
+build => 140,
 suit => 3,
 unit => 6,
 race => 'protoss',
@@ -435,18 +456,48 @@ shield => 150,
 armor => 4,
 attack => {
 	ground => {
-		damage => [6, 7, 8, 9],
 		dps => [17, undef, undef, 49],
-		min => 25,
-		build => 12.7*$FM,
-		max => 4,
+		count => 4,
 	},
 	air => 'ground',
 	range => 8,
 },
 sight => 11,
 speed => 10,
-special => [],
+special => [
+	{
+		name => 'Build Interceptor',
+		alt => 'Interceptor',
+		min => 25,
+		build => 20,
+		suit => 1,
+		unit => 0,
+		race => 'protoss',
+		organic => 0,
+		hp => 40,
+		shield => 40,
+		armor => 0,
+		attack => {
+			ground => {
+				damage => [6, 7, 8, 9],
+				cooldown => 43, # approximately 37 according to liquipedia
+				build => 20,
+			},
+			air => 'ground',
+			range => 0,
+		},
+		sight => 0,
+		range => 0,
+	},
+],
+upgrade => [
+	{
+		name => 'Carrier Capacity',
+		damage => {
+			count => 8-4,
+		},
+	},
+],
 counter => ['wraith', 'corsair', 'scourge'],
 },
 
@@ -458,7 +509,7 @@ trans => {
 },
 min => 100,
 gas => 350,
-build => 131, # 160
+build => 160,
 suit => 3,
 unit => 4,
 race => 'protoss',
@@ -470,7 +521,7 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [7, undef, undef, 9],
+		cooldown => 45,
 		type => 'explosive',
 	},
 	air => 'ground',
@@ -478,10 +529,14 @@ attack => {
 },
 sight => 9,
 speed => 12,
+energy => 200,
 upgrade => [
 	{
-		name => 'energy',
-		energy => 'more',
+		name => 'Khaydarin Core',
+		min => 150,
+		gas => 150,
+		build => 166,
+		energy => 250-200,
 	},
 ],
 special => [
@@ -491,21 +546,27 @@ special => [
 		desc => 'cloaks nearby friendly units except for other Arbiters',
 		duration => -1,
 	},
+	{
+		name => 'Stasis Field',
+		abbr => 'sf',
+		min => 150,
+		gas => 150,
+		build => 100,
+		desc => 'traps all non-burrowed units (3x3m) for 40 seconds, making them frozen and undamagable',
+		cost => 100,
+		range => 9,
+		duration => 1000 / $FPS,
+	},
 	{
 		name => 'Recall',
 		abbr => 'rc',
+		min => 150,
+		gas => 150,
+		build => 100,
 		desc => 'creates a 5x5m wormhole which transports units to the Arbiter',
-		cost => 75-60,
+		cost => 150,
 		duration => 0,
 	},
-	{
-		name => 'Stasis field',
-		abbr => 'sf',
-		desc => 'traps all non-burrowed units (3x3m) for 40 seconds, making them frozen and undamagable',
-		cost => 50-40,
-		range => 9,
-		duration => 40,
-	},
 ],
 },
 
@@ -514,7 +575,7 @@ cat => 'robotic',
 name => 'Reaver',
 min => 200,
 gas => 100,
-build => 44.5*$FM, # 70
+build => 70,
 suit => 3,
 unit => 4,
 race => 'protoss',
@@ -525,10 +586,10 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 100,
-		dps => 50,
+		cooldown => 60,
 		splash => 1,
 		cost => 15,
-		build => 4.54*$FM,
+		build => 7,
 		max => 5,
 	},
 	range => 8,
@@ -537,10 +598,13 @@ sight => 10,
 speed => 5,
 upgrade => [
 	{
+		name => 'Scarab Damage',
+		min => 200,
+		gas => 200,
+		build => 166,
 		attack => {
 			ground => {
 				damage => 125 - 100,
-				dps => 63 - 50,
 			},
 		},
 	},
@@ -552,14 +616,17 @@ upgrade => [
 		},
 	},
 	{
+		name => 'Increased Reaver Capacity',
+		min => 200,
+		gas => 200,
+		build => 166,
 		attack => {
 			ground => {
-				max => 5,
+				max => 10-5,
 			},
 		},
 	},
 ],
-special => [],
 },
 
 {
@@ -570,7 +637,7 @@ trans => {
 },
 min => 25,
 gas => 75,
-build => 25.35*$FM, # 40
+build => 40,
 suit => 1,
 unit => 1,
 race => 'protoss',
@@ -579,8 +646,6 @@ air => 1,
 hp => 40,
 shield => 20,
 armor => 0,
-attack => {
-},
 sight => 9,
 detect => 1,
 speed => 9,
@@ -589,17 +654,25 @@ upgrade => [
 		name => "Sensor Array",
 		min => 150,
 		gas => 150,
+		build => 133,
 		sight => 11 - 9,
 	},
 	{
 		name => "Gravitic Booster",
 		min => 150,
 		gas => 150,
+		build => 166,
 		speed => 13 - 9,
 	},
 ],
-cloak => 1,
-special => [],
+special => [
+	{
+		name => 'Cloaked',
+		abbr => 'cl',
+		desc => 'cloaked at all times',
+		duration => -1,
+	},
+],
 },
 
 {
@@ -610,7 +683,7 @@ trans => {
 },
 min => 200,
 gas => 0,
-build => 38*$FM, # 60
+build => 60,
 suit => 3,
 unit => 2,
 race => 'protoss',
@@ -625,12 +698,17 @@ speed => 13,
 transport => 1,
 upgrade => [
 	{
+		name => 'Gravitic Drive',
+		min => 200,
+		gas => 200,
+		build => 166,
 		speed => 19 - 13,
 	}
 ],
-special => [],
 },
 
+# terran
+
 {
 race => 'terran',
 cat => 'base',
@@ -647,18 +725,17 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		dps => 10,
+		cooldown => 15,
 	},
 	range => 1,
 },
 sight => 7,
 speed => 15,
-special => [],
 },
 
 {
 cat => 'base',
-name => 'Turret',
+name => 'Missile Turret',
 trans => {
 	nl => 'toren',
 },
@@ -666,14 +743,13 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
-unit => 0,
 race => 'terran',
 hp => 200,
 armor => 0,
 attack => {
 	air => {
 		damage => 20,
-		dps => 40,
+		cooldown => 15,
 		type => 'explosive',
 	},
 	range => 7,
@@ -681,7 +757,6 @@ attack => {
 sight => 11,
 detect => 1,
 speed => 0,
-special => [],
 },
 
 {
@@ -702,7 +777,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [6, 7, 8, 9],
-		dps => [12, undef, undef, 18],
+		cooldown => 15,
 	},
 	air => 'ground',
 	range => 4,
@@ -711,6 +786,10 @@ sight => 7,
 speed => 11,
 upgrade => [
 	{
+		name => 'U-238 Shells',
+		min => 150,
+		gas => 150,
+		build => 100,
 		attack => {
 			range => 5 - 4,
 		},
@@ -720,15 +799,18 @@ special => [
 	{
 		name => 'stim pack',
 		abbr => 'sp',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
 		attack => {
 			ground => {
-				dps => [24, undef, undef, 36],
+				cooldown => 7.5,
 			},
 			air => 'ground',
 		},
-		duration => undef, #XXX
+		duration => 220 / $FPS,
 	},
 ],
 },
@@ -748,7 +830,7 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [16, 18, 20, 22],
-		dps => [22, undef, undef, 30],
+		cooldown => 22,
 		splash => 1,
 		type => 'implosive',
 	},
@@ -756,16 +838,23 @@ attack => {
 },
 sight => 7,
 speed => 11,
+upgrade => [
+],
 special => [
 	{
-		name => 'stim pack',
+		name => 'Stim Pack',
 		abbr => 'sp',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
 		attack => {
-			dps => [44, undef, undef, 60],
+			ground => {
+				cooldown => 11,
+			},
 		},
-		duration => undef, #XXX
+		duration => 220 / $FPS,
 	},
 ],
 },
@@ -788,7 +877,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [14, undef, undef, 18],
+		cooldown => 22,
 		type => 'implosive',
 	},
 	air => 'ground',
@@ -798,30 +887,58 @@ sight => 9,
 speed => 11,
 upgrade => [
 	{
+		name => 'Ocular Implants',
+		min => 150,
+		gas => 150,
+		build => 166,
 		sight => 11 - 9,
+		special => {
+			ns => {
+				# nuke
+				range => 10-8,
+			},
+		},
+	},
+	{
+		name => 'Moebius Reactor',
+		min => 150,
+		gas => 150,
+		build => 166,
+		energy => 250-200,
 	},
 ],
+energy => 200,
 special => [
 	{
-		name => 'Cloak',
+		name => 'Personal Cloaking',
 		abbr => 'cl',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'has the ability to cloak',
-		cost => 13-10,
-		main => .5-.4,
+		cost => 25,
+		maint => 1, # per second
 	},
 	{
 		name => 'Lockdown',
 		abbr => 'ld',
+		min => 200,
+		gas => 200,
+		build => 100,
 		desc => 'disables a mechanical unit completely for one minute',
 		range => 8,
-		cost => 50-40,
+		cost => 100,
 		duration => 60,
 	},
 	{
 		name => 'Nuclear Strike',
 		abbr => 'ns',
+		min => 200,
+		gas => 200,
+		unit => 8,
 		desc => 'guides a nuclear missile which will do 500 damage',
-		duration => 0,
+		duration => 14+3,
+		range => 8,
 	},
 ],
 },
@@ -842,29 +959,45 @@ attack => {
 },
 sight => 9,
 speed => 11,
+energy => 200,
+update => [
+	{
+		name => 'Caduceus Reactor',
+		min => 150,
+		gas => 150,
+		build => 166,
+		energy => 250-200,
+	},
+],
 special => [
 	{
 		name => 'Healing',
 		abbr => 'hl',
-		desc => 'heals friendly biological units',
+		desc => 'heals 2 HP of friendly biological units',
 		range => 2,
-		cost => undef,
-		duration => 0,
+		cost => 1,
+		duration => 1,
 	},
 	{
 		name => 'Restoration',
 		abbr => 'rs',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'removes harmful effects (Lockdown, Flare, Irradiate, Plague, Ensnare, Parasite) from a unit',
 		range => 6,
-		cost => undef,
+		cost => 50,
 		duration => 0,
 	},
 	{
 		name => 'Optic Flare',
 		abbr => 'of',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'reduces the sight of target unit to 1',
 		range => 9,
-		cost => undef,
+		cost => 75,
 		duration => 0,
 	},
 ],
@@ -878,7 +1011,7 @@ trans => {
 },
 min => 75,
 gas => 0,
-build => 19*$FM, # 30
+build => 30,
 suit => 2,
 unit => 2,
 race => 'terran',
@@ -888,7 +1021,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
+		cooldown => 30,
 		type => 'implosive',
 	},
 	range => 5,
@@ -897,20 +1030,37 @@ sight => 8,
 speed => 20,
 upgrade => [
 	{
+		name => 'Ion Thrusters',
+		min => 100,
+		gas => 100,
+		build => 100,
 		speed => 28 - 20,
 	},
 ],
 special => [
 	{
-		name => 'spider mine',
+		name => 'Spider Mine',
 		abbr => 'sm',
-		desc => 'burrows a mine (capable of doing 125+ damage to enemy units coming within range 3)',
+		min => 100,
+		gas => 100,
+		build => 80,
+		alt => 'Spider Mine',
+		desc => 'burrows a mine which will automaticaly target non-hovering enemy units',
 		amount => 3,
+		organic => 0,
+		hp => 20,
+		suit => 1,
+		armor => 0,
 		attack => {
-			damage => 125,
-			type => 'explosive',
+			ground => {
+				damage => 125,
+				splash => 1,
+				type => 'explosive',
+			},
+			range => 3,
 		},
-		duration => 0,
+		sight => 3,
+		speed => 25,
     },
 ],
 },
@@ -933,7 +1083,7 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [30, 33, 36, 39],
-		dps => [24, undef, undef, 32],
+		cooldown => 37,
 		type => 'explosive',
 	},
 	range => 7,
@@ -942,20 +1092,22 @@ sight => 10,
 speed => 12,
 special => [
 	{
-		name => 'siege mode',
+		name => 'Siege Mode',
 		abbr => 'sg',
+		min => 150,
+		gas => 150,
+		build => 80,
 		alt => 'Sieged Tank',
 		attack => {
 			ground => {
 				damage => [70, 75, 80, 85],
-				dps => [28, 30, 32, 34],
+				cooldown => 75,
 				splash => 1,
 				type => 'explosive',
 			},
 			range => 12,
 		},
 		speed => 0,
-		duration => -1,
 	},
 ],
 },
@@ -978,12 +1130,12 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [12, 13, 14, 15],
-		dps => [16, undef, undef, 20],
+		cooldown => 22,
 	},
 	air => {
 		damage => [20, 24, 28, 32],
-		dps => [27, undef, undef, 44],
 		type => 'explosive',
+		cooldown => 22,
 	},
 	range => 5,
 },
@@ -991,14 +1143,17 @@ sight => 8,
 speed => 13,
 upgrade => [
 	{
+		name => 'Charon Boosters',
+		min => 100,
+		gas => 100,
+		build => 133,
 		attack => {
-			air => {
+#			air => {
 				range => 8 - 5,
-			},
+#			},
 		},
 	},
 ],
-special => [],
 },
 
 {
@@ -1017,24 +1172,37 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		dps => [8, 9, 10, 11],
+		cooldown => 30,
 	},
 	air => {
 		damage => [20, 22, 24, 26],
-		dps => [27, undef, undef, 35],
+		cooldown => 22,
 		type => 'explosive',
 	},
 	range => 5,
 },
 sight => 7,
 speed => 17,
+energy => 200,
 special => [
 	{
 		name => 'Cloak',
 		abbr => 'cl',
+		min => 150,
+		gas => 150,
+		build => 100,
 		desc => 'has the ability to cloak',
-		cost => 13-10,
-		maint => .5-.4, # /second
+		cost => 25,
+		maint => 1, # /second
+	},
+],
+upgrade => [
+	{
+		name => 'Apollo Reactor',
+		min => 200,
+		gas => 200,
+		build => 166,
+		energy => 250-200,
 	},
 ],
 },
@@ -1047,7 +1215,7 @@ trans => {
 },
 min => 400,
 gas => 300,
-build => 160,
+build => 133,
 suit => 3,
 unit => 6,
 race => 'terran',
@@ -1058,23 +1226,39 @@ armor => 3,
 attack => {
 	ground => {
 		damage => [25, 28, 31, 34],
-		dps => [25, 28, 31, 34],
+		cooldown => 30,
 	},
 	air => 'ground',
 	range => 6,
 },
 sight => 11,
 speed => 7,
+energy => 200,
 special => [
 	{
 		name => 'Yamato Gun',
 		abbr => 'yg',
+		min => 100,
+		gas => 100,
+		build => 120,
 		desc => 'blast doing 260 damage to a target',
 		attack => {
-			damage => 260,
+			ground => {
+				damage => 260,
+			},
+			air => 'ground',
+			range => 10,
 		},
-		range => 10,
-		cost => 75-60,
+		cost => 150,
+	},
+],
+upgrade => [
+	{
+		name => 'Colossus Reactor',
+		min => 150,
+		gas => 150,
+		build => 166,
+		energy => 250-200,
 	},
 ],
 },
@@ -1095,38 +1279,52 @@ organic => 0,
 air => 1,
 hp => 200,
 armor => 1,
-attack => {
-},
 sight => 10,
 detect => 1,
 speed => 15,
+energy => 200,
 special => [
 	{
-		name => 'defensive matrix',
+		name => 'Defensive Matrix',
 		abbr => 'dm',
 		desc => 'gives target unit a shield of 250HP for one minute',
 		range => 10,
-		cost => 50-40,
-		duration => 60,
+		cost => 100,
+		duration => 55,
 	},
 	{
-		name => 'EMP',
+		name => 'EMP Shockwave',
 		abbr => 'ep',
+		min => 200,
+		gas => 200,
+		build => 120,
 		desc => 'units in 3-matrix radius will lose all energy and shields',
 		range => 8,
-		cost => 50-40,
+		cost => 100,
 	},
 	{
-    	name => 'irradiate',
+    	name => 'Irradiate',
 		abbr => 'ir',
+		min => 200,
+		gas => 200,
+		build => 80,
 		desc => 'organic units will suffer upto 250 damage over 30s',
 		range => 9,
-		cost => 38-30,
+		cost => 75,
 		attack => {
 			damage => 250,
 			splash => 1,
 		},
-		duration => 30,
+		duration => 25,
+	},
+],
+upgrade => [
+	{
+		name => 'Titan Reactor',
+		min => 150,
+		gas => 150,
+		build => 166,
+		energy => 250-200,
 	},
 ],
 },
@@ -1139,7 +1337,7 @@ trans => {
 },
 min => 250,
 gas => 125,
-build => 60,
+build => 50,
 suit => 3,
 unit => 3,
 race => 'terran',
@@ -1150,15 +1348,15 @@ armor => 2,
 attack => {
 	air => {
 		damage => [6, 7, 8, 9],
-		dps => [23, undef, undef, 25],
+		cooldown => 64,
 		splash => 1,
 		type => 'explosive',
+		count => 8,
 	},
 	range => 6,
 },
 sight => 8,
 speed => 19,
-special => [],
 },
 
 {
@@ -1174,23 +1372,22 @@ organic => 0,
 air => 1,
 hp => 150,
 armor => 1,
-attack => {
-},
 sight => 8,
 speed => 15,
 transport => 1,
-special => [],
 },
 
+# zerg
+
 {
 race => 'zerg',
 cat => 'base',
 name => 'Drone',
 min => 50,
 gas => 0,
-build => 13*$FM, # 20
+build => 20,
 suit => 1,
-unit => (1),
+unit => 1,
 race => 'zerg',
 organic => 1,
 hp => 40,
@@ -1198,13 +1395,12 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		dps => 7,
+		cooldown => 22,
 	},
 	range => 1,
 },
 sight => 7,
 speed => 14,
-special => [],
 },
 
 {
@@ -1212,7 +1408,7 @@ cat => 'base',
 name => 'Overlord',
 min => 100,
 gas => 0,
-build => 26*$FM, # 40
+build => 40,
 suit => 3,
 unit => -9,
 race => 'zerg',
@@ -1220,21 +1416,34 @@ organic => 1,
 air => 1,
 hp => 200,
 armor => 0,
-attack => {
-},
+cargo => 0,
 sight => 9,
 detect => 1,
 speed => 2,
 transport => 1,
 upgrade => [
 	{
+		name => 'Ventral Sacs',
+		min => 200,
+		gas => 200,
+		build => 160,
+		cargo => -8,
+	},
+	{
+		name => 'Antennae',
+		min => 150,
+		gas => 150,
+		build => 133,
 		sight => 11 - 9,
 	},
 	{
+		name => 'Pneumatized Carapace',
+		min => 150,
+		gas => 150,
+		build => 133,
 		speed => 10 - 2,
 	},
 ],
-special => [],
 },
 
 {
@@ -1243,42 +1452,31 @@ name => 'Larva',
 trans => {
 	nl => 'larve',
 },
-min => 0,
-gas => 0,
-build => 14.3*$FM, # = 21.5
+build => 20,
 suit => 1,
 unit => 0,
 race => 'zerg',
 organic => 1,
 hp => 25,
 armor => 10,
-attack => {
-},
 sight => 4,
-speed => 0.1, #XXX
-special => [],
-},
-
-{
-cat => 'creep',
-name => 'Egg',
-trans => {
-	nl => 'ei',
-},
-min => 0,
-gas => 0,
-build => 0,
-suit => 3,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 200,
-armor => 10,
-attack => {
-},
-sight => 4,
-speed => 0,
-special => [],
+speed => 0.1, # more or less
+special => [
+	{
+		name => 'transform',
+		alt => 'Egg',
+		trans => {
+			nl => 'ei',
+		},
+		suit => 3,
+		race => 'zerg',
+		organic => undef, # unchanged from parent
+		hp => 200,
+		armor => 10,
+		sight => 4,
+		speed => 0,
+	},
+],
 },
 
 {
@@ -1288,21 +1486,19 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 300,
 armor => 2,
 attack => {
 	ground => {
 		damage => 40,
-		dps => 38,
+		cooldown => 32,
 		type => 'explosive',
 	},
 	range => 7,
 },
 sight => 10,
 speed => 0,
-special => [],
 },
 
 {
@@ -1312,21 +1508,19 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 400,
 armor => 0,
 attack => {
 	air => {
 		damage => 15,
-		dps => 30,
+		cooldown => 15,
 	},
 	range => 7,
 },
 sight => 10,
 detect => 1,
 speed => 0,
-special => [],
 },
 
 {
@@ -1334,7 +1528,7 @@ cat => 'hatchery',
 name => 'Zergling',
 min => 25,
 gas => 0,
-build => 19*$FM, # 14
+build => 28, # for 2
 suit => 1,
 unit => 0.5,
 race => 'zerg',
@@ -1344,7 +1538,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [5, 6, 7, 8],
-		dps => [18, undef, undef, 29], # 29 is an estimate
+		cooldown => 8,
 	},
 	range => 1,
 },
@@ -1352,17 +1546,24 @@ sight => 5,
 speed => 14,
 upgrade => [
 	{
+		name => 'Metabolic Boost',
+		min => 100,
+		gas => 100,
+		build => 80,
 		speed => 22 - 14,
 	},
 	{
+		name => 'Adrenal Glands',
+		min => 200,
+		gas => 200,
+		build => 80,
 		attack => {
 			ground => {
-				dps => [undef, undef, undef, 42 - 29],
+				cooldown => 6,
 			},
 		},
 	},
 ],
-special => [],
 counter => ['archon', 'templar', 'firebat'],
 },
 
@@ -1371,7 +1572,7 @@ cat => 'hatchery',
 name => 'Hydralisk',
 min => 75,
 gas => 25,
-build => 18.5*$FM, # 28
+build => 28,
 suit => 2,
 unit => 1,
 race => 'zerg',
@@ -1381,7 +1582,7 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [20, 22, 24, 26],
+		cooldown => 15,
 		type => 'explosive',
 	},
 	air => 'ground',
@@ -1391,15 +1592,28 @@ sight => 6,
 speed => 11,
 upgrade => [
 	{
+		name => 'Grooved Spines',
+		min => 150,
+		gas => 150,
+		build => 100,
 		attack => {
 			range => 5 - 4,
 		},
 	},
 	{
+		name => 'Muscular Augments',
+		min => 150,
+		gas => 150,
+		build => 100,
 		speed => 16 - 11,
 	},
+	{
+		name => 'Lurker Aspect',
+		min => 200,
+		gas => 200,
+		build => 120,
+	},
 ],
-special => [],
 },
 
 {
@@ -1408,7 +1622,7 @@ name => 'Lurker',
 min => 125,
 gas => 125,
 base => 'hydralisk',
-build => 25.5*$FM, # 40
+build => 40,
 suit => 2,
 unit => 2,
 race => 'zerg',
@@ -1418,14 +1632,13 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [16, undef, undef, 21],
-		splash => 1,
+		cooldown => 37,
+		splash => 'line',
 	},
 	range => 6,
 },
 sight => 8,
 speed => 17,
-special => [],
 },
 
 {
@@ -1433,7 +1646,7 @@ cat => 'lair',
 name => 'Queen',
 min => 100,
 gas => 100,
-build => 42.5*$FM, # 50
+build => 50,
 suit => 2,
 unit => 2,
 race => 'zerg',
@@ -1441,64 +1654,62 @@ organic => 1,
 air => 1,
 hp => 120,
 armor => 0,
-attack => {
-},
 sight => 10,
 speed => 18,
+energy => 200,
 special => [
 	{
-		name => 'infest CC',
+		name => 'Infest CC',
 		abbr => 'ic',
-		desc => 'assimilate a Terran Command Center to produce infested marines',
+		desc => 'assimilate a damaged Terran Command Center to produce infested marines',
 		duration => 0,
 	},
 	{
-		name => 'parasite',
+		name => 'Parasite',
 		abbr => 'ps',
 		desc => "shares an infected unit's vision",
 		range => 12,
-		cost => 38-30,
+		cost => 75,
 	},
 	{
-		name => 'ensnare',
+		name => 'Ensnare',
 		abbr => 'es',
-		desc => 'slows units downto 1/2 speed',
+		min => 100,
+		gas => 100,
+		build => 80,
+		desc => 'slows units downto half speed',
 		range => 9,
-		cost => 38-30,
-		duration => undef,
+		cost => 75,
+		duration => 25,
 	},
 	{
-		name => 'Broodling',
+		name => 'Spawn Broodling',
 		abbr => 'sb',
+		min => 100,
+		gas => 100,
+		build => 80,
 		desc => 'spawn one inside an enemy unit killing it',
 		range => 9,
-		cost => 75-60,
-	},
-],
-},
+		cost => 150,
 
-{
-cat => 'lair',
-name => 'Broodling',
-min => 0,
-gas => 0,
-build => 0,
-suit => 1,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 30,
-armor => 0,
-attack => {
-	ground => {
-		damage => [4, 5, 6, 7],
-		dps => [8, 10, 12, 14],
+		count => 2,
+		alt => 'Broodling',
+		suit => 1,
+		unit => 0,
+		organic => 1,
+		hp => 30,
+		armor => 0,
+		attack => {
+			ground => {
+				damage => [4, 5, 6, 7],
+				cooldown => 15,
+			},
+			range => 1,
+		},
+		sight => 5,
+		speed => 19,
 	},
-	range => 1,
-},
-sight => 5,
-speed => 19,
-special => [],
+],
 },
 
 {
@@ -1523,7 +1734,6 @@ attack => {
 },
 sight => 5,
 speed => 17,
-special => [],
 },
 
 {
@@ -1531,7 +1741,7 @@ cat => 'lair',
 name => 'Scourge',
 min => 12,
 gas => 38,
-build => 20*$FM, # 15
+build => 30, # for 2
 suit => 1,
 unit => 0.5,
 race => 'zerg',
@@ -1555,7 +1765,7 @@ cat => 'lair',
 name => 'Mutalisk',
 min => 100,
 gas => 100,
-build => 26*$FM, # 40
+build => 40,
 suit => 1,
 unit => 2,
 race => 'zerg',
@@ -1565,16 +1775,27 @@ hp => 120,
 armor => 0,
 attack => {
 	ground => {
-		damage => [9, 10, 11, 12],
-		dps => [9, 10, 11, 12],
-		splash => 1,
+		damage => [9 .. 12],
+		cooldown => 30,
+		splash => 'bounce',
 	},
 	air => 'ground',
 	range => 3,
 },
 sight => 7,
 speed => 18,
-special => [], #TODO: glaive
+special => [
+	{
+		alt => 'Cocoon',
+		suit => 3,
+		organic => 1,
+		hp => 200,
+		armor => 0,
+		sight => 4,
+		speed => 0,
+	},
+	#TODO: glaive
+],
 counter => ['templar', 'corsair', 'valkyrie'],
 },
 
@@ -1583,7 +1804,7 @@ cat => 'hive',
 name => 'Guardian',
 min => 150,
 gas => 200,
-build => 25.6*$FM, # 40
+build => 40,
 base => 'mutalisk',
 suit => 3,
 unit => 2,
@@ -1595,13 +1816,12 @@ armor => 2,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
+		cooldown => 30,
 	},
 	range => 8,
 },
 sight => 11,
 speed => 7,
-special => [],
 },
 
 {
@@ -1609,7 +1829,7 @@ cat => 'hive',
 name => 'Devourer',
 min => 250,
 gas => 150,
-build => 25.6*$FM, # 40
+build => 40,
 base => 'mutalisk',
 suit => 3,
 unit => 2,
@@ -1621,7 +1841,7 @@ armor => 2,
 attack => {
 	air => {
 		damage => [25, 27, 29, 31],
-		dps => [8, undef, undef, 9],
+		cooldown => 100,
 		type => 'explosive',
 	},
 	range => 6,
@@ -1636,39 +1856,44 @@ cat => 'hive',
 name => 'Defiler',
 min => 50,
 gas => 150,
-build => 32.5*$FM, # 50
+build => 50,
 suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
 hp => 80,
 armor => 1,
-attack => {
-},
 sight => 10,
 speed => 12,
+energy => 200,
 special => [
 	{
-		name => 'consume',
+		name => 'Consume',
 		abbr => 'cs',
+		min => 100,
+		gas => 100,
+		build => 100,
 		desc => 'gain energy by eating one of your own',
-		cost => -undef,
+		cost => -50,
 		duration => 0,
 	},
 	{
-		name => 'dark swarm',
+		name => 'Dark Swarm',
 		abbr => 'ds',
 		desc => 'protect 6x6m from ranged attacks for 60s',
 		range => 9,
-		cost => 50-40,
+		cost => 100,
 		duration => 60,
 	},
 	{
-		name => 'plague',
+		name => 'Plague',
 		abbr => 'pl',
+		min => 200,
+		gas => 200,
+		build => 100,
 		desc => 'anything in its radius will loose 25 HP per second for 12s or until 1 HP left',
 		range => 9,
-		cost => 75-60,
+		cost => 150,
 		duration => 12,
 	},
 ],
@@ -1680,7 +1905,7 @@ cat => 'hive',
 name => 'Ultralisk',
 min => 200,
 gas => 200,
-build => 38.8*$FM, # 60
+build => 60,
 suit => 3,
 unit => 4,
 race => 'zerg',
@@ -1690,7 +1915,7 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [20, 23, 26, 29],
-		dps => [40, 46, 52, 58],
+		cooldown => 15,
 	},
 	range => 1,
 },
@@ -1698,13 +1923,20 @@ sight => 7,
 speed => 16,
 upgrade => [
 	{
+		name => 'Chitinous Plating',
+		min => 150,
+		gas => 150,
+		build => 133,
 		armor => 2,
 	},
 	{
+		name => 'Anabolic Synthesis',
+		min => 200,
+		gas => 200,
+		build => 133,
 		speed => 21 - 16,
 	},
 ],
-special => [],
 },
 
 ]