use warnings;
use parent 'Catalyst::Controller';
-use POSIX;
+use POSIX qw/floor pow/;
use NDWeb::Include;
use ND::Include;
, p.x,p.y,p.z, race
, p.value - p.size*200 -
COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 -
- COALESCE(ss.total ,(SELECT
+ COALESCE(ds.total ,(SELECT
COALESCE(avg(total),0) FROM
- structure_scans)::int)*1500 AS fleetvalue
+ current_development_scans)::int)*1500 AS fleetvalue
,(metal+crystal+eonium)/100 AS resvalue, comment
, hidden, light, medium, heavy, metal, crystal, eonium
,metal_roids, crystal_roids, eonium_roids
FROM current_planet_stats p
JOIN raid_targets r ON p.id = r.planet
LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
- LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
- LEFT OUTER JOIN current_tech_scans ts ON p.id = ts.planet
+ LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
WHERE r.raid = $1
AND NOT COALESCE(p.x = $2 AND p.y = $3,False)
ORDER BY size});
$targetquery->execute($raid->{id},$planet->{x},$planet->{y});
my @targets;
while (my $target = $targetquery->fetchrow_hashref){
- if ($planet){
+ if ($planet && $planet->{x}){
if ($planet->{x} == $target->{x}){
$target->{style} = 'incluster';
}
my $roids = floor(0.25*$size);
$size -= $roids;
my $xp = 0;
- if ($planet){
+ if ($planet && $planet->{score}){
$xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
}
push @roids,{wave => $i, roids => $roids, xp => $xp};
$target->{resvalue} = floor($target->{resvalue}/$num)*$num;
}
$target->{comment} = parseMarkup($target->{comment}) if ($target->{comment});
- $target->{hidden} = int($target->{hidden} / 100);
+ $target->{hidden} = int($target->{hidden} / 100) if $target->{hidden};
push @targets,$target;
}
$c->forward('log',[$raid, "BC opened raid"]);
$c->model->commit;
- $c->res->redirect($c->req->referer);
+ $c->forward('/redirect');
}
sub close : Local {
$c->forward('log',[$raid, "BC closed raid"]);
$c->model->commit;
- $c->res->redirect($c->req->referer);
+ $c->forward('/redirect');
}
sub remove : Local {
$c->forward('log',[$raid, "BC removed raid"]);
$c->model->commit;
- $c->res->redirect($c->req->referer);
+ $c->forward('/redirect');
}
sub showcoords : Local {
$c->forward('log',[$raid, "BC released coords"]);
$c->model->commit;
- $c->res->redirect($c->req->referer);
+ $c->forward('/redirect');
}
sub hidecoords : Local {
$c->forward('log',[$raid, "BC hid coords"]);
$c->model->commit;
- $c->res->redirect($c->req->referer);
+ $c->forward('/redirect');
}
sub create : Local {