From ea322778910b20ef3c4640fcdad5a36e8b358c5c Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Tue, 25 Nov 2008 23:35:43 +0100
Subject: [PATCH] Fixed estimated score column

---
 lib/NDWeb/Controller/Alliances.pm | 4 ++--
 root/src/alliances/resources.tt2  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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
diff --git a/root/src/alliances/resources.tt2 b/root/src/alliances/resources.tt2
index dec56a9..71031ab 100644
--- 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>
-- 
2.39.2