X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FAlliances.pm;h=e95d80f4a27aef74385665e369c9d163d446ab06;hb=ea322778910b20ef3c4640fcdad5a36e8b358c5c;hp=76ed462fa4c2188d157c07aa571db8f25efd85b5;hpb=d9c77fa710e898c2fd3bf7ac2459b59b88ac44f5;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm index 76ed462..e95d80f 100644 --- a/lib/NDWeb/Controller/Alliances.pm +++ b/lib/NDWeb/Controller/Alliances.pm @@ -221,9 +221,9 @@ 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 + ,(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