if ($planet->{x} == $target->{x}){
$target->{style} = 'incluster';
}
- $target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.4);
+ $target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.6);
$target->{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4);
#next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
}
my $targetquery = $dbh->prepare(qq{SELECT r.id,coords(x,y,z),comment,size
,score,value,race,planet_status,relationship,r.planet, s.scans
- ,max(rc.wave) AS waves
+ ,COALESCE(max(rc.wave),0) AS waves
FROM raid_targets r
JOIN current_planet_stats p ON p.id = r.planet
LEFT OUTER JOIN ( SELECT planet, array_accum(s::text) AS scans
WHERE r.raid = ?
GROUP BY r.id,x,y,z,comment,size,score,value,race
,planet_status,relationship,comment,r.planet, s.scans
+ ,sizerank,scorerank,xprank,valuerank
ORDER BY $order
});
my $claims = $dbh->prepare(q{ SELECT username,launched FROM raid_claims
my @targets;
while (my $target = $targetquery->fetchrow_hashref){
my @waves;
- $target->{waves} ||= $raid->{waves};
+ if ($target->{waves} < $raid->{waves}){
+ $target->{waves} = $raid->{waves}
+ }
for my $i (1 .. $target->{waves}){
$claims->execute($target->{id},$i);
my $claimers;