X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fraids%2Fview.tt2;h=826ac606190abc7dff8d8dd7b6be26e770753ba8;hb=25cfbba80f992bd251751782e30cb8c3d57b53d3;hp=80288f1fa37cc916c24722e4809730aaeee39ff9;hpb=ce9b24b16397f66996eb5f4e7f7a0da594bfb88e;p=ndwebbie.git

diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index 80288f1..826ac60 100644
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -22,6 +22,10 @@
 [% FOR t IN targets %]
 <fieldset class="[% t.style %]"> <legend><a name="target[% t.id %]">Target: #[% t.id %]</a></legend>
 	<div class="leftinfo"><ul>
+		<li><a href="[% c.uri_for('targetcalc',t.id) %]" rel="external">Calc</a></li>
+		[% IF raid.released_coords %]
+		<li>Coords: [% t.x %]:[% t.y %]:[% t.z %]</li>
+		[% END %]
 		<li>Size: [% t.size %]</li>
 		<li class="[% t.scorebash %]">Score: [% t.score %]</li>
 		<li class="[% t.valuebash %]">Value: [% t.value %]</li>
@@ -30,8 +34,9 @@
 		<li>Hidden value: [% t.hidden %]</li>
 		<li>Factory Usage: [% t.light %], [% t.medium %], [% t.heavy %]</li>
 		<li>Race: [% t.race %]</li>
+		<li>Cap: [% t.cap * 100 | format('%.02f') %]</li>
 		[% FOR r IN t.roids %]
-			<li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp %] xp)</li>
+			<li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp | commify %] xp)</li>
 		[% END %]
 	</ul>
 	[% IF t.comment %]
@@ -43,15 +48,15 @@
 	<tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
 	<tr align="center">
 		<th>Roids</th>
-		<td>[% t.scans.metal_roids %]</td>
-		<td>[% t.scans.crystal_roids %]</td>
-		<td>[% t.scans.eonium_roids %]</td>
+		<td>[% t.metal_roids | commify %]</td>
+		<td>[% t.crystal_roids | commify %]</td>
+		<td>[% t.eonium_roids | commify %]</td>
 	</tr>
 	<tr align="center">
 		<th>Resources</th>
-		<td>[% t.scans.metal %]</td>
-		<td>[% t.scans.crystal %]</td>
-		<td>[% t.scans.eonium %]</td>
+		<td>[% t.metal | commify %]</td>
+		<td>[% t.crystal | commify %]</td>
+		<td>[% t.eonium | commify %]</td>
 	</tr>
 
 	</table>
@@ -61,32 +66,32 @@
 	<tr><th>Waves</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.scans.waves %]</td>
+		<td>[% t.waves %]</td>
 	</tr>
 	<tr>
 		<td>Amps</td>
-		<td>[% t.scans.amps %]</td>
+		<td>[% t.amps %]</td>
 	</tr>
 	<tr>
 		<td>Dists</td>
-		<td>[% t.scans.distorters %]</td>
+		<td>[% t.distorters %]</td>
 	</tr>
 	<tr><th>Production</th></tr>
 	<tr>
 		<td>Research</td>
-		<td>[% t.scans.hulls %]</td>
+		<td>[% t.hulls %]</td>
 	</tr>
 	<tr>
 		<td>Light factory</td>
-		<td>[% t.scans.light_fac %]</td>
+		<td>[% t.light_fac %]</td>
 	</tr>
 	<tr>
 		<td>Medium factory</td>
-		<td>[% t.scans.medium_fac %]</td>
+		<td>[% t.medium_fac %]</td>
 	</tr>
 	<tr>
 		<td>Heavy factory</td>
-		<td>[% t.scans.heavy_fac %]</td>
+		<td>[% t.heavy_fac %]</td>
 	</tr>
 	</table>
 	</div>
@@ -100,7 +105,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>[% s.amount | commify %]</td>
 		</tr>
 		[% END %]
 		</table>
@@ -122,15 +127,15 @@
 
 <script type="text/javascript">
 function update(){
-	$.get("/jsrpc/update/[% raid %]/"+modified,{},parseUpdate);
+	$.get("/jsrpc/update/[% raid.id %]/"+modified,{},parseUpdate);
 }
 
 function claim(target,wave,command){
-	$.get("/jsrpc/"+command+"/"+[% raid %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
+	$.get("/jsrpc/"+command+"/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
 }
 
 function join(target,wave,joinable){
-	$.get("/jsrpc/joinable/"+[% raid %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
+	$.get("/jsrpc/joinable/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
 }
 
 $(document).ready(function(){