X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/24084c2319f2fd4f3b9ce3da6eddca31f935ee51..3553bfad44ded8de93e288d7c73bd397c9d8a95a:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 4c1115d..b250714 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,
@@ -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,
@@ -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,9 +178,12 @@ 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,
@@ -221,9 +236,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,
@@ -261,9 +279,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,9 +315,12 @@ 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,
@@ -357,9 +381,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 +438,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,
@@ -467,16 +497,19 @@ 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 => [
 	{
 		anti => 3,
-		dps => [17, undef, undef, 49],
+		dps => [17, undef, undef, 25],
 		count => 4,
 		range => 8,
 	},
@@ -490,9 +523,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,
@@ -513,9 +549,12 @@ special => [
 upgrade => [
 	{
 		name => 'Carrier Capacity',
-		damage => {
-			count => 8-4,
-		},
+		attack => [
+			{
+				dps => [17, undef, undef, 24],
+				count => 8-4,
+			},
+		],
 	},
 ],
 counter => ['wraith', 'corsair', 'scourge'],
@@ -531,9 +570,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,
@@ -598,9 +640,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,
@@ -661,9 +706,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,
@@ -707,9 +755,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,
@@ -737,9 +788,12 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp =>  60,
 armor => 0,
 attack => [
@@ -765,6 +819,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -791,9 +848,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 => [
@@ -847,9 +907,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 => [
@@ -897,9 +960,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 => [
@@ -964,7 +1030,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,
@@ -979,9 +1045,12 @@ 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,
@@ -1040,9 +1109,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 => [
@@ -1076,7 +1148,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,
@@ -1105,9 +1179,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 => [
@@ -1156,9 +1233,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 => [
@@ -1203,9 +1283,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,
@@ -1262,9 +1345,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,
@@ -1319,9 +1405,12 @@ 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,
@@ -1385,9 +1474,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,
@@ -1414,9 +1506,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,
@@ -1435,9 +1531,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 => [
@@ -1459,9 +1558,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,
@@ -1503,9 +1606,11 @@ trans => {
 },
 build => 20,
 suit => 1,
-unit => 0,
+pop => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 25,
 armor => 10,
 sight => 4,
@@ -1536,6 +1641,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1559,6 +1667,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1581,9 +1692,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 => [
@@ -1627,9 +1741,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 => [
@@ -1680,9 +1797,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 => [
@@ -1706,9 +1826,12 @@ 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,
@@ -1753,8 +1876,10 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
-		organic => 1,
+		pop => 0,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
@@ -1779,9 +1904,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 => [
@@ -1804,9 +1931,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,
@@ -1829,9 +1959,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,
@@ -1851,7 +1984,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1870,9 +2006,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,
@@ -1897,9 +2036,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,
@@ -1925,9 +2067,12 @@ 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,
@@ -1974,9 +2119,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 => [