X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/803059fa9104398d4cdc539ae29bb281925d4d4e..24084c2319f2fd4f3b9ce3da6eddca31f935ee51:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 107f103..5d558d1 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -29,7 +29,6 @@ use strict;
 			anti => 1,
 			name => 'Particle beam',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
 			range => 0,
 		},
@@ -58,7 +57,6 @@ use strict;
 			anti => 3,
 			name => 'Phase disruptor',
 			damage => 20,
-			dps => 16,
 			cooldown => 1.25,
 			type => 'projectile',
 			range => 7,
@@ -92,8 +90,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Repulsor Cannon',
-			damage => [8 .. 11],
-			dps => [9.4, 10.6, 11.8, 13.0],
+			damage => 8,
+			upgrade => 1,
 			type => 'projectile',
 			cooldown => 0.85,
 			range => 5,
@@ -153,8 +151,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'Purifier beams',
-			damage => [6 .. 9],
-			dps => [16.3, 19.0, 21.7, 24.4],
+			damage => 6,
+			upgrade => 1,
 			cooldown => 2.21,
 			count => 6,
 			range => 7,
@@ -212,7 +210,6 @@ use strict;
 			anti => 3,
 			name => 'Photon overcharge',
 			damage => 20,
-			dps => 16,
 			cooldown => 1.25,
 			type => 'projectile',
 			range => 13,
@@ -254,8 +251,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Psi blades',
-			damage => [8 .. 11],
-			dps => [13.3, 15.0, 16.7, 18.4],
+			damage => 8,
+			upgrade => 1,
 			cooldown => 1.2,
 			count => 2,
 			range => 0,
@@ -302,8 +299,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'Disruption beam',
-			damage => [6 .. 9],
-			dps => [6 .. 9],
+			damage => 6,
+			upgrade => 1,
 			cooldown => 1.0,
 			range => 5,
 		},
@@ -362,8 +359,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'Particle disruptors',
-			damage => [10 .. 13],
-			dps => [6.9, 7.6, 8.3, 9.0],
+			damage => 10,
+			upgrade => 1,
 			bonus => {
 				armored => 4,
 			},
@@ -457,8 +454,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Warp blade',
-			damage => [45, 50, 55, 60],
-			dps => [26.6, 29.6, 32.6, 35.6],
+			damage => 45,
+			upgrade => 5,
 			cooldown => 1.694,
 			range => 0,
 		},
