1
0
Fork 0

Added experimental flat design for new shiplist UI

This commit is contained in:
Michaël Lemaire 2017-01-08 23:04:07 +01:00
parent ac2a0a728e
commit 327fb63173
23 changed files with 376 additions and 283 deletions

View file

@ -85,17 +85,18 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.70710678" inkscape:zoom="2.8284271"
inkscape:cx="1028.3203" inkscape:cx="112.1938"
inkscape:cy="623.67986" inkscape:cy="932.35192"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer4" inkscape:current-layer="layer14"
showgrid="false" showgrid="false"
units="px" units="px"
showguides="true" showguides="true"
inkscape:snap-bbox="false" inkscape:snap-bbox="false"
inkscape:bbox-nodes="true" inkscape:bbox-nodes="true"
inkscape:bbox-paths="true"> inkscape:bbox-paths="true"
inkscape:snap-to-guides="true">
<sodipodi:guide <sodipodi:guide
position="0,0" position="0,0"
orientation="0,1920" orientation="0,1920"
@ -112,6 +113,14 @@
position="0,1080" position="0,1080"
orientation="1080,0" orientation="1080,0"
id="guide4161" /> id="guide4161" />
<sodipodi:guide
position="132.22897,919.94592"
orientation="20.152542,0"
id="guide4275" />
<sodipodi:guide
position="157.68481,948.23019"
orientation="0,-25.102295"
id="guide4281" />
</sodipodi:namedview> </sodipodi:namedview>
<metadata <metadata
id="metadata7"> id="metadata7">
@ -126,170 +135,124 @@
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<g <g
inkscape:label="Misc"
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer13"
transform="translate(0,27.637839)"> inkscape:label="Ship list">
<rect
style="opacity:1;fill:#373e48;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="rect4413"
width="1920"
height="131.42857"
x="0"
y="-27.637838" />
<rect
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.07141"
x="0"
y="104.29073" />
<g <g
id="g4573" inkscape:groupmode="layer"
transform="matrix(0.18668786,0,0,0.19236071,-25.920279,-110.7567)"> id="layer14"
inkscape:label="Ship list background">
<rect <rect
mask="url(#mask4579)" transform="translate(0,27.637839)"
y="-232.65211" 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"
x="44.285706" id="rect4415"
height="147.5143" width="133.01472"
width="116.59103" height="948.2301"
id="rect4552" x="0"
style="opacity:1;fill:#ffff00;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" /> y="104.13197" />
</g>
<path
sodipodi:type="star"
style="opacity:1;fill:#d40000;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="path5830"
sodipodi:sides="6"
sodipodi:cx="136.89053"
sodipodi:cy="-163.96046"
sodipodi:r1="73.418701"
sodipodi:r2="63.582462"
sodipodi:arg1="1.0471976"
sodipodi:arg2="1.5707963"
inkscape:flatsided="true"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 173.59988,-100.378 -73.4187,-1e-5 -36.709348,-63.58246 36.709358,-63.58246 73.4187,1e-5 36.70934,63.58246 z" />
<circle
style="opacity:1;fill:#2c5aa0;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="path4192"
cx="343.95694"
cy="-162.85133"
r="70.710678" />
<g
id="g4184">
<rect
y="68.069527"
x="-437.6991"
height="60.811184"
width="16.970562"
id="rect4180"
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" />
<rect
y="60.998459"
x="-262.33661"
height="73.539108"
width="19.091883"
id="rect4182"
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" />
<ellipse
ry="99.702057"
rx="53.740116"
cy="108.37461"
cx="-339.41125"
id="path4176"
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" />
<ellipse
ry="65.407379"
rx="130.81476"
cy="143.3764"
cx="-336.58282"
id="path4178"
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" />
</g> </g>
<g <g
id="g4211"> inkscape:groupmode="layer"
<path id="layer15"
transform="translate(0,-27.637839)" inkscape:label="Ship list portraits"
sodipodi:nodetypes="ccccc" style="display:inline">
inkscape:connector-curvature="0" <g
id="rect4602" style=""
d="m 95.459412,146.61905 24.041628,7.42462 0,24.04163 -24.041628,0 z" id="g4211"
style="display:inline;opacity:1;fill:#f2f2f2;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(-0.76574513,27.637839)">
<path <path
inkscape:tile-y0="139.548" transform="translate(0,-27.637839)"
inkscape:tile-x0="10.101525" sodipodi:nodetypes="ccccc"
inkscape:tile-h="95.96449" inkscape:connector-curvature="0"
inkscape:tile-w="122.46449" id="rect4602"
inkscape:tile-cy="187.53024" d="m 95.459412,146.61905 24.041628,7.42462 0,24.04163 -24.041628,0 z"
inkscape:tile-cx="71.333772" style="display:inline;opacity:1;fill:#f2f2f2;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" />
sodipodi:nodetypes="cccccccc" <path
inkscape:connector-curvature="0" inkscape:tile-y0="139.548"
id="rect4197" inkscape:tile-x0="10.101525"
d="m 10.101525,115.44569 89.600534,0 0,27.06027 24.742631,7.92802 0,46.91349 -24.742631,7.69875 -89.600534,0 z" inkscape:tile-h="95.96449"
style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#ac0505;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> inkscape:tile-w="122.46449"
<rect inkscape:tile-cy="187.53024"
y="152.11865" inkscape:tile-cx="71.333772"
x="98.892159" sodipodi:nodetypes="cccccccc"
height="42.341286" inkscape:connector-curvature="0"
width="5.0654392" id="rect4197"
id="rect4437-3-3" d="m 10.101525,115.44569 89.600534,0 0,27.06027 24.742631,7.92802 0,46.91349 -24.742631,7.69875 -89.600534,0 z"
style="opacity:1;fill:#ffcc00;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" /> style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#038700;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
<rect inkscape:export-filename="/tmp/export.png"
y="152.11865" inkscape:export-xdpi="90"
x="107.0619" inkscape:export-ydpi="90" />
height="42.341286" <rect
width="5.0654392" y="152.11865"
id="rect4437-3-3-6" x="98.892159"
style="opacity:1;fill:#d40000;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" /> height="42.341286"
<rect width="5.0654392"
y="152.11865" id="rect4437-3-3"
x="115.23164" style="opacity:1;fill:#ffcc00;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" />
height="42.341286" <rect
width="5.0654392" y="152.11865"
id="rect4437-3-3-6-7" x="107.0619"
style="opacity:1;fill:#0044aa;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" /> height="42.341286"
<rect width="5.0654392"
y="120.72739" id="rect4437-3-3-6"
x="15.854823" style="opacity:1;fill:#d40000;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" />
height="77.905304" <rect
width="77.905304" y="152.11865"
id="rect4248" x="115.23164"
style="opacity:1;fill:#1a1a1a;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" /> height="42.341286"
<use width="5.0654392"
height="100%" id="rect4437-3-3-6-7"
width="100%" style="opacity:1;fill:#0044aa;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" />
transform="matrix(0.27367874,0,0,0.27367874,146.63482,129.86918)" <rect
id="use4250" y="120.72739"
xlink:href="#g4184" x="15.854823"
y="0" height="77.905304"
x="0" /> width="77.905304"
<text id="rect4248"
sodipodi:linespacing="125%" style="opacity:1;fill:#1a1a1a;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="text4606" inkscape:export-filename="/tmp/export.png"
y="138.04846" inkscape:export-xdpi="90"
x="106.33884" inkscape:export-ydpi="90" />
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" <use
xml:space="preserve"><tspan height="100%"
width="100%"
transform="matrix(0.27367874,0,0,0.27367874,146.63482,129.86918)"
id="use4250"
xlink:href="#g4184"
y="0"
x="0" />
<text
sodipodi:linespacing="125%"
id="text4606"
y="138.04846" y="138.04846"
x="106.33884" x="106.33884"
id="tspan4608" 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"
sodipodi:role="line">2</tspan></text> xml:space="preserve"><tspan
y="138.04846"
x="106.33884"
id="tspan4608"
sodipodi:role="line">2</tspan></text>
</g>
</g> </g>
<use
x="0"
y="0"
xlink:href="#g4211"
id="use4222"
transform="translate(11.313709,-122.68303)"
width="100%"
height="100%" />
</g> </g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer5" id="layer5"
inkscape:label="Playbar"> inkscape:label="Playbar"
style="display:inline">
<g
inkscape:groupmode="layer"
id="layer11"
inkscape:label="Playbar background">
<rect
style="opacity:1;fill:#373e48;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="rect4413"
width="1920"
height="131.76981"
x="0"
y="-27.637838"
transform="translate(0,27.637839)" />
</g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer6" id="layer6"
@ -328,22 +291,35 @@
height="100%" /> height="100%" />
</g> </g>
</g> </g>
</g>
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="Actions">
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer10" id="layer9"
inkscape:label="Actions background"> inkscape:label="Actions">
<rect <g
style="opacity:1;fill:#333333;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" inkscape:groupmode="layer"
id="rect4439" id="layer10"
width="1723.3817" inkscape:label="Actions background">
height="98.571426" <rect
x="185.84662" style="opacity:1;fill:#333333;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"
y="9.000001" /> id="rect4439"
width="1723.3817"
height="98.571426"
x="185.84662"
y="9.000001" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer12"
inkscape:label="Current ship">
<use
x="0"
y="0"
xlink:href="#g4211"
id="use4222"
transform="translate(11.372347,-122.16951)"
width="100%"
height="100%" />
</g> </g>
</g> </g>
<g <g
@ -352,44 +328,41 @@
inkscape:label="Ship detail" inkscape:label="Ship detail"
style="display:inline"> style="display:inline">
<rect <rect
transform="translate(0,27.637839)"
style="opacity:1;fill:#4d4d4d;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" style="opacity:1;fill:#4d4d4d;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="rect4578" id="rect4578"
width="399.29291" width="493.87869"
height="636.92389" height="636.92389"
x="141" x="141"
y="111.36216" /> y="139" />
<text <text
xml:space="preserve" 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" 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="234" x="279"
y="173.70711" y="174.70711"
id="text4580" id="text4580"
sodipodi:linespacing="125%"><tspan sodipodi:linespacing="125%"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan4582" id="tspan4582"
x="234" x="279"
y="173.70711">Juggernaut</tspan></text> y="174.70711">Juggernaut</tspan></text>
<rect <rect
transform="translate(0,27.637839)"
style="opacity:1;fill:#999999;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" style="opacity:1;fill:#999999;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="rect4584" id="rect4584"
width="367" width="465"
height="165.00002" height="165.00002"
x="157" x="157"
y="164.36217" /> y="192" />
<rect <rect
transform="translate(0,27.637839)"
style="opacity:1;fill:#999999;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" style="opacity:1;fill:#999999;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="rect4586" id="rect4586"
width="368" width="464"
height="391.3381" height="391.3381"
x="156" x="156"
y="342.36215" /> y="370" />
<rect <rect
style="opacity:1;fill:#808080;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" style="opacity:1;fill:#808080;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="rect4594" id="rect4594"
width="348" width="444"
height="57" height="57"
x="166" x="166"
y="379" /> y="379" />
@ -404,13 +377,49 @@
xml:space="preserve" 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" 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" x="226"
y="419" y="414"
id="text4598" id="text4598"
sodipodi:linespacing="125%"><tspan sodipodi:linespacing="125%"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan4600" id="tspan4600"
x="226" x="226"
y="419">Rotary gun</tspan></text> y="414"
style="font-size:22.5px">Rotary gun</tspan></text>
<use
x="0"
y="0"
xlink:href="#rect4594"
id="use4261"
transform="translate(0,69)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#rect4596"
id="use4263"
transform="translate(0,68)"
width="100%"
height="100%" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:20px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#e9afaf;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="223.87305"
y="483.41992"
id="text4598-3"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4600-5"
x="223.87305"
y="483.41992"
style="font-size:20px;fill:#e9afaf">Energy recovery -15% (2 turns)</tspan></text>
<rect
style="opacity:1;fill:#e6e6e6;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="rect4320"
width="79.5"
height="79.5"
x="197"
y="18.499998" />
</g> </g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
@ -481,11 +490,81 @@
style="font-size:17.5px;fill:#ffffff">Shoot a single missile that explodes just before impact, and overloads the shield, doing <flowSpan style="font-size:17.5px;fill:#ffffff">Shoot a single missile that explodes just before impact, and overloads the shield, doing <flowSpan
style="fill:#3771c8" style="fill:#3771c8"
id="flowSpan4298">7 shield damage</flowSpan></flowPara></flowRoot> </g> id="flowSpan4298">7 shield damage</flowSpan></flowPara></flowRoot> </g>
<g
inkscape:label="Misc"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,27.637839)">
<g
id="g4573"
transform="matrix(0.18668786,0,0,0.19236071,-25.920279,-110.7567)">
<rect
mask="url(#mask4579)"
y="-232.65211"
x="44.285706"
height="147.5143"
width="116.59103"
id="rect4552"
style="opacity:1;fill:#ffff00;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" />
</g>
<path
sodipodi:type="star"
style="opacity:1;fill:#d40000;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="path5830"
sodipodi:sides="6"
sodipodi:cx="136.89053"
sodipodi:cy="-163.96046"
sodipodi:r1="73.418701"
sodipodi:r2="63.582462"
sodipodi:arg1="1.0471976"
sodipodi:arg2="1.5707963"
inkscape:flatsided="true"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 173.59988,-100.378 -73.4187,-1e-5 -36.709348,-63.58246 36.709358,-63.58246 73.4187,1e-5 36.70934,63.58246 z" />
<circle
style="opacity:1;fill:#2c5aa0;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="path4192"
cx="343.95694"
cy="-162.85133"
r="70.710678" />
<g
id="g4184">
<rect
y="68.069527"
x="-437.6991"
height="60.811184"
width="16.970562"
id="rect4180"
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" />
<rect
y="60.998459"
x="-262.33661"
height="73.539108"
width="19.091883"
id="rect4182"
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" />
<ellipse
ry="99.702057"
rx="53.740116"
cy="108.37461"
cx="-339.41125"
id="path4176"
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" />
<ellipse
ry="65.407379"
rx="130.81476"
cy="143.3764"
cx="-336.58282"
id="path4178"
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" />
</g>
</g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer3" id="layer3"
inkscape:label="Description" inkscape:label="Description"
style="display:inline"> style="display:none">
<text <text
xml:space="preserve" 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:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;font-size:40px;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"
@ -517,43 +596,48 @@
id="tspan4635">Available weapon/ability</tspan></text> id="tspan4635">Available weapon/ability</tspan></text>
<path <path
style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 45.077906,424.792 170.92209,411.208" d="M 47.077906,419.792 172.92209,406.208"
id="path4615-5" id="path4615-5"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<text <text
xml:space="preserve" 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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;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"
x="604.99835" x="701.99835"
y="490.82336" y="477.82336"
id="text4611-5-6" id="text4611-5-6"
sodipodi:linespacing="125%"><tspan sodipodi:linespacing="125%"><tspan
sodipodi:role="line" sodipodi:role="line"
x="604.99835" x="701.99835"
y="490.82336" y="477.82336"
style="font-size:22.5px;fill:#ff00ff" style="font-size:22.5px;fill:#ff00ff"
id="tspan4635-2">Auto-scroll area</tspan></text> id="tspan4635-2">Auto-scroll area</tspan></text>
<path <path
style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 523.97653,531.71318 73.51828,-40.45405" d="m 619.97653,512.71318 73.51828,-40.45405"
id="path4615-5-9" id="path4615-5-9"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<text <text
xml:space="preserve" 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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;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"
x="653.3056" x="747.3056"
y="196.0193" y="156.0193"
id="text4611-5-6-1" id="text4611-5-6-1"
sodipodi:linespacing="125%"><tspan sodipodi:linespacing="125%"><tspan
sodipodi:role="line" sodipodi:role="line"
x="653.3056" x="747.3056"
y="196.0193" y="156.0193"
style="font-size:22.5px;fill:#ff00ff" style="font-size:22.5px;fill:#ff00ff"
id="tspan4635-2-2">Ship details, on hover or hold</tspan></text> id="tspan4635-2-2">Ship details,</tspan><tspan
sodipodi:role="line"
x="747.3056"
y="184.1443"
style="font-size:22.5px;fill:#ff00ff"
id="tspan4283">on hover or hold</tspan></text>
<path <path
style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 540.9471,212.10091 647.69939,188.61742" d="M 634.9471,170.10091 741.69939,146.61742"
id="path4615-5-9-0" id="path4615-5-9-0"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
@ -611,5 +695,23 @@
id="path4615-5-9-0-6" id="path4615-5-9-0-6"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<text
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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="-112.70837"
y="496.20728"
id="text4611-5-62"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
x="-112.70837"
y="496.20728"
style="font-size:22.5px;fill:#ff00ff"
id="tspan4635-9">Active effect</tspan></text>
<path
style="display:inline;fill:#ff00ff;fill-rule:evenodd;stroke:#ff00ff;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 48.077909,488.792 173.92209,475.208"
id="path4615-5-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 143 B

