X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=ae9c7a61a7c8eb4a632dcbcb62785741edb75106;hb=d29ac23b4c0f046c1da9f5e0a8245f1dce8396e5;hp=781f4c179db942308a2d7ee57573ad354d9ae9f5;hpb=8174fac466dde64437063677e2819d266c18a058;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 781f4c1..ae9c7a6 100644
--- 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 = ?});
@@ -132,7 +131,7 @@ sub view : Local {
 			LEFT OUTER JOIN current_development_scans ds USING (pid)
 		WHERE r.raid = $1
 			AND NOT COALESCE(p.x = $2 AND p.y = $3,False)
-		ORDER BY size});
+		ORDER BY size DESC, value DESC, score DESC});
 	$targetquery->execute($raid->{id},$planet->{x},$planet->{y});
 	my @targets;
 	while (my $target = $targetquery->fetchrow_hashref){
@@ -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);
@@ -204,7 +206,7 @@ ORDER BY name,tick DESC
 
 		push @targets,$target;
 	}
-	@targets = sort {$b->{roids}[0]{xp} <=> $a->{roids}[0]{xp} or $b->{size} <=> $a->{size}} @targets;
+	#@targets = sort {$b->{roids}[0]{xp} <=> $a->{roids}[0]{xp} or $b->{size} <=> $a->{size}} @targets;
 
 	$c->stash(targets => \@targets);
 }
@@ -309,10 +311,11 @@ sub postraidupdate : Local {
 	my $dbh = $c->model;
 
 	$dbh->begin_work;
+	my $tick = $c->req->param('tick');
+	my $waves = $c->req->param('waves');
 	$dbh->do(q{UPDATE raids SET message = ?, tick = ?, waves = ? WHERE id = ?}
 		,undef,html_escape $c->req->param('message')
-		,$c->req->param('tick'),$c->req->param('waves')
-		,$raid);
+		,$tick,$waves,$raid);
 
 	$c->forward('log',[$raid, 'BC updated raid']);
 
@@ -514,10 +517,12 @@ sub postcreate : Local {
 
 	$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 $tick = $c->req->param('tick');
+	my $waves = $c->req->param('waves');
+	my $message = html_escape $c->req->param('message');
+	$query->execute($tick,$waves,$message);
 	my $raid = $query->fetchrow_array;
-	$c->forward('log',[$raid,"Created raid landing at tick: ".$c->req->param('tick')]);
+	$c->forward('log',[$raid,"Created raid landing at tick: ".$tick]);
 
 	if ($c->req->param('gal') || $c->req->param('target')) {
 		my @gals = $c->req->param('gal');
@@ -531,7 +536,8 @@ sub postcreate : Local {
 				)
 			)
 		});
-		$addtarget->execute($raid,\@targets,\@gals,$c->req->param('sizelimit'));
+		my $sizelimit = $c->req->param('sizelimit');
+		$addtarget->execute($raid,\@targets,\@gals,$sizelimit);
 		$c->forward('log',[$raid,"BC added planets (@targets) and the gals for (@gals)"]);
 	}
 	$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,'M')}
@@ -720,9 +726,11 @@ sub postcreateretal : Local {
 	my $dbh = $c->model;
 
 	$dbh->begin_work;
+	my $tick = $c->req->param('tick');
+	my $waves = $c->req->param('waves');
+	my $message = html_escape $c->req->param('message');
 	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'));
+	$query->execute($tick, $waves, $message);
 	my $raid = $query->fetchrow_array;
 	$c->forward('log',[$raid,"Created retal raid landing at tick: ".$c->req->param('tick')]);