X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6cbcbe66607ebd1f7b6bdf478a6554d9fe1f7fd0..1765f080901b6e821b148a4d6ad7b49aee5da03f:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index b1839cb..6404dce 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -122,7 +122,7 @@ use strict;
 			cost => 100,
 			radius => 3.5,
 			range => 9,
-			duration => 30,
+			duration => 10,
 		},
 	],
 },
@@ -356,7 +356,9 @@ use strict;
 			anti => 3,
 			damage => [10 .. 13],
 			dps => [6.9, 7.6, 8.3, 9.0],
-			#bonus => +4 A,
+			bonus => {
+				armored => 4,
+			},
 			type => 'projectile',
 			cooldown => 1.44,
 			range => 6,
@@ -487,7 +489,9 @@ use strict;
 			anti => 3,
 			damage => [25, 28, 31, 34],
 			dps => [14.3, 16.0, 17.7, 19.4],
-			#bonus => +10 (+1) B,
+			bonus => {
+				organic => [10 .. 13],
+			},
 			splash => 1,
 			cooldown => 1.754,
 			range => 3,
@@ -518,7 +522,9 @@ use strict;
 		{
 			anti => 1,
 			damage => [20, 22, 24, 26],
-			#bonus => +30 (+3) A,
+			bonus => {
+				armored => [30, 33, 36, 39],
+			},
 			dps => [13.8, 15.2, 16.6, 18.0],
 			cooldown => 1.45,
 			range => 6,
@@ -685,7 +691,9 @@ use strict;
 			anti => 2,
 			damage => [5 .. 8],
 			dps => [9, 10.8, 12.6, 14.4],
-			#bonus => +5 L,
+			bonus => {
+				light => 5,
+			},
 			type => 'projectile',
 			cooldown => 1.11,
 			count => 2,
@@ -742,7 +750,9 @@ use strict;
 		{
 			anti => 3,
 			damage => [6 .. 9],
-			#bonus => +4 (+1), +10 (+1) A,
+			bonus => {
+				armored => [4 .. 7],
+			},
 			dps => [12, 14, 16, 18],
 			cooldown => 0.5,
 			range => 6, # keeps firing until range 8
@@ -757,6 +767,13 @@ use strict;
 			desc => 'increases damage to armored by 6 for 20 seconds',
 			duration => 20,
 			cooldown => 60,
+			attack => [
+				{
+					bonus => {
+						armored => 6, # total +10 .. 13
+					},
+				},
+			],
 		},
 	],
 },
@@ -786,7 +803,9 @@ use strict;
 			name => 'Pulsar Beam',
 			damage => 15,
 			# costs energy
-			#bonus => +10 L,
+			bonus => {
+				light => 10,
+			},
 			dps => 17.4,
 			cooldown => 0.86,
 			cost => 25,
