X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fraids%2Fview.tt2;h=826ac606190abc7dff8d8dd7b6be26e770753ba8;hb=9a036ffed7e1b7aae37274f9963047c564db8be4;hp=f076c8f4ceac58fac8449d73ec272feb550db608;hpb=2bfb812c02a2082d8801a7fbbb834992f49f961c;p=ndwebbie.git

diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index f076c8f..826ac60 100644
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -23,6 +23,9 @@
 <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>
@@ -33,7 +36,7 @@
 		<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 %] ([% comma(r.xp) %] xp)</li>
+			<li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp | commify %] xp)</li>
 		[% END %]
 	</ul>
 	[% IF t.comment %]
@@ -45,15 +48,15 @@
 	<tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
 	<tr align="center">
 		<th>Roids</th>
-		<td>[% comma(t.metal_roids) %]</td>
-		<td>[% comma(t.crystal_roids) %]</td>
-		<td>[% comma(t.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>[% comma(t.metal) %]</td>
-		<td>[% comma(t.crystal) %]</td>
-		<td>[% comma(t.eonium) %]</td>
+		<td>[% t.metal | commify %]</td>
+		<td>[% t.crystal | commify %]</td>
+		<td>[% t.eonium | commify %]</td>
 	</tr>
 
 	</table>
@@ -102,7 +105,7 @@
 		<table>
 		[% FOR s IN m.ships %]
 		<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-			<td>[% s.ship %]</td><td>[% comma(s.amount) %]</td>
+			<td>[% s.ship %]</td><td>[% s.amount | commify %]</td>
 		</tr>
 		[% END %]
 		</table>
@@ -124,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(){