@@ -497,10 +494,11 @@ use strict;
 		{
 			anti => 3,
 			name => 'Psionic shockwave',
-			damage => [25, 28, 31, 34],
-			dps => [14.3, 16.0, 17.7, 19.4],
+			damage => 25,
+			upgrade => 3,
 			bonus => {
-				organic => [10 .. 13],
+				organic => 10,
+				-organic => 1,
 			},
 			splash => 1,
 			cooldown => 1.754,
@@ -532,11 +530,12 @@ use strict;
 		{
 			anti => 1,
 			name => 'Phase disruptors',
-			damage => [20, 22, 24, 26],
+			damage => 20,
+			upgrade => 2,
 			bonus => {
-				armored => [30, 33, 36, 39],
+				armored => 30,
+				-armored => 3,
 			},
-			dps => [13.8, 15.2, 16.6, 18.0],
 			cooldown => 1.45,
 			range => 6,
 		},
@@ -576,8 +575,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Thermal Lances',
-			damage => [15, 17, 19, 21],
-			dps => [18.2, 20.6, 23.0, 25.4],
+			damage => 15,
+			upgrade => 2,
 			splash => 'line',
 			cooldown => 1.65,
 			count => 2,
@@ -702,8 +701,8 @@ use strict;
 		{
 			anti => 2,
 			name => 'Ion Cannons',
-			damage => [5 .. 8],
-			dps => [9, 10.8, 12.6, 14.4],
+			damage => 5,
+			upgrade => 1,
 			bonus => {
 				light => 5,
 			},
@@ -763,11 +762,12 @@ use strict;
 		{
 			anti => 3,
 			name => 'Prismatic beam',
-			damage => [6 .. 9],
+			damage => 6,
+			upgrade => 1,
 			bonus => {
-				armored => [4 .. 7],
+				armored => 4,
+				-armored => 1,
 			},
-			dps => [12, 14, 16, 18],
 			cooldown => 0.5,
 			range => 6, # keeps firing until range 8
 		},
@@ -784,7 +784,7 @@ use strict;
 			attack => [
 				{
 					bonus => {
-						armored => 6, # total +10 .. 13
+						armored => 6,
 					},
 				},
 			],
@@ -820,7 +820,6 @@ use strict;
 			bonus => {
 				light => 10,
 			},
-			dps => 17.4,
 			cooldown => 0.86,
 			cost => 25,
 			maint => 1.4,
@@ -873,13 +872,23 @@ use strict;
 	},
 	attack => [
 		{
-			anti => 3,
+			anti => 2,
 			name => 'Kinetic Overload',
-			damage => [30, 33, 36, 39],
+			damage => 30,
+			upgrade => 3,
 			bonus => {
-				'massive air' => 14,
+				massive => 14,
+				-massive => 2,
 			},
-			dps => [9.1, 10.0, 10.9, 11.8],
+			type => 'projectile',
+			cooldown => 3.3,
+			range => 15,
+		},
+		{
+			anti => 1,
+			name => 'Resonance Coil',
+			damage => 30,
+			upgrade => 3,
 			type => 'projectile',
 			cooldown => 3.3,
 			range => 15,
@@ -910,7 +919,11 @@ use strict;
 	},
 	attack => [
 		{
+			anti => 3,
+			count => 8,
 			range => 8, # leash range 14
+			dps => [26.7, undef, undef, 42.6],
+			cooldown => 0.5,
 		},
 	],
 	speed => 1.875,
@@ -936,10 +949,8 @@ use strict;
 				{
 					anti => 3,
 					name => 'Interceptor Beams',
-					damage => [5 .. 8],
-#					dps => 26.7 (+5.3),
-					dps => [3.3, 4.0, 4.7, 5.4],
-#					cooldown => 0.5 (0.125/ 0.25),
+					damage => 5,
+					upgrade => 1,
 					cooldown => 3.0,
 					count => 2,
 					range => 2,
@@ -956,6 +967,11 @@ use strict;
 			gas => 150,
 			build => 80,
 			desc => 'increases Interceptor launch speed from 2/s to 4-8/s',
+			attack => [
+				{
+					cooldown => -0.375, # -0.25
+				},
+			],
 		},
 	],
 },
@@ -984,7 +1000,6 @@ use strict;
 			anti => 1,
 			name => 'Fusion cutter',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
 			range => 0,
 		},
@@ -1032,7 +1047,6 @@ use strict;
 			anti => 2,
 			name => 'Longbolt missiles',
 			damage => 12,
-			dps => 27.9,
 			cooldown => 0.8608,
 			count => 2,
 			type => 'projectile',
@@ -1087,7 +1101,6 @@ use strict;
 			anti => 1,
 			name => 'Ibiks cannon',
 			damage => 40,
-			dps => 20,
 			splash => 1,
 			cooldown => 2,
 			range => 6,
@@ -1144,8 +1157,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'C-14 rifle',
-			damage => [6 .. 9],
-			dps => [7, 8.2, 9.4, 10.6],
+			damage => 6,
+			upgrade => 1,
 			cooldown => 0.8608,
 			range => 5,
 		},
