X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e7d0872468d9ff54c39ac8a7e64f283ba093c7aa..962d9b682969c139ab48ad8158adcaf01fef7730:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 2d46ae5..678646e 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -19,20 +19,24 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 20,
 shield => 20,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		name => "Particle Beam",
 		damage => 5,
-		cooldown => 22,
+		cooldown => 22 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 8,
 speed => 14,
 counter => ['vulture', 'dark templar'],
@@ -50,17 +54,20 @@ gas => 0,
 build => 50,
 suit => 3,
 race => 'protoss',
+attr => {
+	structure => 1,
+},
 hp => 100,
 shield => 100,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 3,
 		damage => 20,
-		cooldown => 22,
+		cooldown => 22 / $FPS,
+		range => 7,
 	},
-	air => 'ground',
-	range => 7,
-},
+],
 sight => 11,
 detect => 1,
 speed => 0,
@@ -78,20 +85,25 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 100,
 shield => 60,
 armor => 1,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		name => "Psi Blades",
-		damage => [16, 18, 20, 22],
-		cooldown => 22,
+		damage => 16,
+		upgrade => 2,
+		cooldown => 22 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 7,
 speed => 11,
 upgrade => [
@@ -117,22 +129,26 @@ min => 125,
 gas => 50,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 1,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 3,
 		name => "Phase Disruptor",
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		type => 'explosive',
-		cooldown => 30,
+		cooldown => 30 / $FPS,
+		range => 4,
 	},
-	air => 'ground',
-	range => 4,
-},
+],
 sight => 8,
 speed => 15,
 upgrade => [
@@ -141,9 +157,11 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		attack => {
-			range => 6 - 4,
-		},
+		attack => [
+			{
+				range => 6 - 4,
+			},
+		],
 	},
 ],
 counter => ['zergling', 'zealot', 'tank'],
@@ -160,21 +178,26 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
 speed => 9,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Khaydarin Amulet",
 		min => 150,
 		gas => 150,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -215,20 +238,25 @@ min => 125,
 gas => 100,
 build => 50,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 shield => 40,
 armor => 1,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		name => "Warp Blades",
-		damage => [40, 43, 46, 49],
-		cooldown => 30,
+		damage => 40,
+		upgrade => 3,
+		cooldown => 30 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 7,
 speed => 15,
 special => [
@@ -253,22 +281,26 @@ gas => 300,
 build => 20,
 base => ['templar', 'templar'],
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 10,
 shield => 350,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 3,
 		name => "Psionic Shockwave",
-		damage => [30, 33, 36, 39],
-		cooldown => 20,
+		damage => 30,
+		upgrade => 3,
+		cooldown => 20 / $FPS,
 		splash => 1,
+		range => 2,
 	},
-	air => 'ground',
-	range => 2,
-},
+],
 sight => 8,
 speed => 14,
 },
@@ -285,31 +317,33 @@ gas => 200,
 build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 25,
 shield => 200,
 armor => 1,
