fix station system sensor scan

st-universe · Sep 8, 2023 · cd680ee · cd680ee
1 parent 0accf3a
commit cd680ee
Showing 1 changed file with 45 additions and 40 deletions.
diff --git a/src/html/stationmacros.xhtml b/src/html/stationmacros.xhtml
@@ -214,47 +214,52 @@
           <td tal:condition="entry/getRow"
             style="width: ${viewportScale}vw; height: ${viewportScale}vw; font-size: ${viewportFont}vw;"
             tal:attributes="class entry/getCSSClass" tal:content="entry/getRow">.</td>
-          <td tal:condition="not:entry/getRow" tal:define="code entry/getSubspaceCode"
-            tal:attributes="class entry/getCSSClass"
-            style="background-image: url(assets/map/starmap/${entry/getSystemBackgroundId}.png); width: ${viewportScale}vw; height: ${viewportScale}vw; background-size: cover;">
-            <tal:block tal:condition="entry/isClickable">
-              <div style="width: ${viewportScale}vw; height: ${viewportScale}vw; top: 0px !important;"
-                class="lssobj imgOverlayText" onclick="${entry/getOnClick}">
-                <img src="assets/map/${entry/getFieldGraphicID}.png" class="lssSubspaceOverShield"
-                  style="z-index: 1; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                <tal:block tal:condition="entry/getShieldState">
-                  <img src="assets/planets/s1.png" class="lssColoShield"
-                    style="width: ${viewportScale}vw; height: ${viewportScale}vw; z-index: 2;" />
-                  <img tal:condition="php:SHIP.getSubspaceState() AND code" src="assets/subspace/generated/${code}.png"
-                    class="lssSubspaceOverShield"
-                    style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                </tal:block>
-                <tal:block tal:condition="not:entry/getShieldState">
-                  <img tal:condition="php:SHIP.getSubspaceState() AND code" src="assets/subspace/generated/${code}.png"
-                    style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                </tal:block>
-                <div style="font-size: ${viewportFont}vw;" class="centered" tal:content="entry/getDisplayCount">.
+          <tal:block tal:condition="not:entry/getRow">
+            <td tal:define="lssCellData entry/getLssCellData" tal:attributes="class entry/getCSSClass"
+              style="background-image: url(assets/map/starmap/${lssCellData/getSystemBackgroundId}.png); width: ${viewportScale}vw; height: ${viewportScale}vw; background-size: cover;">
+              <tal:block tal:condition="entry/isClickable" tal:define="code lssCellData/getSubspaceCode">
+                <div style="width: ${viewportScale}vw; height: ${viewportScale}vw; top: 0px !important;"
+                  class="lssobj imgOverlayText" onclick="${entry/getOnClick}">
+                  <img src="assets/map/${lssCellData/getFieldGraphicID}.png" class="lssSubspaceOverShield"
+                    style="z-index: 1; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                  <tal:block tal:condition="lssCellData/getColonyShieldState">
+                    <img src="assets/planets/s1.png" class="lssColoShield"
+                      style="width: ${viewportScale}vw; height: ${viewportScale}vw; z-index: 2;" />
+                    <img tal:condition="php:SHIP.getSubspaceState() AND code"
+                      src="assets/subspace/generated/${code}.png" class="lssSubspaceOverShield"
+                      style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                  </tal:block>
+                  <tal:block tal:condition="not:lssCellData/getColonyShieldState">
+                    <img tal:condition="php:SHIP.getSubspaceState() AND code"
+                      src="assets/subspace/generated/${code}.png"
+                      style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                  </tal:block>
+                  <div style="font-size: ${viewportFont}vw;" class="centered" tal:content="lssCellData/getDisplayCount">
+                    .
+                  </div>
                 </div>
-              </div>
-            </tal:block>
-            <tal:block tal:condition="not:entry/isClickable">
-              <div class="imgOverlayText" style="top: 0px !important;">
-                <tal:block tal:condition="entry/getShieldState">
-                  <img src="assets/planets/s1.png" class="lssColoShield"
-                    style="width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                  <img tal:condition="php:SHIP.getSubspaceState() AND code" src="assets/subspace/generated/${code}.png"
-                    class="lssSubspaceOverShield"
-                    style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                </tal:block>
-                <tal:block tal:condition="not:entry/getShieldState">
-                  <img tal:condition="php:SHIP.getSubspaceState() AND code" src="assets/subspace/generated/${code}.png"
-                    style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
-                </tal:block>
-                <div style="font-size: ${viewportFont}vw;" class="centered" tal:content="entry/getDisplayCount">.
+              </tal:block>
+              <tal:block tal:condition="not:entry/isClickable">
+                <div class="imgOverlayText" style="top: 0px !important;">
+                  <tal:block tal:condition="lssCellData/getColonyShieldState">
+                    <img src="assets/planets/s1.png" class="lssColoShield"
+                      style="width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                    <img tal:condition="php:SHIP.getSubspaceState() AND code"
+                      src="assets/subspace/generated/${code}.png" class="lssSubspaceOverShield"
+                      style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                  </tal:block>
+                  <tal:block tal:condition="not:lssCellData/getColonyShieldState">
+                    <img tal:condition="php:SHIP.getSubspaceState() AND code"
+                      src="assets/subspace/generated/${code}.png"
+                      style="z-index: 3; width: ${viewportScale}vw; height: ${viewportScale}vw;" />
+                  </tal:block>
+                  <div style="font-size: ${viewportFont}vw;" class="centered" tal:content="lssCellData/getDisplayCount">
+                    .
+                  </div>
                 </div>
-              </div>
-            </tal:block>
-          </td>
+              </tal:block>
+            </td>
+          </tal:block>
         </tal:block>
       </tr>
     </table>
@@ -346,4 +351,4 @@
   </table>
 </metal:macro>
 
-</html>
+</html>