Fixed estimated score column

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index 76ed462fa4c2188d157c07aa571db8f25efd85b5..e95d80f4a27aef74385665e369c9d163d446ab06 100644 (file)
--- 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

diff --git a/root/src/alliances/resources.tt2 b/root/src/alliances/resources.tt2
index dec56a96f2d48483844e2599799d34cad8d9e9cb..71031ab294405fa8a3f0447e3ab3d4057a5f0652 100644 (file)
--- a/root/src/alliances/resources.tt2
+++ b/root/src/alliances/resources.tt2
@@ -25,7 +25,7 @@
                <td>[% a.hidplanet %]</td>
                <td>[% a.nscore %] ([% a.scoregain %])</td>
                <td>[% a.nscore2 %] ([% a.nscore2 - a.score %])</td>
-               <td>[% a.nscore2 %] ([% a.nscore3 - a.score %])</td>
+               <td>[% a.nscore3 %] ([% a.scoregain3 %])</td>
        </tr>
 [% END %]
 </table>