@@ -842,7 +861,9 @@ use strict;
 		{
 			anti => 3,
 			damage => [30, 33, 36, 39],
-			#bonus => +14 Ma Air,
+			bonus => {
+				'massive air' => 14,
+			},
 			dps => [9.1, 10.0, 10.9, 11.8],
 			type => 'projectile',
 			cooldown => 3.3,
@@ -1124,7 +1145,6 @@ use strict;
 		{
 			name => 'Stim Pack',
 			abbr => 'sp',
-			alt => 'Stimmed Marine',
 			desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
 			speed => 1.125,
 			min => 100,
@@ -1133,6 +1153,7 @@ use strict;
 			attack => [
 				{
 					anti => 3,
+					damage => [6 .. 9],
 					dps => [10.5, 12.2, 13.9, 15.6],
 					cooldown => 0.5739,
 					range => 5,
@@ -1164,7 +1185,9 @@ use strict;
 		{
 			anti => 1,
 			damage => [10 .. 13],
-			#bonus => +10 (+1) A,
+			bonus => {
+				armored => [10 .. 13],
+			},
 			dps => [6.7, 7.4, 8.1, 8.8],
 			type => 'projectile',
 			cooldown => 1.5,
@@ -1175,7 +1198,6 @@ use strict;
 		{
 			name => 'Stim Pack',
 			abbr => 'sp',
-			alt => 'Stimmed Marauder',
 			desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
 			speed => 1.125,
 			min => 100,
@@ -1183,7 +1205,11 @@ use strict;
 			build => 170,
 			attack => [
 				{
-					anti => 3,
+					anti => 1,
+					damage => [10 .. 13],
+					bonus => {
+						armored => [10 .. 13],
+					},
 					dps => [10 .. 13],
 					type => 'projectile',
 					cooldown => 1.0,
@@ -1267,7 +1293,9 @@ use strict;
 		{
 			anti => 3,
 			damage => [10 .. 13],
-			#bonus => +10 (+1) L,
+			bonus => {
+				light => [10 .. 13],
+			},
 			dps => [6.7, 7.4, 8.1, 8.8],
 			cooldown => 1.5,
 			range => 6,
@@ -1332,6 +1360,9 @@ use strict;
 		{
 			anti => 1,
 			damage => [8 .. 11],
+			bonus => {
+				light => [6 .. 9],
+			},
 			dps => [3.2, 3.6, 4.0, 4.4],
 			splash => 'line',
 			cooldown => 2.5,
@@ -1356,7 +1387,10 @@ use strict;
 			build => 110,
 			attack => [
 				{
-					#bonus => +6 (+1), +11 (+1) L,
+					damage => [6 .. 9],
+					bonus => {
+						light => [5, 5, 5, 5], # total [11 .. 14]
+					},
 				},
 			],
 		},
@@ -1408,7 +1442,9 @@ use strict;
 			build => 110,
 			attack => [
 				{
-					#bonus => +12 (+1) L,
+					bonus => {
+						light => [12 .. 15],
+					},
 				},
 			],
 		},
@@ -1435,7 +1471,9 @@ use strict;
 		{
 			anti => 3,
 			damage => 125,
-			#bonus => +35 Shield,
+			bonus => {
+				shields => 40,
+			},
 			splash => 1,
 			cooldown => 40,
 			range => 5,
@@ -1475,7 +1513,9 @@ use strict;
 		{
 			anti => 1,
 			damage => [15, 17, 19, 21],
-			#bonus => +10 (+1)A,
+			bonus => {
+				armored => [10 .. 13],
+			},
 			dps => [14.4, 16.3, 18.2, 20.1],
 			cooldown => 1.04,
 			range => 7,
@@ -1491,7 +1531,9 @@ use strict;
 				{
 					anti => 1,
 					damage => [35, 38, 41, 44],
-					#bonus => 15 (+2)A,
+					bonus => {
+						armored => [15, 17, 19, 21],
+					},
 					dps => [11.7, 12.7, 13.7, 14.7],
 					splash => 1,
 					cooldown => 3,
@@ -1526,6 +1568,7 @@ use strict;
 	attack => [
 		{
 			anti => 1,
+			name => "Thor's Hammer",
 			damage => [30, 33, 36, 39],
 			dps => [46.9, 51.6, 56.3, 61.0],
 			cooldown => 1.28,
@@ -1534,9 +1577,12 @@ use strict;
 		},
 		{
 			anti => 2,
-			name => 'Explosive Payload',
+			name => 'Javelin Missiles',
+#			name => 'Explosive Payload',
 			damage => [6 .. 9],
-			#bonus => +6 (+1) L Air,
+			bonus => {
+				'light air' => [6 .. 9],
+			},
 			dps => [8, 9.3, 10.6, 11.9],
 			splash => 1,
 			type => 'projectile',
@@ -1546,7 +1592,8 @@ use strict;
 		},
 		{
 			anti => 2,
-			name => 'High Impact Payload',
+			name => 'Punisher Cannons',
+#			name => 'High Impact Payload',
 			damage => [24, 26, 28, 30],
 			dps => [12 .. 15],
 			cooldown => 2,
@@ -1578,7 +1625,9 @@ use strict;
 		{
 			anti => 2,
 			damage => [10 .. 13],
-			#bonus => +4A,
+			bonus => {
+				armored => 4,
+			},
 			dps => [10 .. 13],
 			type => 'projectile',
 			cooldown => 2,
@@ -1832,14 +1881,14 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 110,
-			special => {
-				at => {
-					duration => 240,
-				},
-				pd => {
-					duration => 30,
-				},
-			},
+#			special => {
+#				at => {
+#					duration => 240,
+#				},
+#				pd => {
+#					duration => 30,
+#				},
+#			},
 		},
 		{
 			name => 'Corvid Reactor',
@@ -2125,7 +2174,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 60,
-			speed => 0.875,
+			speed => 3.375 - 1.875,
 		},
 	],
 },
@@ -2182,7 +2231,9 @@ use strict;
 		{
 			anti => 1,
 			damage => 25,
-			#bonus => +5A,
+			bonus => {
+				armored => 5,
+			},
 			dps => 13.5,
 			cooldown => 1.85,
 			range => 7,
@@ -2213,7 +2264,9 @@ use strict;
 		{
 			anti => 2,
 			damage => 15,
-			#bonus => + 30 B,
+			bonus => {
+				organic => 30,
+			},
 			dps => 17.4,
 			type => 'projectile',
 			cooldown => 0.8608,
@@ -2299,7 +2352,10 @@ use strict;
 		{
 			anti => 1,
 			damage => [20, 22, 24, 26],
-			#bonus => +15 (+2)L / +60 (+3)S,
+			bonus => {
+				light => [15, 17, 19, 21],
+				structure => [60, 63, 66, 69],
+			},
 			splash => 1,
 			range => 0,
 		},
@@ -2660,7 +2716,9 @@ use strict;
 		{
 			anti => 2,
 			damage => [14 .. 17],
-			#bonus => +6 (+1)Ma,
+			bonus => {
+				massive => [6 .. 9],
+			},
 			dps => [7.4, 7.9, 8.4, 8.9],
 			type => 'projectile',
 			cooldown => 1.9,