Don't show unit scans in raid if they're older than the AU

[ndwebbie.git] / lib / NDWeb / Controller / Raids.pm

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 50983d739513d7b8be1d6b5f55d13dac8ec54a26..1b1335274ee3fd004daf9f236f97aa9b668cf0a1 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -106,7 +106,6 @@ sub view : Local {
        $c->forward('findRaid');
        $raid = $c->stash->{raid};
 
-       $c->stash(raid => $raid->{id});
        my $planet;
        if ($c->user->planet){
                my $query = $dbh->prepare(q{SELECT value, score,x,y FROM current_planet_stats WHERE pid = ?});
@@ -159,8 +158,11 @@ ORDER BY name,tick DESC
                        WHERE fid = ? ORDER BY num
                });
                my @missions;
+               my $tick = 0;
                while (my $mission = $unitscans->fetchrow_hashref){
                        my @ships;
+                       last if $mission->{tick} <= $tick;
+                       $tick = $mission->{tick};
                        $ships->execute($mission->{fid});
                        while (my $ship = $ships->fetchrow_hashref){
                                push @ships,$ship;
@@ -188,9 +190,9 @@ ORDER BY name,tick DESC
                $target->{claims} = \@claims;
 
                my $num = pow(10,length($target->{score})-2);
-               $target->{score} = "Hidden"; #ceil($target->{score}/$num)*$num;
+               $target->{score} = "Hidden" unless $raid->{released_coords}; #ceil($target->{score}/$num)*$num;
                $num = pow(10,length($target->{value})-2);
-               $target->{value} = "Hidden"; #ceil($target->{value}/$num)*$num;
+               $target->{value} = "Hidden" unless $raid->{released_coords}; #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);
@@ -667,7 +669,7 @@ sub calcredir : Private {
        );
 
        my $ships = $dbh->prepare(q{
-SELECT id, amount FROM fleet_ships fs JOIN ship_stats s ON s.name = fs.ship
+SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship)
 WHERE fid = $1
                });
 
@@ -693,6 +695,67 @@ WHERE fid = $1
        $c->res->redirect("http://game.planetarion.com/bcalc.pl?$query");
 }
 
+sub retal : Local {
+       my ($self, $c) = @_;
+       my $dbh = $c->model;
+
+       my $incs = $dbh->prepare(q{
+SELECT coords(x,y,z),pid,race,size,score,value,alliance
+       ,array_agg(i.eta) AS eta,array_agg(amount) AS amount
+       ,array_agg(shiptype) AS type,array_agg(fleet) AS name
+       ,array_agg(c.landing_tick) AS landing
+FROM calls c
+       JOIN incomings i USING (call)
+       JOIN current_planet_stats p USING (pid)
+WHERE c.status <> 'Covered' AND c.landing_tick BETWEEN tick() AND tick() + 6
+       AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10
+GROUP BY pid,race,x,y,z,size,score,value,alliance
+ORDER BY size DESC
+               });
+       $incs->execute;
+       $c->stash(planets => $incs->fetchall_arrayref({}));
+
+}
+
+sub postcreateretal : Local {
+       my ($self, $c) = @_;
+       my $dbh = $c->model;
+
+       $dbh->begin_work;
+       my $query = $dbh->prepare(q{INSERT INTO raids (tick,waves,message) VALUES(?,?,?) RETURNING (id)});
+       $query->execute($c->req->param('tick'),$c->req->param('waves')
+               ,html_escape $c->req->param('message'));
+       my $raid = $query->fetchrow_array;
+       $c->forward('log',[$raid,"Created retal raid landing at tick: ".$c->req->param('tick')]);
+
+       if ($c->req->param('target')) {
+               my @targets = $c->req->param('target');
+
+               my $addtarget = $dbh->prepare(q{
+INSERT INTO raid_targets(raid,pid,comment) (
+       SELECT $1,pid,array_to_string(array_agg(
+                       fleet || ': eta=' || eta || ', amount=' || amount || ', type=' || shiptype
+                               || ' landing=' || landing_tick || 'back=' || landing_tick + eta
+               ),E'\n')
+       FROM calls c
+               JOIN incomings i USING (call)
+               JOIN current_planet_stats p USING (pid)
+       WHERE c.status <> 'Covered' AND c.landing_tick BETWEEN tick() AND tick() + 6
+               AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10
+               AND pid = ANY ($2)
+       GROUP BY pid
+       )
+               });
+               $addtarget->execute($raid,\@targets);
+               $c->forward('log',[$raid,"BC added planets (@targets) to retal_raid"]);
+       }
+       $dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,'M')}
+               ,undef,$raid);
+       $dbh->commit;
+
+       $c->res->redirect($c->uri_for('edit',$raid));
+}
+
 
 sub listAlliances : Private {
        my ($self, $c) = @_;