Updated covop page to show 5 man bank hack + accurate values

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

diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm
index 21a47ebeb571c3d4d3e16d5fcb54ab6152c7b5cc..8ccc41689ee1082f6967add2e639c3a54ca37236 100644 (file)
--- a/lib/NDWeb/Controller/CovOp.pm
+++ b/lib/NDWeb/Controller/CovOp.pm
@@ -23,8 +23,8 @@ Catalyst Controller.
 
 sub index :Path :Args(0) {
        my ( $self, $c ) = @_;
-       $c->stash( where => q{AND MaxResHack > 130000
-               ORDER BY minalert ASC,MaxResHack DESC});
+       $c->stash( where => q{AND max_bank_hack > 60000
+               ORDER BY max_bank_hack DESC, minalert ASC});
        $c->forward('list');
 }
 
@@ -38,11 +38,11 @@ sub distwhores : Local {
 sub marktarget : Local {
        my ( $self, $c, $target ) = @_;
        my $dbh = $c->model;
-
        my $update = $dbh->prepare(q{INSERT INTO covop_attacks (uid,id,tick) VALUES(?,?,tick())});
-       $update->execute($c->user->id,$target);
-
-       $c->res->redirect($c->req->referer);
+       eval{
+               $update->execute($c->user->id,$target);
+       };
+       $c->forward('/redirect');
 }
 
 sub list : Private {
@@ -50,18 +50,19 @@ sub list : Private {
        my $dbh = $c->model;
 
        my $query = $dbh->prepare(q{SELECT id, coords, metal, crystal, eonium
-               , covop_alert(seccents,structures,gov,0) AS minalert
-               , covop_alert(seccents,structures,gov,50) AS maxalert
-               , distorters,gov
-               , MaxResHack,co.tick AS lastcovop
-               FROM (SELECT p.id,coords(x,y,z), metal,crystal,eonium,
-                       seccents,NULLIF(ss.total::integer,0) AS structures,distorters
-                       ,max_bank_hack(metal,crystal,eonium,p.value
-                               ,(SELECT value FROM current_planet_stats WHERE id = ?)) AS MaxResHack
-                       , planet_status, relationship,gov
+               , covop_alert(seccents,structures,size,guards,gov,0) AS minalert
+               , covop_alert(seccents,structures,size,guards,gov,50) AS maxalert
+               , distorters,gov,pstick,dstick
+               , max_bank_hack,hack15,co.tick AS lastcovop
+               FROM (SELECT p.id,coords(x,y,z),size, metal,crystal,eonium,guards
+                       ,seccents,NULLIF(ds.total::integer,0) AS structures,distorters
+                       ,max_bank_hack(metal,crystal,eonium,p.value,c.value,5)
+                       ,max_bank_hack(metal,crystal,eonium,p.value,c.value,15) AS hack15
+                       , planet_status, relationship,gov,ps.tick AS pstick, ds.tick AS dstick
                        FROM current_planet_stats p
                                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_development_scans ds ON p.id = ds.planet
+                               CROSS JOIN (SELECT value FROM current_planet_stats WHERE id = $1) c
                        ) AS foo
                        LEFT OUTER JOIN (SELECT id,max(tick) AS tick FROM covop_attacks GROUP BY id) co USING (id)
                WHERE (metal IS NOT NULL OR seccents IS NOT NULL)
@@ -70,11 +71,7 @@ sub list : Private {
                } . $c->stash->{where});
        $query->execute($c->user->planet);
 
-       my @targets;
-       while (my $target = $query->fetchrow_hashref){
-               push @targets,$target;
-       }
-       $c->stash(targets => \@targets);
+       $c->stash(targets => $query->fetchall_arrayref({}));
 
        $c->stash(template => 'covop/index.tt2');
 }