X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fraids%2Fview.tt2;h=4b88e7ad0c3b784019a0571288b406558398a250;hb=27f93c2b1d0e6c9c8a073b18ed508cf68ded6003;hp=e163b9de7f17e76da5cc4cf901606cae2503d884;hpb=b1a7289bb7acbb4e911b62557acb7812492d90d5;p=ndwebbie.git

diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index e163b9d..4b88e7a 100644
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -31,7 +31,7 @@
 		<li>Factory Usage: [% t.light %], [% t.medium %], [% t.heavy %]</li>
 		<li>Race: [% t.race %]</li>
 		[% FOR r IN t.roids %]
-			<li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp %] xp)</li>
+			<li>Roids wave [% r.wave %]: [% r.roids %] ([% comma(r.xp) %] xp)</li>
 		[% END %]
 	</ul>
 	[% IF t.comment %]
@@ -43,15 +43,15 @@
 	<tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
 	<tr align="center">
 		<th>Roids</th>
-		<td>[% t.roidMetal %]</td>
-		<td>[% t.roidCrystal %]</td>
-		<td>[% t.roidEonium %]</td>
+		<td>[% comma(t.metal_roids) %]</td>
+		<td>[% comma(t.crystal_roids) %]</td>
+		<td>[% comma(t.eonium_roids) %]</td>
 	</tr>
 	<tr align="center">
 		<th>Resources</th>
-		<td>[% t.resourceMetal %]</td>
-		<td>[% t.resourceCrystal %]</td>
-		<td>[% t.resourceEonium %]</td>
+		<td>[% comma(t.metal) %]</td>
+		<td>[% comma(t.crystal) %]</td>
+		<td>[% comma(t.eonium) %]</td>
 	</tr>
 
 	</table>
@@ -61,32 +61,32 @@
 	<tr><th>Waves</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.techWaves %]</td>
+		<td>[% t.waves %]</td>
 	</tr>
 	<tr>
 		<td>Amps</td>
-		<td>[% t.strucWave_Amplifier %]</td>
+		<td>[% t.amps %]</td>
 	</tr>
 	<tr>
 		<td>Dists</td>
-		<td>[% t.strucWave_Distorter %]</td>
+		<td>[% t.distorters %]</td>
 	</tr>
 	<tr><th>Production</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.techHulls %]</td>
+		<td>[% t.hulls %]</td>
 	</tr>
 	<tr>
 		<td>Light factory</td>
-		<td>[% t.strucLight_Factory %]</td>
+		<td>[% t.light_fac %]</td>
 	</tr>
 	<tr>
 		<td>Medium factory</td>
-		<td>[% t.strucMedium_Factory %]</td>
+		<td>[% t.medium_fac %]</td>
 	</tr>
 	<tr>
 		<td>Heavy factory</td>
-		<td>[% t.strucHeavy_Factory %]</td>
+		<td>[% t.heavy_fac %]</td>
 	</tr>
 	</table>
 	</div>
@@ -100,7 +100,7 @@
 		<table>
 		[% FOR s IN m.ships %]
 		<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-			<td>[% s.ship %]</td><td>[% s.amount %]</td>
+			<td>[% s.ship %]</td><td>[% comma(s.amount) %]</td>
 		</tr>
 		[% END %]
 		</table>