X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Falliances%2Fresources.tt2;h=a9ce49807315627b510727eb23722b6f0d5875d1;hb=2a703f7250ea25f2f556eb25b644dcb7268f92ce;hp=dec56a96f2d48483844e2599799d34cad8d9e9cb;hpb=00325acb2f3a1ae09e4a73d09a33f056dfb60fda;p=ndwebbie.git

diff --git a/root/src/alliances/resources.tt2 b/root/src/alliances/resources.tt2
index dec56a9..a9ce498 100644
--- a/root/src/alliances/resources.tt2
+++ b/root/src/alliances/resources.tt2
@@ -9,7 +9,7 @@
 		<th><a href="[% c.uri_for('resources','resplanet') %]">Resources / Planet</a></th>
 		<th><a href="[% c.uri_for('resources','hidplanet') %]">Hidden Resources / Planet</a></th>
 		<th><a href="[% c.uri_for('resources','nscore') %]">Res score (gain)</a>[1]</th>
-		<th><a href="[% c.uri_for('resources','nscore2') %]">Avg res score (gain)</a>[2]</th>
+		<th><a href="[% c.uri_for('resources','nscore2') %]">Top res score (gain)</a>[2]</th>
 		<th><a href="[% c.uri_for('resources','nscore3') %]">Estimated score</a>[3]</th>
 	</tr>
 [% FOR a IN alliances %]
@@ -17,18 +17,18 @@
 		<td><a href="[% c.uri_for("edit",a.id) %]">[% a.name %]</a></td>
 		<td class="[% a.relationship %]">[% a.relationship %]</td>
 		<td>[% a.members %] ([% a.planets %])</td>
-		<td>[% a.score %]</td>
-		<td>[% a.size %]</td>
-		<td>[% a.resources %]</td>
-		<td>[% a.hidden %]</td>
-		<td>[% a.resplanet %]</td>
-		<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.score | commify %]</td>
+		<td>[% a.size | commify %]</td>
+		<td>[% a.resources | commify %]</td>
+		<td>[% a.hidden | commify %]</td>
+		<td>[% a.resplanet | commify %]</td>
+		<td>[% a.hidplanet | commify %]</td>
+		<td>[% a.nscore | commify %] ([% a.nscore - a.score %])</td>
+		<td>[% a.nscore2 | commify %] ([% a.nscore2 - a.score %])</td>
+		<td>[% a.nscore3 | commify %] ([% a.nscore3 - a.score %])</td>
 	</tr>
 [% END %]
 </table>
 <p>[1] = New score if resources are spent (gain is just the extra value compared to unspent resources) + hidden production getting released</p>
-<p>[2] = Same as [1] but calculated with avg resources and max 60 members</p>
-<p>[3] = Same as [2] but also includes resources if roids are kept to end of round (gain is just from the roids)</p>
+<p>[2] = Score for the top60 members, after res being spent and production getting released.</p>
+<p>[3] = Same as [2] but also includes resources if roids are kept to end of round</p>