X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=944b6914d2a1f3371ab7799b4bc9e3f90af9a29c;hb=cc2295480ae9acde53cd38d11aa28c56b0d9db34;hp=647a7f90e672eaf64a9978df36377625e54e17a7;hpb=a29ab5af4b628f895810e8b644079d68ca0d51a2;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 647a7f9..944b691 100644
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -141,7 +141,7 @@ sub view : Local {
 			if ($planet->{x} == $target->{x}){
 				$target->{style} = 'incluster';
 			}
-			$target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.4);
+			$target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.6);
 			$target->{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4);
 			#next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
 		}
@@ -247,7 +247,7 @@ sub edit : Local {
 
 	my $targetquery = $dbh->prepare(qq{SELECT r.id,coords(x,y,z),comment,size
 		,score,value,race,planet_status,relationship,r.planet, s.scans
-		,max(rc.wave) AS waves
+		,COALESCE(max(rc.wave),0) AS waves
 		FROM raid_targets r
 			JOIN current_planet_stats p ON p.id = r.planet
 			LEFT OUTER JOIN ( SELECT planet, array_accum(s::text) AS scans
@@ -262,6 +262,7 @@ sub edit : Local {
 		WHERE r.raid = ?
 		GROUP BY r.id,x,y,z,comment,size,score,value,race
 			,planet_status,relationship,comment,r.planet, s.scans
+			,sizerank,scorerank,xprank,valuerank
 		ORDER BY $order
 		});
 	my $claims =  $dbh->prepare(q{ SELECT username,launched FROM raid_claims
@@ -271,7 +272,9 @@ sub edit : Local {
 	my @targets;
 	while (my $target = $targetquery->fetchrow_hashref){
 		my @waves;
-		$target->{waves} ||= $raid->{waves};
+		if ($target->{waves} < $raid->{waves}){
+			$target->{waves} = $raid->{waves}
+		}
 		for my $i (1 .. $target->{waves}){
 			$claims->execute($target->{id},$i);
 			my $claimers;