View file

@ -1,7 +1,8 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8" />
<title>SpaceTac</title> <title>SpaceTac</title>
<style> <style>
@ -15,52 +16,53 @@
} }
.game { .game {
width: 1280px; width: 1920px;
height: 720px; height: 1080px;
margin: 20px auto;
} }
</style> </style>
<!-- build:remove --> <!-- build:remove -->
<link rel="stylesheet" href="vendor/jasmine-core/lib/jasmine-core/jasmine.css"> <link rel="stylesheet" href="vendor/jasmine-core/lib/jasmine-core/jasmine.css">
<!-- /build --> <!-- /build -->
</head> </head>
<body> <body>
<div id="-space-tac" class="game"></div> <div id="-space-tac" class="game"></div>
<!-- build:remove --> <!-- build:remove -->
<script src="http://localhost:35729/livereload.js"></script> <script src="http://localhost:35729/livereload.js"></script>
<script src="vendor/deep-diff/releases/deep-diff-0.3.0.min.js"></script> <script src="vendor/deep-diff/releases/deep-diff-0.3.0.min.js"></script>
<!-- /build --> <!-- /build -->
<!-- build:js all.min.js --> <!-- build:js all.min.js -->
<script src="vendor/jasmine-core/lib/jasmine-core/jasmine.js"></script> <script src="vendor/jasmine-core/lib/jasmine-core/jasmine.js"></script>
<script src="vendor/jasmine-core/lib/jasmine-core/jasmine-html.js"></script> <script src="vendor/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="vendor/jasmine-core/lib/jasmine-core/boot.js"></script> <script src="vendor/jasmine-core/lib/jasmine-core/boot.js"></script>
<script src="vendor/phaser/build/phaser.js"></script> <script src="vendor/phaser/build/phaser.js"></script>
<script src="build.js"></script> <script src="build.js"></script>
<!-- /build --> <!-- /build -->
<script> <script>
var currentWindowOnload = window.onload; var currentWindowOnload = window.onload;
window.oncontextmenu = function (e) { e.preventDefault(); }; window.oncontextmenu = function (e) { e.preventDefault(); };
window.onload = function () { window.onload = function () {
<!-- build:remove --> <!--build:remove-- >
if (currentWindowOnload) { if (currentWindowOnload) {
currentWindowOnload(); currentWindowOnload();
} }
<!-- /build --> <!-- /build -->
var queryString = new jasmine.QueryString({ var queryString = new jasmine.QueryString({
getWindowLocation: function() { return window.location; } getWindowLocation: function () { return window.location; }
}); });
if (queryString.getParam('onlytests') || queryString.getParam('spec')) { if (queryString.getParam('onlytests') || queryString.getParam('spec')) {
document.getElementById("-space-tac").hidden = true; document.getElementById("-space-tac").hidden = true;
} else { } else {
new SpaceTac.GameUI(); new SpaceTac.GameUI();
} }
}; };
</script> </script>
</body> </body>
</html>
</html>

