,waves*COUNT(DISTINCT rt.id) AS waves,COUNT(rc.uid) AS claims
,COUNT(nullif(rc.launched,false)) AS launched
,COUNT(NULLIF(uid > 0 OR rc.wave > r.waves,true)) AS blocked
,waves*COUNT(DISTINCT rt.id) AS waves,COUNT(rc.uid) AS claims
,COUNT(nullif(rc.launched,false)) AS launched
,COUNT(NULLIF(uid > 0 OR rc.wave > r.waves,true)) AS blocked
my ($self, $c, $raid, $order) = @_;
my $dbh = $c->model;
my ($self, $c, $raid, $order) = @_;
my $dbh = $c->model;
- my $query = $dbh->prepare(q{SELECT id,tick,waves,message,released_coords,open,ftid
+ my $query = $dbh->prepare(q{SELECT id,tick,waves,message,released_coords,open,ftid,open_tick
- $dbh->do(q{UPDATE raids SET message = ?, tick = ?, waves = ? WHERE id = ?}
+ my $open_tick = $c->req->param('open_tick') || undef;
+ $dbh->do(q{UPDATE raids SET message = ?, tick = ?, waves = ?, open_tick = ? WHERE id = ?}
-SELECT pid,metal_roids, crystal_roids, eonium_roids, ds.total
+SELECT pid, x, y, z, released_coords, metal_roids, crystal_roids, eonium_roids, ds.total
LEFT OUTER JOIN current_planet_scans ps USING (pid)
LEFT OUTER JOIN current_development_scans ds USING (pid)
LEFT OUTER JOIN current_planet_scans ps USING (pid)
LEFT OUTER JOIN current_development_scans ds USING (pid)
-WHERE rt.id = ? AND r.open AND not r.removed
- AND r.id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)
+WHERE rt.id = $1 AND r.open AND not r.removed
+ AND r.id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = $2)
},undef,$target,$c->user->id));
my $fleets = $dbh->prepare(q{
},undef,$target,$c->user->id));
my $fleets = $dbh->prepare(q{
-SELECT pid,metal_roids, crystal_roids, eonium_roids, ds.total
+SELECT pid, x, y, z, released_coords, metal_roids, crystal_roids, eonium_roids, ds.total
LEFT OUTER JOIN current_planet_scans ps USING (pid)
LEFT OUTER JOIN current_development_scans ds USING (pid)
WHERE uid = $1 AND fid = $2
LEFT OUTER JOIN current_planet_scans ps USING (pid)
LEFT OUTER JOIN current_development_scans ds USING (pid)
WHERE uid = $1 AND fid = $2
+ if ($c->stash->{target}->{released_coords}) {
+ push @query
+ ,"def_coords_x_1=".$c->stash->{target}->{x}
+ ,"def_coords_y_1=".$c->stash->{target}->{y}
+ ,"def_coords_z_1=".$c->stash->{target}->{z};
+ }
+
my $ships = $dbh->prepare(q{
SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship)
WHERE fid = $1
my $ships = $dbh->prepare(q{
SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship)
WHERE fid = $1