X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/24084c2319f2fd4f3b9ce3da6eddca31f935ee51..359b30d5ac11a27cf99d333086b61a880bf4bedf:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 5d558d1..1e9df00 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -11,7 +11,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Probe',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -71,7 +71,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Mothership Core',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 30,
@@ -99,7 +99,8 @@ use strict;
 	],
 	speed => 1.875,
 	sight => 9,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Photon Overcharge',
@@ -132,7 +133,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Mothership',
-	unit => 8,
+	pop => 8,
 	min => 300,
 	gas => 300,
 	build => 100,
@@ -160,7 +161,8 @@ use strict;
 	],
 	speed => 1.4062,
 	sight => 14,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Cloaking Field',
@@ -217,7 +219,8 @@ use strict;
 	],
 	speed => 0,
 	sight => 11,
-	energy => 100,
+	energy => 0,
+	capacity => 100,
 	special => [
 		{
 			name => 'Chrono Boost',
@@ -233,7 +236,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Zealot',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 38,
@@ -280,7 +283,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Sentry',
-	unit => 2,
+	pop => 2,
 	min => 50,
 	gas => 100,
 	build => 37,
@@ -307,7 +310,8 @@ use strict;
 	],
 	speed => 2.25,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Force Field',
@@ -341,7 +345,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Stalker',
-	unit => 2,
+	pop => 2,
 	min => 125,
 	gas => 50,
 	build => 42,
@@ -389,7 +393,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'High Templar',
-	unit => 2,
+	pop => 2,
 	min => 50,
 	gas => 150,
 	build => 55,
@@ -406,7 +410,8 @@ use strict;
 	},
 	speed => 1.875,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Feedback',
@@ -435,7 +440,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Dark Templar',
-	unit => 2,
+	pop => 2,
 	min => 125,
 	gas => 125,
 	build => 55,
@@ -478,7 +483,7 @@ use strict;
 	name => 'Archon',
 	min => 100, # or 175 or 250
 	gas => 300, # or 275 or 250
-	unit => 4,
+	pop => 4,
 	build => 12,
 	base => ['Templar', 'Templar'],
 	size => 1.5,
@@ -513,7 +518,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Immortal',
-	unit => 4,
+	pop => 4,
 	min => 250,
 	gas => 100,
 	build => 55,
@@ -556,7 +561,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Colossus',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 75,
@@ -604,7 +609,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Observer',
-	unit => 1,
+	pop => 1,
 	min => 25,
 	gas => 75,
 	build => 30,
@@ -644,7 +649,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Warp Prism',
-	unit => 2,
+	pop => 2,
 	min => 200,
 	gas => 0,
 	build => 50,
@@ -683,7 +688,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Phoenix',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 100,
 	build => 35,
@@ -714,7 +719,8 @@ use strict;
 	],
 	speed => 4.25,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Graviton Beam',
@@ -744,7 +750,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Void Ray',
-	unit => 4,
+	pop => 4,
 	min => 250,
 	gas => 150,
 	build => 60,
@@ -796,7 +802,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Oracle',
-	unit => 3,
+	pop => 3,
 	min => 150,
 	gas => 150,
 	build => 50,
@@ -828,7 +834,8 @@ use strict;
 	],
 	speed => 4,
 	sight => 10,
