X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FGraph.pm;h=68ff44000526bfef2e2d94384d955e084e1a4143;hb=c4b0e3e4fbef182e3ef1411c91cbb72c2ced70e2;hp=4f0ff62b5a5985878f57dcfb30393d76bd997483;hpb=37607373bbe268cc5dc741378dc51d878e8f8a9a;p=ndwebbie.git

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 4f0ff62..68ff440 100644
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -89,44 +89,46 @@ sub render_body {
 		my $query;
 		if ($type eq 'stats'){
 				$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+			$graph_settings{y_min_value} = 0;
 		}elsif($type eq 'ranks'){
 			$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+			$graph_settings{y_max_value} = 0;
 		}
 		$query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
 		$graph_settings{title} = $type;
 		$graph_settings{two_axes} = 1;
 		$graph_settings{use_axis} = [2,1,2,2];
-		$graph_settings{y_max_value} = 0 if $type eq 'ranks';
 		$img = graphFromQuery 500,300,\%graph_settings,$query;
 	}elsif ($type eq 'galstats' || $type eq 'galranks'){
 		my $query;
 		my ($x,$y) = ($req{x},$req{y});
 		if ($type eq 'galstats'){
 			$query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM galaxies WHERE x = $1 AND y = $2 ORDER BY tick ASC});
+			$graph_settings{y_min_value} = 0;
 		}elsif($type eq 'galranks'){
 			$query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
+			$graph_settings{y_max_value} = 0;
 		}
 		$query->execute($x,$y) or die $DBH->errstr;
 		$graph_settings{title} = $type;
 		$graph_settings{two_axes} = 1;
 		$graph_settings{use_axis} = [2,1,2,2];
-		$graph_settings{y_max_value} = 0 if $type eq 'ranks';
 		$img = graphFromQuery 500,300,\%graph_settings,$query;
 	}elsif ($type eq 'alliance' || $type eq 'allianceavg'){
 
 
 		$graph_settings{title} = 'Alliance vs known members';
 		$graph_settings{two_axes} = 1;
-		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{use_axis} = [2,1,1,2];
 		$graph_settings{y2_label} = 'score';
 
 		my $query;
 		if ($type eq 'alliance'){
-			$query = $DBH->prepare(q{SELECT a.tick,a.size,a.score,memsize, memscore FROM (SELECT tick,SUM(size) AS memsize,SUM(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+			$query = $DBH->prepare(q{SELECT a.tick,a.score,a.size,memsize, memscore FROM (SELECT tick,SUM(size) AS memsize,SUM(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
 WHERE a.id = $1 ORDER BY tick});
 		}else{
 			$graph_settings{title} = 'Average alliance vs known members';
-			$query = $DBH->prepare(q{SELECT a.tick,a.size/members AS size,a.score/members AS score,memsize, memscore FROM (SELECT tick,AVG(size) AS memsize,AVG(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+			$query = $DBH->prepare(q{SELECT a.tick,a.score/members AS score,a.size/members AS size,memsize, memscore FROM (SELECT tick,AVG(size) AS memsize,AVG(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
 WHERE a.id = $1 ORDER BY tick});
 		}
 		$query->execute($2) or die $DBH->errstr;
@@ -135,10 +137,10 @@ WHERE a.id = $1 ORDER BY tick});
 	}elsif ($type eq 'planetvsnd'){
 		$graph_settings{title} = 'You vs ND AVG';
 		$graph_settings{two_axes} = 1;
-		$graph_settings{use_axis} = [1,2,1,2];
+		$graph_settings{use_axis} = [2,1,1,2];
 		$graph_settings{y2_label} = 'score';
 
-		my $query = $DBH->prepare(q{SELECT a.tick,a.size/members as NDsize,a.score/members AS NDscore,memsize, memscore FROM (SELECT tick,size AS memsize,score AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.id = $1) p JOIN alliance_stats a ON a.tick = p.tick
+		my $query = $DBH->prepare(q{SELECT a.tick,a.score/members AS NDscore,a.size/members as NDsize,memsize, memscore FROM (SELECT tick,size AS memsize,score AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.id = $1) p JOIN alliance_stats a ON a.tick = p.tick
 			WHERE a.id = 1 ORDER BY tick});
 		$query->execute($req{id}) or die $DBH->errstr;