X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fstats%2Fplanet.tt2;h=b139081dcb785a6857f5c5b8d32c801bdd335c25;hb=15d94c254b3f539cae6e9074e3a34a0ecababfa9;hp=d8d9f665037329c29912c83e800f8b3a01c3aa56;hpb=436af6a696e3488f5d25e027553ec356da4cde01;p=ndwebbie.git

diff --git a/root/src/stats/planet.tt2 b/root/src/stats/planet.tt2
index d8d9f66..b139081 100644
--- a/root/src/stats/planet.tt2
+++ b/root/src/stats/planet.tt2
@@ -1,5 +1,9 @@
 [% META title = 'Planet stats' %]
+[% IF p.id %]
 [% PROCESS inc/stats.tt2 %]
+[% ELSE %]
+<p> No such planet</p>
+[% END %]
 
 <div class="leftinfo">
 [% IF planetscan.tick %]
@@ -8,15 +12,15 @@
 	<tr><th>Type</th><th>Roids</th><th>Resources</th></tr>
 	<tr align="right"><td align="left">Metal</td>
 		<td>[% planetscan.metal_roids %]</td>
-		<td>[% comma(planetscan.metal) %]</td>
+		<td>[% planetscan.metal | commify %]</td>
 	</tr>
 	<tr align="right"><td align="left">Crystal</td>
 		<td>[% planetscan.crystal_roids %]</td>
-		<td>[% comma(planetscan.crystal) %]</td>
+		<td>[% planetscan.crystal | commify %]</td>
 	</tr>
 	<tr align="right"><td align="left">Eonium</td>
 		<td>[% planetscan.eonium_roids %]</td>
-		<td>[% comma(planetscan.eonium) %]</td>
+		<td>[% planetscan.eonium | commify %]</td>
 	</tr>
 	<tr><th>Agents</th><th><th>Guards</th></tr>
 	<tr align="right"><td>[% planetscan.agents %]</td>
@@ -27,60 +31,55 @@
 	<tr align="right"><td>[% planetscan.light %]</td>
 		<td>[% planetscan.medium %]</td><td>[% planetscan.heavy %]</td>
 	</tr>
-	<tr><th>Hidden:</th><td colspan="2" align="right">[% comma(planetscan.hidden) %]</td></tr>
+	<tr><th>Hidden:</th><td colspan="2" align="right">[% planetscan.hidden | commify %]</td></tr>
 </table>
 [% END %]
-[% IF structurescan.tick %]
-<table [% IF structurescan.tick < TICK - 24 %] class="old"[% END %]>
-	<tr><th>Tick:</th><td>[% structurescan.tick %]</td></tr>
+[% IF devscan.tick %]
+<table [% IF devscan.tick < TICK - 24 %] class="old"[% END %]>
+	<tr><th>Tick:</th><td>[% devscan.tick %]</td></tr>
 	<tr><th colspan="3">Factories</th></tr>
 	<tr><th>Light</th><th>Medium</th><th>Heavy</th></tr>
-	<tr align="right"><td>[% structurescan.light_fac %]</td>
-		<td>[% structurescan.medium_fac %]</td>
-		<td>[% structurescan.heavy_fac %]</td>
+	<tr align="right"><td>[% devscan.light_fac %]</td>
+		<td>[% devscan.medium_fac %]</td>
+		<td>[% devscan.heavy_fac %]</td>
 	</tr>
 	<tr><th>Amps</th><th></th><th>Distorters</th></tr>
-	<tr align="right"><td>[% structurescan.amps %]</td>
+	<tr align="right"><td>[% devscan.amps %]</td>
 		<td></td>
-		<td>[% structurescan.distorters %]</td>
+		<td>[% devscan.distorters %]</td>
 	</tr>
-	<tr><th colspan="3">Refinaries</th></tr>
+	<tr><th colspan="3">Refineries</th></tr>
 	<tr><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
-	<tr align="right"><td>[% structurescan.metal_ref %]</td>
-		<td>[% structurescan.crystal_ref %]</td>
-		<td>[% structurescan.eonium_ref %]</td>
+	<tr align="right"><td>[% devscan.metal_ref %]</td>
+		<td>[% devscan.crystal_ref %]</td>
+		<td>[% devscan.eonium_ref %]</td>
 	</tr>
 	<tr><th>Reslabs</th><th>Finance</th><th>Seccents</th></tr>
-	<tr align="right"><td>[% structurescan.reslabs %]</td>
-		<td>[% structurescan.fincents %]</td>
-		<td>[% structurescan.seccents %]</td>
+	<tr align="right"><td>[% devscan.reslabs %]</td>
+		<td>[% devscan.fincents %]</td>
+		<td>[% devscan.seccents %]</td>
 	</tr>
-</table>
-[% END %]
-[% IF techscan.tick %]
-<table [% IF techscan.tick < TICK - 24 %] class="old"[% END %]>
-	<tr><th>Tick:</th><td>[% techscan.tick %]</td></tr>
-	<tr><th>Research</th><th>Level</th></tr>
-	<tr><td>Travel Time</td>
-		<td align="right">[% techscan.travel %]</td>
+	<tr><th colspan="2">Research</th><th>Level</th></tr>
+	<tr><td colspan="2">Travel Time</td>
+		<td align="right">[% devscan.travel %]</td>
 	</tr>
-	<tr><td>Infrastructure</td>
-		<td align="right">[% techscan.infra %]</td>
+	<tr><td colspan="2">Infrastructure</td>
+		<td align="right">[% devscan.infra %]</td>
 	</tr>
-	<tr><td>Hulls</td>
-		<td align="right">[% techscan.hulls %]</td>
+	<tr><td colspan="2">Hulls</td>
+		<td align="right">[% devscan.hulls %]</td>
 	</tr>
-	<tr><td>Waves</td>
-		<td align="right">[% techscan.waves %]</td>
+	<tr><td colspan="2">Waves</td>
+		<td align="right">[% devscan.waves %]</td>
 	</tr>
-	<tr><td>Core Extraction</td>
-		<td align="right">[% techscan.extraction %]</td>
+	<tr><td colspan="2">Core Extraction</td>
+		<td align="right">[% devscan.extraction %]</td>
 	</tr>
-	<tr><td>Covert Ops</td>
-		<td align="right">[% techscan.covert %]</td>
+	<tr><td colspan="2">Covert Ops</td>
+		<td align="right">[% devscan.covert %]</td>
 	</tr>
-	<tr><td>Mining</td>
-		<td align="right">[% techscan.mining %]</td>
+	<tr><td colspan="2">Mining</td>
+		<td align="right">[% devscan.mining %]</td>
 	</tr>
 </table>
 [% END %]
@@ -125,7 +124,9 @@
 </div>
 [% END %]
 
+[% IF p.id %]
 <div class="leftinfo">
 <img class="graph" src="[% c.uri_for('/graphs/planetstats',p.id,STICK) %]" alt="stats" height="300" width="500">
 <img class="graph" src="[% c.uri_for('/graphs/planetranks',p.id,STICK) %]" alt="ranks" height="300" width="500">
 </div>
+[% END %]