From 72b206b172f32b65161b0377ea01fb4e7afa4df3 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 13 Jun 2015 03:26:49 +0200 Subject: [PATCH] sc: drop precalculated dps data Shown values derived from other columns is assumed to be more correct in cases of disparities. --- sc-units.inc.pl | 45 +++------------------------------------------ sc.plp | 1 + 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/sc-units.inc.pl b/sc-units.inc.pl index c440f95..47658d1 100644 --- a/sc-units.inc.pl +++ b/sc-units.inc.pl @@ -24,7 +24,6 @@ attack => { ground => { name => "Particle Beam", damage => 5, - dps => 7, cooldown => 22, }, range => 1, @@ -52,7 +51,6 @@ armor => 0, attack => { ground => { damage => 20, - dps => 27, cooldown => 22, }, air => 'ground', @@ -85,7 +83,6 @@ attack => { ground => { name => "Psi Blades", damage => [16, 18, 20, 22], - dps => [22, undef, undef, 30], cooldown => 22, }, range => 1, @@ -125,7 +122,6 @@ attack => { ground => { name => "Phase Disruptor", damage => [20, 22, 24, 26], - dps => [20, 22, 24, 26], type => 'explosive', cooldown => 30, }, @@ -224,7 +220,6 @@ attack => { ground => { name => "Warp Blades", damage => [40, 43, 46, 49], - dps => [40, 43, 46, 49], cooldown => 30, }, range => 1, @@ -263,7 +258,6 @@ attack => { ground => { name => "Psionic Shockwave", damage => [30, 33, 36, 39], - dps => [45, undef, undef, 59], cooldown => 20, splash => 1, }, @@ -361,12 +355,10 @@ armor => 0, attack => { ground => { damage => [8, 9, 10, 11], - dps => [8, 9, 10, 11], cooldown => 30, }, air => { damage => [28, 30, 32, 34], - dps => [38, undef, undef, 46], type => 'explosive', cooldown => 22, }, @@ -412,7 +404,6 @@ armor => 1, attack => { air => { damage => [5, 6, 7, 8], - dps => [19, undef, undef, 30], cooldown => 8, splash => 1, type => 'explosive', @@ -489,7 +480,6 @@ special => [ attack => { ground => { damage => [6, 7, 8, 9], - dps => [4, 5, 5, 6], cooldown => 43, # approximately 37 according to liquipedia build => 20, }, @@ -531,7 +521,6 @@ armor => 1, attack => { ground => { damage => [10, 11, 12, 13], - dps => [7, undef, undef, 9], cooldown => 45, type => 'explosive', }, @@ -597,7 +586,6 @@ armor => 0, attack => { ground => { damage => 100, - dps => 50, cooldown => 60, splash => 1, cost => 15, @@ -617,7 +605,6 @@ upgrade => [ attack => { ground => { damage => 125 - 100, - dps => 63 - 50, }, }, }, @@ -738,7 +725,6 @@ armor => 0, attack => { ground => { damage => 5, - dps => 10, cooldown => 15, }, range => 1, @@ -763,7 +749,6 @@ armor => 0, attack => { air => { damage => 20, - dps => 40, cooldown => 15, type => 'explosive', }, @@ -792,7 +777,6 @@ armor => 0, attack => { ground => { damage => [6, 7, 8, 9], - dps => [12, undef, undef, 18], cooldown => 15, }, air => 'ground', @@ -823,7 +807,6 @@ special => [ attack => { ground => { cooldown => 7.5, - dps => [24, undef, undef, 36], }, air => 'ground', }, @@ -847,7 +830,6 @@ armor => 1, attack => { ground => { damage => [16, 18, 20, 22], - dps => [22, undef, undef, 30], cooldown => 22, splash => 1, type => 'implosive', @@ -868,8 +850,9 @@ special => [ desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health', speed => 17, attack => { - cooldown => 11, - dps => [44, undef, undef, 60], + ground => { + cooldown => 11, + }, }, duration => 220 / $FPS, }, @@ -894,7 +877,6 @@ armor => 0, attack => { ground => { damage => [10, 11, 12, 13], - dps => [14, undef, undef, 18], cooldown => 22, type => 'implosive', }, @@ -1039,7 +1021,6 @@ armor => 0, attack => { ground => { damage => [20, 22, 24, 26], - dps => [20, 22, 24, 26], cooldown => 30, type => 'implosive', }, @@ -1102,7 +1083,6 @@ armor => 1, attack => { ground => { damage => [30, 33, 36, 39], - dps => [24, undef, undef, 32], cooldown => 37, type => 'explosive', }, @@ -1121,7 +1101,6 @@ special => [ attack => { ground => { damage => [70, 75, 80, 85], - dps => [28, 30, 32, 34], cooldown => 75, splash => 1, type => 'explosive', @@ -1151,12 +1130,10 @@ armor => 1, attack => { ground => { damage => [12, 13, 14, 15], - dps => [16, undef, undef, 20], cooldown => 22, }, air => { damage => [20, 24, 28, 32], - dps => [27, undef, undef, 44], type => 'explosive', cooldown => 22, }, @@ -1195,12 +1172,10 @@ armor => 0, attack => { ground => { damage => [8, 9, 10, 11], - dps => [8, 9, 10, 11], cooldown => 30, }, air => { damage => [20, 22, 24, 26], - dps => [27, undef, undef, 35], cooldown => 22, type => 'explosive', }, @@ -1251,7 +1226,6 @@ armor => 3, attack => { ground => { damage => [25, 28, 31, 34], - dps => [25, 28, 31, 34], cooldown => 30, }, air => 'ground', @@ -1374,7 +1348,6 @@ armor => 2, attack => { air => { damage => [6, 7, 8, 9], - dps => [23, undef, undef, 25], cooldown => 64, splash => 1, type => 'explosive', @@ -1422,7 +1395,6 @@ armor => 0, attack => { ground => { damage => 5, - dps => 7, cooldown => 22, }, range => 1, @@ -1520,7 +1492,6 @@ armor => 2, attack => { ground => { damage => 40, - dps => 38, cooldown => 32, type => 'explosive', }, @@ -1543,7 +1514,6 @@ armor => 0, attack => { air => { damage => 15, - dps => 30, cooldown => 15, }, range => 7, @@ -1568,7 +1538,6 @@ armor => 0, attack => { ground => { damage => [5, 6, 7, 8], - dps => [18, undef, undef, 29], # 29 is an estimate cooldown => 8, }, range => 1, @@ -1591,7 +1560,6 @@ upgrade => [ attack => { ground => { cooldown => 6, - dps => [undef, undef, undef, 42 - 29], }, }, }, @@ -1614,7 +1582,6 @@ armor => 0, attack => { ground => { damage => [10, 11, 12, 13], - dps => [20, 22, 24, 26], cooldown => 15, type => 'explosive', }, @@ -1665,7 +1632,6 @@ armor => 1, attack => { ground => { damage => [20, 22, 24, 26], - dps => [16, undef, undef, 21], cooldown => 37, splash => 'line', }, @@ -1736,7 +1702,6 @@ special => [ attack => { ground => { damage => [4, 5, 6, 7], - dps => [8, 10, 12, 14], cooldown => 15, }, range => 1, @@ -1811,7 +1776,6 @@ armor => 0, attack => { ground => { damage => [9 .. 12], - dps => [9, 10, 11, 12], cooldown => 30, splash => 'bounce', }, @@ -1852,7 +1816,6 @@ armor => 2, attack => { ground => { damage => [20, 22, 24, 26], - dps => [20, 22, 24, 26], cooldown => 30, }, range => 8, @@ -1878,7 +1841,6 @@ armor => 2, attack => { air => { damage => [25, 27, 29, 31], - dps => [8, undef, undef, 9], cooldown => 100, type => 'explosive', }, @@ -1953,7 +1915,6 @@ armor => 1, attack => { ground => { damage => [20, 23, 26, 29], - dps => [40, 46, 52, 58], cooldown => 15, }, range => 1, diff --git a/sc.plp b/sc.plp index 4105bec..8a63e8c 100644 --- a/sc.plp +++ b/sc.plp @@ -245,6 +245,7 @@ sub showrange { map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) } map { ref $_ ? @{$_} : $_ } $attack->{damage} + #TODO: upgrade (zergling) ]; $out .= '' . showrange($row, 'attack', $area, 'dps'); return $tagbase . $out; -- 2.30.0