sc: separate shield and hp values in data

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index c6f75c261021b986396f091f099f6829728fb49e..9a9a12a2e8af7ac4ff7e9e0e14382ac077404bcd 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -28,6 +28,7 @@ Unit properties as seen or measured in Brood War
                border-collapse: separate;
                border-spacing: 0;
                margin: 0 auto;
+               white-space: nowrap;
        }
        .units th, .units td {
                border: 0;
@@ -51,10 +52,6 @@ Unit properties as seen or measured in Brood War
                margin: 0;
                text-align: center;
        }
-       .units th.cat {
-               font-size: 70%;
-               text-transform: uppercase;
-       }
        .units thead th, .units tfoot th {
                font-size: 70%;
                font-weight: normal;
@@ -66,6 +63,10 @@ Unit properties as seen or measured in Brood War
                margin-left: 0.2em;
                vertical-align: middle;
        }
+       .unit-composed {
+               color: #C88;
+               font-size: 70%;
+       }
        .unit {
                text-align: center;
                white-space: nowrap;
@@ -126,10 +127,17 @@ Unit properties as seen or measured in Brood War
                display: table-cell;
        }
        .legend {
-               min-width: 15em;
-               padding-left: 2em;
+               min-width: 20em;
                text-align: left;
        }
+       .units {
+               float: left;
+               padding-bottom: 1em;
+               margin-right: 2em;
+       }
+       .footer {
+               clear: left;
+       }
 </style>
 
 <:
@@ -145,8 +153,8 @@ sub coltoggle {
 <thead><tr>
        <th></th>
        <th><:= coltoggle('name', '') :></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 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="val unit-hp">HP</th>
@@ -192,8 +200,8 @@ sub showrange {
                elsif ($type eq 'implosive') {
                        $min /= 4;
                }
-               $min = int($min + .5);  # round halves up
        }}
+       $_ = int($_ + .5) for $min, $max;  # round halves up
 
        return $min == $max ? $min : "$min-$max";
 }
@@ -239,12 +247,12 @@ sub showrange {
        }
 
        my $units = do 'sc-units.inc.pl';
-       die "Cannot open unit data: $_\n" for $! || $@ || ();
+       die "Cannot open unit data: $_\n" for $@ || $! || ();
        my $grouped = !exists $get{order};
        if (exists $get{order}) {
                $get{order} ||= '';
                if ($get{order} eq 'size') {
-                       $_->{order} = $_->{unit}*8 + $_->{size} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+                       $_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
                }
                elsif ($get{order} eq 'cost') {
                        $_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
@@ -261,15 +269,19 @@ sub showrange {
                printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $race
                        if $grouped and $race ne $_->{race};
                $_->{cat} = $_->{race} if not $grouped;
-               my $sizechar = [qw/? s m l/]->[$_->{size}];
+               $_->{hp} += $_->{shield};
+               my $suitchar = [qw/? s m l/]->[$_->{suit}];
                print(
                        '<tr>',
                        sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
                        '<td>' . $_->{name},
                        '<td class="val min">' . ($_->{min} || '0'),
                        '<td class="val gas">' . ($_->{gas} || ''),
-                       '<td class="val time">' . sprintf('%.0f', $_->{build} || '0'),
-                       sprintf('<td class="unit unit-%s">%s', $sizechar, ucfirst $sizechar),
+                       sprintf('<td class="val time">%s%.0f',
+                               !!$_->{base} && '<span class="unit-composed">+</span>',
+                               $_->{build} || '0',
+                       ),
+                       sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
                        '<td class="val unit">' . join('',
                                $_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
                                defined $_->{organic} && sprintf(
@@ -280,7 +292,9 @@ sub showrange {
                                ),
                        ),
                        '<td class="val unit-hp">' . $_->{hp},
-                       '<td class="val unit-shield">' . ($_->{shield} ? $_->{shield}.'%' : '&nbsp;'),
+                       '<td class="val unit-shield">' . (
+                               $_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
+                       ),
                        '<td class="val unit-armor">' . showrange($_, 'armor'),
                        showattack($_, 'ground'),
                        showattack($_, 'air'),
@@ -319,14 +333,17 @@ sub showrange {
 <dl>
 <dt>cost
        <dd>minerals+gas required to create one unit
+       <dd>includes total expenses if based on existing units
 <dt>build
        <dd>relative time needed to create at least one unit
+       <dd>excludes construction of dependencies such as buildings
+               and <span class="unit-composed">+</span>parent units
 <dt>size
-       <dd><span class="unit unit-s">S</span>mall,
+       <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
        <dd>number of command points taken per unit
-       <dd><span class="unit unit-o">organic</span>/<span class="unit unit-u">mechanic</span> unit
+       <dd><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
 <dt>HP<dd>
        total number of hitpoints (including shields)
 <dt>shield
@@ -337,7 +354,7 @@ sub showrange {
        <dd>base unit armor
        <dd>can be increased by upto 3 at various facilities
        <dd>each point decreases damage per hit by one, upto a minimum of ½
-       <dd>reduction applies to initial damage, before size penalties <small>(so a large plasma hit of 12 to 4 armor deals 2 damage, not ½)</small>
+       <dd>reduction applies to initial damage, before size penalties <small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
 <dt>ground/air
        <dd>damage done per single attack against ground/air units
        <dd>2nd column indicates relative amount of damage done in