X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FResources.pm;h=f06620d41ea0501a0191bdd61e8809ee36834e15;hb=eb2ec45ab96b0968c5bfc5d17ec6c6d7a57ebe37;hp=ef098e049cd5eb59bd18be108ad17f1d3ea2650e;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git

diff --git a/NDWeb/Pages/Resources.pm b/NDWeb/Pages/Resources.pm
index ef098e0..f06620d 100644
--- a/NDWeb/Pages/Resources.pm
+++ b/NDWeb/Pages/Resources.pm
@@ -49,17 +49,14 @@ sub render_body {
 		(s.size::int8*(1464-tick())*250)/100 + score + (resources/planets*LEAST(members,60))/300 AS nscore3,
 		(s.size::int8*(1464-tick())*250)/100 AS scoregain3
 		FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources, count(*) AS planets 
-		FROM planets p join covop_targets c ON p.id = c.planet GROUP by alliance_id) r 
+		FROM planets p join planet_scans c ON p.id = c.planet GROUP by alliance_id) r 
 		NATURAL JOIN alliances a 
 		LEFT OUTER JOIN (SELECT * FROM alliance_stats WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON a.id = s.id
 		ORDER BY $order
 		});
 	$query->execute;
 	my @alliances;
-	my $i = 0;
 	while (my $alliance = $query->fetchrow_hashref){
-		$i++;
-		$alliance->{ODD} = $i % 2;
 		push @alliances,$alliance;
 	}
 	$BODY->param(Alliances => \@alliances);