1
0
Fork 0

Updated actionbar theme and action icons

This commit is contained in:
Michaël Lemaire 2017-01-13 00:57:28 +01:00
parent b0b7d89eb6
commit 41a257df7a
16 changed files with 946 additions and 210 deletions

View file

@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
@ -15,11 +16,138 @@
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="actions.svg"
inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/temp.png"
inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/actions/fire-submunitionmissile.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient10708">
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="0"
id="stop10710" />
<stop
id="stop10716"
offset="0.41864359"
style="stop-color:#e6cece;stop-opacity:0.92340428" />
<stop
style="stop-color:#d3aaaa;stop-opacity:0.71276593"
offset="0.63385004"
id="stop10718" />
<stop
style="stop-color:#b56f6f;stop-opacity:0"
offset="1"
id="stop10712" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient10700">
<stop
style="stop-color:#9a9a9a;stop-opacity:0"
offset="0"
id="stop10702" />
<stop
id="stop10828"
offset="0.62673485"
style="stop-color:#d9d9d9;stop-opacity:0.13404255" />
<stop
style="stop-color:#ffffff;stop-opacity:0.54255319"
offset="1"
id="stop10704" />
</linearGradient>
<pattern
inkscape:collect="always"
xlink:href="#pattern10688"
id="pattern10694"
patternTransform="matrix(7.0792381,0,0,7.2943536,-231.84785,-27.961366)" />
<pattern
inkscape:collect="always"
xlink:href="#Strips1_1white"
id="pattern10688"
patternTransform="matrix(10,0,0,10,2,0)" />
<pattern
inkscape:isstock="true"
inkscape:stockid="Stripes 1:1 white"
id="Strips1_1white"
patternTransform="translate(0,0) scale(10,10)"
height="1"
width="2"
patternUnits="userSpaceOnUse"
inkscape:collect="always">
<rect
id="rect8251"
height="2"
width="1"
y="-0.5"
x="0"
style="fill:white;stroke:none" />
</pattern>
<linearGradient
inkscape:collect="always"
id="linearGradient10525">
<stop
style="stop-color:#ff0000;stop-opacity:0"
offset="0"
id="stop10527" />
<stop
style="stop-color:#f86222;stop-opacity:1"
offset="1"
id="stop10529" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient10423">
<stop
style="stop-color:#887119;stop-opacity:1"
offset="0"
id="stop10425" />
<stop
id="stop10431"
offset="0.42762059"
style="stop-color:#83a02b;stop-opacity:0.56862748" />
<stop
style="stop-color:#489843;stop-opacity:0;"
offset="1"
id="stop10427" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient5844">
<stop
style="stop-color:#bcbcbc;stop-opacity:1;"
offset="0"
id="stop5846" />
<stop
id="stop6528"
offset="0.26181653"
style="stop-color:#d4d4d4;stop-opacity:1" />
<stop
style="stop-color:#595959;stop-opacity:1;"
offset="0.67535776"
id="stop6530" />
<stop
style="stop-color:#2a2a2a;stop-opacity:1"
offset="1"
id="stop5848" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient5468">
<stop
style="stop-color:#fbe854;stop-opacity:1"
offset="0"
id="stop5470" />
<stop
id="stop5472"
offset="0.11726352"
style="stop-color:#b98850;stop-opacity:1" />
<stop
style="stop-color:#6d6d6d;stop-opacity:0;"
offset="1"
id="stop5474" />
</linearGradient>
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath3925">
@ -29,19 +157,160 @@
id="path3927"
inkscape:connector-curvature="0" />
</clipPath>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5844"
id="linearGradient6538"
x1="93.53553"
y1="107.1656"
x2="93.53553"
y2="148.70813"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4476343,0,0,1.4476343,-81.750237,-57.297196)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10423"
id="linearGradient10429"
x1="87.630737"
y1="128.00001"
x2="239.40616"
y2="128.00001"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter10513"
x="-0.17241065"
width="1.3448213"
y="-0.5030039"
height="2.0060078">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="10.903208"
id="feGaussianBlur10515" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10525"
id="linearGradient10531"
x1="48.48732"
y1="128.08944"
x2="64.649763"
y2="128.08944"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(2.0203051,-0.50507623)" />
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter10557"
x="-0.37457808"
width="1.7491562"
y="-0.099473032"
height="1.1989461">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="2.5225404"
id="feGaussianBlur10559" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5468"
id="linearGradient10608"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-10,0)"
x1="169.07599"
y1="113.24746"
x2="108.23768"
y2="113.18433" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5844"
id="linearGradient10610"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4476343,0,0,1.4476343,-81.750237,-57.297196)"
x1="37.20599"
y1="110.42603"
x2="37.20599"
y2="116.76176" />
<mask
maskUnits="userSpaceOnUse"
id="mask4579">
<g
id="g4581"
transform="translate(-31.785717,-23.928572)">
<circle
r="53.033009"
cy="-141.63815"
cx="132.83505"
id="circle4583"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path4585"
d="m 112.85714,-206.20927 55.35714,0 -19.28571,50.71429 38.92857,0 -73.92857,92.85714 21.42857,-69.28571 -36.428568,0 z"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</mask>
<mask
maskUnits="userSpaceOnUse"
id="mask10690">
<rect
style="opacity:1;fill:url(#pattern10694);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
id="rect10692"
width="163.8338"
height="168.81219"
x="-227.39804"
y="-205.73518"
transform="matrix(0,1,-1,0,0,0)" />
</mask>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter10824"
x="-0.021938298"
width="1.0438766"
y="-0.49100003"
height="1.9820001">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="2.3324547"
id="feGaussianBlur10826" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10700"
id="linearGradient10832"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.5201334,0,0,1.5201334,-139.53744,-62.542035)"
x1="16.428572"
y1="128"
x2="184.28572"
y2="128" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient10708"
id="radialGradient10836"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.9404233,0,0,1.9404233,-217.14096,-116.33914)"
cx="184.64287"
cy="128"
fx="184.64287"
fy="128"
r="24.642857" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
pagecolor="#232323"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="122.81513"
inkscape:cy="168.49069"
inkscape:zoom="2.8"
inkscape:cx="119.91673"
inkscape:cy="136.03306"
inkscape:document-units="px"
inkscape:current-layer="layer2"
inkscape:current-layer="layer5"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1030"
@ -73,51 +342,45 @@
inkscape:label="endturn"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-796.36216)">
transform="translate(0,-796.36216)"
style="display:none">
<g
id="g3939"
inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/temp.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0.61036973,0,0,0.61036973,-76.47386,495.66155)">
id="g4487">
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path3935"
d="m 160,632.36218 120,210 0,-130 z"
style="fill:#43903f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
d="m 21.185297,881.63628 73.244367,128.17762 0,-79.34804 z"
style="fill:#39c731;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path3937"
d="m 280,842.36218 0,-130 230,-150 z"
style="fill:#4a6c48;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
d="m 94.072521,1009.8139 0,-79.34804 140.385039,-91.55546 z"
style="fill:#489843;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="move">
<g
id="g5815"
transform="matrix(0.49994317,0,0,0.49994317,-67.559263,-53.06051)">
<path
sodipodi:nodetypes="cccccc"
inkscape:connector-curvature="0"
id="path3006"
d="m 160,362.36218 210,0 -95,-120 10,85 -125,0 z"
style="fill:#4b818a;fill-opacity:1;stroke:none" />
<path
sodipodi:nodetypes="cccccc"
inkscape:connector-curvature="0"
id="path3006-7"
d="m 160,362.36218 210,0 -95,120 10,-85 -125,0 z"
style="fill:#40686f;fill-opacity:1;stroke:none" />
</g>
inkscape:label="move"
style="display:none">
<path
style="fill:#ffcc00;fill-opacity:1;stroke:none"
d="m 12.431644,128.12628 104.988066,0 -47.494601,-59.993187 4.999431,42.495177 -62.492896,0 z"
id="path3006"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
style="fill:#d4aa00;fill-opacity:1;stroke:none"
d="m 12.431644,127.87374 104.988066,0 -47.494601,59.99318 4.999431,-42.49517 -62.492896,0 z"
id="path3006-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<circle
style="fill:none;stroke:#68a3ad;stroke-width:31.39999962;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="fill:none;stroke:#ffdd55;stroke-width:31.39999962;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3794"
transform="matrix(0.49994317,0,0,0.49994317,-59.247222,-53.160498)"
transform="matrix(0.49994317,0,0,0.49994317,-59.247222,-53.160494)"
clip-path="url(#clipPath3925)"
inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/temp.png"
inkscape:export-xdpi="90"
@ -126,4 +389,260 @@
cy="362.36218"
r="110" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="fire-gatlinggun"
style="display:none">
<g
id="g10561"
transform="matrix(0.72068912,-0.72068912,0.72068912,0.72068912,-79.281576,151.46811)">
<rect
transform="matrix(1.4476343,0,0,1.4476343,-81.750237,-57.297196)"
ry="5.5"
y="101.98858"
x="87.630737"
height="52.022854"
width="151.77542"
id="rect10421"
style="opacity:0.61100003;fill:url(#linearGradient10429);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#filter10513)" />
<use
height="100%"
width="100%"
transform="translate(178.29499,0)"
id="use6554"
xlink:href="#g4509"
y="0"
x="0" />
<g
transform="matrix(3.123757,0,0,1.4476343,-336.21366,-57.245494)"
id="g4509">
<path
inkscape:connector-curvature="0"
id="rect4507"
d="m 98.214287,111.35714 61.071423,0 0,4.28571 -61.071423,0 z"
style="opacity:1;fill:url(#linearGradient10608);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
</g>
<rect
y="102.40788"
x="-108.11786"
height="9.3062201"
width="172.6821"
id="rect4497"
style="opacity:1;fill:url(#linearGradient10610);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" />
<use
height="100%"
width="100%"
transform="translate(222.86872,13.959321)"
id="use6556"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(44.573743,13.959321)"
id="use4512"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(4.5218589e-7,13.959321)"
id="use4499"
xlink:href="#rect4497"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(267.44249,27.918659)"
id="use6562"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(89.14749,27.918659)"
id="use4514"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(4.5218589e-7,27.918659)"
id="use4501"
xlink:href="#rect4497"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(133.72123,41.82629)"
id="use4518"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(-44.573742,41.82629)"
id="use4516"
xlink:href="#g4509"
y="0"
x="0" />
<use
height="100%"
width="100%"
transform="translate(4.5218589e-7,41.877992)"
id="use4503"
xlink:href="#rect4497"
y="0"
x="0" />
<rect
y="97.754784"
x="48.53685"
height="60.490433"
width="9.306221"
id="rect4505"
style="opacity:1;fill:url(#linearGradient6538);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" />
<use
height="100%"
width="100%"
transform="translate(312.01622,41.82629)"
id="use6572"
xlink:href="#g4509"
y="0"
x="0" />
<rect
y="97.153519"
x="50.507626"
height="60.861691"
width="16.162443"
id="rect10523"
style="opacity:0.406;fill:url(#linearGradient10531);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#filter10557)" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="fire-energydepleter"
style="display:none">
<g
id="g4573"
transform="matrix(1.3709234,0,0,1.4125814,-38.332891,329.50396)"
mask="url(#mask10690)">
<rect
mask="url(#mask4579)"
y="-232.65211"
x="44.285706"
height="147.5143"
width="116.59103"
id="rect4552"
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>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="fire-submunitionmissile"
style="display:inline">
<rect
style="opacity:1;fill:url(#linearGradient10832);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;filter:url(#filter10824)"
id="rect10698"
width="255.16525"
height="11.401"
x="-114.56382"
y="126.33456" />
<use
x="0"
y="0"
xlink:href="#rect10698"
id="use10720"
transform="matrix(0.31323088,-0.11400672,0.11400672,0.31323088,163.20311,77.600652)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10720"
id="use10722"
transform="matrix(0.30901699,-0.95105652,0.95105652,0.30901699,-27.538324,225.5369)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10720"
id="use10724"
transform="matrix(-0.809017,-0.58778525,0.58778525,-0.809017,182.88888,322.39994)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10720"
id="use10726"
transform="matrix(0.30901699,0.95105652,-0.95105652,0.30901699,221.42678,-46.361951)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10720"
id="use10728"
transform="matrix(-0.809017,0.58778525,-0.58778525,-0.809017,336.73196,151.48596)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#path10696"
id="use10730"
transform="matrix(0.55933925,0,0,0.55933925,59.893429,-29.728528)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10730"
id="use10738"
transform="translate(82.152814,59.119315)"
width="100%"
height="100%" />
<circle
style="opacity:1;fill:url(#radialGradient10836);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
id="path10696"
cx="141.14436"
cy="132.03505"
r="47.817574" />
<use
x="0"
y="0"
xlink:href="#use10730"
id="use10742"
transform="translate(-42.611973,154.32444)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10730"
id="use10740"
transform="translate(56.048182,153.17278)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#use10730"
id="use10746"
transform="translate(-74.474985,64.109905)"
width="100%"
height="100%" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -16,9 +16,48 @@
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="battle.svg">
sodipodi:docname="battle.svg"
inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/actionbar.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient10006">
<stop
style="stop-color:#868b91;stop-opacity:1"
offset="0"
id="stop10008" />
<stop
id="stop10016"
offset="0.07847533"
style="stop-color:#7d8288;stop-opacity:0.89411765;" />
<stop
style="stop-color:#7a7f85;stop-opacity:0.8627451;"
offset="0.49327353"
id="stop10018" />
<stop
id="stop10020"
offset="0.90582961"
style="stop-color:#50555c;stop-opacity:0.34509804;" />
<stop
style="stop-color:#343a42;stop-opacity:0;"
offset="1"
id="stop10010" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient9958">
<stop
style="stop-color:#d1d8ff;stop-opacity:0.53617018"
offset="0"
id="stop9960" />
<stop
style="stop-color:#51586e;stop-opacity:0"
offset="1"
id="stop9962" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4352">
@ -234,6 +273,108 @@
result="composite2"
id="feComposite6031-5" />
</filter>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient9958"
id="radialGradient9976"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.76494682,-6.0104076,-21.043441)"
cx="227.86516"
cy="-58.265144"
fx="227.86516"
fy="-58.265144"
r="27.400387" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10006"
id="linearGradient10012"
x1="0"
y1="65.884903"
x2="157.68481"
y2="65.884903"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:label="Bloom"
inkscape:menu="Bevels"
inkscape:menu-tooltip="Soft, cushion-like bevel with matte highlights"
style="color-interpolation-filters:sRGB;"
id="filter10394">
<feGaussianBlur
result="result1"
in="SourceAlpha"
stdDeviation="2.2"
id="feGaussianBlur10396" />
<feSpecularLighting
result="result0"
specularExponent="18.1"
specularConstant="2"
surfaceScale="5"
id="feSpecularLighting10398">
<feDistantLight
azimuth="225"
elevation="24"
id="feDistantLight10400" />
</feSpecularLighting>
<feComposite
result="result6"
operator="in"
in2="SourceAlpha"
id="feComposite10402" />
<feMorphology
radius="5.7"
operator="dilate"
id="feMorphology10404" />
<feGaussianBlur
result="result11"
stdDeviation="5.7"
id="feGaussianBlur10406" />
<feDiffuseLighting
surfaceScale="1.1020000000000001"
result="result3"
diffuseConstant="2"
in="result1"
id="feDiffuseLighting10408">
<feDistantLight
elevation="25"
azimuth="225"
id="feDistantLight10410" />
</feDiffuseLighting>
<feBlend
result="result7"
mode="multiply"
in="result3"
in2="SourceGraphic"
id="feBlend10412" />
<feComposite
in="result7"
operator="in"
in2="SourceAlpha"
result="result91"
id="feComposite10414" />
<feBlend
result="result9"
mode="lighten"
in="result6"
in2="result91"
id="feBlend10416" />
<feComposite
in="result11"
in2="result9"
id="feComposite10418" />
</filter>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter10850"
x="-0.77418002"
width="2.54836"
y="-0.041734771"
height="1.0834695">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.140475"
id="feGaussianBlur10852" />
</filter>
</defs>
<sodipodi:namedview
id="base"
@ -242,11 +383,11 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="346.71693"
inkscape:cy="713.01557"
inkscape:zoom="5.6568542"
inkscape:cx="243.62481"
inkscape:cy="1128.5583"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:current-layer="layer25"
showgrid="false"
units="px"
showguides="true"
@ -624,7 +765,7 @@
x="0"
y="-27.637838"
transform="translate(0,27.637839)"
inkscape:export-filename="/tmp/export.png"
inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/actionbar.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:tile-cx="960"
@ -633,6 +774,20 @@
inkscape:tile-h="131.76981"
inkscape:tile-x0="0"
inkscape:tile-y0="6.3635254e-07" />
<rect
style="opacity:1;fill:url(#linearGradient10012);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect10004"
width="157.68481"
height="131.76981"
x="0"
y="0" />
<rect
style="opacity:1;fill:#353a43;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter10394)"
id="rect10022"
width="133"
height="108.5"
x="11.379707"
y="11.46429" />
</g>
<g
inkscape:groupmode="layer"
@ -644,55 +799,57 @@
inkscape:label="AP background"
style="display:inline">
<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:#434936;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;filter:url(#filter5827)"
id="rect4249"
width="1756.4532"
height="28.991375"
x="157.68481"
y="97.121567"
y="99.310905"
inkscape:export-filename="/tmp/export.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<use
style="display:inline"
x="0"
y="0"
xlink:href="#g4573"
id="use4168"
transform="matrix(0.75331227,0,0,0.75331227,176.95546,218.6579)"
width="100%"
height="100%" />
</g>
<g
inkscape:groupmode="layer"
id="layer8"
inkscape:label="AP info">
inkscape:label="AP info"
style="display:inline">
<path
transform="translate(0,27.637839)"
style="opacity:1;fill:#ffdd4b;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"
d="m 206.22794,95.419286 1684.82326,0 16.8238,-12.121846 -1718.47077,0 z"
style="opacity:1;fill:#ffdd4b;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;filter:url(#filter5649)"
d="m 206.22794,119.86752 1684.82326,0 16.8238,-12.12184 -1718.47077,0 z"
id="rect4437"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
inkscape:export-filename="/tmp/export.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<use
x="0"
y="0"
xlink:href="#g4573"
id="use4168"
transform="matrix(0.75331227,0,0,0.75331227,177.45546,219.21855)"
width="100%"
height="100%" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="Actions">
inkscape:label="Actions"
style="display:inline">
<g
inkscape:groupmode="layer"
id="layer10"
inkscape:label="Actions background">
<rect
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"
style="opacity:1;fill:#4c555b;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;filter:url(#filter5827)"
id="rect4439"
width="1723.3817"
height="88.571426"
x="185.84662"
y="9.000001"
y="6.2928934"
inkscape:export-filename="/tmp/export.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
@ -702,225 +859,299 @@
id="layer23"
inkscape:label="Actions icons"
style="display:inline">
<rect
style="display:inline;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="73.5"
height="73.5"
x="194.5"
y="16.535713"
inkscape:tile-cx="236.75"
inkscape:tile-cy="58.249998"
inkscape:tile-w="79.5"
inkscape:tile-h="79.5"
inkscape:tile-x0="197"
inkscape:tile-y0="18.499998" />
<g
id="g9611"
inkscape:tile-cx="231.75"
inkscape:tile-cy="-49.214287"
inkscape:tile-w="73.5"
inkscape:tile-h="73.5"
inkscape:tile-x0="195"
inkscape:tile-y0="-85.964287"
transform="translate(20.506097,-1.76777)"
inkscape:export-filename="/home/michael/workspace/perso/spacetac/out/assets/images/battle/action-active.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<rect
inkscape:tile-y0="18.499998"
inkscape:tile-x0="197"
inkscape:tile-h="79.5"
inkscape:tile-w="79.5"
inkscape:tile-cy="58.249998"
inkscape:tile-cx="236.75"
y="-85.964287"
x="195"
height="73.5"
width="73.5"
id="rect4320"
style="display:inline;opacity:1;fill:#2f2f2f;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;filter:url(#filter6021-3)" />
<ellipse
style="opacity:0.331;fill:url(#radialGradient9976);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path9956"
cx="221.85475"
cy="-65.613174"
rx="27.400387"
ry="20.959839" />
<rect
style="opacity:1;fill:#b0e0ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5649)"
id="rect9994"
width="2.1213202"
height="66.46804"
x="264.28116"
y="-82.448303"
transform="matrix(0.70716727,0,0,0.93177603,77.700759,-3.3575936)" />
<use
x="0"
y="0"
xlink:href="#rect9994"
id="use9996"
transform="translate(-67.25,0)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#rect9994"
id="use9998"
transform="matrix(0,1,-1,0,182.53572,-348.1811)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#rect9994"
id="use10000"
transform="matrix(0,1,-1,0,182.53572,-281.4311)"
width="100%"
height="100%" />
</g>
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(85.86,0)"
id="use4628"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
id="use9894"
width="100%"
height="100%"
transform="translate(-20.506097,101.56067)" />
<use
x="0"
y="0"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(65.488903,101.56067)"
id="use9896"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(171.72,0)"
id="use4630"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(151.4839,101.56067)"
id="use9898"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(257.58,0)"
id="use4632"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(237.4789,101.56067)"
id="use9900"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(343.44,0)"
id="use4634"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(323.4739,101.56067)"
id="use9902"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(429.3,0)"
id="use4636"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(409.4689,101.56067)"
id="use9904"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(515.16,0)"
id="use4638"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(495.4639,101.56067)"
id="use9906"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(601.02,0)"
id="use4640"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(581.4589,101.56067)"
id="use9908"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(686.88,0)"
id="use4642"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(667.4539,101.56067)"
id="use9910"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(772.74,0)"
id="use4644"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(753.4489,101.56067)"
id="use9912"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(858.6,0)"
id="use4646"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(839.4439,101.56067)"
id="use9914"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(944.46,0)"
id="use4648"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(925.4389,101.56067)"
id="use9916"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1030.32,0)"
id="use4650"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1011.4339,101.56067)"
id="use9918"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1116.18,0)"
id="use4652"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1097.4289,101.56067)"
id="use9920"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1202.04,0)"
id="use4654"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1183.4239,101.56067)"
id="use9922"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1287.9,0)"
id="use4656"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1269.4189,101.56067)"
id="use9924"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1373.76,0)"
id="use4658"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1355.4139,101.56067)"
id="use9926"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1459.62,0)"
id="use4660"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1441.4089,101.56067)"
id="use9928"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1545.48,0)"
id="use4662"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1527.4039,101.56067)"
id="use9930"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
transform="translate(1631.34,0)"
id="use4664"
width="100%"
height="100%" />
<use
style="display:inline"
x="0"
y="0"
inkscape:tiled-clone-of="#rect4320"
xlink:href="#rect4320"
id="use4626"
transform="translate(0.5,-102.5)"
inkscape:tiled-clone-of="#g9611"
xlink:href="#g9611"
transform="translate(1613.3989,101.56067)"
id="use9932"
width="100%"
height="100%" />
</g>
<g
inkscape:groupmode="layer"
id="layer24"
inkscape:label="Action icon active"
style="display:inline">
<ellipse
style="opacity:1;fill:#97d3fb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.39999962;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter10850)"
id="path10840"
cx="285.67114"
cy="-51.10569"
rx="1.7677671"
ry="32.79208" />
<use
x="0"
y="0"
xlink:href="#path10840"
id="use10854"
transform="translate(-66.998368,0)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#path10840"
id="use10856"
transform="matrix(0,1,-1,0,201.15465,-370.01085)"
width="100%"
height="100%" />
<use
x="0"
y="0"
xlink:href="#path10840"
id="use10858"
transform="matrix(0,1,-1,0,200.97788,-303.54282)"
width="100%"
height="100%" />
</g>
<g
inkscape:groupmode="layer"
id="layer25"
inkscape:label="Action icon fading" />
</g>
<g
inkscape:groupmode="layer"
id="layer12"
inkscape:label="Current ship">
inkscape:label="Current ship"
style="display:inline">
<use
x="0"
y="0"
@ -1500,29 +1731,9 @@
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" />
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>
<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

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View file

