X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FCovOp.pm;h=7b020b045d81a9379204206623331194a38a03fc;hb=8324b5418795fb16c583fea1c84237c195095579;hp=ea67978ef9fd8037de2d9baf24d8bc1674bef33c;hpb=a4b209407c81ec7b71c9c7f8c4d57bb2f77256f4;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm
index ea67978..7b020b0 100644
--- a/lib/NDWeb/Controller/CovOp.pm
+++ b/lib/NDWeb/Controller/CovOp.pm
@@ -23,58 +23,62 @@ 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, hack5 DESC, hack15 DESC, minalert,x,y,z});
+	$c->forward('list');
+}
+
+sub easy : Local {
+	my ( $self, $c ) = @_;
+	$c->stash( where =>  qq{AND minalert < 70
+		ORDER BY minalert, max_bank_hack DESC, hack5 DESC, hack15 DESC,x,y,z});
 	$c->forward('list');
 }
 
 sub distwhores : Local {
 	my ( $self, $c ) = @_;
 	$c->stash( where =>  qq{AND distorters > 0
-		ORDER BY distorters DESC, minalert ASC});
+		ORDER BY distorters DESC, minalert, x,y,z});
 	$c->forward('list');
 }
 
 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 {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT id, coords, metal, crystal, eonium
-		, covop_alert(seccents,structures,size,guards,gov,0) AS minalert
-		, covop_alert(seccents,structures,size,guards,gov,50) AS maxalert
-		, distorters,gov
-		, MaxResHack,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
-				,(SELECT value FROM current_planet_stats WHERE id = ?)) AS MaxResHack
-			, planet_status, relationship,gov
+	my $query = $dbh->prepare(q{SELECT *
+		FROM (SELECT p.id,coords(x,y,z),x,y,z,size, metal,crystal,eonium
+			,distorters,guards
+			,covop_alert(seccents,ds.total,size,guards,gov,0) AS minalert
+			,covop_alert(seccents,ds.total,size,guards,gov,50) AS maxalert
+			,max_bank_hack(500000,500000,500000,p.value,c.value,5)
+			,max_bank_hack(metal,crystal,eonium,p.value,c.value,5) AS hack5
+			,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_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)
+			LEFT OUTER JOIN (SELECT id,max(tick) AS lastcovop FROM covop_attacks
+				GROUP BY id) co USING (id)
+		WHERE (metal IS NOT NULL OR distorters IS NOT NULL)
 			AND (NOT planet_status IN ('Friendly','NAP'))
 			AND  (relationship IS NULL OR NOT relationship IN ('Friendly','NAP'))
 		} . $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');
 }