sc: ghost upgrades

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 01b4957c5e07b69489b34ec0a082f5dcd1e6642f..e0465bac520acaa28cca7557c033d2fcd9b2637d 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -278,7 +278,7 @@ sub showrangeint {
                                $_->{transform},
                        ) :
                        !defined $_->{build} ? '<td>' : sprintf('<td class="val time"%s>%s%.0f',
-                               defined $_->{warp} && qq(title="$_->{build} without warpgate"),
+                               defined $_->{warp} && sprintf(' title="%.0f without warpgate"', $_->{build}),
                                !!$_->{base} && sprintf(
                                        '<span class="unit-composed" title="%s">+</span>',
                                        'from '.join('+', @{ $_->{base} }),
@@ -356,12 +356,11 @@ sub showrangeint {
                        $_->{attr}->{jump}
                                && qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
                        '<td class="unit-magic">' . showmagic($_),
-                       !$_->{attack}->[1] ? () : (
-                               '<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 1), '<td colspan=3>'
-                       ),
-                       !$_->{attack}->[2] ? () : (
-                               '<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 2), '<td colspan=3>'
-                       ),
+                       (map {(
+                               '<tr class="sub"><th class="cat"><td><td colspan=10>',
+                               showattack($row, $_),
+                               '<td colspan=3>',
+                       )} 1 .. $#{ $_->{attack} }),
                        "\n"
                );
        }
@@ -400,7 +399,7 @@ sub showrangeint {
                        ) for @rows;
                }
                elsif ($get{order} eq 'attack') {
-                       $_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
+                       $_->{order} = $_->{hp} / 16384 + max(
                                map {
                                        ($_->{dps} ? $_->{dps}->[-1] :
                                                ($_->{damage} + $_->{upgrade} * 3)