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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 7d59dc4..a8ec4de 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -20,8 +20,11 @@ gas => 0,
 build => 20,
 suit => 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,
@@ -80,8 +86,11 @@ gas => 0,
 build => 40,
 suit => 1,
 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,
@@ -121,8 +130,11 @@ gas => 50,
 build => 50,
 suit => 3,
 pop => 2,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 1,
@@ -167,8 +179,11 @@ gas => 150,
 build => 50,
 suit => 1,
 pop => 2,
+cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 shield => 40,
 armor => 0,
@@ -222,8 +237,11 @@ gas => 100,
 build => 50,
 suit => 1,
 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,
@@ -262,8 +280,11 @@ build => 20,
 base => ['templar', 'templar'],
 suit => 3,
 pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 10,
 shield => 350,
 armor => 0,
@@ -295,8 +316,11 @@ build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
 pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 25,
 shield => 200,
 armor => 1,
@@ -359,7 +383,10 @@ build => 80,
 suit => 3,
 pop => 3,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 shield => 100,
@@ -413,7 +440,10 @@ build => 40,
 suit => 2,
 pop => 2,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 100,
 shield => 80,
@@ -469,7 +499,10 @@ build => 140,
 suit => 3,
 pop => 6,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 hp => 300,
 shield => 150,
 armor => 4,
@@ -492,7 +525,10 @@ special => [
 		suit => 1,
 		pop => 0,
 		race => 'protoss',
-		organic => 0,
+		attr => {
+			mech => 1,
+			flying => 1,
+		},
 		hp => 40,
 		shield => 40,
 		armor => 0,
@@ -536,7 +572,10 @@ build => 160,
 suit => 3,
 pop => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 shield => 150,
@@ -602,8 +641,11 @@ gas => 100,
 build => 70,
 suit => 3,
 pop => 4,
+cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 0,
@@ -613,7 +655,7 @@ attack => [
 		damage => 100,
 		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
@@ -666,7 +708,10 @@ build => 40,
 suit => 1,
 pop => 1,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 40,
 shield => 20,
@@ -711,8 +756,11 @@ gas => 0,
 build => 60,
 suit => 3,
 pop => 2,
+cargo => -8,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 80,
 shield => 60,
 armor => 1,
@@ -741,8 +789,12 @@ gas => 0,
 build => 20,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	organic => 1,
+},
 hp =>  60,
 armor => 0,
 attack => [
@@ -750,7 +802,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -768,6 +820,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -795,8 +850,11 @@ gas => 0,
 build => 24,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  40,
 armor => 0,
 attack => [
@@ -851,8 +909,11 @@ gas => 25,
 build => 24,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  50,
 armor => 1,
 attack => [
@@ -901,8 +962,11 @@ gas => 75,
 build => 50,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  45,
 armor => 0,
 attack => [
@@ -983,8 +1047,11 @@ gas => 25,
 build => 30,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  60,
 armor => 1,
 sight => 9,
@@ -1044,8 +1111,11 @@ gas => 0,
 build => 30,
 suit => 2,
 pop => 2,
+cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp =>  80,
 armor => 0,
 attack => [
@@ -1079,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,
@@ -1109,8 +1181,11 @@ gas => 100,
 build => 50,
 suit => 3,
 pop => 2,
+cargo => 4,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 150,
 armor => 1,
 attack => [
@@ -1160,8 +1235,11 @@ gas => 50,
 build => 40,
 suit => 3,
 pop => 2,
+cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 125,
 armor => 1,
 attack => [
@@ -1208,7 +1286,10 @@ build => 60,
 suit => 3,
 pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1267,7 +1348,10 @@ build => 133,
 suit => 3,
 pop => 6,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 500,
 armor => 3,
@@ -1324,7 +1408,10 @@ build => 80,
 suit => 3,
 pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 1,
@@ -1390,7 +1477,10 @@ build => 50,
 suit => 3,
 pop => 3,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 2,
@@ -1418,8 +1508,12 @@ gas => 100,
 build => 50,
 suit => 3,
 pop => 2,
+cargo => -8,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 1,
@@ -1439,8 +1533,11 @@ gas => 0,
 build => 20,
 suit => 1,
 pop => 1,
+cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 armor => 0,
 attack => [
@@ -1448,7 +1545,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -1463,8 +1560,12 @@ gas => 0,
 build => 40,
 suit => 3,
 pop => -9,
+cargo => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 0,
@@ -1508,7 +1609,9 @@ build => 20,
 suit => 1,
 pop => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 25,
 armor => 10,
 sight => 4,
@@ -1539,6 +1642,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1562,6 +1668,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1585,8 +1694,11 @@ gas => 0,
 build => 28, # for 2
 suit => 1,
 pop => 0.5,
+cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 35,
 armor => 0,
 attack => [
@@ -1595,7 +1707,7 @@ attack => [
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1631,8 +1743,11 @@ gas => 25,
 build => 28,
 suit => 2,
 pop => 1,
+cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 0,
 attack => [
@@ -1684,8 +1799,11 @@ base => 'hydralisk',
 build => 40,
 suit => 2,
 pop => 2,
+cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 125,
 armor => 1,
 attack => [
@@ -1711,7 +1829,10 @@ build => 50,
 suit => 2,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1757,7 +1878,9 @@ special => [
 		alt => 'Broodling',
 		suit => 1,
 		pop => 0,
-		organic => 1,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
@@ -1766,7 +1889,7 @@ special => [
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 0,
 			},
 		],
 		sight => 5,
@@ -1784,7 +1907,9 @@ build => 40,
 suit => 1,
 pop => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 60,
 armor => 0,
 attack => [
@@ -1793,7 +1918,7 @@ attack => [
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1809,7 +1934,10 @@ build => 30, # for 2
 suit => 1,
 pop => 0.5,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 25,
 armor => 0,
@@ -1817,7 +1945,7 @@ attack => [
 	{
 		anti => 2,
 		damage => 110,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1834,7 +1962,10 @@ build => 40,
 suit => 1,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1854,7 +1985,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1875,7 +2009,10 @@ base => 'mutalisk',
 suit => 3,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 2,
@@ -1902,7 +2039,10 @@ base => 'mutalisk',
 suit => 3,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 250,
 armor => 2,
@@ -1929,8 +2069,11 @@ gas => 150,
 build => 50,
 suit => 2,
 pop => 2,
+cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 1,
 sight => 10,
@@ -1978,8 +2121,11 @@ gas => 200,
 build => 60,
 suit => 3,
 pop => 4,
+cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 400,
 armor => 1,
 attack => [
@@ -1988,7 +2134,7 @@ attack => [
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,