X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=templates%2Fraids.tmpl;h=4b88667db8dd21cda08ddb4b33355144f8e9d0db;hb=11149303e8c0c031f5e08c5792930b490ba4a30b;hp=3592592fd3c8acec6d4fcf46b013bb0bcede8681;hpb=619ac6577d061276b5cd03ac2a4a0ed1e7d4fc86;p=ndwebbie.git

diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index 3592592..4b88667 100644
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -52,7 +52,7 @@
 	<p><b style="color: red;">DO NOT JOIN A WAVE UNLESS YOU HAVE PERMISSION FROM THE PERSON WHO CLAIMED IT</b></p>
 	<p><b style="color: purple;">COORDS ARE NOT SHOWN UNTIL AT LEAST 10 MIN AFTER YOUR CLAIM</b></p>
 	<p>Landing tick first wave: <TMPL_VAR NAME=LandingTick></p>
-	<TMPL_VAR NAME=Message>
+	<TMPL_VAR ESCAPE=NONE NAME=Message>
 </fieldset>
 
 <TMPL_IF Ajax>
@@ -74,6 +74,8 @@
 		<li class="<TMPL_VAR NAME=ValueBash>">Value: <TMPL_VAR NAME=Value></li>
 		<li>Fleet value: <TMPL_VAR NAME=FleetValue></li>
 		<li>Resource value: <TMPL_VAR NAME=ResValue></li>
+		<li>Hidden value: <TMPL_VAR NAME=Hidden></li>
+		<li>Factory Usage: <TMPL_VAR NAME=Light>, <TMPL_VAR NAME=Medium>, <TMPL_VAR NAME=Heavy></li>
 		<li>Race: <TMPL_VAR NAME=Race></li>
 		<TMPL_LOOP Roids>
 			<li>Roids wave <TMPL_VAR NAME=Wave>: <TMPL_VAR NAME=Roids> (<TMPL_VAR NAME=XP> xp)</li>
@@ -81,15 +83,75 @@
 	</ul>
 	<TMPL_IF Comment>
 		<fieldset> <legend>Comment</legend>
-			<TMPL_VAR NAME=Comment>
+			<TMPL_VAR ESCAPE=NONE NAME=Comment>
 		</fieldset>
 	</TMPL_IF>
-	<TMPL_VAR NAME=PlanetScan>
+	<table>
+	<tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
+	<tr align="center">
+		<th>Roids</th>
+		<td><TMPL_VAR NAME=roidMetal></td>
+		<td><TMPL_VAR NAME=roidCrystal></td>
+		<td><TMPL_VAR NAME=roidEonium></td>
+	</tr>
+	<tr align="center">
+		<th>Resources</th>
+		<td><TMPL_VAR NAME=resourceMetal></td>
+		<td><TMPL_VAR NAME=resourceCrystal></td>
+		<td><TMPL_VAR NAME=resourceEonium></td>
+	</tr>
+
+	</table>
+	</div>
+	<div class="leftinfo">
+	<table>
+	<tr><th>Waves</th></tr>
+	<tr>
+		<td>Research</td>
+		<td><TMPL_VAR NAME=techWaves></td>
+	</tr>
+	<tr>
+		<td>Amps</td>
+		<td><TMPL_VAR NAME="strucWave Amplifier"></td>
+	</tr>
+	<tr>
+		<td>Dists</td>
+		<td><TMPL_VAR NAME="strucWave Distorter"></td>
+	</tr>
+	<tr><th>Production</th></tr>
+	<tr>
+		<td>Research</td>
+		<td><TMPL_VAR NAME=techHulls></td>
+	</tr>
+	<tr>
+		<td>Light factory</td>
+		<td><TMPL_VAR NAME="strucLight Factory"></td>
+	</tr>
+	<tr>
+		<td>Medium factory</td>
+		<td><TMPL_VAR NAME="strucMedium Factory"></td>
+	</tr>
+	<tr>
+		<td>Heavy factory</td>
+		<td><TMPL_VAR NAME="strucHeavy Factory"></td>
+	</tr>
+	</table>
+	</div>
+	<TMPL_LOOP Missions>
+	<div class="leftinfo">
+
+		<p><TMPL_VAR NAME=Name><br/>
+			Tick: <TMPL_VAR NAME=Tick><br/>
+			Ships:<TMPL_VAR NAME=Amount>
+		</p>
+		<table>
+		<TMPL_LOOP Ships>
+		<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
+			<td><TMPL_VAR NAME=Ship></td><td><TMPL_VAR NAME=Amount></td>
+		</tr>
+		</TMPL_LOOP>
+		</table>
 	</div>
-	<TMPL_LOOP Scans>
-		<div class="leftinfo">
-		<TMPL_VAR NAME=Scan>
-		</div>
 	</TMPL_LOOP>
 	<div class="clear"> &nbsp;</div>
 	<form action="<TMPL_VAR NAME=PAGE>" method="post">