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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 4c1115d..a8ec4de 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,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,
@@ -234,7 +252,7 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -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,
@@ -610,7 +655,7 @@ attack => [
 		damage => 100,
 		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
@@ -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,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 => [
@@ -747,7 +802,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -765,6 +820,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -791,9 +849,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 +908,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 +961,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 +1031,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 +1046,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 +1110,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 +1149,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 +1180,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 +1234,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 +1284,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 +1346,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 +1406,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 +1475,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 +1507,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 +1532,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 => [
@@ -1445,7 +1545,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -1459,9 +1559,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 +1607,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 +1642,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1559,6 +1668,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1581,9 +1693,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 => [
@@ -1592,7 +1707,7 @@ attack => [
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1627,9 +1742,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 +1798,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 +1827,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 +1877,10 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
-		organic => 1,
+		pop => 0,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
@@ -1763,7 +1889,7 @@ special => [
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 0,
 			},
 		],
 		sight => 5,
@@ -1779,9 +1905,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 => [
@@ -1790,7 +1918,7 @@ attack => [
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1804,9 +1932,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,
@@ -1814,7 +1945,7 @@ attack => [
 	{
 		anti => 2,
 		damage => 110,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1829,9 +1960,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 +1985,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1870,9 +2007,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 +2037,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 +2068,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 +2120,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 => [
@@ -1985,7 +2134,7 @@ attack => [
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,