sc: hots attributes hash (attr)

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index cf2155f3b9bbffe6fa1d9979ad9660dfead41c9b..0534c04ed3659278b6e51ed6b01d4c96cf9a353e 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -63,7 +63,7 @@ sub coltoggle {
        <th class="val min"><img src="/minerals.png" alt="min"></th>
        <th class="val gas"><img src="/gas.png" alt="gas"></th>
        <th class="val time"><:= coltoggle(qw'build cost') :></th>
        <th class="val min"><img src="/minerals.png" alt="min"></th>
        <th class="val gas"><img src="/gas.png" alt="gas"></th>
        <th class="val time"><:= coltoggle(qw'build cost') :></th>

-       <th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+       <th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>

        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</th>
        <th class="val unit-armor">armor</th>
        <th class="val unit-hp">HP</th>
        <th class="val unit-shield">shield</th>
        <th class="val unit-armor">armor</th>


@@ -178,14 +178,20 @@ sub showval {
                local $_ = $row;
                $_->{hp} += $_->{shield} if $_->{shield};
                my $suitchar = '';
                local $_ = $row;
                $_->{hp} += $_->{shield} if $_->{shield};
                my $suitchar = '';

-               if ($_->{cargo} > 0) {
+               if ($_->{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}];
                }
                        $suitchar = [qw/? s m l l h h h h/]->[abs $_->{cargo}];
                }
                elsif ($_->{size}) {
                        $suitchar = [qw/s m l h h h/]->[$_->{size}];
                }

-               elsif ($_->{suit}) {
-                       $suitchar = [qw/? s m l/]->[$_->{suit}];
+               elsif ($_->{attr} and $_->{attr}->{light}) {
+                       $suitchar = 's';
+               }
+               elsif ($_->{attr} and $_->{attr}->{armored}) {
+                       $suitchar = 'l';

                }
 
                return (
                }
 
                return (


@@ -196,14 +202,22 @@ sub showval {
                                $_->{build} || '0',
                        ),
                        !$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
                                $_->{build} || '0',
                        ),
                        !$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),

-                       '<td class="val unit">' . join('',
-                               defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit},
-                               defined $_->{organic} && sprintf(
-                                       '<span class="unit-%s" title="%s">%s</span>',
-                                       $_->{organic} ? 'o' : 'u',
-                                       $_->{organic} ? 'organic' : 'mechanic',
-                                       $_->{organic} ? 'o' : 'm',
-                               ),
+                       '<td class="val unit">' . (
+                               defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
+                       ),
+                       '<td class="unit unit-type">' . join('', grep { $_ }
+                               (defined $_->{organic} || $_->{attr}->{organic})
+                                       && '<span class="unit-o" title="organic">o</span>',
+                               (defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
+                                       && '<span class="unit-u" title="mechanic">m</span>',
+                               $_->{attr}->{psionic}
+                                       && '<span class="unit-p" title="psionic">ψ</span>',
+                       ),
+                       '<td class="unit unit-attr">' . join('', grep { $_ }
+                               $_->{attr}->{armored}
+                                       && '<span class="unit unit-l" title="armored">A</span>',
+                               $_->{attr}->{light}
+                                       && '<span class="unit unit-s" title="light">L</span>',

                        ),
                        '<td class="val unit-hp">' . $_->{hp} // '',
                        '<td class="val unit-shield">' . (
                        ),
                        '<td class="val unit-hp">' . $_->{hp} // '',
                        '<td class="val unit-shield">' . (


@@ -218,6 +232,7 @@ sub showval {
                                showval($_, 'sight')
                        ),
                        '<td class="val unit-speed">' . showval($_, 'speed'),
                                showval($_, 'sight')
                        ),
                        '<td class="val unit-speed">' . showval($_, 'speed'),

+                       $_->{attr}->{massive} && '<span class="unit-massive">☇</span>',

                        '<td class="unit-magic">' . showmagic($_),
                        "\n"
                );
                        '<td class="unit-magic">' . showmagic($_),
                        "\n"
                );


@@ -243,7 +258,7 @@ sub showval {
        my ($race, $cat) = ('', '');
        for (@rows) {
                if ($grouped) {
        my ($race, $cat) = ('', '');
        for (@rows) {
                if ($grouped) {

-                       printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+                       printf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>'."\n",

                                $race = $_->{race}, ucfirst $race
                                        unless $race eq $_->{race};
                }
                                $race = $_->{race}, ucfirst $race
                                        unless $race eq $_->{race};
                }