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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 0201ace..a8ec4de 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -22,7 +22,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 20,
 shield => 20,
 armor => 0,
@@ -32,7 +34,7 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 8,
@@ -52,6 +54,9 @@ gas => 0,
 build => 50,
 suit => 3,
 race => 'protoss',
+attr => {
+	structure => 1,
+},
 hp => 100,
 shield => 100,
 armor => 0,
@@ -83,7 +88,9 @@ suit => 1,
 pop => 2,
 cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 100,
 shield => 60,
 armor => 1,
@@ -94,7 +101,7 @@ attack => [
 		damage => 16,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -125,7 +132,9 @@ suit => 3,
 pop => 2,
 cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 1,
@@ -172,7 +181,9 @@ suit => 1,
 pop => 2,
 cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 shield => 40,
 armor => 0,
@@ -228,7 +239,9 @@ suit => 1,
 pop => 2,
 cargo => 2,
 race => 'protoss',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 shield => 40,
 armor => 1,
@@ -239,7 +252,7 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -269,7 +282,9 @@ suit => 3,
 pop => 4,
 cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 10,
 shield => 350,
 armor => 0,
@@ -303,7 +318,9 @@ suit => 3,
 pop => 4,
 cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 25,
 shield => 200,
 armor => 1,
@@ -366,7 +383,10 @@ build => 80,
 suit => 3,
 pop => 3,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 shield => 100,
@@ -420,7 +440,10 @@ build => 40,
 suit => 2,
 pop => 2,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 100,
 shield => 80,
@@ -476,7 +499,10 @@ build => 140,
 suit => 3,
 pop => 6,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 hp => 300,
 shield => 150,
 armor => 4,
@@ -499,7 +525,10 @@ special => [
 		suit => 1,
 		pop => 0,
 		race => 'protoss',
-		organic => 0,
+		attr => {
+			mech => 1,
+			flying => 1,
+		},
 		hp => 40,
 		shield => 40,
 		armor => 0,
@@ -543,7 +572,10 @@ build => 160,
 suit => 3,
 pop => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 shield => 150,
@@ -611,7 +643,9 @@ suit => 3,
 pop => 4,
 cargo => 4,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 100,
 shield => 80,
 armor => 0,
@@ -621,7 +655,7 @@ attack => [
 		damage => 100,
 		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
@@ -674,7 +708,10 @@ build => 40,
 suit => 1,
 pop => 1,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 40,
 shield => 20,
@@ -721,7 +758,9 @@ suit => 3,
 pop => 2,
 cargo => -8,
 race => 'protoss',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 80,
 shield => 60,
 armor => 1,
@@ -752,7 +791,10 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	organic => 1,
+},
 hp =>  60,
 armor => 0,
 attack => [
@@ -760,7 +802,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -778,6 +820,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -807,7 +852,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  40,
 armor => 0,
 attack => [
@@ -864,7 +911,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  50,
 armor => 1,
 attack => [
@@ -915,7 +964,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  45,
 armor => 0,
 attack => [
@@ -998,7 +1049,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'terran',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp =>  60,
 armor => 1,
 sight => 9,
@@ -1060,7 +1113,9 @@ suit => 2,
 pop => 2,
 cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp =>  80,
 armor => 0,
 attack => [
@@ -1094,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,
@@ -1126,7 +1183,9 @@ suit => 3,
 pop => 2,
 cargo => 4,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 150,
 armor => 1,
 attack => [
@@ -1178,7 +1237,9 @@ suit => 3,
 pop => 2,
 cargo => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+},
 hp => 125,
 armor => 1,
 attack => [
@@ -1225,7 +1286,10 @@ build => 60,
 suit => 3,
 pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1284,7 +1348,10 @@ build => 133,
 suit => 3,
 pop => 6,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 500,
 armor => 3,
@@ -1341,7 +1408,10 @@ build => 80,
 suit => 3,
 pop => 2,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 1,
@@ -1407,7 +1477,10 @@ build => 50,
 suit => 3,
 pop => 3,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 2,
@@ -1437,7 +1510,10 @@ suit => 3,
 pop => 2,
 cargo => -8,
 race => 'terran',
-organic => 0,
+attr => {
+	mech => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 1,
@@ -1459,7 +1535,9 @@ suit => 1,
 pop => 1,
 cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 40,
 armor => 0,
 attack => [
@@ -1467,7 +1545,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -1484,7 +1562,10 @@ suit => 3,
 pop => -9,
 cargo => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 200,
 armor => 0,
@@ -1528,7 +1609,9 @@ build => 20,
 suit => 1,
 pop => 0,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 25,
 armor => 10,
 sight => 4,
@@ -1559,6 +1642,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1582,6 +1668,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1607,7 +1696,9 @@ suit => 1,
 pop => 0.5,
 cargo => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 35,
 armor => 0,
 attack => [
@@ -1616,7 +1707,7 @@ attack => [
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1654,7 +1745,9 @@ suit => 2,
 pop => 1,
 cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 0,
 attack => [
@@ -1708,7 +1801,9 @@ suit => 2,
 pop => 2,
 cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 125,
 armor => 1,
 attack => [
@@ -1734,7 +1829,10 @@ build => 50,
 suit => 2,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1780,7 +1878,9 @@ special => [
 		alt => 'Broodling',
 		suit => 1,
 		pop => 0,
-		organic => 1,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
@@ -1789,7 +1889,7 @@ special => [
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 0,
 			},
 		],
 		sight => 5,
@@ -1807,7 +1907,9 @@ build => 40,
 suit => 1,
 pop => 1,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 60,
 armor => 0,
 attack => [
@@ -1816,7 +1918,7 @@ attack => [
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1832,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,
@@ -1840,7 +1945,7 @@ attack => [
 	{
 		anti => 2,
 		damage => 110,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1857,7 +1962,10 @@ build => 40,
 suit => 1,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 120,
 armor => 0,
@@ -1877,7 +1985,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1898,7 +2009,10 @@ base => 'mutalisk',
 suit => 3,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 150,
 armor => 2,
@@ -1925,7 +2039,10 @@ base => 'mutalisk',
 suit => 3,
 pop => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+	flying => 1,
+},
 air => 1,
 hp => 250,
 armor => 2,
@@ -1954,7 +2071,9 @@ suit => 2,
 pop => 2,
 cargo => 2,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 80,
 armor => 1,
 sight => 10,
@@ -2004,7 +2123,9 @@ suit => 3,
 pop => 4,
 cargo => 4,
 race => 'zerg',
-organic => 1,
+attr => {
+	organic => 1,
+},
 hp => 400,
 armor => 1,
 attack => [
@@ -2013,7 +2134,7 @@ attack => [
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,