X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f8b9a7861ff42de0f09e6ed1b80b7f1783dddf45..b4a1675c422fe6cf9b9d19d4b217f6403d6d4d28:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 1befd31..4221224 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -27,7 +27,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Particle beam',
+			name => 'Particle Beam',
 			damage => 5,
 			cooldown => 1.5,
 			range => 0,
@@ -55,7 +55,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Phase disruptor',
+			name => 'Phase Disruptor',
 			damage => 20,
 			cooldown => 1.25,
 			type => 'projectile',
@@ -99,6 +99,7 @@ use strict;
 	],
 	speed => 1.875,
 	sight => 9,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -150,7 +151,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Purifier beams',
+			name => 'Purifier Beams',
 			damage => 6,
 			upgrade => 1,
 			cooldown => 2.21,
@@ -160,6 +161,7 @@ use strict;
 	],
 	speed => 1.4062,
 	sight => 14,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -193,6 +195,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Nexus',
+	pop => -10,
 	min => 400,
 	gas => 0,
 	build => 100,
@@ -208,7 +211,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Photon overcharge',
+			name => 'Photon Overcharge',
 			damage => 20,
 			cooldown => 1.25,
 			type => 'projectile',
@@ -217,6 +220,7 @@ use strict;
 	],
 	speed => 0,
 	sight => 11,
+	energy => 0,
 	capacity => 100,
 	special => [
 		{
@@ -250,7 +254,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Psi blades',
+			name => 'Psi Blades',
 			damage => 8,
 			upgrade => 1,
 			cooldown => 1.2,
@@ -268,12 +272,17 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 140,
-			speed => .5,
 			range => 4,
 			duration => 3.5,
 			cooldown => 10,
 		},
 	],
+	upgrade => [
+		{
+			name => 'Charge',
+			speed => .5,
+		},
+	],
 },
 
 {
@@ -298,7 +307,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Disruption beam',
+			name => 'Disruption Beam',
 			damage => 6,
 			upgrade => 1,
 			cooldown => 1.0,
@@ -307,6 +316,7 @@ use strict;
 	],
 	speed => 2.25,
 	sight => 10,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -358,7 +368,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Particle disruptors',
+			name => 'Particle Disruptors',
 			damage => 10,
 			upgrade => 1,
 			bonus => {
@@ -406,6 +416,7 @@ use strict;
 	},
 	speed => 1.875,
 	sight => 10,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -453,7 +464,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Warp blade',
+			name => 'Warp Blade',
 			damage => 45,
 			upgrade => 5,
 			cooldown => 1.694,
