sc: collision diameter and transportability in size title

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 5b7e4a7a1a1ef7cac4fc92c88063036a532f2190..8b0e5e84ab27a02627c14eec6074be7ca97e7aed 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -241,11 +241,17 @@ sub showrange {
                                !!$_->{base} && '<span class="unit-composed">+</span>',
                                $_->{build} || '0',
                        ),
-                       sprintf('<td class="unit unit-%s" title="%3$s">%s',
-                               $_->{cargo} < 0      ? ('supply', T => 'transport') :
+                       sprintf('<td class="unit unit-%s" title="%4$s%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} || '-', ''),
+                               (
+                                       [qw( x s m l l h h h h )]->[ $_->{cargo} ],
+                                       $_->{cargo} || '-',
+                                       $_->{cargo} ? 'transportable' : 'untransportable',
+                               ),
+                               defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
                        ),
                        sprintf('<td class="val unit%s">%s',
                                defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
@@ -291,8 +297,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>'