X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FIntel.pm;h=55f6643ee057f789e51746bff47427703bc32f15;hb=ae3584eafcf3b109119ed28e6a7c6d873ca6ec2c;hp=4cc3b7e4bcd6871301f069b6c26551d8da0ba35d;hpb=436af6a696e3488f5d25e027553ec356da4cde01;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm index 4cc3b7e..55f6643 100644 --- a/lib/NDWeb/Controller/Intel.pm +++ b/lib/NDWeb/Controller/Intel.pm @@ -289,13 +289,13 @@ sub naps : Local { ,ruler, p.planet,race, size, score, value , xp, sizerank, scorerank, valuerank, xprank, p.value - p.size*200 - COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - - COALESCE(ss.total ,(SELECT COALESCE(avg(total),0) - FROM structure_scans)::int)*1500 AS fleetvalue + - COALESCE(ds.total ,(SELECT COALESCE(avg(total),0) + FROM current_development_scans)::int)*1500 AS fleetvalue ,(metal+crystal+eonium)/100 AS resvalue, planet_status,hit_us , alliance,relationship,nick FROM current_planet_stats p LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet - LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet + LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc }); $query->execute;