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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 466595c..0201ace 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -19,7 +19,8 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'protoss',
 organic => 0,
 hp => 20,
@@ -79,7 +80,8 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
 organic => 1,
 hp => 100,
@@ -89,7 +91,8 @@ attack => [
 	{
 		anti => 1,
 		name => "Psi Blades",
-		damage => [16, 18, 20, 22],
+		damage => 16,
+		upgrade => 2,
 		cooldown => 22 / $FPS,
 		range => 1,
 	},
@@ -119,7 +122,8 @@ min => 125,
 gas => 50,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'protoss',
 organic => 0,
 hp => 100,
@@ -129,7 +133,8 @@ attack => [
 	{
 		anti => 3,
 		name => "Phase Disruptor",
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		type => 'explosive',
 		cooldown => 30 / $FPS,
 		range => 4,
@@ -164,7 +169,8 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
 organic => 1,
 hp => 40,
@@ -219,7 +225,8 @@ min => 125,
 gas => 100,
 build => 50,
 suit => 1,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'protoss',
 organic => 1,
 hp => 80,
@@ -229,7 +236,8 @@ attack => [
 	{
 		anti => 1,
 		name => "Warp Blades",
-		damage => [40, 43, 46, 49],
+		damage => 40,
+		upgrade => 3,
 		cooldown => 30 / $FPS,
 		range => 1,
 	},
@@ -258,7 +266,8 @@ gas => 300,
 build => 20,
 base => ['templar', 'templar'],
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
 organic => 0,
 hp => 10,
@@ -268,7 +277,8 @@ attack => [
 	{
 		anti => 3,
 		name => "Psionic Shockwave",
-		damage => [30, 33, 36, 39],
+		damage => 30,
+		upgrade => 3,
 		cooldown => 20 / $FPS,
 		splash => 1,
 		range => 2,
@@ -290,7 +300,8 @@ gas => 200,
 build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
 organic => 0,
 hp => 25,
@@ -353,7 +364,7 @@ min => 275,
 gas => 125,
 build => 80,
 suit => 3,
-unit => 3,
+pop => 3,
 race => 'protoss',
 organic => 0,
 air => 1,
@@ -363,13 +374,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,7 +418,7 @@ min => 150,
 gas => 100,
 build => 40,
 suit => 2,
-unit => 2,
+pop => 2,
 race => 'protoss',
 organic => 0,
 air => 1,
@@ -415,7 +428,8 @@ armor => 1,
 attack => [
 	{
 		anti => 2,
-		damage => [5, 6, 7, 8],
+		damage => 5,
+		upgrade => 1,
 		cooldown => 8 / $FPS,
 		splash => 1,
 		type => 'explosive',
@@ -460,7 +474,7 @@ min => 350,
 gas => 250,
 build => 140,
 suit => 3,
-unit => 6,
+pop => 6,
 race => 'protoss',
 organic => 0,
 hp => 300,
@@ -469,7 +483,7 @@ armor => 4,
 attack => [
 	{
 		anti => 3,
-		dps => [17, undef, undef, 49],
+		dps => [17, undef, undef, 25],
 		count => 4,
 		range => 8,
 	},
@@ -483,7 +497,7 @@ special => [
 		min => 25,
 		build => 20,
 		suit => 1,
-		unit => 0,
+		pop => 0,
 		race => 'protoss',
 		organic => 0,
 		hp => 40,
@@ -492,7 +506,8 @@ special => [
 		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 +520,12 @@ special => [
 upgrade => [
 	{
 		name => 'Carrier Capacity',
-		damage => {
-			count => 8-4,
-		},
+		attack => [
+			{
+				dps => [17, undef, undef, 24],
+				count => 8-4,
+			},
+		],
 	},
 ],
 counter => ['wraith', 'corsair', 'scourge'],
@@ -523,7 +541,7 @@ min => 100,
 gas => 350,
 build => 160,
 suit => 3,
-unit => 4,
+pop => 4,
 race => 'protoss',
 organic => 0,
 air => 1,
@@ -533,7 +551,8 @@ armor => 1,
 attack => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 45 / $FPS,
 		type => 'explosive',
 		range => 5,
@@ -589,7 +608,8 @@ min => 200,
 gas => 100,
 build => 70,
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'protoss',
 organic => 0,
 hp => 100,
@@ -652,7 +672,7 @@ min => 25,
 gas => 75,
 build => 40,
 suit => 1,
-unit => 1,
+pop => 1,
 race => 'protoss',
 organic => 0,
 air => 1,
@@ -698,7 +718,8 @@ min => 200,
 gas => 0,
 build => 60,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => -8,
 race => 'protoss',
 organic => 0,
 hp => 80,
@@ -728,7 +749,8 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
 organic => 0,
 hp =>  60,
@@ -782,7 +804,8 @@ min => 50,
 gas => 0,
 build => 24,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
 organic => 1,
 hp =>  40,
@@ -790,7 +813,8 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
-		damage => [6, 7, 8, 9],
+		damage => 6,
+		upgrade => 1,
 		cooldown => 15 / $FPS,
 		range => 4,
 	},
@@ -837,7 +861,8 @@ min => 50,
 gas => 25,
 build => 24,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
 organic => 1,
 hp =>  50,
@@ -845,7 +870,8 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
-		damage => [16, 18, 20, 22],
+		damage => 16,
+		upgrade => 2,
 		cooldown => 22 / $FPS,
 		splash => 1,
 		type => 'implosive',
@@ -886,7 +912,8 @@ min => 25,
 gas => 75,
 build => 50,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
 organic => 1,
 hp =>  45,
@@ -894,7 +921,8 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 22 / $FPS,
 		type => 'implosive',
 		range => 7,
@@ -909,12 +937,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 +980,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,7 +995,8 @@ min => 50,
 gas => 25,
 build => 30,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'terran',
 organic => 1,
 hp =>  60,
@@ -1028,7 +1057,8 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'terran',
 organic => 0,
 hp =>  80,
@@ -1036,7 +1066,8 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 30 / $FPS,
 		type => 'implosive',
 		range => 5,
@@ -1092,7 +1123,8 @@ min => 150,
 gas => 100,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'terran',
 organic => 0,
 hp => 150,
@@ -1100,7 +1132,8 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
-		damage => [30, 33, 36, 39],
+		damage => 30,
+		upgrade => 3,
 		cooldown => 37 / $FPS,
 		type => 'explosive',
 		range => 7,
@@ -1119,7 +1152,8 @@ special => [
 		attack => [
 			{
 				anti => 1,
-				damage => [70, 75, 80, 85],
+				damage => 70,
+				upgrade => 5,
 				cooldown => 75 / $FPS,
 				splash => 1,
 				type => 'explosive',
@@ -1141,7 +1175,8 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'terran',
 organic => 0,
 hp => 125,
@@ -1149,13 +1184,15 @@ 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,7 +1223,7 @@ min => 150,
 gas => 100,
 build => 60,
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'terran',
 organic => 0,
 air => 1,
@@ -1195,13 +1232,15 @@ 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,7 +1282,7 @@ min => 400,
 gas => 300,
 build => 133,
 suit => 3,
-unit => 6,
+pop => 6,
 race => 'terran',
 organic => 0,
 air => 1,
@@ -1252,7 +1291,8 @@ armor => 3,
 attack => [
 	{
 		anti => 3,
-		damage => [25, 28, 31, 34],
+		damage => 25,
+		upgrade => 3,
 		cooldown => 30 / $FPS,
 		range => 6,
 	},
@@ -1299,7 +1339,7 @@ min => 100,
 gas => 225,
 build => 80,
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'terran',
 organic => 0,
 air => 1,
@@ -1365,7 +1405,7 @@ min => 250,
 gas => 125,
 build => 50,
 suit => 3,
-unit => 3,
+pop => 3,
 race => 'terran',
 organic => 0,
 air => 1,
@@ -1374,7 +1414,8 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
-		damage => [6, 7, 8, 9],
+		damage => 6,
+		upgrade => 1,
 		cooldown => 64 / $FPS,
 		splash => 1,
 		type => 'explosive',
@@ -1393,7 +1434,8 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 3,
-unit => 2,
+pop => 2,
+cargo => -8,
 race => 'terran',
 organic => 0,
 air => 1,
@@ -1414,7 +1456,8 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
-unit => 1,
+pop => 1,
+cargo => 1,
 race => 'zerg',
 organic => 1,
 hp => 40,
@@ -1438,7 +1481,8 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 3,
-unit => -9,
+pop => -9,
+cargo => 0,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1482,7 +1526,7 @@ trans => {
 },
 build => 20,
 suit => 1,
-unit => 0,
+pop => 0,
 race => 'zerg',
 organic => 1,
 hp => 25,
@@ -1560,7 +1604,8 @@ min => 25,
 gas => 0,
 build => 28, # for 2
 suit => 1,
-unit => 0.5,
+pop => 0.5,
+cargo => 1,
 race => 'zerg',
 organic => 1,
 hp => 35,
@@ -1568,7 +1613,8 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
-		damage => [5, 6, 7, 8],
+		damage => 5,
+		upgrade => 1,
 		cooldown => 8 / $FPS,
 		range => 1,
 	},
@@ -1605,7 +1651,8 @@ min => 75,
 gas => 25,
 build => 28,
 suit => 2,
-unit => 1,
+pop => 1,
+cargo => 2,
 race => 'zerg',
 organic => 1,
 hp => 80,
@@ -1613,7 +1660,8 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
-		damage => [10, 11, 12, 13],
+		damage => 10,
+		upgrade => 1,
 		cooldown => 15 / $FPS,
 		type => 'explosive',
 		range => 4,
@@ -1657,7 +1705,8 @@ gas => 125,
 base => 'hydralisk',
 build => 40,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 4,
 race => 'zerg',
 organic => 1,
 hp => 125,
@@ -1665,7 +1714,8 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 37 / $FPS,
 		splash => 'line',
 		range => 6,
@@ -1682,7 +1732,7 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 2,
-unit => 2,
+pop => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1729,14 +1779,15 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
-		unit => 0,
+		pop => 0,
 		organic => 1,
 		hp => 30,
 		armor => 0,
 		attack => [
 			{
 				anti => 1,
-				damage => [4, 5, 6, 7],
+				damage => 4,
+				upgrade => 1,
 				cooldown => 15 / $FPS,
 				range => 1,
 			},
@@ -1754,7 +1805,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
-unit => 1,
+pop => 1,
 race => 'zerg',
 organic => 1,
 hp => 60,
@@ -1779,7 +1830,7 @@ min => 12,
 gas => 38,
 build => 30, # for 2
 suit => 1,
-unit => 0.5,
+pop => 0.5,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1804,7 +1855,7 @@ min => 100,
 gas => 100,
 build => 40,
 suit => 1,
-unit => 2,
+pop => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1813,7 +1864,8 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
-		damage => [9 .. 12],
+		damage => 9,
+		upgrade => 1,
 		cooldown => 30 / $FPS,
 		splash => 'bounce',
 		range => 3,
@@ -1844,7 +1896,7 @@ gas => 200,
 build => 40,
 base => 'mutalisk',
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1853,7 +1905,8 @@ armor => 2,
 attack => [
 	{
 		anti => 1,
-		damage => [20, 22, 24, 26],
+		damage => 20,
+		upgrade => 2,
 		cooldown => 30 / $FPS,
 		range => 8,
 	},
@@ -1870,7 +1923,7 @@ gas => 150,
 build => 40,
 base => 'mutalisk',
 suit => 3,
-unit => 2,
+pop => 2,
 race => 'zerg',
 organic => 1,
 air => 1,
@@ -1879,7 +1932,8 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
-		damage => [25, 27, 29, 31],
+		damage => 25,
+		upgrade => 2,
 		cooldown => 100 / $FPS,
 		type => 'explosive',
 		range => 6,
@@ -1897,7 +1951,8 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 2,
-unit => 2,
+pop => 2,
+cargo => 2,
 race => 'zerg',
 organic => 1,
 hp => 80,
@@ -1946,7 +2001,8 @@ min => 200,
 gas => 200,
 build => 60,
 suit => 3,
-unit => 4,
+pop => 4,
+cargo => 4,
 race => 'zerg',
 organic => 1,
 hp => 400,
@@ -1954,7 +2010,8 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
-		damage => [20, 23, 26, 29],
+		damage => 20,
+		upgrade => 3,
 		cooldown => 15 / $FPS,
 		range => 1,
 	},