From 7c93700c5cbe9cdfe4b83599f8b5ad14266f26e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Wed, 15 May 2019 00:53:44 +0200
Subject: [PATCH] Continued work on planning display

---
 docs/style.md                     |    3 +-
 graphics/ui/battle.svg            | 1272 +++++++++++++++++++++--------
 src/core/BattlePlanning.spec.ts   |    4 +-
 src/core/BattlePlanning.ts        |    3 +-
 src/core/actions/BaseAction.ts    |   16 +
 src/core/actions/MoveAction.ts    |    4 +
 src/core/actions/TriggerAction.ts |    4 +
 src/ui/battle/Arena.ts            |   12 +
 src/ui/battle/BattleView.spec.ts  |    2 +-
 src/ui/battle/BattleView.ts       |   14 +
 src/ui/battle/PlanDisplay.ts      |   25 +-
 src/ui/common/Tooltip.ts          |    2 +-
 12 files changed, 1006 insertions(+), 355 deletions(-)

diff --git a/docs/style.md b/docs/style.md
index 84e3538..83da903 100644
--- a/docs/style.md
+++ b/docs/style.md
@@ -16,8 +16,7 @@ Buttons should be lit by a pure white line in top-left corner (~75% of the borde
 * Third color is for neutral/story
 * Fourth color is for highlight
 
-http://paletton.com/#uid=63s0i0kcJwV44YO8FN3hmo6l-eV
-
+<http://paletton.com/#uid=63s0i0kcJwV44YO8FN3hmo6l-eV>
 
 ```
 *** Primary color:
diff --git a/graphics/ui/battle.svg b/graphics/ui/battle.svg
index 4bea56c..b1cefac 100644
--- a/graphics/ui/battle.svg
+++ b/graphics/ui/battle.svg
@@ -25,6 +25,22 @@
    enable-background="new">
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10876">
+      <stop
+         style="stop-color:#3a6479;stop-opacity:0"
+         offset="0"
+         id="stop10871" />
+      <stop
+         id="stop10880"
+         offset="0.57949823"
+         style="stop-color:#3b535f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6690a4;stop-opacity:1"
+         offset="1"
+         id="stop10873" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient8762">
@@ -61,18 +77,6 @@
          offset="1"
          id="stop5557" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5008">
-      <stop
-         style="stop-color:#391b13;stop-opacity:1;"
-         offset="0"
-         id="stop5004" />
-      <stop
-         style="stop-color:#6b3f34;stop-opacity:1"
-         offset="1"
-         id="stop5006" />
-    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6968">
@@ -121,42 +125,6 @@
          offset="1"
          id="stop6958" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10129">
-      <stop
-         style="stop-color:#994c1d;stop-opacity:1"
-         offset="0"
-         id="stop10125" />
-      <stop
-         id="stop10133"
-         offset="0.59190553"
-         style="stop-color:#8e471f;stop-opacity:0.45882353" />
-      <stop
-         style="stop-color:#080707;stop-opacity:0"
-         offset="1"
-         id="stop10127" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9609">
-      <stop
-         style="stop-color:#e09c47;stop-opacity:1"
-         offset="0"
-         id="stop9605" />
-      <stop
-         id="stop9617"
-         offset="0.50610304"
-         style="stop-color:#e09c47;stop-opacity:1" />
-      <stop
-         style="stop-color:#dc6441;stop-opacity:1"
-         offset="0.51251525"
-         id="stop9619" />
-      <stop
-         style="stop-color:#dc6441;stop-opacity:1"
-         offset="1"
-         id="stop9607" />
-    </linearGradient>
     <linearGradient
        id="linearGradient5947"
        osb:paint="gradient">
@@ -339,27 +307,6 @@
          result="composite2"
          id="feComposite6031-5-0" />
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9609"
-       id="linearGradient9611"
-       x1="732.44476"
-       y1="877.88531"
-       x2="1512.2041"
-       y2="877.88531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-546.66666,-230.83445)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10129"
-       id="radialGradient10131"
-       cx="1515.5656"
-       cy="877.29608"
-       fx="1515.5656"
-       fy="877.29608"
-       r="182.4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-546.66692,-230.83445)" />
     <filter
        style="color-interpolation-filters:sRGB"
        inkscape:label="Thin glory"
@@ -548,17 +495,6 @@
          y="121.98493"
          transform="rotate(45)" />
     </mask>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5008"
-       id="radialGradient5010"
-       cx="1493.6573"
-       cy="877.88531"
-       fx="1493.6573"
-       fy="877.88531"
-       r="18.468012"
-       gradientTransform="matrix(1,0,0,0.79806604,0,177.27486)"
-       gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
@@ -1278,19 +1214,6 @@
          d="m 1103.6304,498.39142 v 192.12646 h 192.124 V 498.39142 Z m 57.2615,21.62794 38.8005,67.20142 38.7979,-67.20142 6.2662,3.61879 -38.8005,67.20144 h 77.5983 v 7.23261 h -77.5983 l 38.8005,67.20143 -6.2662,3.61633 -38.7979,-67.20144 -38.8005,67.20144 -6.2636,-3.61633 38.798,-67.20143 h -77.5958 v -7.23261 h 77.5958 l -38.798,-67.20144 z"
          style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.27869511px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </clipPath>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter6823"
-       x="-0.59218971"
-       width="2.1843794"
-       y="-0.066229704"
-       height="1.1324594">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.4489155"
-         id="feGaussianBlur6825" />
-    </filter>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath6833">
@@ -1643,6 +1566,197 @@
          stdDeviation="3.0820655"
          id="feGaussianBlur1529" />
     </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter5165-3"
+       x="-0.035459854"
+       width="1.0709198"
+       y="-0.22327241"
+       height="1.4465448">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.9752511"
+         id="feGaussianBlur5167-8" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter5165"
+       x="-0.035459854"
+       width="1.0709198"
+       y="-0.22327241"
+       height="1.4465448">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.9752511"
+         id="feGaussianBlur5167" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter6697"
+       x="-0.027217617"
+       width="1.0544352"
+       y="-0.12710458"
+       height="1.2542092">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="14.534661"
+         id="feGaussianBlur6699" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter6767"
+       x="-0.068218563"
+       width="1.1364371"
+       y="-0.25422489"
+       height="1.5084498">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="26.716252"
+         id="feGaussianBlur6769" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter6913"
+       x="-0.022302223"
+       width="1.0446044"
+       y="-0.083111974"
+       height="1.1662239">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="13.296087"
+         id="feGaussianBlur6915" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter8723">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="0.6"
+         result="composite1"
+         id="feComposite8709" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix8711" />
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(111,131,172)"
+         result="flood1"
+         id="feFlood8713" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend8715" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend8717" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix8719" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite8721" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Colorize"
+       id="filter8751">
+      <feComposite
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="0"
+         k2="0.6"
+         result="composite1"
+         id="feComposite8737" />
+      <feColorMatrix
+         in="composite1"
+         values="1"
+         type="saturate"
+         result="colormatrix1"
+         id="feColorMatrix8739" />
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(192,144,88)"
+         result="flood1"
+         id="feFlood8741" />
+      <feBlend
+         in="flood1"
+         in2="colormatrix1"
+         mode="multiply"
+         result="blend1"
+         id="feBlend8743" />
+      <feBlend
+         in2="blend1"
+         mode="screen"
+         result="blend2"
+         id="feBlend8745" />
+      <feColorMatrix
+         in="blend2"
+         values="1"
+         type="saturate"
+         result="colormatrix2"
+         id="feColorMatrix8747" />
+      <feComposite
+         in="colormatrix2"
+         in2="SourceGraphic"
+         operator="in"
+         k2="1"
+         result="composite2"
+         id="feComposite8749" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4769"
+       x="-0.044399999"
+       width="1.0888"
+       y="-0.044399999"
+       height="1.0888">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.0378356"
+         id="feGaussianBlur4771" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10876"
+       id="linearGradient10878"
+       x1="1387.3435"
+       y1="207.43018"
+       x2="1883.7325"
+       y2="207.43018"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10876"
+       id="linearGradient10886"
+       gradientUnits="userSpaceOnUse"
+       x1="1387.3435"
+       y1="207.43018"
+       x2="1883.7325"
+       y2="207.43018"
+       gradientTransform="translate(3.0517578e-5,2.6187973)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1651,11 +1765,11 @@
      borderopacity="1"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.9999998"
-     inkscape:cx="-348.59606"
-     inkscape:cy="331.22692"
+     inkscape:zoom="0.49999998"
+     inkscape:cx="936.46786"
+     inkscape:cy="679.54174"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer12"
      showgrid="false"
      units="px"
      showguides="false"
@@ -1666,7 +1780,7 @@
      inkscape:object-nodes="true"
      inkscape:snap-intersection-paths="false"
      inkscape:object-paths="true"
-     inkscape:snap-global="true"
+     inkscape:snap-global="false"
      inkscape:showpageshadow="false"
      showborder="true"
      borderlayer="false"
@@ -1705,7 +1819,8 @@
   <g
      inkscape:groupmode="layer"
      id="layer8"
-     inkscape:label="Background">
+     inkscape:label="Background"
+     sodipodi:insensitive="true">
     <image
        sodipodi:absref="/home/michael/workspace/spacetac/data/stage2/image/battle/background.jpg"
        y="0"
@@ -1727,16 +1842,6 @@
      inkscape:label="Ship sprites"
      style="display:inline"
      transform="translate(0,-67.5)">
-    <image
-       sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/sprite.png"
-       xlink:href="pics/sprite.png"
-       style="display:inline;enable-background:new"
-       y="244.75706"
-       x="930.039"
-       id="image9266"
-       preserveAspectRatio="none"
-       height="84.542961"
-       width="84.542961" />
     <use
        x="0"
        y="0"
@@ -1744,7 +1849,7 @@
        id="use9421"
        width="100%"
        height="100%"
-       transform="rotate(145.64836,953.86992,404.14966)" />
+       transform="rotate(145.64836,277.97147,593.27542)" />
     <use
        x="0"
        y="0"
@@ -1752,7 +1857,7 @@
        id="use9423"
        width="100%"
        height="100%"
-       transform="rotate(20.124054,593.54688,-573.67691)" />
+       transform="rotate(20.124054,-178.55665,3185.8928)" />
     <use
        x="0"
        y="0"
@@ -1760,9 +1865,9 @@
        id="use9425"
        width="100%"
        height="100%"
-       transform="rotate(-19.010378,1837.2096,2376.0281)" />
+       transform="rotate(-19.010378,1274.7654,-1645.4552)" />
     <use
-       transform="rotate(-21.867087,1393.9931,-638.58841)"
+       transform="rotate(-21.867087,817.17482,-4126.6078)"
        height="100%"
        width="100%"
        id="use9392"
@@ -1770,72 +1875,107 @@
        y="0"
        x="0"
        style="display:inline;enable-background:new" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#image9266"
+       id="use8416"
+       transform="translate(1340.6316,36.123121)"
+       width="100%"
+       height="100%" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="Tactical HUD"
-     style="display:none">
-    <g
+     style="display:inline">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#image9266"
+       id="use8419"
+       transform="rotate(-75,547.80529,-267.91892)"
+       width="100%"
+       height="100%"
+       style="display:inline;filter:url(#filter8723);enable-background:new" />
+    <path
+       transform="translate(0,-39.862161)"
+       style="display:inline;fill:none;stroke:#a5b7da;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+       d="m 339.00002,654.86214 474.00002,138"
+       id="path8726"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.19899998;fill:#a5b7da;fill-opacity:1;stroke:#dde6f9;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8733"
+       sodipodi:type="arc"
+       sodipodi:cx="-812.54443"
+       sodipodi:cy="744.59564"
+       sodipodi:rx="612.26343"
+       sodipodi:ry="612.26343"
+       sodipodi:start="0"
+       sodipodi:end="0.78539816"
+       d="m -200.28101,744.59564 a 612.26343,612.26343 0 0 1 -179.3278,432.93566 L -812.54443,744.59564 Z"
+       transform="rotate(-95.121377)" />
+    <use
        style="display:inline;enable-background:new"
-       id="g6405"
-       inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-impacted.png"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96"
-       transform="translate(-194.06172,-219.87976)"
-       clip-path="url(#clipPath6833)">
-      <g
-         inkscape:export-ydpi="96"
-         inkscape:export-xdpi="96"
-         inkscape:export-filename="/home/michael/workspace/perso/spacetac/graphics/exported/battle/hud/ship-impacted.png"
-         transform="matrix(0.91965781,0,0,0.91965781,96.261289,118.46699)"
-         id="g10019">
-        <g
-           transform="rotate(60,1199.6921,594.4473)"
-           id="use10010">
-          <g
-             id="g7674">
-            <path
-               sodipodi:type="inkscape:offset"
-               inkscape:radius="0"
-               inkscape:original="M 1193.8203 549.1543 L 1199.6914 559.32422 L 1205.5645 549.1543 L 1193.8203 549.1543 z "
-               style="fill:#f1ca9b;fill-opacity:0.64880958;fill-rule:evenodd;stroke:none;stroke-width:0.4122031px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6823)"
-               id="path6803"
-               d="m 1193.8203,549.1543 5.8711,10.16992 5.8731,-10.16992 z"
-               transform="matrix(3.6059992,0,0,0.69851898,-3126.0615,164.02643)" />
-            <path
-               sodipodi:nodetypes="cccc"
-               inkscape:connector-curvature="0"
-               id="path6373"
-               d="m 1199.6921,559.32487 -5.8724,-10.17139 h 11.7449 z"
-               inkscape:transform-center-y="0.66622862"
-               inkscape:transform-center-x="-0.0001076466"
-               style="fill:#ffdfba;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4122031px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               transform="matrix(2.0288147,0,0,0.39300219,-1234.2608,333.33496)" />
-          </g>
-          <use
-             x="0"
-             y="0"
-             xlink:href="#g7674"
-             id="use7676"
-             width="100%"
-             height="100%"
-             transform="rotate(180,1199.6923,594.44732)" />
-          <g
-             id="g6791" />
-        </g>
-        <use
-           x="0"
-           y="0"
-           xlink:href="#use10010"
-           id="use6489"
-           width="100%"
-           height="100%"
-           transform="matrix(-1,0,0,1,2399.3843,0)" />
-      </g>
-      <g
-         id="g6556"
-         style="opacity:0.76499999" />
+       x="0"
+       y="0"
+       xlink:href="#g8766"
+       id="use8768"
+       transform="translate(1248.7506,-345.12415)"
+       width="100%"
+       height="100%" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g8766"
+       id="use8773"
+       transform="translate(1216.3279,-577.26334)"
+       width="100%"
+       height="100%" />
+    <g
+       id="g8800"
+       transform="translate(284.27209,-111.13709)">
+      <use
+         style="display:inline;enable-background:new"
+         x="0"
+         y="0"
+         xlink:href="#g8823"
+         id="use8825"
+         transform="translate(785.31801,-132.09479)"
+         width="100%"
+         height="100%" />
+      <use
+         height="100%"
+         width="100%"
+         id="use8781"
+         xlink:href="#image5902"
+         y="0"
+         x="0"
+         style="display:inline;enable-background:new"
+         transform="matrix(0.42114861,0,0,0.42114861,682.67213,602.49657)" />
+    </g>
+    <g
+       id="g10817"
+       transform="translate(8.8278819)">
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(556.00003,-179.86217)"
+         id="use10793"
+         xlink:href="#g8823"
+         y="0"
+         x="0" />
+      <use
+         style="display:inline;enable-background:new"
+         x="0"
+         y="0"
+         xlink:href="#g10791"
+         id="use10798"
+         transform="matrix(0.37250994,0,0,0.37250994,403.57696,572.12684)"
+         width="100%"
+         height="100%" />
     </g>
   </g>
   <g
@@ -1881,7 +2021,7 @@
        width="100%"
        height="100%" />
     <use
-       style="enable-background:new;display:inline"
+       style="display:inline;enable-background:new"
        x="0"
        y="0"
        xlink:href="#use7823"
@@ -1940,146 +2080,512 @@
        transform="translate(1717.6126,-370.0443)"
        width="100%"
        height="100%" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#path7819-7"
+       id="use1458"
+       transform="translate(1720.4498,-500.64015)"
+       width="100%"
+       height="100%" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer30"
-     inkscape:label="Targetting display"
-     style="display:none"
-     transform="translate(0,-67.5)">
-    <circle
-       style="display:inline;opacity:0.57300002;fill:url(#radialGradient10131);fill-opacity:1;fill-rule:evenodd;stroke:#5e2819;stroke-width:4.21875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
-       id="path8636"
-       cx="968.89886"
-       cy="646.46167"
-       r="180.31223" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;opacity:0.18900003;fill:#9b5e39;fill-opacity:1;fill-rule:evenodd;stroke:#97442b;stroke-width:4.21875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
-       id="path11657"
-       sodipodi:sides="14"
-       sodipodi:cx="968.89886"
-       sodipodi:cy="645.87238"
-       sodipodi:r1="141.68138"
-       sodipodi:r2="32.586716"
-       sodipodi:arg1="-0.52359878"
-       sodipodi:arg2="-0.2991993"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 1091.5985,575.03168 -91.5607,61.23559 110.1463,-0.98276 -109.0625,15.44466 99.6647,46.90523 -104.96303,-33.40527 69.44343,85.50305 -80.07448,-75.63888 25.46798,107.16595 -39.32613,-102.89128 -23.55172,107.60332 9.21125,-109.7648 -67.9067,86.72854 55.92421,-94.89806 -98.81192,48.6761 91.5607,-61.23559 -110.14624,0.98276 109.06247,-15.44466 -99.66473,-46.90522 104.96307,33.40526 -69.44341,-85.50305 80.07446,75.63888 -25.46797,-107.16595 39.32612,102.89128 23.55172,-107.60332 -9.21125,109.7648 67.90667,-86.72854 -55.92418,94.89806 z"
-       inkscape:transform-center-x="9.1027796"
-       inkscape:transform-center-y="-4.5764601" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:url(#linearGradient9611);stroke-width:5.625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
-       d="M 185.77812,647.05081 H 965.53744"
-       id="path9595"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+     id="layer7"
+     inkscape:label="Info bar"
+     style="display:inline">
     <g
-       transform="matrix(0,0.19477022,-0.19477022,0,610.33666,712.60774)"
-       id="use11345">
-      <rect
-         style="opacity:1;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect9427"
-         width="16.970562"
-         height="60.811184"
-         x="-437.6991"
-         y="68.069527" />
-      <rect
-         style="opacity:1;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect9429"
-         width="19.091883"
-         height="73.539108"
-         x="-262.33661"
-         y="60.998459" />
-      <ellipse
-         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="ellipse9431"
-         cx="-339.41125"
-         cy="108.37461"
-         rx="53.740116"
-         ry="99.702057" />
-      <ellipse
-         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="ellipse9433"
-         cx="-336.58282"
-         cy="143.3764"
-         rx="130.81476"
-         ry="65.407379" />
-    </g>
-    <g
-       id="g4978"
-       inkscape:export-filename="/tmp/export.png"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96"
-       transform="translate(-546.66666,-230.83445)">
-      <path
-         inkscape:export-ydpi="96"
-         inkscape:export-xdpi="96"
-         inkscape:export-filename="/tmp/export.png"
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path10745"
-         d="m 1510.9596,875.89667 v 3.98405 l -34.6853,11.63809 5.3601,-13.6335 -5.3601,-13.6335 z"
-         inkscape:transform-center-x="-3.93566"
-         style="display:inline;opacity:1;fill:url(#radialGradient5010);fill-opacity:1;fill-rule:evenodd;stroke:#dc6441;stroke-width:2.8125;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />
-      <path
-         inkscape:transform-center-y="7.8835938e-06"
-         transform="matrix(1,0,0,0.55607334,-1.5820313,389.70172)"
-         inkscape:transform-center-x="-1.5626526"
-         d="m 1509.8834,877.85156 -9.3759,5.41319 v -10.82637 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="true"
-         sodipodi:arg2="1.0471976"
-         sodipodi:arg1="0"
-         sodipodi:r2="3.1253049"
-         sodipodi:r1="6.2506104"
-         sodipodi:cy="877.85156"
-         sodipodi:cx="1503.6328"
-         sodipodi:sides="3"
-         id="path4974"
-         style="fill:#ec7b5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         style="display:inline;fill:none;fill-rule:evenodd;stroke:#b0482a;stroke-width:0.9375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-         d="m 1481.3672,869.44248 15.4687,5.15624"
-         id="path4980"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <use
+       inkscape:groupmode="layer"
+       id="layer11"
+       inkscape:label="Info bar common"
+       style="display:inline">
+      <g
+         transform="matrix(0.77010703,0,0,-0.18218608,320.69719,1187.8183)"
          style="display:inline;enable-background:new"
-         x="0"
-         y="0"
-         xlink:href="#path4980"
-         id="use4982"
-         width="100%"
-         height="100%"
-         transform="matrix(1,0,0,-1,-8.5648544e-5,1755.8688)" />
+         id="g1333">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path6771"
+           d="M 114.73481,657.01221 H 1545.5612 l -52.6516,383.94719 H 167.3864 Z"
+           style="fill:#688596;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6913)" />
+        <path
+           style="fill:#19323e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04770947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 114.73481,657.01221 H 1545.5612 l -52.6516,383.94719 H 167.3864 Z"
+           id="rect6272"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <g
+           id="g6654"
+           transform="translate(0,-14.826785)"
+           style="opacity:0.15899999;filter:url(#filter6697)">
+          <rect
+             transform="scale(1,-1)"
+             y="-1001.035"
+             x="189.32799"
+             height="43.911205"
+             width="1281.64"
+             id="rect6642"
+             style="opacity:1;fill:#3a6479;fill-opacity:1;stroke:none;stroke-width:1.45974934;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47096773" />
+          <use
+             height="100%"
+             width="100%"
+             transform="translate(0,-76.844509)"
+             id="use6644"
+             xlink:href="#rect6642"
+             y="0"
+             x="0" />
+          <use
+             height="100%"
+             width="100%"
+             transform="translate(0,-153.68903)"
+             id="use6646"
+             xlink:href="#rect6642"
+             y="0"
+             x="0" />
+          <use
+             height="100%"
+             width="100%"
+             transform="translate(0,-230.53356)"
+             id="use6648"
+             xlink:href="#rect6642"
+             y="0"
+             x="0" />
+        </g>
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path6701"
+           d="m 360.19528,722.87894 h 939.90552 l -34.5867,252.21371 H 394.78195 Z"
+           style="opacity:0.42699998;fill:#131b1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.68823713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6767)" />
+      </g>
+      <g
+         transform="matrix(0.5,0,0,0.5,-402.3459,980.07028)"
+         style="display:inline"
+         id="g5705">
+        <g
+           id="g5215"
+           transform="translate(1620.201,169.6419)"
+           style="display:inline"
+           inkscape:export-filename="/home/michael/workspace/spacetac/data/stage1/image/menu/button-small.png"
+           inkscape:export-xdpi="96"
+           inkscape:export-ydpi="96">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path5207"
+             d="M 258.92561,-63.492682 226.5282,-7.378725 H 91.451531 l -32.39741,-56.113957 32.39741,-56.113948 H 226.5282 Z"
+             style="fill:#3a6479;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.56945151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path5209"
+             d="m 65.633371,-63.493012 c 9.70143,16.80661 19.40286,33.61321 29.1043,50.419815 H 223.2415 c 9.70181,-16.806605 19.40361,-33.613205 29.10542,-50.419815 -9.70181,-16.80623 -19.40361,-33.61247 -29.10542,-50.418698 H 94.737671 c -9.70144,16.806228 -19.40287,33.612468 -29.1043,50.418698 z"
+             style="fill:#1b3b4b;fill-opacity:1;fill-rule:evenodd;stroke:#6690a4;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path5211"
+             d="M 181.22984,-108.21719 H 98.024261 c -6.6381,11.501668 -13.27619,23.003358 -19.91429,34.505038"
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f4f4f4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cccccccc"
+             inkscape:connector-curvature="0"
+             id="path5213"
+             d="m 105.31445,-95.603516 c -6.177731,10.703776 -12.355466,21.407552 -18.5332,32.111328 6.177734,10.704428 12.355469,21.408855 18.5332,32.113282 h 107.34961 c 6.17839,-10.704427 12.35677,-21.408854 18.53516,-32.113282 -6.17904,-10.705078 -12.35807,-21.410156 -18.53711,-32.115234 -122.44841,0.0026 15.09673,-0.0052 -107.34766,0.0039 z"
+             style="fill:#152025;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.56945151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5165)" />
+        </g>
+        <g
+           transform="matrix(0.42700362,-0.09809669,0.09809669,0.42700362,1142.5625,192.24297)"
+           id="g5686"
+           inkscape:export-filename="/home/michael/workspace/spacetac/data/stage1/image/menu/icon-options.png"
+           inkscape:export-xdpi="96"
+           inkscape:export-ydpi="96">
+          <path
+             style="fill:#9fc4d6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.82062632px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 1460.1758,106.55493 a 27.272712,27.272712 11.37681 0 0 -27.273,27.273 27.272712,27.272712 11.37681 0 0 27.273,27.27141 27.272712,27.272712 11.37681 0 0 27.273,-27.27141 27.272712,27.272712 11.37681 0 0 -27.273,-27.273 z m 0,17.11775 a 10.154719,10.154719 11.751559 0 1 10.1553,10.15525 10.154719,10.154719 11.751559 0 1 -10.1553,10.15365 10.154719,10.154719 11.751559 0 1 -10.1553,-10.15365 10.154719,10.154719 11.751559 0 1 10.1553,-10.15525 z"
+             id="path5638"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path5646"
+             d="m 1460.1758,81.977757 c -28.6366,-3.27e-4 -51.8512,23.214293 -51.8509,51.850893 0,28.63541 23.2155,51.84819 51.8509,51.84786 28.6354,3.3e-4 51.8496,-23.21245 51.8509,-51.84786 3e-4,-28.6366 -23.2143,-51.85122 -51.8509,-51.850893 z m 0,10.165435 c 23.0237,-0.0012 41.6884,18.663498 41.6872,41.687208 0,23.02114 -18.6661,41.68184 -41.6872,41.68064 -23.0211,0.001 -41.6848,-18.6595 -41.6872,-41.68064 0,-23.02371 18.6635,-41.688409 41.6872,-41.687208 z"
+             style="fill:#9fc4d6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.36866331px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             sodipodi:nodetypes="cccccccccc" />
+          <g
+             id="g5673"
+             transform="translate(0,-0.893047)">
+            <path
+               inkscape:transform-center-y="-59.220193"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="rect5648"
+               d="m 1448.4258,61.749985 h 23.5 l 6,27.5 h -35.5 z"
+               style="fill:#9fc4d6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <use
+               inkscape:transform-center-x="-39.753681"
+               transform="rotate(45,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5651"
+               inkscape:transform-center-y="-39.753679"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               inkscape:transform-center-x="-59.220195"
+               transform="rotate(90,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5653"
+               inkscape:transform-center-y="2.0000002e-06"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               inkscape:transform-center-x="-39.753681"
+               transform="rotate(135,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5655"
+               inkscape:transform-center-y="39.753683"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               transform="rotate(180,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5657"
+               inkscape:transform-center-y="59.220197"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               inkscape:transform-center-x="39.753681"
+               transform="rotate(-135,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5659"
+               inkscape:transform-center-y="39.753683"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               inkscape:transform-center-x="59.220195"
+               transform="rotate(-90,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5661"
+               inkscape:transform-center-y="2.0000001e-06"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+            <use
+               inkscape:transform-center-x="39.753681"
+               transform="rotate(-45,1460.1758,134.72018)"
+               height="100%"
+               width="100%"
+               id="use5663"
+               inkscape:transform-center-y="-39.753679"
+               xlink:href="#rect5648"
+               y="0"
+               x="0" />
+          </g>
+        </g>
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer10"
+       inkscape:label="Planning phase"
+       style="display:inline">
+      <g
+         inkscape:groupmode="layer"
+         id="layer12"
+         inkscape:label="Planning actions"
+         style="display:inline">
+        <rect
+           style="opacity:1;fill:#16262e;fill-opacity:1;stroke:#3a6479;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect10858"
+           width="170.82849"
+           height="809.53198"
+           x="1696.0001"
+           y="51.99995" />
+        <g
+           id="g10865"
+           style="fill:url(#linearGradient10878);fill-opacity:1;stroke:none">
+          <rect
+             y="162.88245"
+             x="1393.3435"
+             height="143.33305"
+             width="490.38892"
+             id="rect10862"
+             style="opacity:1;fill:url(#linearGradient10886);fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             style="opacity:1;fill:#1b3b4b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 1746.623,111.26366 137.1095,0 v 51.61879 H 1718.623 Z"
+             id="rect10882"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g10865"
+           id="use10867"
+           transform="translate(0,236.88076)"
+           width="100%"
+           height="100%" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g10865"
+           id="use10869"
+           transform="translate(0,473.76157)"
+           width="100%"
+           height="100%" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1765.1615"
+           y="147.07306"
+           id="text5185-6-2-8"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8"
+             x="1765.1615"
+             y="147.07306"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Passive</tspan></text>
+        <text
+           id="text10984"
+           y="383.07306"
+           x="1781.8724"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           xml:space="preserve"><tspan
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px"
+             y="383.07306"
+             x="1781.8724"
+             id="tspan10982"
+             sodipodi:role="line">Move</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1776.3412"
+           y="619"
+           id="text5185-6-2-8-8"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8-6"
+             x="1776.3412"
+             y="619"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Active</tspan></text>
+        <rect
+           style="display:inline;opacity:1;fill:#040404;fill-opacity:1;stroke:#3a6479;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+           id="rect10858-8"
+           width="227.39709"
+           height="131.72173"
+           x="1650.7451"
+           y="813.2182" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1671.7867"
+           y="844.14001"
+           id="text5185-6-2-8-3"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8-8"
+             x="1671.7867"
+             y="844.14001"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Power available</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1694.7555"
+           y="901.44666"
+           id="text5185-6-2-8-3-3"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8-8-3"
+             x="1694.7555"
+             y="901.44666"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Power used</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1758.5397"
+           y="872.79333"
+           id="text5185-6-2-8-3-38"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8-8-0"
+             x="1758.5397"
+             y="872.79333"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">7</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+           x="1757.8436"
+           y="930.09998"
+           id="text5185-6-2-8-3-38-4"><tspan
+             sodipodi:role="line"
+             id="tspan5183-2-2-8-8-0-7"
+             x="1757.8436"
+             y="930.09998"
+             style="font-size:24px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">5</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:20px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="1693.5588"
+           y="227.80072"
+           id="text11094"><tspan
+             sodipodi:role="line"
+             x="1693.5588"
+             y="227.80072"
+             style="font-size:21.33333397px;line-height:20px;text-align:center;text-anchor:middle;fill:#9fc4d6;fill-opacity:1"
+             id="tspan11096">No available action</tspan><tspan
+             sodipodi:role="line"
+             x="1693.5588"
+             y="253.73456"
+             style="font-size:21.33333397px;line-height:20px;text-align:center;text-anchor:middle;fill:#9fc4d6;fill-opacity:1"
+             id="tspan11104">of this type</tspan></text>
+      </g>
+      <g
+         inkscape:groupmode="layer"
+         id="layer13"
+         inkscape:label="Planning buttons"
+         style="display:inline">
+        <g
+           style="display:inline;enable-background:new"
+           id="g8899">
+          <use
+             height="100%"
+             width="100%"
+             id="use8852"
+             xlink:href="#g5177-4"
+             y="0"
+             x="0"
+             style="display:inline;enable-background:new"
+             transform="matrix(0.5,0,0,0.5,1646.347,-1.3939849)" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+             x="1724.1499"
+             y="63.680626"
+             id="text5185-6-2"><tspan
+               sodipodi:role="line"
+               id="tspan5183-2-2"
+               x="1724.1499"
+               y="63.680626"
+               style="font-size:32px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Actions</tspan></text>
+        </g>
+        <g
+           style="display:inline;enable-background:new"
+           id="g8904">
+          <use
+             height="100%"
+             width="100%"
+             transform="translate(-241.83053)"
+             id="use8876"
+             xlink:href="#use8852"
+             y="0"
+             x="0" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:12.5px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#9fc4d6;fill-opacity:1;stroke:none;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+             x="1507.5695"
+             y="63.008625"
+             id="text5185-6-2-6"><tspan
+               sodipodi:role="line"
+               id="tspan5183-2-2-4"
+               x="1507.5695"
+               y="63.008625"
+               style="font-size:32px;fill:#9fc4d6;fill-opacity:1;stroke-width:0.5px">Ship</tspan></text>
+        </g>
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;fill:#dbeff9;fill-opacity:1;stroke:none"
+         x="811.47034"
+         y="1045.7249"
+         id="text3488"><tspan
+           sodipodi:role="line"
+           id="tspan3486"
+           x="811.47034"
+           y="1045.7249">Planning phase</tspan></text>
+      <g
+         transform="matrix(0.5,0,0,0.5,1426.4368,980.07028)"
+         style="display:inline"
+         id="g5393-0">
+        <g
+           transform="translate(-19.79899,169.6419)"
+           id="g5177-4"
+           style="display:inline"
+           inkscape:export-filename="/home/michael/workspace/spacetac/data/stage1/image/menu/button.png"
+           inkscape:export-xdpi="96"
+           inkscape:export-ydpi="96">
+          <path
+             style="fill:#3a6479;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.56945151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 518.92561,-63.492682 486.5282,-7.378725 H 91.451531 l -32.39741,-56.113957 32.39741,-56.113948 H 486.5282 Z"
+             id="path5068-0"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc" />
+          <path
+             style="fill:#1b3b4b;fill-opacity:1;fill-rule:evenodd;stroke:#6690a4;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 65.633371,-63.493012 c 9.70143,16.80661 19.40286,33.61321 29.1043,50.419815 129.501279,0 259.002559,0 388.503829,0 9.70181,-16.806605 19.40361,-33.613205 29.10542,-50.419815 -9.70181,-16.80623 -19.40361,-33.61247 -29.10542,-50.418698 -129.50127,0 -259.00255,0 -388.503829,0 -9.70144,16.806228 -19.40287,33.612468 -29.1043,50.418698 z"
+             id="path5071-9"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f4f4f4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 380.30091,-108.21719 H 98.024261 c -6.6381,11.501668 -13.27619,23.003358 -19.91429,34.505038"
+             id="path5083-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccc" />
+          <path
+             style="fill:#152025;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.56945151px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5165-3)"
+             d="m 105.31445,-95.603516 c -6.177731,10.703776 -12.355466,21.407552 -18.5332,32.111328 6.177734,10.704428 12.355469,21.408855 18.5332,32.113282 122.44987,0 244.89974,0 367.34961,0 6.17839,-10.704427 12.35677,-21.408854 18.53516,-32.113282 -6.17904,-10.705078 -12.35807,-21.410156 -18.53711,-32.115234 -122.44841,0.0026 -244.90327,-0.0052 -367.34766,0.0039 z"
+             id="path5107-9"
+             inkscape:connector-curvature="0" />
+        </g>
+        <text
+           id="text5185-6"
+           y="127.2559"
+           x="198.05838"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:64px;line-height:25px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><tspan
+             style="font-size:64px;fill:#9fc4d6;fill-opacity:1"
+             y="127.2559"
+             x="198.05838"
+             id="tspan5183-2"
+             sodipodi:role="line">Ready</tspan></text>
+      </g>
+      <g
+         id="g6363">
+        <g
+           id="g6366">
+          <path
+             style="display:inline;fill:#3a6479;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3559736px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+             d="m 1316.3888,1064.8698 h 187.2224 l -36.7795,-63.4498 h -113.6634 z"
+             id="rect6272-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path6368"
+             d="m 1322.3571,1061.8698 h 175.2303 l -33.3015,-57.4498 h -108.6273 z"
+             style="display:inline;opacity:0.13500001;fill:#152026;fill-opacity:1;fill-rule:evenodd;stroke:#6690a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />
+        </g>
+        <text
+           id="text3488-7"
+           y="1043.9449"
+           x="1362.7562"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;letter-spacing:0px;word-spacing:0px;fill:#dbeff9;fill-opacity:1;stroke:none;enable-background:new"
+           xml:space="preserve"><tspan
+             style="font-size:32px"
+             y="1043.9449"
+             x="1362.7562"
+             id="tspan3486-2"
+             sodipodi:role="line">Turn 4</tspan></text>
+      </g>
     </g>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffdd4b;stroke-width:2.03981209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 294.73959,636.38676 v 21.32811"
-       id="path5018"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path5018"
-       id="use5020"
-       width="100%"
-       height="100%"
-       transform="translate(110.625,-3.3333335e-6)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path5018"
-       id="use5022"
-       width="100%"
-       height="100%"
-       transform="translate(226.875,-3.3333335e-6)" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -2778,12 +3284,12 @@
       <image
          sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/portrait.png"
          xlink:href="pics/portrait.png"
-         y="497.55182"
-         x="465.07187"
-         id="image6587"
-         preserveAspectRatio="none"
+         width="183.97668"
          height="183.97649"
-         width="183.97668" />
+         preserveAspectRatio="none"
+         id="image6587"
+         x="465.07187"
+         y="497.55182" />
     </g>
   </g>
   <g
@@ -2794,7 +3300,7 @@
      transform="translate(0,-67.5)">
     <g
        id="g7442"
-       transform="translate(-544.57033,534.13977)">
+       transform="translate(-141.51945,405.44633)">
       <rect
          inkscape:export-ydpi="96"
          inkscape:export-xdpi="96"
@@ -2874,6 +3380,15 @@
            y="325.57614"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25px;font-family:DAGGERSQUARE;-inkscape-font-specification:DAGGERSQUARE;fill:#d8894d;fill-opacity:1"
            id="tspan5849">Unavailable next turn</tspan></text>
+      <use
+         transform="translate(1384.5355,-76.898706)"
+         style="display:inline;enable-background:new"
+         x="0"
+         y="0"
+         xlink:href="#image5902"
+         id="use1427"
+         width="100%"
+         height="100%" />
     </g>
   </g>
   <g
@@ -2895,29 +3410,16 @@
          style="opacity:1;fill:#ffdd4b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          transform="translate(18.747871,16.245521)" />
     </g>
-    <g
-       id="g4184"
-       transform="translate(0,67.498889)">
-      <use
-         style="display:inline;enable-background:new"
-         x="0"
-         y="0"
-         xlink:href="#image9266"
-         id="use9392-3"
-         width="100%"
-         height="100%"
-         transform="matrix(2.84425,0,0,2.84425,-3104.9056,-708.00622)" />
-    </g>
     <image
        sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/action.png"
        xlink:href="pics/action.png"
-       y="312.3288"
-       x="-333.53336"
-       id="image5902"
-       preserveAspectRatio="none"
-       height="83.066681"
+       style="display:inline;enable-background:new"
        width="83.066681"
-       style="display:inline;enable-background:new" />
+       height="83.066681"
+       preserveAspectRatio="none"
+       id="image5902"
+       x="-333.53336"
+       y="312.3288" />
     <g
        id="g10025-6"
        style="display:inline;fill:none;enable-background:new"
@@ -3179,14 +3681,6 @@
        transform="translate(1183.0283,-522.25003)"
        width="100%"
        height="100%" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path7819-7"
-       id="use1458"
-       transform="translate(1720.4498,-460.77799)"
-       width="100%"
-       height="100%" />
     <g
        id="g1533"
        inkscape:export-filename="/home/michael/workspace/spacetac/data/stage2/image/battle/hud/ship-hover.png"
@@ -3223,6 +3717,90 @@
          y="0"
          x="0" />
     </g>
+    <image
+       sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/sprite.png"
+       xlink:href="pics/sprite.png"
+       width="84.542961"
+       height="84.542961"
+       preserveAspectRatio="none"
+       id="image9266"
+       x="-410.59262"
+       y="236.27179"
+       style="enable-background:new;display:inline"
+       transform="translate(0,-27.637839)" />
+    <g
+       style="enable-background:new;display:inline"
+       id="g8766"
+       transform="translate(-1233.2311,345.12415)">
+      <path
+         inkscape:transform-center-x="-2.8320677"
+         d="m 951.32827,450.99997 -9.02653,4.0214 -7.96588,5.78917 1.03064,-9.82791 -1.03064,-9.79323 7.99591,5.80651 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.0509393"
+         sodipodi:arg1="0"
+         sodipodi:r2="4.6335373"
+         sodipodi:r1="11.328272"
+         sodipodi:cy="450.99997"
+         sodipodi:cx="940"
+         sodipodi:sides="3"
+         id="path8755"
+         style="opacity:0.557;fill:#a5b7da;fill-opacity:1;stroke:#dde6f9;stroke-width:2.51739335;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="star" />
+      <use
+         height="100%"
+         width="100%"
+         transform="matrix(-1,0,0,1,1978.4275,0)"
+         id="use8758"
+         inkscape:transform-center-x="2.8320486"
+         xlink:href="#path8755"
+         y="0"
+         x="0" />
+    </g>
+    <g
+       id="g10791"
+       transform="matrix(0.36038505,0,0,0.36038505,-189.29231,369.98953)">
+      <circle
+         style="display:inline;fill:#b8bbbd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.83975744;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4769);enable-background:new"
+         id="circle4763"
+         cx="-19.999996"
+         cy="-46.13789"
+         r="109.13069" />
+      <circle
+         r="98.321274"
+         cy="-46.13789"
+         cx="-19.999996"
+         id="path4757"
+         style="display:inline;fill:#30383d;fill-opacity:1;fill-rule:evenodd;stroke:#465158;stroke-width:12.15708637;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />
+      <circle
+         style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#38454d;stroke-width:8.99291325;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+         id="circle4761"
+         cx="-19.999996"
+         cy="-46.13789"
+         r="80.583206" />
+    </g>
+    <g
+       style="enable-background:new;display:inline"
+       id="g8823"
+       transform="translate(0,39.862161)">
+      <rect
+         style="display:inline;opacity:1;fill:#6f83ac;fill-opacity:1;stroke:#6f83ac;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+         id="rect8779"
+         width="38.396973"
+         height="38.396973"
+         x="-244.81976"
+         y="824.55927"
+         ry="7.4246187" />
+      <rect
+         ry="0"
+         y="826.04773"
+         x="-243.33127"
+         height="35.419964"
+         width="35.419964"
+         id="rect8842"
+         style="display:inline;opacity:1;fill:#0e1524;fill-opacity:1;stroke:none;stroke-width:2.76740289;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -3749,13 +4327,13 @@
           <image
              sodipodi:absref="/home/michael/workspace/spacetac/graphics/ui/pics/portrait.png"
              xlink:href="pics/portrait.png"
-             style="display:inline;enable-background:new"
-             y="313.90408"
-             x="816.54016"
-             id="image5590"
-             preserveAspectRatio="none"
+             width="76.394867"
              height="76.394867"
-             width="76.394867" />
+             preserveAspectRatio="none"
+             id="image5590"
+             x="816.54016"
+             y="313.90408"
+             style="display:inline;enable-background:new" />
         </g>
         <use
            transform="translate(96.619495)"
diff --git a/src/core/BattlePlanning.spec.ts b/src/core/BattlePlanning.spec.ts
index b4847d8..756eb71 100644
--- a/src/core/BattlePlanning.spec.ts
+++ b/src/core/BattlePlanning.spec.ts
@@ -52,10 +52,10 @@ module TK.SpaceTac.Specs {
 
             planning.addAction(ship, action1, Target.newFromShip(ship));
             check.equals(planning.getShipPlan(ship).actions, [
-                { action: action1.id, target: Target.newFromShip(ship) }
+                { action: action1.id, category: action1.getCategory(), target: Target.newFromShip(ship) }
             ]);
             check.equals(planning.collectAllActions(), [
-                { action: action1.id, target: Target.newFromShip(ship) }
+                { action: action1.id, category: action1.getCategory(), target: Target.newFromShip(ship) }
             ]);
         });
     });
diff --git a/src/core/BattlePlanning.ts b/src/core/BattlePlanning.ts
index 5109b6c..ba84867 100644
--- a/src/core/BattlePlanning.ts
+++ b/src/core/BattlePlanning.ts
@@ -40,7 +40,7 @@ namespace TK.SpaceTac {
             if (any(plan.actions, iaction => action.is(iaction.action))) {
                 // TODO replace (or remove if toggle action ?)
             } else {
-                plan.actions.push({ action: action.id, target });
+                plan.actions.push({ action: action.id, category: action.getCategory(), target });
             }
         }
 
@@ -68,6 +68,7 @@ namespace TK.SpaceTac {
 
     export type ActionPlan = {
         action: RObjectId
+        category: ActionCategory
         target?: Target
     }
 }
diff --git a/src/core/actions/BaseAction.ts b/src/core/actions/BaseAction.ts
index 68c17fa..10dec2b 100644
--- a/src/core/actions/BaseAction.ts
+++ b/src/core/actions/BaseAction.ts
@@ -1,4 +1,13 @@
 module TK.SpaceTac {
+    /**
+     * Category of action
+     */
+    export enum ActionCategory {
+        MOVE,
+        PASSIVE,
+        ACTIVE
+    }
+
     /**
      * Targetting mode for an action.
      * 
@@ -76,6 +85,13 @@ module TK.SpaceTac {
             this.name = name;
         }
 
+        /**
+         * Get the category for this action
+         */
+        getCategory(): ActionCategory {
+            return ActionCategory.PASSIVE;
+        }
+
         /**
          * Get the verb for this action
          */
diff --git a/src/core/actions/MoveAction.ts b/src/core/actions/MoveAction.ts
index 5598041..8ed7c90 100644
--- a/src/core/actions/MoveAction.ts
+++ b/src/core/actions/MoveAction.ts
@@ -25,6 +25,10 @@ module TK.SpaceTac {
             }
         }
 
+        getCategory(): ActionCategory {
+            return ActionCategory.MOVE;
+        }
+
         /** 
          * Configure the engine
          */
diff --git a/src/core/actions/TriggerAction.ts b/src/core/actions/TriggerAction.ts
index b375518..f39617c 100644
--- a/src/core/actions/TriggerAction.ts
+++ b/src/core/actions/TriggerAction.ts
@@ -44,6 +44,10 @@ module TK.SpaceTac {
             copyfields(config, this);
         }
 
+        getCategory(): ActionCategory {
+            return ActionCategory.ACTIVE;
+        }
+
         getVerb(): string {
             return this.range ? "Fire" : "Trigger";
         }
diff --git a/src/ui/battle/Arena.ts b/src/ui/battle/Arena.ts
index 524e80f..e8b8a68 100644
--- a/src/ui/battle/Arena.ts
+++ b/src/ui/battle/Arena.ts
@@ -8,6 +8,9 @@ module TK.SpaceTac.UI {
         // Link to battleview
         view: BattleView
 
+        // Display of battle plan
+        plandisplay: PlanDisplay
+
         // Hint for weapon or move range
         range_hint: RangeHint
 
@@ -58,6 +61,8 @@ module TK.SpaceTac.UI {
             this.layer_weapon_effects = builder.container("effects");
             this.layer_targetting = builder.container("targetting");
 
+            this.plandisplay = new PlanDisplay(this.layer_targetting.getBuilder());
+
             this.range_hint.setLayer(this.layer_hints);
             this.addShipSprites();
             view.battle.drones.list().forEach(drone => this.addDrone(drone, 0));
@@ -274,6 +279,13 @@ module TK.SpaceTac.UI {
             }
         }
 
+        /**
+         * Update the battle plan displayed
+         */
+        refreshPlanDisplay(plan?: BattlePlan): void {
+            this.plandisplay.update(plan || { fleets: [] }, this.getBattle());
+        }
+
         /**
          * Get the boundaries of the arena on display
          */
diff --git a/src/ui/battle/BattleView.spec.ts b/src/ui/battle/BattleView.spec.ts
index da43313..ce821a3 100644
--- a/src/ui/battle/BattleView.spec.ts
+++ b/src/ui/battle/BattleView.spec.ts
@@ -99,7 +99,7 @@ module TK.SpaceTac.UI.Specs {
             battleview.applyPlayerAction(action, Target.newFromLocation(0, 0));
             check.equals(battleview.plannings.length, 2);
             check.equals(battleview.plannings[0].collectAllActions(), [
-                { action: action.id, target: Target.newFromLocation(0, 0) }
+                { action: action.id, category: action.getCategory(), target: Target.newFromLocation(0, 0) }
             ]);
             check.equals(battleview.plannings[1].collectAllActions(), []);
         });
diff --git a/src/ui/battle/BattleView.ts b/src/ui/battle/BattleView.ts
index 2a871bf..4156a1e 100644
--- a/src/ui/battle/BattleView.ts
+++ b/src/ui/battle/BattleView.ts
@@ -203,10 +203,24 @@ module TK.SpaceTac.UI {
                     planning.addAction(this.action_bar.ship, action, target);
                 }
             });
+            this.planningsChanged();
 
             return false;
         }
 
+        /**
+         * Called when the plannings have been modified (this will update the one shown in the arena)
+         */
+        planningsChanged(): void {
+            // By default, show the first plan matching the player
+            const planning = first(this.plannings, planning => this.player.is(planning.player));
+            if (planning) {
+                this.arena.refreshPlanDisplay(planning.getBattlePlan());
+            } else {
+                this.arena.refreshPlanDisplay();
+            }
+        }
+
         /**
          * Display the splash screen at the start of battle
          */
diff --git a/src/ui/battle/PlanDisplay.ts b/src/ui/battle/PlanDisplay.ts
index eba47e5..fbe65e7 100644
--- a/src/ui/battle/PlanDisplay.ts
+++ b/src/ui/battle/PlanDisplay.ts
@@ -4,12 +4,14 @@ module TK.SpaceTac.UI {
      */
     export class PlanDisplay {
         readonly container: UIContainer
+        private battle?: Battle
 
         constructor(builder: UIBuilder) {
             this.container = builder.container("battleplan");
         }
 
-        update(plan: BattlePlan): void {
+        update(plan: BattlePlan, battle?: Battle): void {
+            this.battle = battle;
             this.updateBattle(plan, this.container);
         }
 
@@ -46,6 +48,27 @@ module TK.SpaceTac.UI {
         }
 
         private updateShip(plan: ShipPlan, parent: UIContainer) {
+            const move = first(plan.actions, action => action.category == ActionCategory.MOVE);
+            const ship = this.battle ? this.battle.getShip(plan.ship) : null;
+            if (ship) {
+                this.updateMoveAction(ship, move, parent);
+            } else {
+                console.error("Ship not found to update actions", plan);
+            }
+        }
+
+        private updateMoveAction(ship: Ship, action: ActionPlan | null, parent: UIContainer) {
+            const child = parent.getByName("move");
+            const graphics = child ? as(UIGraphics, child) : parent.getBuilder().graphics("move");
+            graphics.clear();
+            if (action && action.target) {
+                graphics.addLine({
+                    start: ship.location,
+                    end: action.target,
+                    width: 5,
+                    color: 0xa5b7da
+                });
+            }
         }
     }
 }
diff --git a/src/ui/common/Tooltip.ts b/src/ui/common/Tooltip.ts
index ee5cc1d..f8fe820 100644
--- a/src/ui/common/Tooltip.ts
+++ b/src/ui/common/Tooltip.ts
@@ -182,7 +182,7 @@ module TK.SpaceTac.UI {
             let builder = this.getBuilder();
             let scontent = (typeof content == "string") ? content : content(builder);
             if (typeof scontent == "string") {
-                builder.text(scontent, 0, 0, { color: "#cccccc", size: 20 });
+                builder.text(scontent, 0, 0, { color: "#DBEFF9", size: 18 });
             }
 
             if (scontent) {