@@ -1172,8 +1185,8 @@ use strict;
 			attack => [
 				{
 					anti => 3,
-					damage => [6 .. 9],
-					dps => [10.5, 12.2, 13.9, 15.6],
+					damage => 6,
+					upgrade => 1,
 					cooldown => 0.5739,
 					range => 5,
 				},
@@ -1204,11 +1217,12 @@ use strict;
 		{
 			anti => 1,
 			name => 'Punisher grenades',
-			damage => [10 .. 13],
+			damage => 10,
+			upgrade => 1,
 			bonus => {
-				armored => [10 .. 13],
+				armored => 10,
+				-armored => 1,
 			},
-			dps => [6.7, 7.4, 8.1, 8.8],
 			type => 'projectile',
 			cooldown => 1.5,
 			range => 6,
@@ -1226,11 +1240,12 @@ use strict;
 			attack => [
 				{
 					anti => 1,
-					damage => [10 .. 13],
+					damage => 10,
+					upgrade => 1,
 					bonus => {
-						armored => [10 .. 13],
+						armored => 10,
+						-armored => 1,
 					},
-					dps => [10 .. 13],
 					type => 'projectile',
 					cooldown => 1.0,
 					range => 6,
@@ -1275,8 +1290,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'P-45 Reaper pistol',
-			damage => [4 .. 7],
-			dps => [7.3, 9.1, 10.9, 12.7],
+			damage => 4,
+			upgrade => 1,
 			cooldown => 1.1,
 			count => 2,
 			range => 4.5,
@@ -1314,11 +1329,12 @@ use strict;
 		{
 			anti => 3,
 			name => 'C-10 rifle',
-			damage => [10 .. 13],
+			damage => 10,
+			upgrade => 1,
 			bonus => {
-				light => [10 .. 13],
+				light => 10,
+				-light => 1,
 			},
-			dps => [6.7, 7.4, 8.1, 8.8],
 			cooldown => 1.5,
 			range => 6,
 		},
@@ -1382,11 +1398,12 @@ use strict;
 		{
 			anti => 1,
 			name => 'Infernal flamethrower',
-			damage => [8 .. 11],
+			damage => 8,
+			upgrade => 1,
 			bonus => {
-				light => [6 .. 9],
+				light => 6,
+				-light => 1,
 			},
-			dps => [3.2, 3.6, 4.0, 4.4],
 			splash => 'line',
 			cooldown => 2.5,
 			range => 5,
@@ -1410,9 +1427,11 @@ use strict;
 			build => 110,
 			attack => [
 				{
-					damage => [6 .. 9],
+					damage => 6,
+					upgrade => 1,
 					bonus => {
-						light => [5, 5, 5, 5], # total [11 .. 14]
+						light => 5,
+						-light => 0,
 					},
 				},
 			],
@@ -1441,8 +1460,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Napalm Spray',
-			damage => [18, 20, 22, 24],
-			dps => [9 .. 12],
+			damage => 18,
+			upgrade => 2,
 			splash => 1,
 			cooldown => 2,
 			range => 2,
@@ -1467,7 +1486,8 @@ use strict;
 			attack => [
 				{
 					bonus => {
-						light => [12 .. 15],
+						light => 12,
+						-light => 1,
 					},
 				},
 			],
@@ -1538,11 +1558,12 @@ use strict;
 		{
 			anti => 1,
 			name => '90 mm twin cannon',
-			damage => [15, 17, 19, 21],
+			damage => 15,
+			upgrade => 2,
 			bonus => {
-				armored => [10 .. 13],
+				armored => 10,
+				-armored => 1,
 			},
-			dps => [14.4, 16.3, 18.2, 20.1],
 			cooldown => 1.04,
 			range => 7,
 		},
@@ -1557,11 +1578,12 @@ use strict;
 				{
 					anti => 1,
 					name => '120 mm shock cannon',
-					damage => [35, 38, 41, 44],
+					damage => 35,
+					upgrade => 3,
 					bonus => {
-						armored => [15, 17, 19, 21],
+						armored => 15,
+						-armored => 2,
 					},
-					dps => [11.7, 12.7, 13.7, 14.7],
 					splash => 1,
 					cooldown => 3,
 					range => 13,
@@ -1596,8 +1618,8 @@ use strict;
 		{
 			anti => 1,
 			name => "Thor's Hammer",
-			damage => [30, 33, 36, 39],
-			dps => [46.9, 51.6, 56.3, 61.0],
+			damage => 30,
+			upgrade => 3,
 			cooldown => 1.28,
 			range => 7,
 			count => 2,
@@ -1606,11 +1628,12 @@ use strict;
 			anti => 2,
 			name => 'Javelin Missiles',
 #			name => 'Explosive Payload',
-			damage => [6 .. 9],
+			damage => 6,
+			upgrade => 1,
 			bonus => {
-				'light air' => [6 .. 9],
+				light => 6,
+				-light => 1,
 			},
-			dps => [8, 9.3, 10.6, 11.9],
 			splash => 1,
 			type => 'projectile',
 			cooldown => 3,
@@ -1621,8 +1644,8 @@ use strict;
 			anti => 2,
 			name => 'Punisher Cannons',
 #			name => 'High Impact Payload',
-			damage => [24, 26, 28, 30],
-			dps => [12 .. 15],
+			damage => 24,
+			upgrade => 2,
 			cooldown => 2,
 			range => 10,
 		},
@@ -1652,11 +1675,11 @@ use strict;
 		{
 			anti => 2,
 			name => 'Lanzer torpedoes',
-			damage => [10 .. 13],
+			damage => 10,
+			upgrade => 1,
 			bonus => {
 				armored => 4,
 			},
-			dps => [10 .. 13],
 			type => 'projectile',
 			cooldown => 2,
 			count => 2,
@@ -1674,8 +1697,8 @@ use strict;
 				{
 					anti => 1,
 					name => 'Twin gatling cannon',
-					damage => [12 .. 15],
-					dps => [12 .. 15],
+					damage => 12,
+					upgrade => 1,
 					cooldown => 1,
 					range => 6,
 				},
@@ -1755,8 +1778,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Backlash rockets',
-			damage => [12 .. 15],
-			dps => [19.2, 20.8, 22.4, 24.0],
+			damage => 12,
+			upgrade => 1,
 			type => 'projectile',
 			cooldown => 1.25,
 			count => 2,
@@ -1820,7 +1843,6 @@ use strict;
 					anti => 3,
 					name => '12 mm gauss cannon',
 					damage => 8,
-					dps => 10,
 					cooldown => 0.8,
 					range => 6,
 				},
@@ -1954,8 +1976,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'ATS laser batteries',
-			damage => [8 .. 11],
-			dps => [35.6, 40.0, 44.4, 48.8],
+			damage => 8,
+			upgrade => 1,
 			cooldown => 0.225,
 			type => 'projectile',
 			range => 6,
@@ -1963,8 +1985,8 @@ use strict;
 		{
 			anti => 2,
 			name => 'ATS laser batteries',
-			damage => [6 .. 9],
-			dps => [26.7, 31.1, 35.5, 39.9],
+			damage => 6,
+			upgrade => 1,
 			cooldown => 0.225,
 			type => 'projectile',
 			range => 6,
@@ -2025,7 +2047,6 @@ use strict;
 			anti => 1,
 			name => 'Claws',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
 			range => 0,
 		},
@@ -2055,8 +2076,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Claws',
-			damage => [4 .. 7],
-			dps => [8, 10, 12, 14],
+			damage => 4,
+			upgrade => 1,
 			cooldown => 1.0,
 			type => 'projectile', # except if range < 3
 			range => 5,
@@ -2065,8 +2086,8 @@ use strict;
 		{
 			anti => 2,
 			name => 'Acid Spines',
-			damage => [9 .. 12],
-			dps => [9 .. 12],
+			damage => 9,
+			upgrade => 1,
 			cooldown => 1.0,
 			type => 'projectile', # except if range < 3
 			range => 7,
@@ -2272,7 +2293,6 @@ use strict;
 			bonus => {
 				armored => 5,
 			},
-			dps => 13.5,
 			cooldown => 1.85,
 			range => 7,
 		},
@@ -2306,7 +2326,6 @@ use strict;
 			bonus => {
 				organic => 30,
 			},
-			dps => 17.4,
 			type => 'projectile',
 			cooldown => 0.8608,
 			range => 7,
@@ -2338,8 +2357,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Claws',
-			damage => [5 .. 8],
-			dps => [7.2, 8.6, 10.0, 11.4],
+			damage => 5,
+			upgrade => 1,
 			cooldown => 0.696,
 		},
 	],
@@ -2356,7 +2375,6 @@ use strict;
 			attack => [
 				{
 					anti => 1,
-					dps => [8.5, 10.2, 11.9, 13.6],
 					cooldown => -0.109,
 				},
 			],
@@ -2392,10 +2410,13 @@ use strict;
 		{
 			anti => 1,
 			name => 'Volatile Burst',
-			damage => [20, 22, 24, 26],
+			damage => 20,
+			upgrade => 2,
 			bonus => {
-				light => [15, 17, 19, 21],
-				structure => [60, 63, 66, 69],
+				light => 15,
+				-light => 2,
+				structure => 60,
+				-structure => 3,
 			},
 			splash => 1,
 			range => 0,
@@ -2436,8 +2457,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Acid Saliva', # Claws melee
-			damage => [16, 18, 20, 22],
-			dps => [8 .. 11],
+			damage => 16,
+			upgrade => 2,
 			cooldown => 2.0,
 		},
 	],
@@ -2495,8 +2516,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'Needle spines', # Scythe melee
-			damage => [12 .. 15],
-			dps => [16, 17.3, 18.6, 19.9],
+			damage => 12,
+			upgrade => 1,
 			type => 'projectile', # except melee
 			cooldown => 0.75,
 			range => 5,
@@ -2588,7 +2609,6 @@ use strict;
 				{
 					anti => 3,
 					damage => 8,
-					dps => 9.3,
 					cooldown => 0.8608,
 					range => 5,
 				},
@@ -2648,9 +2668,12 @@ use strict;
 	attack => [
 		{
 			anti => 1,
-			dps => [27.9, 30.2, 32.5, 34.8],
+			dps => [16.7, undef, undef, 20.8], # 20/.6 * 2 /60*25
 			type => 'projectile',
-			cooldown => 0.86,
+			count => 2,
+			cooldown => 60,
+			duration => 25,
+			range => 3*25, # locust speed * duration = theoretical walk limit
 		},
 	],
 	speed => 2.95,
@@ -2672,8 +2695,8 @@ use strict;
 				{
 					anti => 1,
 					name => 'Acid Spit',
-					damage => [12 .. 15],
-					dps => [14.0, 15.2, 16.4, 17.6],
+					damage => 12,
+					upgrade => 1,
 					type => 'projectile',
 					cooldown => 0.6,
 					range => 3,
@@ -2721,8 +2744,8 @@ use strict;
 		{
 			anti => 3,
 			name => 'Glaive Wurm',
-			damage => [9 .. 12],
-			dps => [5.9, 6.6, 7.3, 8.0],
+			damage => 9,
+			upgrade => 1,
 			splash => 'bounce',
 			psionic => 1,
 			cooldown => 1.5246,
@@ -2761,11 +2784,12 @@ use strict;
 		{
 			anti => 2,
 			name => 'Parasite Spores',
-			damage => [14 .. 17],
+			damage => 14,
+			upgrade => 1,
 			bonus => {
-				massive => [6 .. 9],
+				massive => 6,
+				-massive => 1,
 			},
-			dps => [7.4, 7.9, 8.4, 8.9],
 			type => 'projectile',
 			cooldown => 1.9,
 			range => 6,
@@ -2807,8 +2831,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Broodling Strike',
-			damage => [20, 22, 24, 26],
-			dps => [8.0, 8.8, 9.6, 10.4],
+			damage => 20,
+			upgrade => 2,
 			cooldown => 2.5,
 			range => 9.5,
 		},
@@ -2836,8 +2860,8 @@ use strict;
 				{
 					anti => 1,
 					name => 'Claws',
-					damage => [4 .. 7],
-					dps => [6.2, 7.7, 9.2, 10.7],
+					damage => 4,
+					upgrade => 1,
 					cooldown => 0.6455,
 					range => 0,
 				},
@@ -2927,8 +2951,8 @@ use strict;
 		{
 			anti => 1,
 			name => 'Kaiser Blades',
-			damage => [35, 38, 41, 44],
-			dps => [40.7, 44.2, 47.7, 51.2],
+			damage => 35,
+			upgrade => 3,
 			splash => 1,
 			cooldown => 0.861,
 			range => 1,