sc: show upgrade range in [Carrier] attack count

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 4c1115d820db19c8d1af1418a65b61da0efeadbc..94918dc7e71eef3170e83ed6f6876b7ae7d6801b 100644 (file)
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -476,7 +476,7 @@ armor => 4,
 attack => [
        {
                anti => 3,
 attack => [
        {
                anti => 3,

-               dps => [17, undef, undef, 49],
+               dps => [17, undef, undef, 25],

                count => 4,
                range => 8,
        },
                count => 4,
                range => 8,
        },


@@ -513,9 +513,12 @@ special => [
 upgrade => [
        {
                name => 'Carrier Capacity',
 upgrade => [
        {
                name => 'Carrier Capacity',

-               damage => {
-                       count => 8-4,
-               },
+               attack => [
+                       {
+                               dps => [17, undef, undef, 24],
+                               count => 8-4,
+                       },
+               ],

        },
 ],
 counter => ['wraith', 'corsair', 'scourge'],
        },
 ],
 counter => ['wraith', 'corsair', 'scourge'],

diff --git a/sc.plp b/sc.plp
index 3a11f0ce4ad2cf8406f02758220e73a728314427..dc32a47f67b16dddf57266e0b21cbec0a8106d2b 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -129,7 +129,9 @@ sub showrange {
                $maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
                my $out = '<td class="val hurt">';
                $maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
                my $out = '<td class="val hurt">';

-               $out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
+               $out .= sprintf('<small>%s× </small>',
+                       showrange($attack->{count}, $upattack->{count}),
+               ) if $attack->{count} > 1;

                $out .= '<span class="unit-l" title="explosive">*</span>'
                        if $attack->{type} eq 'explosive';
                $out .= '<span class="unit-s" title="implosive">~</span>'
                $out .= '<span class="unit-l" title="explosive">*</span>'
                        if $attack->{type} eq 'explosive';
                $out .= '<span class="unit-s" title="implosive">~</span>'


@@ -167,7 +169,10 @@ sub showrange {
 
                $out .= '<td class="val hurt hurtrel">';
                if ($attack->{dps}) {
 
                $out .= '<td class="val hurt hurtrel">';
                if ($attack->{dps}) {

-                       $out .= showrange($attack->{dps}->[0], $attack->{dps}->[-1]);
+                       # precalculated dps, do not touch
+                       $out .= showrange($attack->{dps}->[0],
+                               $upattack->{dps}->[-1] // $attack->{dps}->[-1]
+                       );

                }
                elsif ($attack->{cooldown}) {
                        if (my $type = $attack->{type}) {
                }
                elsif ($attack->{cooldown}) {
                        if (my $type = $attack->{type}) {