X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e75dbcba340459a1bef997680a7d1bf152039a32..bc9880bcc09c8eb2fade78b8e8677697aa7f4fa9:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 94918dc..d58c30e 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -19,9 +19,12 @@ 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,
@@ -31,7 +34,7 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 8,
@@ -51,6 +54,9 @@ gas => 0,
 build => 50,
 suit => 3,
 race => 'protoss',
+attr => {
+	structure => 1,
+},
 hp => 100,
 shield => 100,
 armor => 0,
@@ -79,9 +85,12 @@ 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,
@@ -92,7 +101,7 @@ attack => [
 		damage => 16,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -120,9 +129,12 @@ 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,
@@ -166,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 => [
@@ -221,9 +238,12 @@ 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,
@@ -234,7 +254,7 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -261,9 +281,12 @@ 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,
@@ -294,22 +317,26 @@ 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,
 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 => [
@@ -357,9 +384,12 @@ 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,
@@ -411,9 +441,12 @@ 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,
@@ -431,14 +464,16 @@ attack => [
 ],
 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 => [
@@ -450,8 +485,8 @@ special => [
 		build => 80,
 		desc => 'creates a field in which no ground unit/structure can attack',
 		range => 9,
-		cost => 62-50,
-		duration => undef, #XXX
+		cost => 125,
+		duration => 24,
 	},
 ],
 counter => ['devourer', 'valkyrie'],
@@ -467,9 +502,12 @@ 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,
@@ -490,9 +528,12 @@ 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,
@@ -534,9 +575,12 @@ 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,
@@ -553,14 +597,16 @@ attack => [
 ],
 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 => [
@@ -601,9 +647,12 @@ 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,
@@ -613,7 +662,7 @@ attack => [
 		damage => 100,
 		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
@@ -664,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,
@@ -710,9 +762,12 @@ 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,
@@ -740,9 +795,13 @@ 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 => [
@@ -750,7 +809,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -768,6 +827,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -794,9 +856,12 @@ 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 => [
@@ -850,9 +915,12 @@ 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 => [
@@ -900,9 +968,12 @@ 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 => [
@@ -917,6 +988,8 @@ attack => [
 ],
 sight => 9,
 speed => 11,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Ocular Implants',
@@ -936,10 +1009,10 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
-energy => 200,
 special => [
 	{
 		name => 'Personal Cloaking',
@@ -967,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,
@@ -982,21 +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,
 sight => 9,
 speed => 11,
-energy => 200,
+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 => [
@@ -1043,9 +1121,12 @@ 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 => [
@@ -1079,7 +1160,9 @@ 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,
@@ -1108,9 +1191,12 @@ 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 => [
@@ -1159,9 +1245,12 @@ 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 => [
@@ -1206,9 +1295,12 @@ 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,
@@ -1231,7 +1323,8 @@ attack => [
 ],
 sight => 7,
 speed => 17,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Cloak',
@@ -1250,7 +1343,8 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1265,9 +1359,12 @@ 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,
@@ -1282,7 +1379,8 @@ attack => [
 ],
 sight => 11,
 speed => 7,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Yamato Gun',
@@ -1307,7 +1405,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1322,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',
@@ -1373,7 +1476,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1388,9 +1492,12 @@ 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,
@@ -1417,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,
@@ -1438,9 +1549,12 @@ 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 => [
@@ -1448,7 +1562,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -1462,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,
@@ -1506,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,
@@ -1539,6 +1659,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1562,6 +1685,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1584,9 +1710,12 @@ 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 => [
@@ -1595,7 +1724,7 @@ attack => [
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1615,7 +1744,7 @@ upgrade => [
 		build => 80,
 		attack => [
 			{
-				cooldown => 6 / $FPS,
+				cooldown => (6 - 8) / $FPS,
 			},
 		],
 	},
@@ -1630,9 +1759,12 @@ 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 => [
@@ -1683,9 +1815,12 @@ 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 => [
@@ -1709,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',
@@ -1756,8 +1895,10 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
-		organic => 1,
+		pop => 0,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
@@ -1766,7 +1907,7 @@ special => [
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 0,
 			},
 		],
 		sight => 5,
@@ -1782,9 +1923,11 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
-unit => 1,
+pop => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 60,
 armor => 0,
 attack => [
@@ -1793,7 +1936,7 @@ attack => [
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1807,9 +1950,12 @@ 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,
@@ -1817,7 +1963,7 @@ attack => [
 	{
 		anti => 2,
 		damage => 110,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1832,9 +1978,12 @@ 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,
@@ -1854,7 +2003,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1873,9 +2025,12 @@ 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,
@@ -1900,9 +2055,12 @@ 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,
@@ -1928,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',
@@ -1967,6 +2129,16 @@ special => [
 		duration => 12,
 	},
 ],
+upgrade => [
+	{
+		name => 'Metasynaptic Node',
+		min => 150,
+		gas => 50,
+		build => 166,
+		energy => 62.5-50,
+		capacity => 250-200,
+	},
+],
 counter => ['archon', 'firebat'],
 },
 
@@ -1977,9 +2149,12 @@ 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 => [
@@ -1988,7 +2163,7 @@ attack => [
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,