diff --git a/graphics/ui/battle.svg b/graphics/ui/battle.svg
index 24dd5eb..431f21f 100644
--- a/graphics/ui/battle.svg
+++ b/graphics/ui/battle.svg
@@ -85,17 +85,18 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="0.70710678"
- inkscape:cx="1028.3203"
- inkscape:cy="623.67986"
+ inkscape:zoom="2.8284271"
+ inkscape:cx="112.1938"
+ inkscape:cy="932.35192"
inkscape:document-units="px"
- inkscape:current-layer="layer4"
+ inkscape:current-layer="layer14"
showgrid="false"
units="px"
showguides="true"
inkscape:snap-bbox="false"
inkscape:bbox-nodes="true"
- inkscape:bbox-paths="true">
+ inkscape:bbox-paths="true"
+ inkscape:snap-to-guides="true">
+
+
@@ -126,170 +135,124 @@
-
-
+ id="layer13"
+ inkscape:label="Ship list">
+ inkscape:groupmode="layer"
+ id="layer14"
+ inkscape:label="Ship list background">
-
-
-
-
-
-
-
-
+ transform="translate(0,27.637839)"
+ style="opacity:1;fill:#1c1f24;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4415"
+ width="133.01472"
+ height="948.2301"
+ x="0"
+ y="104.13197" />
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 2
+ style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ xml:space="preserve">2
+
-
+ inkscape:label="Playbar"
+ style="display:inline">
+
+
+
-
-
-
+ id="layer9"
+ inkscape:label="Actions">
+
+
+
+
+
+
+ y="139" />
Juggernaut
+ x="279"
+ y="174.70711">Juggernaut
+ y="192" />
+ y="370" />
@@ -404,13 +377,49 @@
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="226"
- y="419"
+ y="414"
id="text4598"
sodipodi:linespacing="125%">Rotary gun
+ y="414"
+ style="font-size:22.5px">Rotary gun
+
+
+ Energy recovery -15% (2 turns)
+
Shoot a single missile that explodes just before impact, and overloads the shield, doing 7 shield damage
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="display:none">
Available weapon/ability
Auto-scroll area
Ship details, on hover or hold
+ id="tspan4635-2-2">Ship details,on hover or hold
@@ -611,5 +695,23 @@
id="path4615-5-9-0-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
+ Active effect
+
diff --git a/out/assets/images/battle/actionbar.png b/out/assets/images/battle/actionbar.png
index 43cb467..24cb11e 100644
Binary files a/out/assets/images/battle/actionbar.png and b/out/assets/images/battle/actionbar.png differ
diff --git a/out/assets/images/battle/actionpointsempty.png b/out/assets/images/battle/actionpointsempty.png
index cac0dfa..b2d1909 100644
Binary files a/out/assets/images/battle/actionpointsempty.png and b/out/assets/images/battle/actionpointsempty.png differ
diff --git a/out/assets/images/battle/actionpointsfull.png b/out/assets/images/battle/actionpointsfull.png
index d2a37fe..268b36f 100644
Binary files a/out/assets/images/battle/actionpointsfull.png and b/out/assets/images/battle/actionpointsfull.png differ
diff --git a/out/assets/images/battle/actionpointsnone.png b/out/assets/images/battle/actionpointsnone.png
new file mode 100644
index 0000000..9df62fc
Binary files /dev/null and b/out/assets/images/battle/actionpointsnone.png differ
diff --git a/out/assets/images/battle/actionpointspart.png b/out/assets/images/battle/actionpointspart.png
index 7a5675f..548687d 100644
Binary files a/out/assets/images/battle/actionpointspart.png and b/out/assets/images/battle/actionpointspart.png differ
diff --git a/out/assets/images/battle/shiplist-background.png b/out/assets/images/battle/shiplist-background.png
new file mode 100644
index 0000000..31c451d
Binary files /dev/null and b/out/assets/images/battle/shiplist-background.png differ
diff --git a/out/assets/images/battle/shiplist-base.png b/out/assets/images/battle/shiplist-base.png
deleted file mode 100644
index 1e6e718..0000000
Binary files a/out/assets/images/battle/shiplist-base.png and /dev/null differ
diff --git a/out/assets/images/battle/shiplist-enemy.png b/out/assets/images/battle/shiplist-enemy.png
index 8202c26..0fb195b 100644
Binary files a/out/assets/images/battle/shiplist-enemy.png and b/out/assets/images/battle/shiplist-enemy.png differ
diff --git a/out/assets/images/battle/shiplist-energy-empty.png b/out/assets/images/battle/shiplist-energy-empty.png
new file mode 100644
index 0000000..224498c
Binary files /dev/null and b/out/assets/images/battle/shiplist-energy-empty.png differ
diff --git a/out/assets/images/battle/shiplist-energy-full.png b/out/assets/images/battle/shiplist-energy-full.png
new file mode 100644
index 0000000..55ca104
Binary files /dev/null and b/out/assets/images/battle/shiplist-energy-full.png differ
diff --git a/out/assets/images/battle/shiplist-hull-empty.png b/out/assets/images/battle/shiplist-hull-empty.png
index 7a417a7..02d0a3a 100644
Binary files a/out/assets/images/battle/shiplist-hull-empty.png and b/out/assets/images/battle/shiplist-hull-empty.png differ
diff --git a/out/assets/images/battle/shiplist-hull-full.png b/out/assets/images/battle/shiplist-hull-full.png
index e21b4a0..68cc0ee 100644
Binary files a/out/assets/images/battle/shiplist-hull-full.png and b/out/assets/images/battle/shiplist-hull-full.png differ
diff --git a/out/assets/images/battle/shiplist-own.png b/out/assets/images/battle/shiplist-own.png
index 48c6de8..6cf301e 100644
Binary files a/out/assets/images/battle/shiplist-own.png and b/out/assets/images/battle/shiplist-own.png differ
diff --git a/out/assets/images/battle/shiplist-shield-empty.png b/out/assets/images/battle/shiplist-shield-empty.png
index 5af3d0d..e402caa 100644
Binary files a/out/assets/images/battle/shiplist-shield-empty.png and b/out/assets/images/battle/shiplist-shield-empty.png differ
diff --git a/out/assets/images/battle/shiplist-shield-full.png b/out/assets/images/battle/shiplist-shield-full.png
index 2740e18..27abfaa 100644
Binary files a/out/assets/images/battle/shiplist-shield-full.png and b/out/assets/images/battle/shiplist-shield-full.png differ
diff --git a/out/index.html b/out/index.html
index 50f9829..853bac7 100644
--- a/out/index.html
+++ b/out/index.html
@@ -1,7 +1,8 @@
+
-
+
SpaceTac
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+ currentWindowOnload();
+ }
+
+ var queryString = new jasmine.QueryString({
+ getWindowLocation: function () { return window.location; }
+ });
+ if (queryString.getParam('onlytests') || queryString.getParam('spec')) {
+ document.getElementById("-space-tac").hidden = true;
+ } else {
+ new SpaceTac.GameUI();
+ }
+ };
+
-
+
+