sc: flying attribute for brood war units

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 3a11f0ce4ad2cf8406f02758220e73a728314427..2a748dcd8d0b8dc34da42a19d29a7f2d9f46ab2c 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">';
-               $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>'
@@ -167,7 +169,10 @@ sub showrange {
 
                $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}) {
@@ -228,25 +233,6 @@ sub showrange {
                my ($row) = @_;
                local $_ = $row;
                $_->{hp} += $_->{shield} if $_->{shield};
-               my $suitchar = '';
-               if ($_->{attr}->{structure}) {
-                       $suitchar = 'b';
-               }
-               elsif ($_->{suit}) {
-                       $suitchar = [qw/? s m l/]->[$_->{suit}];
-               }
-               elsif ($_->{cargo} > 0) {
-                       $suitchar = [qw/? s m l l h h h h/]->[abs $_->{cargo}];
-               }
-               elsif ($_->{size}) {
-                       $suitchar = [qw/s m l h h h/]->[$_->{size}];
-               }
-               elsif ($_->{attr} and $_->{attr}->{light}) {
-                       $suitchar = 's';
-               }
-               elsif ($_->{attr} and $_->{attr}->{armored}) {
-                       $suitchar = 'l';
-               }
 
                return (
                        '<td class="val min">' . ($_->{min} // ''),
@@ -255,13 +241,16 @@ sub showrange {
                                !!$_->{base} && '<span class="unit-composed">+</span>',
                                $_->{build} || '0',
                        ),
-                       !$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s%s',
-                               $suitchar, ucfirst $suitchar,
-                               $_->{attr}->{massive}
-                                       && '<span class="unit-massive" title="massive">⚓</span>',
+                       sprintf('<td class="unit unit-%s" title="%3$s">%s',
+                               $_->            {cargo} < 0 ? ('supply',           T => 'transport') :
+                               $_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') :
+                               $_->{attr}->{flying}    ? ('air', F => 'flying') :
+                               $_->{attr}->{structure} ? ('x',   B => 'building') :
+                               ([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
                        ),
-                       '<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})
@@ -276,6 +265,17 @@ sub showrange {
                                        && '<span class="unit unit-l" title="armored">A</span>',
                                $_->{attr}->{light}
                                        && '<span class="unit unit-s" title="light">L</span>',
+                               $_->{suit} && sprintf(
+                                       '<span class="unit unit-%s" title="%3$s">%s</span>',
+                                       map { @{$_} } [
+                                               [qw( x ? unknown )],
+                                               [qw( s S small )],
+                                               [qw( m M medium )],
+                                               [qw( l L large )],
+                                       ]->[ $_->{suit} ],
+                               ),
+                               $_->{attr}->{massive}
+                                       && '<span class="unit-massive" title="massive">⚓</span>',
                        ),
                        '<td class="val unit-hp">' . $_->{hp} // '',
                        $_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
@@ -292,8 +292,6 @@ sub showrange {
                                showrange($_->{speed}, $_->{upgraded}->{speed}),
                        $_->{attr}->{jump}
                                && qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
-                       $_->{attr}->{flying}
-                               && qq'<span class="unit unit-jump" title="flying">↑</span>',
                        '<td class="unit-magic">' . showmagic($_),
                        !$_->{attack}->[1] ? () : (
                                '<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
@@ -311,13 +309,13 @@ 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') {
@@ -379,19 +377,9 @@ sub showrange {
        <dd>excludes construction of dependencies such as buildings
                and <span class="unit-composed">+</span>parent units
 <dt>size
-       <dd><:
-if ($scver{major} > 1) {
-               :>transports can fit 8 <span class="unit unit-s">S</span>mall,
-               4 <span class="unit unit-m">M</span>edium,
-               2 <span class="unit unit-l">L</span>arge,
-               or a single <span class="unit unit-h">H</span>uge unit
-       <dd>massive <span class="unit-massive">⚓</span> units
-               cannot be lifted or slowed and can break force fields<:
-} else {
-               :>affected by <span class="unit unit-s">S</span>mall,
-               <span class="unit unit-m">M</span>edium, or
-               <span class="unit unit-l">L</span>arge unit damage<:
-} :>
+       <dd><span class="unit unit-supply">T</span>ransports can fit upto
+               <span class="unit unit-s">8</span>
+               non-<span class="unit unit-air">F</span>lying units
        <dd>number of command points taken per unit
        <dd><:
 if ($scver{major} > 1) {
@@ -401,9 +389,14 @@ if ($scver{major} > 1) {
                <span class="unit unit-p">ψ</span>(ps)ionic,
                <span class="unit unit-s">L</span>ight, and
                <span class="unit unit-l">A</span>rmored
-               attributes<:
+               attributes
+       <dd>massive <span class="unit-massive">⚓</span> units
+               cannot be lifted or slowed and can break force fields<:
 } else {
-               :><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit<:
+               :><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
+       <dd>affected by <span class="unit unit-s">S</span>mall,
+               <span class="unit unit-m">M</span>edium, or
+               <span class="unit unit-l">L</span>arge unit damage<:
 } :>
 <dt>HP<dd>
        total number of hitpoints (including shields)