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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 466595c..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,
@@ -89,7 +98,8 @@ attack => [
 	{
 		anti => 1,
 		name => "Psi Blades",
-		damage => [16, 18, 20, 22],
+		damage => 16,
+		upgrade => 2,
 		cooldown => 22 / $FPS,
 		range => 1,
 	},
@@ -119,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,
@@ -129,7 +142,8 @@ attack => [
 	{
 		anti => 3,
 		name => "Phase Disruptor",
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		type => 'explosive',
 		cooldown => 30 / $FPS,
 		range => 4,
@@ -164,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,
@@ -219,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,
@@ -229,7 +249,8 @@ attack => [
 	{
 		anti => 1,
 		name => "Warp Blades",
-		damage => [40, 43, 46, 49],
+		damage => 40,
+		upgrade => 3,
 		cooldown => 30 / $FPS,
 		range => 1,
 	},
@@ -258,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,
@@ -268,7 +292,8 @@ attack => [
 	{
 		anti => 3,
 		name => "Psionic Shockwave",
-		damage => [30, 33, 36, 39],
+		damage => 30,
+		upgrade => 3,
 		cooldown => 20 / $FPS,
 		splash => 1,
 		range => 2,
@@ -290,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,
@@ -353,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,
@@ -363,13 +394,15 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
-		damage => [8, 9, 10, 11],
+		damage => 8,
+		upgrade => 1,
 		cooldown => 30 / $FPS,
 		range => 4,
 	},
 	{
 		anti => 2,
-		damage => [28, 30, 32, 34],
+		damage => 28,
+		upgrade => 2,
 		type => 'explosive',
 		cooldown => 22 / $FPS,
 		range => 4,
@@ -405,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,
@@ -415,7 +451,8 @@ armor => 1,
 attack => [
 	{
 		anti => 2,
-		damage => [5, 6, 7, 8],
+		damage => 5,
+		upgrade => 1,
 		cooldown => 8 / $FPS,
 		splash => 1,
 		type => 'explosive',
@@ -460,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,
 	},
@@ -483,16 +523,20 @@ 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,
 		attack => [
 			{
 				anti => 3,
-				damage => [6, 7, 8, 9],
+				damage => 6,
+				upgrade => 1,
 				cooldown => 43 / $FPS, # approximately 37 according to liquipedia
 				build => 20,
 				range => 0,
@@ -505,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'],
@@ -523,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,
@@ -533,7 +583,8 @@ armor => 1,
 attack => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 45 / $FPS,
 		type => 'explosive',
 		range => 5,
@@ -589,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,
@@ -652,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,
@@ -698,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,
@@ -728,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 => [
@@ -756,6 +819,9 @@ gas => 0,
 build => 30,
 suit => 3,
 race => 'terran',
+attr => {
+	structure => 1,
+},
 hp => 200,
 armor => 0,
 attack => [
@@ -782,15 +848,19 @@ 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 => [
 	{
 		anti => 3,
-		damage => [6, 7, 8, 9],
+		damage => 6,
+		upgrade => 1,
 		cooldown => 15 / $FPS,
 		range => 4,
 	},
@@ -837,15 +907,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [16, 18, 20, 22],
+		damage => 16,
+		upgrade => 2,
 		cooldown => 22 / $FPS,
 		splash => 1,
 		type => 'implosive',
@@ -886,15 +960,19 @@ 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 => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 22 / $FPS,
 		type => 'implosive',
 		range => 7,
@@ -909,12 +987,12 @@ upgrade => [
 		gas => 150,
 		build => 166,
 		sight => 11 - 9,
-		special => {
-			ns => {
-				# nuke
-				range => 10-8,
-			},
-		},
+#		special => {
+#			ns => {
+#				# nuke
+#				range => 10-8,
+#			},
+#		},
 	},
 	{
 		name => 'Moebius Reactor',
@@ -952,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,
@@ -967,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,
@@ -1028,15 +1109,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 30 / $FPS,
 		type => 'implosive',
 		range => 5,
@@ -1063,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,
@@ -1092,15 +1179,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [30, 33, 36, 39],
+		damage => 30,
+		upgrade => 3,
 		cooldown => 37 / $FPS,
 		type => 'explosive',
 		range => 7,
@@ -1119,7 +1210,8 @@ special => [
 		attack => [
 			{
 				anti => 1,
-				damage => [70, 75, 80, 85],
+				damage => 70,
+				upgrade => 5,
 				cooldown => 75 / $FPS,
 				splash => 1,
 				type => 'explosive',
@@ -1141,21 +1233,26 @@ 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 => [
 	{
 		anti => 1,
-		damage => [12, 13, 14, 15],
+		damage => 12,
+		upgrade => 1,
 		cooldown => 22 / $FPS,
 		range => 5,
 	},
 	{
 		anti => 2,
-		damage => [20, 24, 28, 32],
+		damage => 20,
+		upgrade => 4,
 		type => 'explosive',
 		cooldown => 22 / $FPS,
 		range => 5,
@@ -1186,22 +1283,27 @@ 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,
 attack => [
 	{
 		anti => 1,
-		damage => [8, 9, 10, 11],
+		damage => 8,
+		upgrade => 1,
 		cooldown => 30 / $FPS,
 		range => 5,
 	},
 	{
 		anti => 2,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 22 / $FPS,
 		type => 'explosive',
 		range => 5,
@@ -1243,16 +1345,20 @@ 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,
 attack => [
 	{
 		anti => 3,
-		damage => [25, 28, 31, 34],
+		damage => 25,
+		upgrade => 3,
 		cooldown => 30 / $FPS,
 		range => 6,
 	},
@@ -1299,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,
@@ -1365,16 +1474,20 @@ 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,
 attack => [
 	{
 		anti => 2,
-		damage => [6, 7, 8, 9],
+		damage => 6,
+		upgrade => 1,
 		cooldown => 64 / $FPS,
 		splash => 1,
 		type => 'explosive',
@@ -1393,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,
@@ -1414,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 => [
@@ -1438,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,
@@ -1482,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,
@@ -1515,6 +1641,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 300,
 armor => 2,
 attack => [
@@ -1538,6 +1667,9 @@ gas => 0,
 build => 20,
 suit => 3,
 race => 'zerg',
+attr => {
+	structure => 1,
+},
 hp => 400,
 armor => 0,
 attack => [
@@ -1560,15 +1692,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [5, 6, 7, 8],
+		damage => 5,
+		upgrade => 1,
 		cooldown => 8 / $FPS,
 		range => 1,
 	},
@@ -1605,15 +1741,19 @@ 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 => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 15 / $FPS,
 		type => 'explosive',
 		range => 4,
@@ -1657,15 +1797,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 37 / $FPS,
 		splash => 'line',
 		range => 6,
@@ -1682,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,
@@ -1729,14 +1876,17 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
-		organic => 1,
+		pop => 0,
+		attr => {
+			organic => 1,
+		},
 		hp => 30,
 		armor => 0,
 		attack => [
 			{
 				anti => 1,
-				damage => [4, 5, 6, 7],
+				damage => 4,
+				upgrade => 1,
 				cooldown => 15 / $FPS,
 				range => 1,
 			},
@@ -1754,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 => [
@@ -1779,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,
@@ -1804,16 +1959,20 @@ 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,
 attack => [
 	{
 		anti => 3,
-		damage => [9 .. 12],
+		damage => 9,
+		upgrade => 1,
 		cooldown => 30 / $FPS,
 		splash => 'bounce',
 		range => 3,
@@ -1825,7 +1984,10 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
-		organic => 1,
+		attr => {
+			organic => 1,
+			flying => 1,
+		},
 		hp => 200,
 		armor => 0,
 		sight => 4,
@@ -1844,16 +2006,20 @@ 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,
 attack => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 30 / $FPS,
 		range => 8,
 	},
@@ -1870,16 +2036,20 @@ 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,
 attack => [
 	{
 		anti => 2,
-		damage => [25, 27, 29, 31],
+		damage => 25,
+		upgrade => 2,
 		cooldown => 100 / $FPS,
 		type => 'explosive',
 		range => 6,
@@ -1897,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,
@@ -1946,15 +2119,19 @@ 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 => [
 	{
 		anti => 1,
-		damage => [20, 23, 26, 29],
+		damage => 20,
+		upgrade => 3,
 		cooldown => 15 / $FPS,
 		range => 1,
 	},