sc: colourise negative supply values (providers)

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index e426a6e5ae6f5c822c5386fdf4c33839d5e17cf5..09ae989cc26ea4b03dc1cf0bb9c62be3a07926a3 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -73,6 +73,14 @@ for my $unit (@{$units}) {
                        addupgrade(\$unit->{upgraded}->{$col}, $increase, $unit->{$col});
                }
        }
+       for my $special (@{ $unit->{special} }) {
+               for my $upgrade (@{ $special->{upgrade} }) {
+                       while (my ($col, $increase) = each %{$upgrade}) {
+                               defined $special->{$col} or next;
+                               addupgrade(\$special->{upgraded}->{$col}, $increase, $special->{$col});
+                       }
+               }
+       }
 }
 
 sub coltoggle {
@@ -118,33 +126,37 @@ sub showrange {
                my $upattack = $row->{upgraded}->{attack}->[$area];
                my $damage = $attack->{damage};
                my $maxdamage = $upattack->{damage} // $damage;
-               $damage = $damage->[0] if ref $damage;
-               $maxdamage = $maxdamage->[-1] if ref $maxdamage;
+               $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>'
                        if $attack->{type} eq 'implosive';
+       if (my @bonus = sort grep { !/^-/ } keys %{ $attack->{bonus} }) {
                $out .= sprintf('<span class="%s" title="%s">&ge;</span>',
                        (map {
-                               $_ =~ /^light/ ? 'unit-s' :
+                               $_ eq 'light' ? 'unit-s' :
                                $_ eq 'armored' ? 'unit-l' :
                                $_ eq 'organic' ? 'unit-o' :
-                               $_ =~ /^massive/ ? 'unit-h' :
+                               $_ eq 'massive' ? 'unit-h' :
                                $_ eq 'shields' ? 'unit-shield' :
                                '',
-                       } join '_', keys %{ $attack->{bonus} }),
+                       } join '_', @bonus),
                        join(', ', map {(
                                sprintf('+%s vs %s',
-                                       (map {
-                                               ref $_ ? showrange($_->[0], $_->[-1]) : $_
-                                       } $attack->{bonus}->{$_}),
+                                       showrange(
+                                               $attack->{bonus}->{$_},
+                                               $attack->{bonus}->{$_} + $attack->{bonus}->{"-$_"} * 3,
+                                       ),
                                        $_,
                                ),
-                       )} keys %{ $attack->{bonus} }),
-               ) if $attack->{bonus};
+                       )} @bonus),
+               );
+       }
                $out .= '<span class="unit-pdd" title="projectile">•</span>'
                        if $attack->{type} eq 'projectile';
 
@@ -152,11 +164,17 @@ sub showrange {
                $out .= showrange($damage, $maxdamage);
                $out .= '</span>' if $attack->{name};
                $out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
-                       $attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
+                       $attack->{splash} eq 'line' ? ('linear', '+') : ('splash', '⁜')
                ) if $attack->{splash};
 
                $out .= '<td class="val hurt hurtrel">';
-               if ($attack->{cooldown}) {
+               if ($attack->{dps}) {
+                       # precalculated dps, do not touch
+                       $out .= showrange($attack->{dps}->[0],
+                               $upattack->{dps}->[-1] // $attack->{dps}->[-1]
+                       );
+               }
+               elsif ($attack->{cooldown}) {
                        if (my $type = $attack->{type}) {
                                if ($type eq 'explosive') {
                                        $damage /= 2;
@@ -168,7 +186,8 @@ sub showrange {
                        $damage *= ($attack->{count} // 1) / $attack->{cooldown};
                        if (my $bonus = $upattack->{bonus} // $attack->{bonus}) {
                                $maxdamage += $_ for max(
-                                       map { ref $_ ? $_->[-1] : $_ } values %{$bonus}
+                                       map { $bonus->{$_} + $bonus->{"-$_"} * 3 }
+                                       grep { !/^-/ } keys %{$bonus}
                                );
                        }
                        $maxdamage *= ($upattack->{count} // $attack->{count} // 1)
@@ -246,8 +265,9 @@ sub showrange {
                                $_->{attr}->{massive}
                                        && '<span class="unit-massive" title="massive">⚓</span>',
                        ),
-                       '<td class="val unit">' . (
-                               defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
+                       sprintf('<td class="val unit%s">%s',
+                               defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
+                               defined $_->{pop} && $_->{pop} == .5 ? '½' : $_->{pop},
                        ),
                        '<td class="unit unit-type">' . join('', grep { $_ }
                                (defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
@@ -297,19 +317,19 @@ sub showrange {
                $get{order} ||= '';
                if ($get{order} eq 'size') {
                        $_->{order} = (
-                               $_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+                               $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
                                + $_->{hp}/512 + $_->{min}/8192
                        ) for @$units;
                }
                elsif ($get{order} eq 'cost') {
                        $_->{order} = (
-                               $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+                               $_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
                        ) for @$units;
                }
                elsif ($get{order} eq 'attack') {
                        $_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
                                map {
-                                       ((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+                                       ($_->{damage} + $_->{upgrade} * 3)
                                        * ($_->{count} // 1) / ($_->{cooldown} // 1)
                                        * ($_->{splash} ? 1.01 : 1)
                                        * ($_->{type} eq 'implosive' ? .96 : 1)
@@ -407,8 +427,8 @@ if ($scver{major} > 1) {
        <dd>damage given per single hit
        <dd><span class="hurtrel">dps</span> indicates relative amount of damage
                done in 1 second of in-game time
-       <dd>splash damage hits all objects nearby <span class="unit-splash">+</span>
-               or in a straight line <span class="unit-splash">×</span>.
+       <dd>splash damage hits all objects nearby <span class="unit-splash">⁜</span>
+               or in a straight line <span class="unit-splash">+</span>.
        <dd><:
 if ($scver{major} > 1) {
                :>does not include <span>&ge;</span>bonus damage