X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/51f4351333a46b51e93e27c294015e084c8ea243..dd526b56391929a69bb47a5f7d4b911b61f463f8:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index dc90ec8..552c7e4 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -34,7 +34,7 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 8,
@@ -101,7 +101,7 @@ attack => [
 		damage => 16,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -189,13 +189,15 @@ shield => 40,
 armor => 0,
 sight => 7,
 speed => 9,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Khaydarin Amulet",
 		min => 150,
 		gas => 150,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -252,7 +254,7 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -326,14 +328,15 @@ shield => 200,
 armor => 1,
 sight => 10,
 speed => 14,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Argus Talisman",
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -385,6 +388,7 @@ pop => 3,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
@@ -441,6 +445,7 @@ pop => 2,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 100,
@@ -459,27 +464,29 @@ attack => [
 ],
 sight => 9,
 speed => 17,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Argus Jewel',
 		min => 100,
 		gas => 100,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
 	{
-		name => 'Disruption web',
+		name => 'Disruption Web',
 		abbr => 'dw',
 		min => 200,
 		gas => 200,
 		build => 80,
 		desc => 'creates a field in which no ground unit/structure can attack',
 		range => 9,
-		cost => 62-50,
-		duration => undef, #XXX
+		cost => 125,
+		duration => 24,
 	},
 ],
 counter => ['devourer', 'valkyrie'],
@@ -499,6 +506,7 @@ pop => 6,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 hp => 300,
 shield => 150,
@@ -524,6 +532,7 @@ special => [
 		race => 'protoss',
 		attr => {
 			mech => 1,
+			flying => 1,
 		},
 		hp => 40,
 		shield => 40,
@@ -570,6 +579,7 @@ pop => 4,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -587,14 +597,16 @@ attack => [
 ],
 sight => 9,
 speed => 12,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Khaydarin Core',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -650,7 +662,7 @@ attack => [
 		damage => 100,
 		cooldown => 60 / $FPS,
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
@@ -705,6 +717,7 @@ pop => 1,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 40,
@@ -787,6 +800,7 @@ cargo => 1,
 race => 'terran',
 attr => {
 	mech => 1,
+	organic => 1,
 },
 hp =>  60,
 armor => 0,
@@ -795,7 +809,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -876,7 +890,7 @@ upgrade => [
 ],
 special => [
 	{
-		name => 'stim pack',
+		name => 'Stim Pack',
 		abbr => 'sp',
 		min => 100,
 		gas => 100,
@@ -974,6 +988,8 @@ attack => [
 ],
 sight => 9,
 speed => 11,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Ocular Implants',
@@ -993,10 +1009,10 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
-energy => 200,
 special => [
 	{
 		name => 'Personal Cloaking',
@@ -1049,14 +1065,16 @@ hp =>  60,
 armor => 1,
 sight => 9,
 speed => 11,
-energy => 200,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Caduceus Reactor',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -1281,6 +1299,7 @@ pop => 2,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
@@ -1304,7 +1323,8 @@ attack => [
 ],
 sight => 7,
 speed => 17,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Cloak',
@@ -1323,7 +1343,8 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1342,6 +1363,7 @@ pop => 6,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 500,
@@ -1357,7 +1379,8 @@ attack => [
 ],
 sight => 11,
 speed => 7,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Yamato Gun',
@@ -1382,7 +1405,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1401,6 +1425,7 @@ pop => 2,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -1408,7 +1433,8 @@ armor => 1,
 sight => 10,
 detect => 1,
 speed => 15,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Defensive Matrix',
@@ -1450,7 +1476,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1469,6 +1496,7 @@ pop => 3,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -1501,6 +1529,7 @@ cargo => -8,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
@@ -1533,7 +1562,7 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,
@@ -1552,6 +1581,7 @@ cargo => 0,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -1694,7 +1724,7 @@ attack => [
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1714,7 +1744,7 @@ upgrade => [
 		build => 80,
 		attack => [
 			{
-				cooldown => 6 / $FPS,
+				cooldown => (6 - 8) / $FPS,
 			},
 		],
 	},
@@ -1818,13 +1848,15 @@ pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
 speed => 18,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Infest CC',
@@ -1875,7 +1907,7 @@ special => [
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 0,
 			},
 		],
 		sight => 5,
@@ -1904,7 +1936,7 @@ attack => [
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1922,6 +1954,7 @@ pop => 0.5,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 25,
@@ -1930,7 +1963,7 @@ attack => [
 	{
 		anti => 2,
 		damage => 110,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 5,
@@ -1949,6 +1982,7 @@ pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
@@ -1971,6 +2005,7 @@ special => [
 		suit => 3,
 		attr => {
 			organic => 1,
+			flying => 1,
 		},
 		hp => 200,
 		armor => 0,
@@ -1994,6 +2029,7 @@ pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
@@ -2023,6 +2059,7 @@ pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 250,
@@ -2059,7 +2096,8 @@ hp => 80,
 armor => 1,
 sight => 10,
 speed => 12,
-energy => 200,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Consume',
@@ -2091,6 +2129,16 @@ special => [
 		duration => 12,
 	},
 ],
+upgrade => [
+	{
+		name => 'Metasynaptic Node',
+		min => 150,
+		gas => 50,
+		build => 166,
+		energy => 62.5-50,
+		capacity => 250-200,
+	},
+],
 counter => ['archon', 'firebat'],
 },
 
@@ -2115,7 +2163,7 @@ attack => [
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 0,
 	},
 ],
 sight => 7,