Issue #42 Add Agility and Attack value to overlay

NineWorlds · Jun 24, 2017 · c216057 · c216057
1 parent d6aa9ad
commit c216057
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 3 deletions.
diff --git a/...ineworlds.xstreamer.templates/templates/squads/html/DarkSide_leftaligned_squad_detail.ftl b/...ineworlds.xstreamer.templates/templates/squads/html/DarkSide_leftaligned_squad_detail.ftl
@@ -25,6 +25,8 @@
  	  </#if>
 	</#if>
 	<div>
+  	  <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
+  	  <span><b class="attack">${fun.findShipAgility(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>	
 	  <span><b class="shields">${(pilot.shields)!"0"}</b> <span class="shields-symbol">*</span>&nbsp;&nbsp;</span>
       <span><b class="hull">${(pilot.hull)!"0"}</b>span class="hull-symbol">&</span></span>
       <#if pilot.pilotId!?length gt 0>

diff --git a/...neworlds.xstreamer.templates/templates/squads/html/DarkSide_rightaligned_squad_detail.ftl b/...neworlds.xstreamer.templates/templates/squads/html/DarkSide_rightaligned_squad_detail.ftl
@@ -24,6 +24,8 @@
 	  </#if>
 	</#if>
 	<div>
+  	  <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
+  	  <span><b class="attack">${fun.findShipAgility(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>	
 	  <span><b class="shields">${(pilot.shields)!"0"}</b> <span class="shields-symbol">*</span>&nbsp;&nbsp;</span>
       <span><b class="hull">${(pilot.hull)!"0"}</b>span class="hull-symbol">&</span></span>
       <#if pilot.pilotId!?length gt 0>

diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/common_utils.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/common_utils.ftl
@@ -7,6 +7,25 @@
   <#return ''>
 </#function>
 
+<#function findShipAgility shipName>
+  <#list allships as ship>
+     <#if ship.xws = shipName>
+        <#return ship.agility>
+     </#if>
+  </#list>
+  <#return '0'>
+</#function>
+
+<#function findShipAttack shipName>
+  <#list allships as ship>
+     <#if ship.xws = shipName>
+        <#return ship.attack>
+     </#if>
+  </#list>
+  <#return '0'>
+</#function>
+
+
 <#function upgradeIconMarkup upgradeType>
   <#assign markup>
     <span class="upgrade-type-symbol">

diff --git a/...neworlds.xstreamer.templates/templates/squads/html/common/css_epic_leftaligned_squads.ftl b/...neworlds.xstreamer.templates/templates/squads/html/common/css_epic_leftaligned_squads.ftl
@@ -36,6 +36,22 @@
        text-shadow: 0px 0px #000000;
        -webkit-font-smoothing: always;
     }
+    
+    .agility-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #56f442;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
+
+    .attack-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #f20e38;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
                   
     .squad { padding:10px;
              height: 100%;
@@ -45,6 +61,8 @@
     .upgrades { font-size: 0.9em; margin-bottom: 5px; font-weight:bold;}
     .shields { font-size: 0.95em; color: cyan; }
     .hull { font-size: 0.95em; color: yellow; }
+    .agility { font-size: 0.95em; color: #56f442; }
+    .attack { font-size: 0.95em; color: #f20e38; }
     .idtag { background-image: url(images/Token-IDTag_Light.png);
              background-size: 30px 30px;
              background-repeat: no-repeat;

diff --git a/...us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl b/...us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl
@@ -30,7 +30,23 @@
        text-shadow: 0px 0px #000000;
        -webkit-font-smoothing: always;
     }
-     
+
+    .agility-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #56f442;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
+
+    .attack-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #f20e38;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
+          
 
     .squad { padding:10px;
              height: 100%; 
@@ -40,6 +56,8 @@
     .upgrades { font-size: 0.9em; margin-bottom: 5px; font-weight:bold;}
     .shields { font-size: 0.95em; color: cyan; }
     .hull { font-size: 0.95em; color: yellow; }
+    .agility { font-size: 0.95em; color: #56f442; }
+    .attack { font-size: 0.95em; color: #f20e38; }    
     .idtag { background-image: url(images/Token-IDTag_Light.png);
              background-size: 30px 30px;
              background-repeat: no-repeat;

diff --git a/...s.nineworlds.xstreamer.templates/templates/squads/html/common/css_rightaligned_squads.ftl b/...s.nineworlds.xstreamer.templates/templates/squads/html/common/css_rightaligned_squads.ftl
@@ -22,6 +22,22 @@
                text-shadow: 0px 0px #000000;
                -webkit-font-smoothing: always;
              }
+    .agility-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #56f442;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
+
+    .attack-symbol {
+       font-family: "x-wing-symbols";
+       font-size: 16pt;
+       color: #f20e38;
+       text-shadow: 0px 0px #000000;
+       -webkit-font-smoothing: always;
+    }
+             
              
     .upgrade-type-symbol {
        font-family: "x-wing-symbols";
@@ -40,6 +56,8 @@
     .upgrades { font-size: 0.9em; margin-bottom: 5px; font-weight: bold;}
     .shields { font-size: 0.95em; color: cyan; }
     .hull { font-size: 0.95em; color: yellow; }
+    .agility { font-size: 0.95em; color: #56f442; }
+    .attack { font-size: 0.95em; color: #f20e38; }        
     .idtag { background-image: url(images/Token-IDTag_Light.png);
              background-size: 30px 30px;
              background-repeat: no-repeat;

diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl
@@ -8,6 +8,8 @@
 		<span> ${pilot.name} </span>
 	  </div>
 	  	<div>
+   	      <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
+  	      <span><b class="attack">${fun.findShipAgility(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>
 		  <span>
 		   <b class="shields">${(pilot.shields)!"0"}</b>
 		   <span class="shields-symbol">*</span>&nbsp;&nbsp;

diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl
@@ -7,12 +7,14 @@
 	<span> ${pilot.name} </span>
   </div>
   	<div>
+  	  <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
+  	  <span><b class="attack">${fun.findShipAgility(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>
 	  <span><b class="shields">${(pilot.shields)!"0"}</b> <span class="shields-symbol">*</span>&nbsp;&nbsp;</span>
       <span><b class="hull">${(pilot.hull)!"0"}</b> <span class="hull-symbol">&</span></span>
       <#if pilot.pilotId!?length gt 0>
 	    <span class="idtag"><b>${pilot.pilotId}</b></span>
 	  </#if>
-	  <span> pts: ${pilot.points}</span>
+	  <span> [${pilot.points}]</span>
 	</div>    	
 
     <#if pilot.upgrades??>

diff --git a/...les/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl b/...les/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl
@@ -7,7 +7,9 @@
 	<span> ${pilot.name} </span>
   </div>
   	<div>
-	  <span>pts: ${pilot.points}&nbsp;&nbsp;</span>
+	  <span>[${pilot.points}]&nbsp;&nbsp;</span>
+  	  <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
+  	  <span><b class="attack">${fun.findShipAgility(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>	  
 	  <span><b class="shields">${(pilot.shields)!"0"}</b> <span class="shields-symbol">*</span>&nbsp;&nbsp;</span>
       <span><b class="hull">${(pilot.hull)!"0"}</b> <span class="hull-symbol">&</span></span>
       <#if pilot.pilotId!?length gt 0>