-	energy => 200,
+	energy => 50, #XXX
+	capacity => 200,
 	special => [
 		{
 			name => 'Revelation',
@@ -855,7 +862,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Tempest',
-	unit => 4,
+	pop => 4,
 	min => 300,
 	gas => 200,
 	build => 60,
@@ -902,7 +909,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Carrier',
-	unit => 6,
+	pop => 6,
 	min => 350,
 	gas => 250,
 	build => 120,
@@ -931,7 +938,7 @@ use strict;
 	special => [
 		{
 			alt => 'Interceptor',
-			unit => 0,
+			pop => 0,
 			min => 25,
 			gas => 0,
 			build => 8,
@@ -982,7 +989,7 @@ use strict;
 	race => 'terran',
 	cat => 'base',
 	name => 'SCV', # T-280 Space Construction Vehicle
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -1012,7 +1019,8 @@ use strict;
 	race => 'terran',
 	cat => 'base',
 	name => 'Mule',
-	unit => 0,
+	pop => 0,
+	cargo => 0,
 	min => 0,
 	build => 0,
 	size => 0.75,
@@ -1083,7 +1091,7 @@ use strict;
 	cat => 'base',
 	name => 'Planetary Fortress',
 	base => ['Command Center'],
-	unit => -11,
+	pop => -11,
 	min => 150,
 	gas => 150,
 	build => 50,
@@ -1141,7 +1149,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Marine',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 25,
@@ -1201,7 +1209,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Marauder',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 25,
 	build => 30,
@@ -1273,7 +1281,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Reaper',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 50,
 	build => 40,
@@ -1313,7 +1321,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Ghost',
-	unit => 2,
+	pop => 2,
 	min => 200,
 	gas => 100,
 	build => 40,
@@ -1341,7 +1349,8 @@ use strict;
 	],
 	speed => 2.25,
 	sight => 11,
-	energy => 200,
+	energy => 75,
+	capacity => 200,
 	special => [
 		{
 			name => 'Sniper Round',
@@ -1382,7 +1391,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Hellion',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 30,
@@ -1443,7 +1452,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Hellbat',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 30,
@@ -1499,7 +1508,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Widow Mine',
-	unit => 2,
+	pop => 2,
 	min => 75,
 	gas => 25,
 	build => 40,
@@ -1542,7 +1551,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Siege Tank',
-	unit => 3,
+	pop => 3,
 	min => 150,
 	gas => 125,
 	build => 45,
@@ -1601,7 +1610,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Thor',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 60,
@@ -1658,7 +1667,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Viking',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 75,
 	build => 42,
@@ -1713,7 +1722,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Medivac',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 42,
@@ -1727,7 +1736,8 @@ use strict;
 		flying => 1,
 	},
 	speed => 2.5,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Heal',
@@ -1752,7 +1762,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -1761,7 +1771,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Banshee', # AH/G-24
-	unit => 3,
+	pop => 3,
 	min => 150,
 	gas => 100,
 	build => 60,
@@ -1788,7 +1798,8 @@ use strict;
 	],
 	speed => 2.75,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Cloak',
@@ -1807,7 +1818,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Raven',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 200,
 	build => 60,
@@ -1823,7 +1834,8 @@ use strict;
 	speed => 2.25,
 	sight => 11,
 	detect => 1,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			alt => 'Auto-Turret',
@@ -1949,7 +1961,7 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 110,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -1958,7 +1970,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Battlecruiser',
-	unit => 6,
+	pop => 6,
 	min => 400,
 	gas => 300,
 	build => 90,
@@ -1994,7 +2006,8 @@ use strict;
 	],
 	speed => 1.875,
 	sight => 12,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Yamato Cannon',
@@ -2019,7 +2032,7 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -2030,7 +2043,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Drone',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -2060,7 +2073,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Queen',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 0,
 	build => 50,
@@ -2096,7 +2109,8 @@ use strict;
 	speed => 0.9375,
 	creep => 2.7,
 	sight => 9,
-	energy => 200,
+	energy => 25,
+	capacity => 200,
 	special => [
 		{
 			name => 'Spawn Larva',
@@ -2130,7 +2144,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Overlord',
-	unit => -9,
+	pop => -9,
 	min => 100,
 	gas => 0,
 	build => 25,
@@ -2180,7 +2194,7 @@ use strict;
 	cat => 'base',
 	name => 'Overseer',
 	base => ['Overlord'],
-	unit => -9,
+	pop => -9,
 	min => 100+50,
 	gas => 50,
 	build => 17,
@@ -2197,7 +2211,8 @@ use strict;
 	creep => 0,
 	sight => 11,
 	detect => 1,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Spawn Changeling',
@@ -2241,7 +2256,7 @@ use strict;
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Larva',
-	unit => 0,
+	pop => 0,
 	build => 15,
 	size => 0.25,
 	cargo => 0,
@@ -2341,7 +2356,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hatchery',
 	name => 'Zergling',
-	unit => 0.5,
+	pop => 0.5,
 	min => 25,
 	gas => 0,
 	build => 24,
@@ -2395,7 +2410,7 @@ use strict;
 	cat => 'hatchery',
 	name => 'Baneling',
 	base => ['Zergling'],
-	unit => 0.5,
+	pop => 0.5,
 	min => 25+25,
 	gas => 25,
 	build => 20,
@@ -2441,7 +2456,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hatchery',
 	name => 'Roach',
-	unit => 2,
+	pop => 2,
 	min => 75,
 	gas => 25,
 	build => 27,
@@ -2500,7 +2515,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Hydralisk',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 50,
 	build => 33,
@@ -2553,7 +2568,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Infestor',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 150,
 	build => 50,
@@ -2569,7 +2584,8 @@ use strict;
 	speed => 2.25,
 	creep => 1.3,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Neural Parasite',
@@ -2624,7 +2640,7 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -2653,7 +2669,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Swarm Host',
-	unit => 4,
+	pop => 4,
 	min => 100,
 	gas => 200,
 	build => 40,
@@ -2727,7 +2743,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Mutalisk',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 33,
@@ -2747,6 +2763,7 @@ use strict;
 			damage => 9,
 			upgrade => 1,
 			splash => 'bounce',
+			type => 'projectile',
 			psionic => 1,
 			cooldown => 1.5246,
 			range => 3,
@@ -2767,7 +2784,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Corruptor',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 100,
 	build => 40,
@@ -2813,7 +2830,7 @@ use strict;
 	cat => 'hive',
 	name => 'Brood Lord',
 	base => ['Corruptor'],
-	unit => 4,
+	pop => 4,
 	min => 150+150,
 	gas => 100+150,
 	build => 34,
@@ -2846,7 +2863,7 @@ use strict;
 			desc => 'Broodlings are spawned upon each attack',
 			duration => -1,
 			alt => 'Broodling',
-			unit => 0,
+			pop => 0,
 #			build => 1,
 			size => 0.75,
 			cargo => 0,
@@ -2883,7 +2900,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hive',
 	name => 'Viper',
-	unit => 3,
+	pop => 3,
 	min => 100,
 	gas => 200,
 	build => 40,
@@ -2899,7 +2916,8 @@ use strict;
 	},
 	speed => 2.9531,
 	sight => 11,
-	energy => 200,
+	energy => 50, #XXX
+	capacity => 200,
 	special => [
 		{
 			name => 'Blinding Cloud',
@@ -2934,7 +2952,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hive',
 	name => 'Ultralisk',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 55,