-attack => {
-},
 sight => 10,
 speed => 14,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Argus Talisman",
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		capacity => 250-200,
 	},
 ],
 special => [
 	{
 		name => 'Feedback',
 		abbr => 'fb',
-		desc => 'targeted unit will lose its mana and receive damage equal to that amount',
+		desc => 'targeted unit will lose its energy and receive damage equal to that amount',
 		range => 10,
 		cost => 50,
 		duration => 0,
@@ -350,25 +384,33 @@ min => 275,
 gas => 125,
 build => 80,
 suit => 3,
-unit => 3,
+pop => 3,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 shield => 100,
 armor => 0,
-attack => {
-	ground => {
-		damage => [8, 9, 10, 11],
-		cooldown => 30,
+attack => [
+	{
+		anti => 1,
+		damage => 8,
+		upgrade => 1,
+		cooldown => 30 / $FPS,
+		range => 4,
 	},
-	air => {
-		damage => [28, 30, 32, 34],
+	{
+		anti => 2,
+		damage => 28,
+		upgrade => 2,
 		type => 'explosive',
-		cooldown => 22,
+		cooldown => 22 / $FPS,
+		range => 4,
 	},
-	range => 4,
-},
+],
 sight => 8,
 speed => 13,
 upgrade => [
@@ -399,32 +441,39 @@ min => 150,
 gas => 100,
 build => 40,
 suit => 2,
-unit => 2,
+pop => 2,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 100,
 shield => 80,
 armor => 1,
-attack => {
-	air => {
-		damage => [5, 6, 7, 8],
-		cooldown => 8,
+attack => [
+	{
+		anti => 2,
+		damage => 5,
+		upgrade => 1,
+		cooldown => 8 / $FPS,
 		splash => 1,
 		type => 'explosive',
+		range => 5,
 	},
-	range => 5,
-},
+],
 sight => 9,
 speed => 17,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Argus Jewel',
 		min => 100,
 		gas => 100,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -453,20 +502,23 @@ min => 350,
 gas => 250,
 build => 140,
 suit => 3,
-unit => 6,
+pop => 6,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 hp => 300,
 shield => 150,
 armor => 4,
-attack => {
-	ground => {
-		dps => [17, undef, undef, 49],
+attack => [
+	{
+		anti => 3,
+		dps => [17, undef, undef, 25],
 		count => 4,
+		range => 8,
 	},
-	air => 'ground',
-	range => 8,
-},
+],
 sight => 11,
 speed => 10,
 special => [
@@ -476,21 +528,25 @@ special => [
 		min => 25,
 		build => 20,
 		suit => 1,
-		unit => 0,
+		pop => 0,
 		race => 'protoss',
-		organic => 0,
+		attr => {
+			mech => 1,
+			flying => 1,
+		},
 		hp => 40,
 		shield => 40,
 		armor => 0,
-		attack => {
-			ground => {
-				damage => [6, 7, 8, 9],
-				cooldown => 43, # approximately 37 according to liquipedia
+		attack => [
+			{
+				anti => 3,
+				damage => 6,
+				upgrade => 1,
+				cooldown => 43 / $FPS, # approximately 37 according to liquipedia
 				build => 20,
+				range => 0,
 			},
-			air => 'ground',
-			range => 0,
-		},
+		],
 		sight => 0,
 		range => 0,
 	},
@@ -498,9 +554,12 @@ special => [
 upgrade => [
 	{
 		name => 'Carrier Capacity',
-		damage => {
-			count => 8-4,
-		},
+		attack => [
+			{
+				dps => [17, undef, undef, 24],
+				count => 8-4,
+			},
+		],
 	},
 ],
 counter => ['wraith', 'corsair', 'scourge'],
@@ -516,32 +575,38 @@ min => 100,
 gas => 350,
 build => 160,
 suit => 3,
-unit => 4,
+pop => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 shield => 150,
 armor => 1,
-attack => {
-	ground => {
-		damage => [10, 11, 12, 13],
-		cooldown => 45,
+attack => [
+	{
+		anti => 3,
+		damage => 10,
+		upgrade => 1,
+		cooldown => 45 / $FPS,
 		type => 'explosive',
+		range => 5,
 	},
-	air => 'ground',
-	range => 5,
-},
+],
 sight => 9,
 speed => 12,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Khaydarin Core',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -582,23 +647,27 @@ min => 200,
 gas => 100,
 build => 70,
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		damage => 100,
-		cooldown => 60,
+		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
+		range => 8,
 	},
-	range => 8,
-},
+],
 sight => 10,
 speed => 5,
 upgrade => [
@@ -607,29 +676,29 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		attack => {
-			ground => {
+		attack => [
+			{
 				damage => 125 - 100,
 			},
-		},
+		],
 	},
 	{
-		attack => {
-			ground => {
+		attack => [
+			{
 				splash => 2 - 1,
 			},
-		},
+		],
 	},
 	{
 		name => 'Increased Reaver Capacity',
 		min => 200,
 		gas => 200,
 		build => 166,
-		attack => {
-			ground => {
+		attack => [
+			{
 				max => 10-5,
 			},
-		},
+		],
 	},
 ],
 },
@@ -644,9 +713,12 @@ min => 25,
 gas => 75,
 build => 40,
 suit => 1,
-unit => 1,
+pop => 1,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 40,
 shield => 20,
@@ -690,14 +762,15 @@ min => 200,
 gas => 0,
 build => 60,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => -8,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 80,
 shield => 60,
 armor => 1,
-attack => {
-},
 sight => 8,
 speed => 13,
 transport => 1,
@@ -722,18 +795,23 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	organic => 1,
+},
 hp =>  60,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		damage => 5,
-		cooldown => 15,
+		cooldown => 15 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 7,
 speed => 15,
 },
@@ -749,16 +827,20 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
-attack => {
-	air => {
+attack => [
+	{
+		anti => 2,
 		damage => 20,
-		cooldown => 15,
+		cooldown => 15 / $FPS,
 		type => 'explosive',
+		range => 7,
 	},
-	range => 7,
-},
+],
 sight => 11,
 detect => 1,
 speed => 0,
@@ -774,19 +856,23 @@ min => 50,
 gas => 0,
 build => 24,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  40,
 armor => 0,
-attack => {
-	ground => {
-		damage => [6, 7, 8, 9],
-		cooldown => 15,
+attack => [
+	{
+		anti => 3,
+		damage => 6,
+		upgrade => 1,
+		cooldown => 15 / $FPS,
+		range => 4,
 	},
-	air => 'ground',
-	range => 4,
-},
+],
 sight => 7,
 speed => 11,
 upgrade => [
@@ -795,9 +881,11 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		attack => {
-			range => 5 - 4,
-		},
+		attack => [
+			{
+				range => 5 - 4,
+			},
+		],
 	},
 ],
 special => [
@@ -809,12 +897,12 @@ special => [
 		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
-		attack => {
-			ground => {
-				cooldown => 7.5,
+		attack => [
+			{
+				anti => 3,
+				cooldown => 7.5 / $FPS,
 			},
-			air => 'ground',
-		},
+		],
 		duration => 220 / $FPS,
 	},
 ],
@@ -827,20 +915,25 @@ min => 50,
 gas => 25,
 build => 24,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  50,
 armor => 1,
-attack => {
-	ground => {
-		damage => [16, 18, 20, 22],
-		cooldown => 22,
+attack => [
+	{
+		anti => 1,
+		damage => 16,
+		upgrade => 2,
+		cooldown => 22 / $FPS,
 		splash => 1,
 		type => 'implosive',
+		range => 2,
 	},
-	range => 2,
-},
+],
 sight => 7,
 speed => 11,
 upgrade => [
@@ -854,11 +947,12 @@ special => [
 		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
-		attack => {
-			ground => {
-				cooldown => 11,
+		attack => [
+			{
+				anti => 1,
+				cooldown => 11 / $FPS,
 			},
-		},
+		],
 		duration => 220 / $FPS,
 	},
 ],
@@ -874,22 +968,28 @@ min => 25,
 gas => 75,
 build => 50,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  45,
 armor => 0,
-attack => {
-	ground => {
-		damage => [10, 11, 12, 13],
-		cooldown => 22,
+attack => [
+	{
+		anti => 3,
+		damage => 10,
+		upgrade => 1,
+		cooldown => 22 / $FPS,
 		type => 'implosive',
+		range => 7,
 	},
-	air => 'ground',
-	range => 7,
-},
+],
 sight => 9,
 speed => 11,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Ocular Implants',
@@ -897,22 +997,22 @@ upgrade => [
 		gas => 150,
 		build => 166,
 		sight => 11 - 9,
-		special => {
-			ns => {
-				# nuke
-				range => 10-8,
-			},
-		},
+#		special => {
+#			ns => {
+#				# nuke
+#				range => 10-8,
+#			},
+#		},
 	},
 	{
 		name => 'Moebius Reactor',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
-energy => 200,
 special => [
 	{
 		name => 'Personal Cloaking',
@@ -940,7 +1040,7 @@ special => [
 		abbr => 'ns',
 		min => 200,
 		gas => 200,
-		unit => 8,
+		pop => 8,
 		desc => 'guides a nuclear missile which will do 500 damage',
 		duration => 14+3,
 		range => 8,
@@ -955,23 +1055,26 @@ min => 50,
 gas => 25,
 build => 30,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  60,
 armor => 1,
-attack => {
-},
 sight => 9,
 speed => 11,
-energy => 200,
-update => [
+energy => 50,
+capacity => 200,
+upgrade => [
 	{
 		name => 'Caduceus Reactor',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -1018,19 +1121,24 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp =>  80,
 armor => 0,
-attack => {
-	ground => {
-		damage => [20, 22, 24, 26],
-		cooldown => 30,
+attack => [
+	{
+		anti => 1,
+		damage => 20,
+		upgrade => 2,
+		cooldown => 30 / $FPS,
 		type => 'implosive',
+		range => 5,
 	},
-	range => 5,
-},
+],
 sight => 8,
 speed => 20,
 upgrade => [
@@ -1052,18 +1160,21 @@ special => [
 		alt => 'Spider Mine',
 		desc => 'burrows a mine which will automaticaly target non-hovering enemy units',
 		amount => 3,
-		organic => 0,
+		attr => {
+			mech => 1,
+		},
 		hp => 20,
 		suit => 1,
 		armor => 0,
-		attack => {
-			ground => {
+		attack => [
+			{
+				anti => 1,
 				damage => 125,
 				splash => 1,
 				type => 'explosive',
+				range => 3,
 			},
-			range => 3,
-		},
+		],
 		sight => 3,
 		speed => 25,
     },
@@ -1080,19 +1191,24 @@ min => 150,
 gas => 100,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 150,
 armor => 1,
-attack => {
-	ground => {
-		damage => [30, 33, 36, 39],
-		cooldown => 37,
+attack => [
+	{
+		anti => 1,
+		damage => 30,
+		upgrade => 3,
+		cooldown => 37 / $FPS,
 		type => 'explosive',
+		range => 7,
 	},
-	range => 7,
-},
+],
 sight => 10,
 speed => 12,
 special => [
@@ -1103,15 +1219,17 @@ special => [
 		gas => 150,
 		build => 80,
 		alt => 'Sieged Tank',
-		attack => {
-			ground => {
-				damage => [70, 75, 80, 85],
-				cooldown => 75,
+		attack => [
+			{
+				anti => 1,
+				damage => 70,
+				upgrade => 5,
+				cooldown => 75 / $FPS,
 				splash => 1,
 				type => 'explosive',
+				range => 12,
 			},
-			range => 12,
-		},
+		],
 		speed => 0,
 	},
 ],
@@ -1127,23 +1245,31 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 125,
 armor => 1,
-attack => {
-	ground => {
-		damage => [12, 13, 14, 15],
-		cooldown => 22,
+attack => [
+	{
+		anti => 1,
+		damage => 12,
+		upgrade => 1,
+		cooldown => 22 / $FPS,
+		range => 5,
 	},
-	air => {
-		damage => [20, 24, 28, 32],
+	{
+		anti => 2,
+		damage => 20,
+		upgrade => 4,
 		type => 'explosive',
-		cooldown => 22,
+		cooldown => 22 / $FPS,
+		range => 5,
 	},
-	range => 5,
-},
+],
 sight => 8,
 speed => 13,
 upgrade => [
@@ -1152,11 +1278,12 @@ upgrade => [
 		min => 100,
 		gas => 100,
 		build => 133,
-		attack => {
-#			air => {
+		attack => [
+			{},
+			{
 				range => 8 - 5,
-#			},
-		},
+			},
+		],
 	},
 ],
 },
@@ -1168,27 +1295,36 @@ min => 150,
 gas => 100,
 build => 60,
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
-attack => {
-	ground => {
-		damage => [8, 9, 10, 11],
-		cooldown => 30,
-	},
-	air => {
-		damage => [20, 22, 24, 26],
-		cooldown => 22,
+attack => [
+	{
+		anti => 1,
+		damage => 8,
+		upgrade => 1,
+		cooldown => 30 / $FPS,
+		range => 5,
+	},
+	{
+		anti => 2,
+		damage => 20,
+		upgrade => 2,
+		cooldown => 22 / $FPS,
 		type => 'explosive',
+		range => 5,
 	},
-	range => 5,
-},
+],
 sight => 7,
 speed => 17,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Cloak',
@@ -1207,7 +1343,8 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1222,23 +1359,28 @@ min => 400,
 gas => 300,
 build => 133,
 suit => 3,
-unit => 6,
+pop => 6,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 500,
 armor => 3,
-attack => {
-	ground => {
-		damage => [25, 28, 31, 34],
-		cooldown => 30,
+attack => [
+	{
+		anti => 3,
+		damage => 25,
+		upgrade => 3,
+		cooldown => 30 / $FPS,
+		range => 6,
 	},
-	air => 'ground',
-	range => 6,
-},
+],
 sight => 11,
 speed => 7,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Yamato Gun',
@@ -1247,13 +1389,13 @@ special => [
 		gas => 100,
 		build => 120,
 		desc => 'blast doing 260 damage to a target',
-		attack => {
-			ground => {
+		attack => [
+			{
+				anti => 3,
 				damage => 260,
+				range => 10,
 			},
-			air => 'ground',
-			range => 10,
-		},
+		],
 		cost => 150,
 	},
 ],
@@ -1263,7 +1405,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1278,16 +1421,20 @@ min => 100,
 gas => 225,
 build => 80,
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
 speed => 15,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Defensive Matrix',
@@ -1329,7 +1476,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1344,22 +1492,27 @@ min => 250,
 gas => 125,
 build => 50,
 suit => 3,
-unit => 3,
+pop => 3,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 2,
-attack => {
-	air => {
-		damage => [6, 7, 8, 9],
-		cooldown => 64,
+attack => [
+	{
+		anti => 2,
+		damage => 6,
+		upgrade => 1,
+		cooldown => 64 / $FPS,
 		splash => 1,
 		type => 'explosive',
 		count => 8,
+		range => 6,
 	},
-	range => 6,
-},
+],
 sight => 8,
 speed => 19,
 },
@@ -1371,9 +1524,13 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => -8,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 1,
@@ -1392,18 +1549,22 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		damage => 5,
-		cooldown => 22,
+		cooldown => 22 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 7,
 speed => 14,
 },
@@ -1415,9 +1576,13 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 3,
-unit => -9,
+pop => -9,
+cargo => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 0,
@@ -1459,9 +1624,11 @@ trans => {
 },
 build => 20,
 suit => 1,
-unit => 0,
+pop => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 25,
 armor => 10,
 sight => 4,
@@ -1492,16 +1659,20 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		damage => 40,
-		cooldown => 32,
+		cooldown => 32 / $FPS,
 		type => 'explosive',
+		range => 7,
 	},
-	range => 7,
-},
+],
 sight => 10,
 speed => 0,
 },
@@ -1514,15 +1685,19 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
-attack => {
-	air => {
+attack => [
+	{
+		anti => 2,
 		damage => 15,
-		cooldown => 15,
+		cooldown => 15 / $FPS,
+		range => 7,
 	},
-	range => 7,
-},
+],
 sight => 10,
 detect => 1,
 speed => 0,
@@ -1535,18 +1710,23 @@ min => 25,
 gas => 0,
 build => 28, # for 2
 suit => 1,
-unit => 0.5,
+pop => 0.5,
+cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 35,
 armor => 0,
-attack => {
-	ground => {
-		damage => [5, 6, 7, 8],
-		cooldown => 8,
+attack => [
+	{
+		anti => 1,
+		damage => 5,
+		upgrade => 1,
+		cooldown => 8 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 5,
 speed => 14,
 upgrade => [
@@ -1562,11 +1742,11 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 80,
-		attack => {
-			ground => {
-				cooldown => 6,
+		attack => [
+			{
+				cooldown => 6 / $FPS,
 			},
-		},
+		],
 	},
 ],
 counter => ['archon', 'templar', 'firebat'],
@@ -1579,20 +1759,24 @@ min => 75,
 gas => 25,
 build => 28,
 suit => 2,
-unit => 1,
+pop => 1,
+cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 0,
-attack => {
-	ground => {
-		damage => [10, 11, 12, 13],
-		cooldown => 15,
+attack => [
+	{
+		anti => 3,
+		damage => 10,
+		upgrade => 1,
+		cooldown => 15 / $FPS,
 		type => 'explosive',
+		range => 4,
 	},
-	air => 'ground',
-	range => 4,
-},
+],
 sight => 6,
 speed => 11,
 upgrade => [
@@ -1601,9 +1785,11 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		attack => {
-			range => 5 - 4,
-		},
+		attack => [
+			{
+				range => 5 - 4,
+			},
+		],
 	},
 	{
 		name => 'Muscular Augments',
@@ -1629,19 +1815,24 @@ gas => 125,
 base => 'hydralisk',
 build => 40,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 125,
 armor => 1,
-attack => {
-	ground => {
-		damage => [20, 22, 24, 26],
-		cooldown => 37,
+attack => [
+	{
+		anti => 1,
+		damage => 20,
+		upgrade => 2,
+		cooldown => 37 / $FPS,
 		splash => 'line',
+		range => 6,
 	},
-	range => 6,
-},
+],
 sight => 8,
 speed => 17,
 },
@@ -1653,15 +1844,19 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 2,
-unit => 2,
+pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
 speed => 18,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Infest CC',
@@ -1700,17 +1895,21 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
-		organic => 1,
+		pop => 0,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
-		attack => {
-			ground => {
-				damage => [4, 5, 6, 7],
-				cooldown => 15,
+		attack => [
+			{
+				anti => 1,
+				damage => 4,
+				upgrade => 1,
+				cooldown => 15 / $FPS,
+				range => 0,
 			},
-			range => 1,
-		},
+		],
 		sight => 5,
 		speed => 19,
 	},
@@ -1724,19 +1923,22 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
-unit => 1,
+pop => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 60,
 armor => 0,
-attack => {
-	ground => {
+attack => [
+	{
+		anti => 1,
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 5,
 speed => 17,
 },
@@ -1748,18 +1950,22 @@ min => 12,
 gas => 38,
 build => 30, # for 2
 suit => 1,
-unit => 0.5,
+pop => 0.5,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 25,
 armor => 0,
-attack => {
-	air => {
+attack => [
+	{
+		anti => 2,
 		damage => 110,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 5,
 speed => 18,
 counter => ['cannon', 'goliath', 'hydralisk'],
@@ -1772,28 +1978,35 @@ min => 100,
 gas => 100,
 build => 40,
 suit => 1,
-unit => 2,
+pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
-attack => {
-	ground => {
-		damage => [9 .. 12],
-		cooldown => 30,
+attack => [
+	{
+		anti => 3,
+		damage => 9,
+		upgrade => 1,
+		cooldown => 30 / $FPS,
 		splash => 'bounce',
+		range => 3,
 	},
-	air => 'ground',
-	range => 3,
-},
+],
 sight => 7,
 speed => 18,
 special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1812,19 +2025,24 @@ gas => 200,
 build => 40,
 base => 'mutalisk',
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 2,
-attack => {
-	ground => {
-		damage => [20, 22, 24, 26],
-		cooldown => 30,
+attack => [
+	{
+		anti => 1,
+		damage => 20,
+		upgrade => 2,
+		cooldown => 30 / $FPS,
+		range => 8,
 	},
-	range => 8,
-},
+],
 sight => 11,
 speed => 7,
 },
@@ -1837,20 +2055,25 @@ gas => 150,
 build => 40,
 base => 'mutalisk',
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 250,
 armor => 2,
-attack => {
-	air => {
-		damage => [25, 27, 29, 31],
-		cooldown => 100,
+attack => [
+	{
+		anti => 2,
+		damage => 25,
+		upgrade => 2,
+		cooldown => 100 / $FPS,
 		type => 'explosive',
+		range => 6,
 	},
-	range => 6,
-},
+],
 sight => 10,
 speed => 15,
 counter => ['goliath', 'dragoon', 'scourge'],
@@ -1863,14 +2086,18 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 1,
 sight => 10,
 speed => 12,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Consume',
@@ -1912,18 +2139,23 @@ min => 200,
 gas => 200,
 build => 60,
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 400,
 armor => 1,
-attack => {
-	ground => {
-		damage => [20, 23, 26, 29],
-		cooldown => 15,
+attack => [
+	{
+		anti => 1,
+		damage => 20,
+		upgrade => 3,
+		cooldown => 15 / $FPS,
+		range => 0,
 	},
-	range => 1,
-},
+],
 sight => 7,
 speed => 16,
 upgrade => [