X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FRaids.pm;h=ac1f6b9f936cb2127ef0b30eef885724fdf48b9d;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=0b342fa42022547358865b52e8d680c91cd0f222;hpb=b3d60946973fc4d48b32c2447522f0bba02087d3;p=ndwebbie.git

diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm
index 0b342fa..ac1f6b9 100644
--- a/NDWeb/Pages/Raids.pm
+++ b/NDWeb/Pages/Raids.pm
@@ -222,9 +222,9 @@ sub render_body {
 			$target{Id} = $target->{id};
 			$target{Race} = $target->{race};
 			my $num = pow(10,length($target->{score})-2);
-			$target{Score} = ceil($target->{score}/$num)*$num;
+			$target{Score} = "Hidden"; #ceil($target->{score}/$num)*$num;
 			$num = pow(10,length($target->{value})-2);
-			$target{Value} = ceil($target->{value}/$num)*$num;
+			$target{Value} = "Hidden"; #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);
@@ -245,7 +245,9 @@ sub render_body {
 				ORDER BY name,i.tick DESC
 			});
 			$unitscans->execute($target->{planet}) or warn $DBH->errstr;
-			my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships WHERE id = ?});
+			my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+				WHERE id = ? ORDER BY num
+			});
 			my @missions;
 			while (my $mission = $unitscans->fetchrow_hashref){
 				my @ships;
@@ -280,7 +282,7 @@ sub render_body {
 				$size -= $roids;
 				my $xp = 0;
 				if ($planet){
-					$xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value});
+					$xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
 				}
 				push @roids,{Wave => $i, Roids => $roids, XP => $xp};
 				if ($self->{AJAX}){