X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=1b1335274ee3fd004daf9f236f97aa9b668cf0a1;hp=26e915764e961fc57b25c44da5c0a2a81a826a80;hb=612f5232bc9d8966b209da8f04cf0fb5619f867e;hpb=4e9d3ae6bff7db31eeef5110180ac6e440502dd3

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 26e9157..1b13352 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 = ?});
@@ -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
 		});
 
@@ -734,7 +736,7 @@ 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
-		),'\n')
+		),E'\n')
 	FROM calls c
 		JOIN incomings i USING (call)
 		JOIN current_planet_stats p USING (pid)