git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
72b206b
)
sc: minor code cleanup, var renames, css optimisations
author
Mischa POSLAWSKY
<perl@shiar.org>
Sat, 13 Jun 2015 01:27:45 +0000
(
03:27
+0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Sat, 13 Jun 2015 01:32:34 +0000
(
03:32
+0200)
base.css
patch
|
blob
|
history
sc.plp
patch
|
blob
|
history
diff --git
a/base.css
b/base.css
index 33e61f406d2471f8f5af51a450a5838ae31f6251..b89cd1a98a1348ad46d5a716a902949eea4cdbbc 100644
(file)
--- a/
base.css
+++ b/
base.css
@@
-69,6
+69,7
@@
p.aside {
}
p.footer {
margin: 1em 0 0;
}
p.footer {
margin: 1em 0 0;
+ clear: both;
}
.help + .footer {
margin: 0;
}
.help + .footer {
margin: 0;
diff --git
a/sc.plp
b/sc.plp
index 8a63e8c9450b8a8bddb8b087f1c603aee69af374..5607a9a236f076e4ea4adefccb6e0aeb4df1b325 100644
(file)
--- a/
sc.plp
+++ b/
sc.plp
@@
-44,12
+44,12
@@
Unit properties as seen or measured in Brood War
}
tr.alt td {
font-size: 70%;
}
tr.alt td {
font-size: 70%;
-
border-top-style: dashed
;
+
padding-left: 0.5em
;
}
.units tr th:first-child {
padding-left: 0;
}
}
.units tr th:first-child {
padding-left: 0;
}
- .units tr:hover:not(.race) {
+ .units t
body t
r:hover:not(.race) {
background: #EEE;
}
background: #EEE;
}
@@
-65,18
+65,10
@@
Unit properties as seen or measured in Brood War
.unit-o {color: #C08} /* organic */
.unit-u {color: #44C} /* mechanic */
.unit-o {color: #C08} /* organic */
.unit-u {color: #44C} /* mechanic */
- img.unit-o, img.unit-u {
- margin-left: 0.2em;
- vertical-align: middle;
- }
.unit-composed {
color: #C88;
font-size: 70%;
}
.unit-composed {
color: #C88;
font-size: 70%;
}
- .unit {
- text-align: center;
- white-space: nowrap;
- }
.unit.unit-s {color: #770}
.unit.unit-m {color: #C70}
.unit.unit-l {color: #D22}
.unit.unit-s {color: #770}
.unit.unit-m {color: #C70}
.unit.unit-l {color: #D22}
@@
-113,6
+105,7
@@
Unit properties as seen or measured in Brood War
}
.units .val {
}
.units .val {
+ white-space: nowrap;
text-align: right;
}
text-align: right;
}
@@
-128,14
+121,10
@@
Unit properties as seen or measured in Brood War
.legend dd {
text-indent: -1em;
margin-left: 1em;
.legend dd {
text-indent: -1em;
margin-left: 1em;
- break-before: avoid;
- -webkit-column-break-before: avoid;
}
}
- .units, .legend {
- display: table-cell;
- }
.legend {
.legend {
+ display: table-cell;
min-width: 20em;
text-align: left;
}
min-width: 20em;
text-align: left;
}
@@
-144,9
+133,6
@@
Unit properties as seen or measured in Brood War
padding-bottom: 1em;
margin-right: 2em;
}
padding-bottom: 1em;
margin-right: 2em;
}
- .footer {
- clear: left;
- }
</style>
<:
</style>
<:
@@
-178,6
+164,12
@@
sub coltoggle {
</tr></thead>
<:
sub showrange {
</tr></thead>
<:
sub showrange {
+ my ($min, $max) = @_;
+ $_ = int($_ + .5) for $min, $max; # round halves up
+ return $min == $max ? $min : "$min-$max";
+}
+
+sub showval {
my ($row, @elements) = @_;
my ($min, $max);
my ($row, @elements) = @_;
my ($min, $max);
@@
-212,9
+204,7
@@
sub showrange {
$min /= 4;
}
}}
$min /= 4;
}
}}
- $_ = int($_ + .5) for $min, $max; # round halves up
-
- return $min == $max ? $min : "$min-$max";
+ return showrange($min, $max);
}
sub showattack {
}
sub showattack {
@@
-239,7
+229,7
@@
sub showrange {
}
$tagbase .= '">';
}
$tagbase .= '">';
- my $out = show
range
($row, 'attack', $area, 'damage');
+ my $out = show
val
($row, 'attack', $area, 'damage');
$out .= '<span class="unit-splash">+</span>' if $attack->{splash};
$attack->{dps} = $attack->{cooldown} && [
map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) }
$out .= '<span class="unit-splash">+</span>' if $attack->{splash};
$attack->{dps} = $attack->{cooldown} && [
map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) }
@@
-247,7
+237,7
@@
sub showrange {
$attack->{damage}
#TODO: upgrade (zergling)
];
$attack->{damage}
#TODO: upgrade (zergling)
];
- $out .= '<td class="val hurt hurtrel">' . show
range
($row, 'attack', $area, 'dps');
+ $out .= '<td class="val hurt hurtrel">' . show
val
($row, 'attack', $area, 'dps');
return $tagbase . $out;
}
return $tagbase . $out;
}
@@
-301,15
+291,15
@@
sub showrange {
'<td class="val unit-shield">' . (
$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : ' '
),
'<td class="val unit-shield">' . (
$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : ' '
),
- '<td class="val unit-armor">' . show
range
($_, 'armor'),
+ '<td class="val unit-armor">' . show
val
($_, 'armor'),
showattack($_, 'ground'),
showattack($_, 'air'),
showattack($_, 'ground'),
showattack($_, 'air'),
- '<td class="val unit-range">' . show
range
($_, 'attack', 'range'),
+ '<td class="val unit-range">' . show
val
($_, 'attack', 'range'),
'<td class="val unit-sight">' . sprintf(
$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
'<td class="val unit-sight">' . sprintf(
$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
- show
range
($_, 'sight')
+ show
val
($_, 'sight')
),
),
- '<td class="val unit-speed">' . show
range
($_, 'speed'),
+ '<td class="val unit-speed">' . show
val
($_, 'speed'),
'<td class="unit-magic">' . showmagic($_),
"\n"
);
'<td class="unit-magic">' . showmagic($_),
"\n"
);
@@
-317,8
+307,9
@@
sub showrange {
my $units = do $datafile;
die "Cannot open unit data: $_\n" for $@ || $! || ();
my $units = do $datafile;
die "Cannot open unit data: $_\n" for $@ || $! || ();
- my $grouped =
!exists $get{order};
+ my $grouped =
1; # race headers
if (exists $get{order}) {
if (exists $get{order}) {
+ $grouped = 0;
$get{order} ||= '';
if ($get{order} eq 'size') {
$_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
$get{order} ||= '';
if ($get{order} eq 'size') {
$_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
@@
-330,25
+321,34
@@
sub showrange {
$units->[$_]->{order} = $_ for 0 .. $#$units;
}
}
$units->[$_]->{order} = $_ for 0 .. $#$units;
}
}
- my @rows = $grouped ? @$units : sort {$a->{order} <=> $b->{order}} @$units;
+ my @rows = @{$units};
+ @rows = sort {$a->{order} <=> $b->{order}} @rows unless $grouped;
my ($race, $cat) = ('', '');
for (@rows) {
my ($race, $cat) = ('', '');
for (@rows) {
- $race = $_->{race},
- 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;
+ if ($grouped) {
+ printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+ $race = $_->{race}, ucfirst $race
+ unless $race eq $_->{race};
+ }
+ else {
+ $_->{cat} = $_->{race};
+ }
+
print(
'<tr>',
print(
'<tr>',
- sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', ' ')),
+ sprintf('<t%s class="cat">%s',
+ $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', ' ')
+ ),
'<td>' . $_->{name},
showunitcols($_),
);
'<td>' . $_->{name},
showunitcols($_),
);
- for my $alt (grep { $_->{alt} } @{ $_->{special} }) {
+ for my $subrow (@{ $_->{special} }) {
+ $subrow->{alt} or next;
print(
print(
- '<tr class="alt"><td class="cat"><td>' . $
alt
->{alt},
- showunitcols($
alt
),
+ '<tr class="alt"><td class="cat"><td>' . $
subrow
->{alt},
+ showunitcols($
subrow
),
);
}
}
);
}
}