X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/b22f63ba31441200ca915c64445d5a87d146c327..7914537c1fda7796579fee5f8b9bb8791d93d546:/sc.plp
diff --git a/sc.plp b/sc.plp
index edbc4c6..b20e51d 100644
--- a/sc.plp
+++ b/sc.plp
@@ -9,7 +9,7 @@ my %scver = (
major => 1,
);
-if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
+if ($Request and $Request eq '2') {
%scver = (
id => 'hots',
name => 'Heart of the Swarm',
@@ -43,14 +43,14 @@ Html({
say "
$scver{game} units
\n";
my $units = do $datafile;
-die "Cannot open unit data: $_\n" for $@ || $! || ();
+Abort("Cannot open unit data", 501, $_) for $@ || $! || ();
my $patch = shift @{$units}
- or die "Cannot open unit data: metadata not found\n";
+ or Abort("Cannot open unit data: metadata not found", 501);
say "Unit properties as seen or measured in $scver{name}\n$patch.";
say "Also see the $_ table." for join(', ',
- ('StarCraft 2: HotS') x ($scver{major} < 2),
- ('original SC: Brood War') x ($scver{major} > 1),
+ (showlink('StarCraft 2: HotS', '/sc/2')) x ($scver{major} < 2),
+ (showlink('original SC: Brood War', '/sc')) x ($scver{major} > 1),
);
say "
\n";
@@ -85,29 +85,27 @@ for my $unit (@{$units}) {
sub coltoggle {
my ($name, $id, $nolink) = @_;
- return sprintf(
- (defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s â¼'
- : $nolink ? '%2$s' : '%s',
- $id && "order=$id", $name
- );
+ return "$name â¼" if defined $get{order} ? $get{order} eq $id : !$id;
+ return $name if $nolink;
+ return showlink($name, '?'.($id && "order=$id"));
}
:>
- |
- <:= coltoggle('name', '') :> |
- cost |
+ <:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :> |
+ <:= coltoggle(name => 'name') :> |
+ <:= coltoggle(cost => 'cost') :> |
gas |
- <:= coltoggle(qw'build cost') :> |
+ build |
<:= coltoggle(qw'size size') :> |
attr |
- HP |
+ <:= coltoggle(HP => 'hp') :> |
shield |
⨠|
- attack |
- <:= coltoggle(qw'dps attack 1') :> |
+ <:= coltoggle(attack => 'attack') :> |
+ dps |
range |
sight |
- speed |
+ <:= coltoggle(speed => 'speed') :> |
specials |
<:
@@ -340,38 +338,51 @@ sub showrangeint {
);
}
+ my @rows = @{$units};
my $grouped = 1; # race headers
if (exists $get{order}) {
$grouped = 0;
$get{order} ||= '';
- if ($get{order} eq 'size') {
+ if ($get{order} eq 'name') {
+ @rows = sort {$a->{name} cmp $b->{name}} @rows;
+ }
+ elsif ($get{order} eq 'hp') {
$_->{order} = (
- $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
- + $_->{hp}/512 + $_->{min}/8192
- ) for @$units;
+ $_->{hp}*1.01 + $_->{armor} + $_->{shield} + $_->{size}/1024,
+ ) for @rows;
}
elsif ($get{order} eq 'cost') {
$_->{order} = (
$_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
- ) for @$units;
+ ) for @rows;
+ }
+ elsif ($get{order} eq 'size') {
+ $_->{order} = (
+ $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+ + $_->{hp}/512 + $_->{min}/8192
+ ) for @rows;
}
elsif ($get{order} eq 'attack') {
$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
map {
- ($_->{damage} + $_->{upgrade} * 3)
- * ($_->{count} // 1) / ($_->{cooldown} // 1)
+ ($_->{dps} ? $_->{dps}->[-1] :
+ ($_->{damage} + $_->{upgrade} * 3)
+ * ($_->{count} // 1) / ($_->{cooldown} // 1)
+ )
* ($_->{splash} ? 1.01 : 1)
* ($_->{type} eq 'implosive' ? .96 : 1)
* ($_->{type} eq 'explosive' ? .98 : 1)
} @{ $_->{attack} }
- ) for @$units;
+ ) for @rows;
}
- else {
- $units->[$_]->{order} = $_ for 0 .. $#$units;
+ elsif ($get{order} eq 'speed') {
+ $_->{order} = (
+ ($_->{upgraded}->{speed} // $_->{speed}*1.01)
+ + $_->{sight}/1024 + $_->{detect}/2048
+ ) for @rows;
}
+ @rows = sort {$a->{order} <=> $b->{order}} @rows if exists $rows[0]->{order};
}
- my @rows = @{$units};
- @rows = sort {$a->{order} <=> $b->{order}} @rows unless $grouped;
my ($race, $cat) = ('', '');
for (@rows) {