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

diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm
index 7b020b0..7e3d2e5 100644
--- a/lib/NDWeb/Controller/CovOp.pm
+++ b/lib/NDWeb/Controller/CovOp.pm
@@ -23,29 +23,36 @@ Catalyst Controller.
 
 sub index :Path :Args(0) {
 	my ( $self, $c ) = @_;
-	$c->stash( where => q{AND max_bank_hack > 60000
-		ORDER BY max_bank_hack DESC, hack5 DESC, hack15 DESC, minalert,x,y,z});
+	$c->stash( where => q{hack5 > 60000 AND minalert < 60
+		ORDER BY hack5 DESC, hack13 DESC
+			,(CASE WHEN tick() - lastcovop < 6 THEN lastcovop ELSE NULL END) NULLS FIRST
+			,minalert, pstick DESC, dstick DESC,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->stash( where =>  q{minalert < 60
+		ORDER BY minalert, hack5 DESC,lastcovop NULLS FIRST
+			,hack13 DESC,pstick DESC, dstick 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, x,y,z});
+	$c->stash( where =>  q{distorters > 0
+		ORDER BY distorters DESC, minalert
+			,lastcovop NULLS FIRST,pstick DESC, dstick DESC,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())});
+	my $update = $dbh->prepare(q{INSERT INTO covop_attacks (uid,pid,tick) VALUES(?,?,tick())});
 	eval{
 		$update->execute($c->user->id,$target);
 	};
@@ -56,26 +63,33 @@ sub list : Private {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT *
-		FROM (SELECT p.id,coords(x,y,z),x,y,z,size, metal,crystal,eonium
+	my $query = $dbh->prepare(q{
+	SELECT * FROM (
+		SELECT *, pid AS id
+			,(2*pvalue::float/cvalue) :: Numeric(4,1) AS max_bank_hack
+			,max_bank_hack(metal,crystal,eonium,pvalue,cvalue,5) AS hack5
+			,max_bank_hack(metal,crystal,eonium,pvalue,cvalue,13) AS hack13
+		FROM (SELECT pid,coords(x,y,z),x,y,z,size
+			,metal + metal_roids * (tick()-ps.tick) * 125 AS metal
+			,crystal + crystal_roids * (tick()-ps.tick) * 125 AS crystal
+			,eonium + eonium_roids * (tick()-ps.tick) * 125 AS 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
+			, p.value AS pvalue, c.value AS cvalue
 			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
+				LEFT OUTER JOIN current_planet_scans ps USING (pid)
+				LEFT OUTER JOIN current_development_scans ds USING (pid)
+				CROSS JOIN (SELECT value FROM current_planet_stats WHERE pid = $1) c
 			) AS foo
-			LEFT OUTER JOIN (SELECT id,max(tick) AS lastcovop FROM covop_attacks
-				GROUP BY id) co USING (id)
+			LEFT OUTER JOIN (SELECT pid,max(tick) AS lastcovop FROM covop_attacks
+				GROUP BY pid) co USING (pid)
 		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});
+	) a
+	WHERE } . $c->stash->{where});
 	$query->execute($c->user->planet);
 
 	$c->stash(targets => $query->fetchall_arrayref({}));