From c1d81128ab5cd72e960f1033a89ff8f1fcfdf57f Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 20 Jun 2015 06:55:07 +0200 Subject: [PATCH] sc: omit precalculated attack dps from unit data --- sc-units-hots.inc.pl | 76 ++++++++++---------------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl index 107f103..5cedf2e 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, @@ -93,7 +91,6 @@ use strict; anti => 1, name => 'Repulsor Cannon', damage => [8 .. 11], - dps => [9.4, 10.6, 11.8, 13.0], type => 'projectile', cooldown => 0.85, range => 5, @@ -154,7 +151,6 @@ use strict; anti => 3, name => 'Purifier beams', damage => [6 .. 9], - dps => [16.3, 19.0, 21.7, 24.4], cooldown => 2.21, count => 6, range => 7, @@ -212,7 +208,6 @@ use strict; anti => 3, name => 'Photon overcharge', damage => 20, - dps => 16, cooldown => 1.25, type => 'projectile', range => 13, @@ -255,7 +250,6 @@ use strict; anti => 1, name => 'Psi blades', damage => [8 .. 11], - dps => [13.3, 15.0, 16.7, 18.4], cooldown => 1.2, count => 2, range => 0, @@ -303,7 +297,6 @@ use strict; anti => 3, name => 'Disruption beam', damage => [6 .. 9], - dps => [6 .. 9], cooldown => 1.0, range => 5, }, @@ -363,7 +356,6 @@ use strict; anti => 3, name => 'Particle disruptors', damage => [10 .. 13], - dps => [6.9, 7.6, 8.3, 9.0], bonus => { armored => 4, }, @@ -458,7 +450,6 @@ use strict; anti => 1, name => 'Warp blade', damage => [45, 50, 55, 60], - dps => [26.6, 29.6, 32.6, 35.6], cooldown => 1.694, range => 0, }, @@ -498,7 +489,6 @@ use strict; anti => 3, name => 'Psionic shockwave', damage => [25, 28, 31, 34], - dps => [14.3, 16.0, 17.7, 19.4], bonus => { organic => [10 .. 13], }, @@ -536,7 +526,6 @@ use strict; bonus => { armored => [30, 33, 36, 39], }, - dps => [13.8, 15.2, 16.6, 18.0], cooldown => 1.45, range => 6, }, @@ -577,7 +566,6 @@ use strict; anti => 1, name => 'Thermal Lances', damage => [15, 17, 19, 21], - dps => [18.2, 20.6, 23.0, 25.4], splash => 'line', cooldown => 1.65, count => 2, @@ -703,7 +691,6 @@ use strict; anti => 2, name => 'Ion Cannons', damage => [5 .. 8], - dps => [9, 10.8, 12.6, 14.4], bonus => { light => 5, }, @@ -767,7 +754,6 @@ use strict; bonus => { armored => [4 .. 7], }, - dps => [12, 14, 16, 18], cooldown => 0.5, range => 6, # keeps firing until range 8 }, @@ -820,7 +806,6 @@ use strict; bonus => { light => 10, }, - dps => 17.4, cooldown => 0.86, cost => 25, maint => 1.4, @@ -873,13 +858,20 @@ use strict; }, attack => [ { - anti => 3, + anti => 2, name => 'Kinetic Overload', damage => [30, 33, 36, 39], bonus => { - 'massive air' => 14, + massive => [14, 16, 18, 20], }, - dps => [9.1, 10.0, 10.9, 11.8], + type => 'projectile', + cooldown => 3.3, + range => 15, + }, + { + anti => 1, + name => 'Resonance Coil', + damage => [30, 33, 36, 39], type => 'projectile', cooldown => 3.3, range => 15, @@ -911,6 +903,8 @@ use strict; attack => [ { range => 8, # leash range 14 + dps => [13.3, undef, undef, 42.6], + cooldown => 0.5, }, ], speed => 1.875, @@ -937,9 +931,6 @@ 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), cooldown => 3.0, count => 2, range => 2, @@ -956,6 +947,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 +980,6 @@ use strict; anti => 1, name => 'Fusion cutter', damage => 5, - dps => 3.3, cooldown => 1.5, range => 0, }, @@ -1032,7 +1027,6 @@ use strict; anti => 2, name => 'Longbolt missiles', damage => 12, - dps => 27.9, cooldown => 0.8608, count => 2, type => 'projectile', @@ -1087,7 +1081,6 @@ use strict; anti => 1, name => 'Ibiks cannon', damage => 40, - dps => 20, splash => 1, cooldown => 2, range => 6, @@ -1145,7 +1138,6 @@ use strict; anti => 3, name => 'C-14 rifle', damage => [6 .. 9], - dps => [7, 8.2, 9.4, 10.6], cooldown => 0.8608, range => 5, }, @@ -1173,7 +1165,6 @@ use strict; { anti => 3, damage => [6 .. 9], - dps => [10.5, 12.2, 13.9, 15.6], cooldown => 0.5739, range => 5, }, @@ -1208,7 +1199,6 @@ use strict; bonus => { armored => [10 .. 13], }, - dps => [6.7, 7.4, 8.1, 8.8], type => 'projectile', cooldown => 1.5, range => 6, @@ -1230,7 +1220,6 @@ use strict; bonus => { armored => [10 .. 13], }, - dps => [10 .. 13], type => 'projectile', cooldown => 1.0, range => 6, @@ -1276,7 +1265,6 @@ use strict; anti => 1, name => 'P-45 Reaper pistol', damage => [4 .. 7], - dps => [7.3, 9.1, 10.9, 12.7], cooldown => 1.1, count => 2, range => 4.5, @@ -1318,7 +1306,6 @@ use strict; bonus => { light => [10 .. 13], }, - dps => [6.7, 7.4, 8.1, 8.8], cooldown => 1.5, range => 6, }, @@ -1386,7 +1373,6 @@ use strict; bonus => { light => [6 .. 9], }, - dps => [3.2, 3.6, 4.0, 4.4], splash => 'line', cooldown => 2.5, range => 5, @@ -1442,7 +1428,6 @@ use strict; anti => 1, name => 'Napalm Spray', damage => [18, 20, 22, 24], - dps => [9 .. 12], splash => 1, cooldown => 2, range => 2, @@ -1542,7 +1527,6 @@ use strict; bonus => { armored => [10 .. 13], }, - dps => [14.4, 16.3, 18.2, 20.1], cooldown => 1.04, range => 7, }, @@ -1561,7 +1545,6 @@ use strict; bonus => { armored => [15, 17, 19, 21], }, - dps => [11.7, 12.7, 13.7, 14.7], splash => 1, cooldown => 3, range => 13, @@ -1597,7 +1580,6 @@ use strict; anti => 1, name => "Thor's Hammer", damage => [30, 33, 36, 39], - dps => [46.9, 51.6, 56.3, 61.0], cooldown => 1.28, range => 7, count => 2, @@ -1610,7 +1592,6 @@ use strict; bonus => { 'light air' => [6 .. 9], }, - dps => [8, 9.3, 10.6, 11.9], splash => 1, type => 'projectile', cooldown => 3, @@ -1622,7 +1603,6 @@ use strict; name => 'Punisher Cannons', # name => 'High Impact Payload', damage => [24, 26, 28, 30], - dps => [12 .. 15], cooldown => 2, range => 10, }, @@ -1656,7 +1636,6 @@ use strict; bonus => { armored => 4, }, - dps => [10 .. 13], type => 'projectile', cooldown => 2, count => 2, @@ -1675,7 +1654,6 @@ use strict; anti => 1, name => 'Twin gatling cannon', damage => [12 .. 15], - dps => [12 .. 15], cooldown => 1, range => 6, }, @@ -1756,7 +1734,6 @@ use strict; anti => 1, name => 'Backlash rockets', damage => [12 .. 15], - dps => [19.2, 20.8, 22.4, 24.0], type => 'projectile', cooldown => 1.25, count => 2, @@ -1820,7 +1797,6 @@ use strict; anti => 3, name => '12 mm gauss cannon', damage => 8, - dps => 10, cooldown => 0.8, range => 6, }, @@ -1955,7 +1931,6 @@ use strict; anti => 1, name => 'ATS laser batteries', damage => [8 .. 11], - dps => [35.6, 40.0, 44.4, 48.8], cooldown => 0.225, type => 'projectile', range => 6, @@ -1964,7 +1939,6 @@ use strict; anti => 2, name => 'ATS laser batteries', damage => [6 .. 9], - dps => [26.7, 31.1, 35.5, 39.9], cooldown => 0.225, type => 'projectile', range => 6, @@ -2025,7 +1999,6 @@ use strict; anti => 1, name => 'Claws', damage => 5, - dps => 3.3, cooldown => 1.5, range => 0, }, @@ -2056,7 +2029,6 @@ use strict; anti => 1, name => 'Claws', damage => [4 .. 7], - dps => [8, 10, 12, 14], cooldown => 1.0, type => 'projectile', # except if range < 3 range => 5, @@ -2066,7 +2038,6 @@ use strict; anti => 2, name => 'Acid Spines', damage => [9 .. 12], - dps => [9 .. 12], cooldown => 1.0, type => 'projectile', # except if range < 3 range => 7, @@ -2272,7 +2243,6 @@ use strict; bonus => { armored => 5, }, - dps => 13.5, cooldown => 1.85, range => 7, }, @@ -2306,7 +2276,6 @@ use strict; bonus => { organic => 30, }, - dps => 17.4, type => 'projectile', cooldown => 0.8608, range => 7, @@ -2339,7 +2308,6 @@ use strict; anti => 1, name => 'Claws', damage => [5 .. 8], - dps => [7.2, 8.6, 10.0, 11.4], cooldown => 0.696, }, ], @@ -2356,7 +2324,6 @@ use strict; attack => [ { anti => 1, - dps => [8.5, 10.2, 11.9, 13.6], cooldown => -0.109, }, ], @@ -2437,7 +2404,6 @@ use strict; anti => 1, name => 'Acid Saliva', # Claws melee damage => [16, 18, 20, 22], - dps => [8 .. 11], cooldown => 2.0, }, ], @@ -2496,7 +2462,6 @@ use strict; anti => 3, name => 'Needle spines', # Scythe melee damage => [12 .. 15], - dps => [16, 17.3, 18.6, 19.9], type => 'projectile', # except melee cooldown => 0.75, range => 5, @@ -2588,7 +2553,6 @@ use strict; { anti => 3, damage => 8, - dps => 9.3, cooldown => 0.8608, range => 5, }, @@ -2673,7 +2637,6 @@ use strict; anti => 1, name => 'Acid Spit', damage => [12 .. 15], - dps => [14.0, 15.2, 16.4, 17.6], type => 'projectile', cooldown => 0.6, range => 3, @@ -2722,7 +2685,6 @@ use strict; anti => 3, name => 'Glaive Wurm', damage => [9 .. 12], - dps => [5.9, 6.6, 7.3, 8.0], splash => 'bounce', psionic => 1, cooldown => 1.5246, @@ -2765,7 +2727,6 @@ use strict; bonus => { massive => [6 .. 9], }, - dps => [7.4, 7.9, 8.4, 8.9], type => 'projectile', cooldown => 1.9, range => 6, @@ -2808,7 +2769,6 @@ use strict; anti => 1, name => 'Broodling Strike', damage => [20, 22, 24, 26], - dps => [8.0, 8.8, 9.6, 10.4], cooldown => 2.5, range => 9.5, }, @@ -2837,7 +2797,6 @@ use strict; anti => 1, name => 'Claws', damage => [4 .. 7], - dps => [6.2, 7.7, 9.2, 10.7], cooldown => 0.6455, range => 0, }, @@ -2928,7 +2887,6 @@ use strict; anti => 1, name => 'Kaiser Blades', damage => [35, 38, 41, 44], - dps => [40.7, 44.2, 47.7, 51.2], splash => 1, cooldown => 0.861, range => 1, -- 2.30.0