Fixed estimated score column

[ndwebbie.git] / lib / NDWeb / Controller / Alliances.pm

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index aa1c33d27408f78c525bffb41db3a24edcff708a..e95d80f4a27aef74385665e369c9d163d446ab06 100644 (file)
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -84,7 +84,7 @@ sub edit : Local {
        $order .= ' DESC' if $order eq 'hit_us';
 
        my $members = $dbh->prepare(q{
-               SELECT coords(x,y,z), nick, ruler, planet, race, size, score, value, xp
+               SELECT id, coords(x,y,z), nick, ruler, planet, race, size, score, value, xp
                        ,planet_status,hit_us, sizerank, scorerank, valuerank, xprank
                FROM current_planet_stats p
                WHERE p.alliance_id = ?
@@ -96,7 +96,7 @@ sub edit : Local {
        my $ticks = $c->req->param('ticks') || 48;
        $c->stash(showticks => $ticks);
 
-       my $query = $dbh->prepare(intelquery q{
+       $query = $dbh->prepare(intelquery q{
                        o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender
                        ,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target
                },q{NOT ingal AND (o.alliance_id = $1 OR t.alliance_id = $1)
@@ -221,12 +221,15 @@ sub resources : Local {
                ,((resources/planets*scoremem)/300 + (hidden/planets*scoremem)/100)::bigint AS scoregain2
                ,(score + (resources/planets*scoremem)/300
                        + (hidden/planets*scoremem)/100)::bigint AS nscore2
-               ,((s.size::int8*(1400-tick())*250)/100 + score + (resources/planets*scoremem)/300
+               ,((s.size::int8*(1150-tick())*250)/100 + score + (resources/planets*scoremem)/300
                        + (hidden/planets*scoremem)/100)::bigint AS nscore3
-               ,(s.size::int8*(1400-tick())*250)/100 AS scoregain3
-               FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources, sum(hidden) AS hidden, count(*) AS planets 
-               FROM planets p join planet_scans c ON p.id = c.planet GROUP by alliance_id) r 
-                       NATURAL JOIN alliances a 
+               ,(s.size::int8*(1150-tick())*250)/100 AS scoregain3
+               FROM (SELECT alliance_id AS id,sum(metal+crystal+eonium) AS resources
+                               , sum(hidden) AS hidden, count(*) AS planets
+                               FROM planets p join current_planet_scans c ON p.id = c.planet
+                               GROUP by alliance_id
+                       ) r
+                       NATURAL JOIN alliances a
                        LEFT OUTER JOIN (SELECT *,LEAST(members,60) AS scoremem FROM alliance_stats
                                WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON a.id = s.id
                ORDER BY $order
@@ -242,12 +245,11 @@ sub resources : Local {
 
 =head1 AUTHOR
 
-A clever guy
+Michael Andreen (harv@ruin.nu)
 
 =head1 LICENSE
 
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
+GPL 2.0, or later.
 
 =cut