View file

@ -13,7 +13,7 @@ module SpaceTac {
audio: View.Audio; audio: View.Audio;
constructor(headless: boolean = false) { constructor(headless: boolean = false) {
super(1280, 720, headless ? Phaser.HEADLESS : Phaser.AUTO, '-space-tac'); super(1920, 1080, headless ? Phaser.HEADLESS : Phaser.AUTO, '-space-tac');
this.audio = new View.Audio(this); this.audio = new View.Audio(this);

View file

@ -6,7 +6,7 @@ module SpaceTac.View {
preload() { preload() {
// Add preload sprite // Add preload sprite
this.add.text(640, 340, "... Loading ...", {align: "center", font: "bold 20px Arial", fill: "#c0c0c0"}) this.add.text(640, 340, "... Loading ...", { align: "center", font: "bold 20px Arial", fill: "#c0c0c0" })
.anchor.set(0.5, 0.5); .anchor.set(0.5, 0.5);
this.preloadBar = this.add.sprite(0, 0, "preload-bar"); this.preloadBar = this.add.sprite(0, 0, "preload-bar");
this.preloadBar.anchor.set(0.5, 0.5); this.preloadBar.anchor.set(0.5, 0.5);
@ -16,9 +16,11 @@ module SpaceTac.View {
// Load images // Load images
this.loadImage("menu/button.png"); this.loadImage("menu/button.png");
this.loadImage("battle/waiting.png"); this.loadImage("battle/waiting.png");
this.loadImage("battle/shiplist-base.png"); this.loadImage("battle/shiplist-background.png");
this.loadImage("battle/shiplist-own.png"); this.loadImage("battle/shiplist-own.png");
this.loadImage("battle/shiplist-enemy.png"); this.loadImage("battle/shiplist-enemy.png");
this.loadImage("battle/shiplist-energy-empty.png");
this.loadImage("battle/shiplist-energy-full.png");
this.loadImage("battle/shiplist-hull-empty.png"); this.loadImage("battle/shiplist-hull-empty.png");
this.loadImage("battle/shiplist-hull-full.png"); this.loadImage("battle/shiplist-hull-full.png");
this.loadImage("battle/shiplist-shield-empty.png"); this.loadImage("battle/shiplist-shield-empty.png");
@ -31,6 +33,7 @@ module SpaceTac.View {
this.loadImage("battle/action-active.png"); this.loadImage("battle/action-active.png");
this.loadImage("battle/action-fading.png"); this.loadImage("battle/action-fading.png");
this.loadImage("battle/action-tooltip.png"); this.loadImage("battle/action-tooltip.png");
this.loadImage("battle/actionpointsnone.png");
this.loadImage("battle/actionpointsempty.png"); this.loadImage("battle/actionpointsempty.png");
this.loadImage("battle/actionpointsfull.png"); this.loadImage("battle/actionpointsfull.png");
this.loadImage("battle/actionpointspart.png"); this.loadImage("battle/actionpointspart.png");

View file

@ -23,23 +23,21 @@ module SpaceTac.View {
// Create an empty action bar // Create an empty action bar
constructor(battleview: BattleView) { constructor(battleview: BattleView) {
super(battleview.game); super(battleview.game);
this.battleview = battleview; this.battleview = battleview;
this.actions = []; this.actions = [];
this.ship = null; this.ship = null;
this.x = 230;
this.y = 0;
battleview.ui.add(this); battleview.ui.add(this);
// Background // Background
this.addChild(new Phaser.Image(this.game, 0, 0, "battle-actionbar", 0)); this.addChild(new Phaser.Image(this.game, 0, 0, "battle-actionbar", 0));
// Action points progress bar // Action points progress bar
this.actionpoints = new ValueBar(this.game, 119, 76, "battle-actionpointsempty"); this.actionpoints = new ValueBar(this.game, 190, 111, "battle-actionpointsempty");
this.actionpoints.setBarImage("battle-actionpointspart"); this.actionpoints.setBarImage("battle-actionpointspart");
this.addChild(this.actionpoints); this.addChild(this.actionpoints);
this.actionpointstemp = new ValueBar(this.game, 119, 76, "battle-actionpointsempty"); this.actionpointstemp = new ValueBar(this.game, 190, 111, "battle-actionpointsnone");
this.actionpointstemp.setBarImage("battle-actionpointsfull"); this.actionpointstemp.setBarImage("battle-actionpointsfull");
this.addChild(this.actionpointstemp); this.addChild(this.actionpointstemp);
@ -68,7 +66,7 @@ module SpaceTac.View {
// Add an action icon // Add an action icon
addAction(ship: Game.Ship, action: Game.BaseAction): ActionIcon { addAction(ship: Game.Ship, action: Game.BaseAction): ActionIcon {
var icon = new ActionIcon(this, 90 + this.actions.length * 62, 2, ship, action); var icon = new ActionIcon(this, 200 + this.actions.length * 62, 2, ship, action);
this.actions.push(icon); this.actions.push(icon);
this.tooltip.bringToTop(); this.tooltip.bringToTop();
@ -115,10 +113,10 @@ module SpaceTac.View {
}); });
this.ship = ship; this.ship = ship;
this.game.tweens.create(this).to({"alpha": 1}, 400).start(); this.game.tweens.create(this).to({ "alpha": 1 }, 400).start();
} else { } else {
this.ship = null; this.ship = null;
this.game.tweens.create(this).to({"alpha": 0.5}, 400).start(); this.game.tweens.create(this).to({ "alpha": 0.5 }, 400).start();
} }
this.updateActionPoints(); this.updateActionPoints();

View file

@ -25,15 +25,15 @@ module SpaceTac.View {
// Create a graphical arena for ship sprites to fight in a 2D space // Create a graphical arena for ship sprites to fight in a 2D space
constructor(battleview: BattleView) { constructor(battleview: BattleView) {
super(battleview.game); super(battleview.game);
this.battleview = battleview; this.battleview = battleview;
this.ship_sprites = []; this.ship_sprites = [];
this.playing = null; this.playing = null;
this.hovered = null; this.hovered = null;
this.range_hint = null; this.range_hint = null;
var offset_x = 206; var offset_x = 133;
var offset_y = 84; var offset_y = 132;
var background = new Phaser.Button(battleview.game, 0, 0, "battle-arena-background"); var background = new Phaser.Button(battleview.game, 0, 0, "battle-arena-background");
var expected_width = battleview.getWidth() - offset_x; var expected_width = battleview.getWidth() - offset_x;

View file

@ -1,6 +1,6 @@
module SpaceTac.View { module SpaceTac.View {
// Bar with all playing ships, by play order // Bar with all playing ships, by play order
export class ShipList extends Phaser.Group { export class ShipList extends Phaser.Image {
// Link to the parent battleview // Link to the parent battleview
battleview: BattleView; battleview: BattleView;
@ -15,7 +15,7 @@ module SpaceTac.View {
// Create an empty action bar // Create an empty action bar
constructor(battleview: BattleView) { constructor(battleview: BattleView) {
super(battleview.game, battleview.ui); super(battleview.game, 0, 131, "battle-shiplist-background");
this.battleview = battleview; this.battleview = battleview;
this.ships = []; this.ships = [];
@ -24,26 +24,11 @@ module SpaceTac.View {
battleview.ui.add(this); battleview.ui.add(this);
this.addBackground();
if (battleview.battle) { if (battleview.battle) {
this.setShipsFromBattle(battleview.battle); this.setShipsFromBattle(battleview.battle);
} }
} }
// Add background children
addBackground(): void {
var background = new Phaser.Graphics(this.game, 0, 0);
background.beginFill(0xFFFFFFFF, 0.9);
background.drawRect(0, 0, 224, 84);
background.endFill();
background.beginFill(0xFFFFFFFF, 0.45);
background.drawRect(0, 84, 206, this.battleview.getHeight() - 84);
background.endFill();
background.visible = true;
this.addChild(background);
}
// Clear the action icons // Clear the action icons
clearAll(): void { clearAll(): void {
this.ships.forEach((ship: ShipListItem) => { this.ships.forEach((ship: ShipListItem) => {
@ -66,7 +51,7 @@ module SpaceTac.View {
var owned = ship.getPlayer() === this.battleview.player; var owned = ship.getPlayer() === this.battleview.player;
var result = new ShipListItem(this, -200, 0, ship, owned); var result = new ShipListItem(this, -200, 0, ship, owned);
this.ships.push(result); this.ships.push(result);
this.add(result); this.addChild(result);
return result; return result;
} }
@ -98,11 +83,11 @@ module SpaceTac.View {
this.ships.forEach((item: ShipListItem) => { this.ships.forEach((item: ShipListItem) => {
var position = this.findPlayPosition(item.ship); var position = this.findPlayPosition(item.ship);
if (position === 0) { if (position === 0) {
item.moveTo(12, 12, animate); item.moveTo(20, 20 - this.y, animate);
} else { } else {
item.moveTo(3, 26 + position * 63, animate); item.moveTo(8, 36 + position * 102 - this.y, animate);
} }
this.setChildIndex(item, 1 + position); this.setChildIndex(item, position);
}); });
} }

View file

@ -4,15 +4,15 @@ module SpaceTac.View {
// Reference to the ship game object // Reference to the ship game object
ship: Game.Ship; ship: Game.Ship;
// Energy display
energy: ValueBar;
// Hull display // Hull display
hull: ValueBar; hull: ValueBar;
// Shield display // Shield display
shield: ValueBar; shield: ValueBar;
// Base display
layer_base: Phaser.Image;
// Portrait // Portrait
layer_portrait: Phaser.Image; layer_portrait: Phaser.Image;
@ -36,12 +36,9 @@ module SpaceTac.View {
list.battleview.cursorOffShip(ship); list.battleview.cursorOffShip(ship);
}); });
this.layer_base = new Phaser.Image(this.game, 0, 0, "battle-shiplist-base", 0); this.layer_portrait = new Phaser.Image(this.game, 76, 76, "ship-" + ship.model + "-portrait", 0);
this.addChild(this.layer_base); this.layer_portrait.position.set(8, 8);
this.layer_portrait.scale.set(0.3, 0.3);
this.layer_portrait = new Phaser.Image(this.game, 30, 30, "ship-" + ship.model + "-portrait", 0);
this.layer_portrait.anchor.set(0.5, 0.5);
this.layer_portrait.scale.set(0.19, 0.19);
this.addChild(this.layer_portrait); this.addChild(this.layer_portrait);
this.layer_hover = new Phaser.Image(this.game, 30, 30, "battle-arena-shipspritehover", 0); this.layer_hover = new Phaser.Image(this.game, 30, 30, "battle-arena-shipspritehover", 0);
@ -49,10 +46,13 @@ module SpaceTac.View {
this.layer_hover.visible = false; this.layer_hover.visible = false;
this.addChild(this.layer_hover); this.addChild(this.layer_hover);
this.shield = ValueBar.newStyled(this.game, "battle-shiplist-shield", 127, 48); this.energy = ValueBar.newStyled(this.game, "battle-shiplist-energy", 90, 39, true);
this.addChild(this.energy);
this.shield = ValueBar.newStyled(this.game, "battle-shiplist-shield", 98, 39, true);
this.addChild(this.shield); this.addChild(this.shield);
this.hull = ValueBar.newStyled(this.game, "battle-shiplist-hull", 60, 48); this.hull = ValueBar.newStyled(this.game, "battle-shiplist-hull", 106, 39, true);
this.addChild(this.hull); this.addChild(this.hull);
this.active_effects = new Phaser.Group(this.game); this.active_effects = new Phaser.Group(this.game);
@ -67,6 +67,7 @@ module SpaceTac.View {
updateAttributes() { updateAttributes() {
this.attributeChanged(this.ship.hull); this.attributeChanged(this.ship.hull);
this.attributeChanged(this.ship.shield); this.attributeChanged(this.ship.shield);
this.attributeChanged(this.ship.ap_current);
} }
// Update effects applied on the ship // Update effects applied on the ship
@ -84,6 +85,8 @@ module SpaceTac.View {
this.hull.setValue(attribute.current, attribute.maximal); this.hull.setValue(attribute.current, attribute.maximal);
} else if (attribute.code === Game.AttributeCode.Shield) { } else if (attribute.code === Game.AttributeCode.Shield) {
this.shield.setValue(attribute.current, attribute.maximal); this.shield.setValue(attribute.current, attribute.maximal);
} else if (attribute.code === Game.AttributeCode.AP) {
this.energy.setValue(attribute.current, attribute.maximal);
} }
} }
@ -91,7 +94,7 @@ module SpaceTac.View {
moveTo(x: number, y: number, animate: boolean) { moveTo(x: number, y: number, animate: boolean) {
if (animate) { if (animate) {
var tween = this.game.tweens.create(this); var tween = this.game.tweens.create(this);
tween.to({x: x, y: y}); tween.to({ x: x, y: y });
tween.start(); tween.start();
} else { } else {
this.x = x; this.x = x;