@ -47,6 +47,8 @@ module SpaceTac.View {
this.loadImage("battle/actions/move.png");
this.loadImage("battle/actions/endturn.png");
this.loadImage("battle/actions/fire-gatlinggun.png");
this.loadImage("battle/actions/fire-energydepleter.png");
this.loadImage("battle/actions/fire-submunitionmissile.png");
this.loadImage("battle/weapon/bullet.png");
this.loadImage("common/standard-bar-background.png");
this.loadImage("common/standard-bar-foreground.png");

View file

@ -34,10 +34,10 @@ module SpaceTac.View {
this.addChild(new Phaser.Image(this.game, 0, 0, "battle-actionbar", 0));
// Action points progress bar
this.actionpoints = new ValueBar(this.game, 190, 111, "battle-actionpointsempty");
this.actionpoints = new ValueBar(this.game, 190, 108, "battle-actionpointsempty");
this.actionpoints.setBarImage("battle-actionpointspart");
this.addChild(this.actionpoints);
this.actionpointstemp = new ValueBar(this.game, 190, 111, "battle-actionpointsnone");
this.actionpointstemp = new ValueBar(this.game, 190, 108, "battle-actionpointsnone");
this.actionpointstemp.setBarImage("battle-actionpointsfull");
this.addChild(this.actionpointstemp);
@ -66,7 +66,7 @@ module SpaceTac.View {
// Add an action icon
addAction(ship: Game.Ship, action: Game.BaseAction): ActionIcon {
var icon = new ActionIcon(this, 200 + this.actions.length * 62, 2, ship, action);
var icon = new ActionIcon(this, 192 + this.actions.length * 88, 8, ship, action);
this.actions.push(icon);
this.tooltip.bringToTop();

View file

@ -34,7 +34,7 @@ module SpaceTac.View {
// Create an icon for a single ship action
constructor(bar: ActionBar, x: number, y: number, ship: Game.Ship, action: Game.BaseAction) {
super(bar.game, x, y, "battle-action-inactive");
this.bar = bar;
this.battleview = bar.battleview;
this.ship = ship;
@ -49,7 +49,9 @@ module SpaceTac.View {
this.addChild(this.layer_active);
// Icon layer
this.layer_icon = new Phaser.Image(this.game, 15, 18, "battle-actions-" + action.code, 0);
this.layer_icon = new Phaser.Image(this.game, this.layer_active.width / 2, this.layer_active.height / 2, "battle-actions-" + action.code, 0);
this.layer_icon.anchor.set(0.5, 0.5);
this.layer_icon.scale.set(0.25, 0.25);
this.addChild(this.layer_icon);
// Fading layer
@ -145,7 +147,7 @@ module SpaceTac.View {
updateActiveStatus(): void {
this.active = this.action.canBeUsed(this.battleview.battle, this.ship);
Animation.setVisibility(this.game, this.layer_active, this.active, 500);
this.game.tweens.create(this.layer_icon).to({alpha: this.active ? 1 : 0.3}, 500).start();
this.game.tweens.create(this.layer_icon).to({ alpha: this.active ? 1 : 0.3 }, 500).start();
this.input.useHandCursor = this.active;
}

View file

@ -31,10 +31,12 @@ module SpaceTac.View {
if (this.icon) {
this.icon.destroy(true);
}
this.icon = new Phaser.Image(this.game, 20, 15, "battle-actions-" + action.action.code);
this.icon = new Phaser.Image(this.game, 76, 72, "battle-actions-" + action.action.code);
this.icon.anchor.set(0.5, 0.5);
this.icon.scale.set(0.44, 0.44);
this.addChild(this.icon);
this.position.set(action.x, action.y + action.height + action.bar.actionpoints.height);
this.position.set(action.x, action.y + action.height + 44);
this.main_title.setText(action.action.equipment ? action.action.equipment.name : action.action.name);
this.sub_title.setText(action.action.equipment ? action.action.name : "");
this.cost.setText(action.action.equipment ? `Cost: ${action.action.equipment.ap_usage} power` : "");

View file

@ -15,7 +15,7 @@ module SpaceTac.View {
// Create an empty action bar
constructor(battleview: BattleView) {
super(battleview.game, 0, 131, "battle-shiplist-background");
super(battleview.game, 0, 133, "battle-shiplist-background");
this.battleview = battleview;
this.ships = [];
@ -85,7 +85,7 @@ module SpaceTac.View {
if (position === 0) {
item.moveTo(20, 20 - this.y, animate);
} else {
item.moveTo(8, 36 + position * 102 - this.y, animate);
item.moveTo(8, 38 + position * 102 - this.y, animate);
}
this.setChildIndex(item, position);
});