$target{Id} = $target->{id};
$target{Race} = $target->{race};
my $num = pow(10,length($target->{score})-2);
- $target{Score} = ceil($target->{score}/$num)*$num;
+ $target{Score} = "Hidden"; #ceil($target->{score}/$num)*$num;
$num = pow(10,length($target->{value})-2);
- $target{Value} = ceil($target->{value}/$num)*$num;
+ $target{Value} = "Hidden"; #ceil($target->{value}/$num)*$num;
$num = pow(10,length($target->{size})-2);
$target{Size} = floor($target->{size}/$num)*$num;
$num = pow(10,length($target->{fleetvalue})-2);
$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
my $unitscans = $DBH->prepare(q{
- SELECT i.id,i.name, i.tick, i.amount
+ SELECT DISTINCT ON (name) i.id,i.name, i.tick, i.amount
FROM fleets i
WHERE i.uid = -1
AND i.sender = ?
AND i.mission = 'Full fleet'
GROUP BY i.id,i.tick,i.name,i.amount
- ORDER BY i.tick,name
+ ORDER BY name,i.tick DESC
});
$unitscans->execute($target->{planet}) or warn $DBH->errstr;
- my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships WHERE id = ?});
+ my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+ WHERE id = ? ORDER BY num
+ });
my @missions;
- my $i = 0;
while (my $mission = $unitscans->fetchrow_hashref){
- $mission->{ODD} = $i++ % 2;
my @ships;
$ships->execute($mission->{id});
- my $j = 0;
while (my $ship = $ships->fetchrow_hashref){
- $ship->{ODD} = $j++ % 2;
push @ships,$ship;
}
push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
$mission->{ships} = \@ships;
$mission->{amount} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+ delete $mission->{id};
push @missions,$mission;
}
$target{missions} = \@missions;
$size -= $roids;
my $xp = 0;
if ($planet){
- $xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value});
+ $xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
}
push @roids,{Wave => $i, Roids => $roids, XP => $xp};
if ($self->{AJAX}){