@@ -493,7 +504,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Psionic shockwave',
+			name => 'Psionic Shockwave',
 			damage => 25,
 			upgrade => 3,
 			bonus => {
@@ -529,7 +540,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Phase disruptors',
+			name => 'Phase Disruptors',
 			damage => 20,
 			upgrade => 2,
 			bonus => {
@@ -714,6 +725,7 @@ use strict;
 	],
 	speed => 4.25,
 	sight => 10,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -761,7 +773,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Prismatic beam',
+			name => 'Prismatic Beam',
 			damage => 6,
 			upgrade => 1,
 			bonus => {
@@ -828,6 +840,7 @@ use strict;
 	],
 	speed => 4,
 	sight => 10,
+	energy => 50, #XXX
 	capacity => 200,
 	special => [
 		{
@@ -998,7 +1011,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Fusion cutter',
+			name => 'Fusion Cutter',
 			damage => 5,
 			cooldown => 1.5,
 			range => 0,
@@ -1046,7 +1059,7 @@ use strict;
 	attack => [
 		{
 			anti => 2,
-			name => 'Longbolt missiles',
+			name => 'Longbolt Missiles',
 			damage => 12,
 			cooldown => 0.8608,
 			count => 2,
@@ -1100,7 +1113,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Ibiks cannon',
+			name => 'Ibiks Cannon',
 			damage => 40,
 			splash => 1,
 			cooldown => 2,
@@ -1157,7 +1170,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'C-14 rifle',
+			name => 'C-14 Rifle',
 			damage => 6,
 			upgrade => 1,
 			cooldown => 0.8608,
@@ -1217,7 +1230,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Punisher grenades',
+			name => 'Punisher Grenades',
 			damage => 10,
 			upgrade => 1,
 			bonus => {
@@ -1254,8 +1267,6 @@ use strict;
 			],
 			duration => 15,
 		},
-	],
-	upgrade => [
 		{
 			name => 'Concussive Shells',
 			abbr => 'cs',
@@ -1290,7 +1301,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'P-45 Reaper pistol',
+			name => 'P-45 Reaper Pistol',
 			damage => 4,
 			upgrade => 1,
 			cooldown => 1.1,
@@ -1329,7 +1340,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'C-10 rifle',
+			name => 'C-10 Rifle',
 			damage => 10,
 			upgrade => 1,
 			bonus => {
@@ -1342,6 +1353,7 @@ use strict;
 	],
 	speed => 2.25,
 	sight => 11,
+	energy => 75,
 	capacity => 200,
 	special => [
 		{
@@ -1372,8 +1384,9 @@ use strict;
 		{
 			name => 'Nuclear Strike',
 			abbr => 'ns',
-			desc => 'guides a nuclear missile which will do 300 damage plus 200 to buildings',
+			desc => 'guides a missile which will do 300 damage plus 200 to buildings',
 			duration => 20,
+			cooldown => 20,
 			range => 12,
 		},
 	],
@@ -1398,7 +1411,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Infernal flamethrower',
+			name => 'Infernal Flamethrower',
 			damage => 8,
 			upgrade => 1,
 			bonus => {
@@ -1558,7 +1571,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => '90 mm twin cannon',
+			name => '90 mm Twin Cannon',
 			damage => 15,
 			upgrade => 2,
 			bonus => {
@@ -1578,7 +1591,7 @@ use strict;
 			attack => [
 				{
 					anti => 1,
-					name => '120 mm shock cannon',
+					name => '120 mm Shock Cannon',
 					damage => 35,
 					upgrade => 3,
 					bonus => {
@@ -1647,6 +1660,7 @@ use strict;
 #			name => 'High Impact Payload',
 			damage => 24,
 			upgrade => 2,
+			type => 'projectile',
 			cooldown => 2,
 			range => 10,
 		},
@@ -1675,7 +1689,7 @@ use strict;
 	attack => [
 		{
 			anti => 2,
-			name => 'Lanzer torpedoes',
+			name => 'Lanzer Torpedoes',
 			damage => 10,
 			upgrade => 1,
 			bonus => {
@@ -1697,7 +1711,7 @@ use strict;
 			attack => [
 				{
 					anti => 1,
-					name => 'Twin gatling cannon',
+					name => 'Twin Gatling Cannon',
 					damage => 12,
 					upgrade => 1,
 					cooldown => 1,
@@ -1728,6 +1742,7 @@ use strict;
 		flying => 1,
 	},
 	speed => 2.5,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -1778,7 +1793,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'Backlash rockets',
+			name => 'Backlash Rockets',
 			damage => 12,
 			upgrade => 1,
 			type => 'projectile',
@@ -1789,6 +1804,7 @@ use strict;
 	],
 	speed => 2.75,
 	sight => 10,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -1824,6 +1840,7 @@ use strict;
 	speed => 2.25,
 	sight => 11,
 	detect => 1,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -1842,7 +1859,7 @@ use strict;
 			attack => [
 				{
 					anti => 3,
-					name => '12 mm gauss cannon',
+					name => '12 mm Gauss Cannon',
 					damage => 8,
 					cooldown => 0.8,
 					range => 6,
@@ -1888,7 +1905,7 @@ use strict;
 			cooldown => 0,
 			attack => [
 				{
-					name => 'Point defense laser',
+					name => 'Point Defense Laser',
 					range => 8,
 				},
 			],
@@ -1976,7 +1993,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			name => 'ATS laser batteries',
+			name => 'ATS Laser Batteries',
 			damage => 8,
 			upgrade => 1,
 			cooldown => 0.225,
@@ -1985,7 +2002,7 @@ use strict;
 		},
 		{
 			anti => 2,
-			name => 'ATS laser batteries',
+			name => 'ATS Laser Batteries',
 			damage => 6,
 			upgrade => 1,
 			cooldown => 0.225,
@@ -1995,6 +2012,7 @@ use strict;
 	],
 	speed => 1.875,
 	sight => 12,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -2097,6 +2115,7 @@ use strict;
 	speed => 0.9375,
 	creep => 2.7,
 	sight => 9,
+	energy => 25,
 	capacity => 200,
 	special => [
 		{
@@ -2145,7 +2164,6 @@ use strict;
 		flying => 1,
 	},
 	speed => 0.586,
-	creep => 0,
 	sight => 11,
 	special => [
 		{
@@ -2195,9 +2213,9 @@ use strict;
 		flying => 1,
 	},
 	speed => 1.875,
-	creep => 0,
 	sight => 11,
 	detect => 1,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -2461,6 +2479,7 @@ use strict;
 			damage => 16,
 			upgrade => 2,
 			cooldown => 2.0,
+			range => 4,
 		},
 	],
 	speed => 2.25,
@@ -2516,7 +2535,7 @@ use strict;
 	attack => [
 		{
 			anti => 3,
-			name => 'Needle spines', # Scythe melee
+			name => 'Needle Spines', # Scythe melee
 			damage => 12,
 			upgrade => 1,
 			type => 'projectile', # except melee
@@ -2570,6 +2589,7 @@ use strict;
 	speed => 2.25,
 	creep => 1.3,
 	sight => 10,
+	energy => 50,
 	capacity => 200,
 	special => [
 		{
@@ -2597,7 +2617,7 @@ use strict;
 			cost => 25,
 			range => 9,
 			duration => 30,
-			build => 5,
+			build => 4.8, # 5 normal but 3 faster
 			size => 0.75,
 			cargo => 0,
 			armor => 0,
@@ -2683,7 +2703,7 @@ use strict;
 	special => [
 		{
 			alt => 'Locust',
-			build => 5,
+			build => 4.8, # 5 normal but 3 faster
 			size => 0.75,
 			cargo => 0,
 			armor => 0,
@@ -2748,6 +2768,7 @@ use strict;
 			damage => 9,
 			upgrade => 1,
 			splash => 'bounce',
+			type => 'projectile',
 			psionic => 1,
 			cooldown => 1.5246,
 			range => 3,
@@ -2900,6 +2921,7 @@ use strict;
 	},
 	speed => 2.9531,
 	sight => 11,
+	energy => 50, #XXX
 	capacity => 200,
 	special => [
 		{