sc: show upgrade range in [Carrier] attack count

[sheet.git] / sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 466595c249ecf2991670c0faabb381f8fb50ac1d..94918dc7e71eef3170e83ed6f6876b7ae7d6801b 100644 (file)
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -89,7 +89,8 @@ attack => [
        {
                anti => 1,
                name => "Psi Blades",
-               damage => [16, 18, 20, 22],
+               damage => 16,
+               upgrade => 2,
                cooldown => 22 / $FPS,
                range => 1,
        },
@@ -129,7 +130,8 @@ attack => [
        {
                anti => 3,
                name => "Phase Disruptor",
-               damage => [20, 22, 24, 26],
+               damage => 20,
+               upgrade => 2,
                type => 'explosive',
                cooldown => 30 / $FPS,
                range => 4,
@@ -229,7 +231,8 @@ attack => [
        {
                anti => 1,
                name => "Warp Blades",
-               damage => [40, 43, 46, 49],
+               damage => 40,
+               upgrade => 3,
                cooldown => 30 / $FPS,
                range => 1,
        },
@@ -268,7 +271,8 @@ attack => [
        {
                anti => 3,
                name => "Psionic Shockwave",
-               damage => [30, 33, 36, 39],
+               damage => 30,
+               upgrade => 3,
                cooldown => 20 / $FPS,
                splash => 1,
                range => 2,
@@ -363,13 +367,15 @@ armor => 0,
 attack => [
        {
                anti => 1,
-               damage => [8, 9, 10, 11],
+               damage => 8,
+               upgrade => 1,
                cooldown => 30 / $FPS,
                range => 4,
        },
        {
                anti => 2,
-               damage => [28, 30, 32, 34],
+               damage => 28,
+               upgrade => 2,
                type => 'explosive',
                cooldown => 22 / $FPS,
                range => 4,
@@ -415,7 +421,8 @@ armor => 1,
 attack => [
        {
                anti => 2,
-               damage => [5, 6, 7, 8],
+               damage => 5,
+               upgrade => 1,
                cooldown => 8 / $FPS,
                splash => 1,
                type => 'explosive',
@@ -469,7 +476,7 @@ armor => 4,
 attack => [
        {
                anti => 3,
-               dps => [17, undef, undef, 49],
+               dps => [17, undef, undef, 25],
                count => 4,
                range => 8,
        },
@@ -492,7 +499,8 @@ special => [
                attack => [
                        {
                                anti => 3,
-                               damage => [6, 7, 8, 9],
+                               damage => 6,
+                               upgrade => 1,
                                cooldown => 43 / $FPS, # approximately 37 according to liquipedia
                                build => 20,
                                range => 0,
@@ -505,9 +513,12 @@ special => [
 upgrade => [
        {
                name => 'Carrier Capacity',
-               damage => {
-                       count => 8-4,
-               },
+               attack => [
+                       {
+                               dps => [17, undef, undef, 24],
+                               count => 8-4,
+                       },
+               ],
        },
 ],
 counter => ['wraith', 'corsair', 'scourge'],
@@ -533,7 +544,8 @@ armor => 1,
 attack => [
        {
                anti => 3,
-               damage => [10, 11, 12, 13],
+               damage => 10,
+               upgrade => 1,
                cooldown => 45 / $FPS,
                type => 'explosive',
                range => 5,
@@ -790,7 +802,8 @@ armor => 0,
 attack => [
        {
                anti => 3,
-               damage => [6, 7, 8, 9],
+               damage => 6,
+               upgrade => 1,
                cooldown => 15 / $FPS,
                range => 4,
        },
@@ -845,7 +858,8 @@ armor => 1,
 attack => [
        {
                anti => 1,
-               damage => [16, 18, 20, 22],
+               damage => 16,
+               upgrade => 2,
                cooldown => 22 / $FPS,
                splash => 1,
                type => 'implosive',
@@ -894,7 +908,8 @@ armor => 0,
 attack => [
        {
                anti => 3,
-               damage => [10, 11, 12, 13],
+               damage => 10,
+               upgrade => 1,
                cooldown => 22 / $FPS,
                type => 'implosive',
                range => 7,
@@ -909,12 +924,12 @@ upgrade => [
                gas => 150,
                build => 166,
                sight => 11 - 9,
-               special => {
-                       ns => {
-                               # nuke
-                               range => 10-8,
-                       },
-               },
+#              special => {
+#                      ns => {
+#                              # nuke
+#                              range => 10-8,
+#                      },
+#              },
        },
        {
                name => 'Moebius Reactor',
@@ -1036,7 +1051,8 @@ armor => 0,
 attack => [
        {
                anti => 1,
-               damage => [20, 22, 24, 26],
+               damage => 20,
+               upgrade => 2,
                cooldown => 30 / $FPS,
                type => 'implosive',
                range => 5,
@@ -1100,7 +1116,8 @@ armor => 1,
 attack => [
        {
                anti => 1,
-               damage => [30, 33, 36, 39],
+               damage => 30,
+               upgrade => 3,
                cooldown => 37 / $FPS,
                type => 'explosive',
                range => 7,
@@ -1119,7 +1136,8 @@ special => [
                attack => [
                        {
                                anti => 1,
-                               damage => [70, 75, 80, 85],
+                               damage => 70,
+                               upgrade => 5,
                                cooldown => 75 / $FPS,
                                splash => 1,
                                type => 'explosive',
@@ -1149,13 +1167,15 @@ armor => 1,
 attack => [
        {
                anti => 1,
-               damage => [12, 13, 14, 15],
+               damage => 12,
+               upgrade => 1,
                cooldown => 22 / $FPS,
                range => 5,
        },
        {
                anti => 2,
-               damage => [20, 24, 28, 32],
+               damage => 20,
+               upgrade => 4,
                type => 'explosive',
                cooldown => 22 / $FPS,
                range => 5,
@@ -1195,13 +1215,15 @@ armor => 0,
 attack => [
        {
                anti => 1,
-               damage => [8, 9, 10, 11],
+               damage => 8,
+               upgrade => 1,
                cooldown => 30 / $FPS,
                range => 5,
        },
        {
                anti => 2,
-               damage => [20, 22, 24, 26],
+               damage => 20,
+               upgrade => 2,
                cooldown => 22 / $FPS,
                type => 'explosive',
                range => 5,
@@ -1252,7 +1274,8 @@ armor => 3,
 attack => [
        {
                anti => 3,
-               damage => [25, 28, 31, 34],
+               damage => 25,
+               upgrade => 3,
                cooldown => 30 / $FPS,
                range => 6,
        },
@@ -1374,7 +1397,8 @@ armor => 2,
 attack => [
        {
                anti => 2,
-               damage => [6, 7, 8, 9],
+               damage => 6,
+               upgrade => 1,
                cooldown => 64 / $FPS,
                splash => 1,
                type => 'explosive',
@@ -1568,7 +1592,8 @@ armor => 0,
 attack => [
        {
                anti => 1,
-               damage => [5, 6, 7, 8],
+               damage => 5,
+               upgrade => 1,
                cooldown => 8 / $FPS,
                range => 1,
        },
@@ -1613,7 +1638,8 @@ armor => 0,
 attack => [
        {
                anti => 3,
-               damage => [10, 11, 12, 13],
+               damage => 10,
+               upgrade => 1,
                cooldown => 15 / $FPS,
                type => 'explosive',
                range => 4,
@@ -1665,7 +1691,8 @@ armor => 1,
 attack => [
        {
                anti => 1,
-               damage => [20, 22, 24, 26],
+               damage => 20,
+               upgrade => 2,
                cooldown => 37 / $FPS,
                splash => 'line',
                range => 6,
@@ -1736,7 +1763,8 @@ special => [
                attack => [
                        {
                                anti => 1,
-                               damage => [4, 5, 6, 7],
+                               damage => 4,
+                               upgrade => 1,
                                cooldown => 15 / $FPS,
                                range => 1,
                        },
@@ -1813,7 +1841,8 @@ armor => 0,
 attack => [
        {
                anti => 3,
-               damage => [9 .. 12],
+               damage => 9,
+               upgrade => 1,
                cooldown => 30 / $FPS,
                splash => 'bounce',
                range => 3,
@@ -1853,7 +1882,8 @@ armor => 2,
 attack => [
        {
                anti => 1,
-               damage => [20, 22, 24, 26],
+               damage => 20,
+               upgrade => 2,
                cooldown => 30 / $FPS,
                range => 8,
        },
@@ -1879,7 +1909,8 @@ armor => 2,
 attack => [
        {
                anti => 2,
-               damage => [25, 27, 29, 31],
+               damage => 25,
+               upgrade => 2,
                cooldown => 100 / $FPS,
                type => 'explosive',
                range => 6,
@@ -1954,7 +1985,8 @@ armor => 1,
 attack => [
        {
                anti => 1,
-               damage => [20, 23, 26, 29],
+               damage => 20,
+               upgrade => 3,
                cooldown => 15 / $FPS,
                range => 1,
        },