Skip to content
GitLab
Commit 9a36ac80 authored by Matt Lowe's avatar Matt Lowe
Browse files

Added colored storm counter

parent 69a9484e
Hide whitespace changes
Inline Side-by-side
cockatrice/cockatrice.qrc
View file @ 9a36ac80
...@@ -313,6 +313,8 @@ ...@@ -313,6 +313,8 @@
<file>resources/counters/r_highlight.svg</file> <file>resources/counters/r_highlight.svg</file>
<file>resources/counters/g.svg</file> <file>resources/counters/g.svg</file>
<file>resources/counters/g_highlight.svg</file> <file>resources/counters/g_highlight.svg</file>
<file>resources/counters/storm.svg</file>
<file>resources/counters/storm_highlight.svg</file>
<file>resources/counters/general.svg</file> <file>resources/counters/general.svg</file>
<file>resources/counters/general_highlight.svg</file> <file>resources/counters/general_highlight.svg</file>
......
cockatrice/resources/counters/storm.svg 0 → 100644
View file @ 9a36ac80
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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="300"
height="300"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
version="1.0"
sodipodi:docname="storm.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 150 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="300 : 150 : 1"
inkscape:persp3d-origin="150 : 100 : 1"
id="perspective31" />
<linearGradient
id="linearGradient3841">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3843" />
<stop
style="stop-color:#fefce9;stop-opacity:0;"
offset="1"
id="stop3845" />
</linearGradient>
<linearGradient
id="linearGradient3813">
<stop
id="stop3815"
offset="0"
style="stop-color:#ff8632;stop-opacity:0;" />
<stop
style="stop-color:#ff8232;stop-opacity:0.40000001;"
offset="0.5"
id="stop4577" />
<stop
id="stop4579"
offset="0.75"
style="stop-color:#cf5300;stop-opacity:0.60000002;" />
<stop
id="stop3817"
offset="1"
style="stop-color:black;stop-opacity:0.80000001;" />
</linearGradient>
<linearGradient
id="linearGradient3779">
<stop
style="stop-color:#ff8232;stop-opacity:1;"
offset="0"
id="stop3781" />
<stop
style="stop-color:#ff4d32;stop-opacity:1;"
offset="1"
id="stop3783" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3779"
id="linearGradient3785"
x1="1.0101526"
y1="2.0049992"
x2="300"
y2="300"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3813"
id="radialGradient3819"
cx="150"
cy="150"
fx="150"
fy="150"
r="150"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3841"
id="linearGradient3847"
x1="149.99989"
y1="0.45544016"
x2="149.99989"
y2="299.54449"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective2461"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2511"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2578"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2650"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2467"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2519"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2571"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2621"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3779"
id="linearGradient3782"
gradientUnits="userSpaceOnUse"
x1="1.0101526"
y1="2.0049992"
x2="300"
y2="300" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="56.521564"
inkscape:cy="177.14958"
inkscape:document-units="px"
inkscape:current-layer="layer2"
width="765px"
height="1260px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="-8"
inkscape:window-y="-8"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Button"
inkscape:groupmode="layer"
id="layer1"
style="display:inline">
<path
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
sodipodi:ry="150"
sodipodi:rx="150"
sodipodi:cy="150"
sodipodi:cx="150"
id="path2760"
style="fill:url(#linearGradient3785);fill-opacity:1.0;fill-rule:evenodd;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:url(#linearGradient3782);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path3788"
sodipodi:cx="150"
sodipodi:cy="150"
sodipodi:rx="150"
sodipodi:ry="150"
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
transform="translate(-1.4253374e-6,2.8293252e-6)" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Schatten"
style="display:inline">
<path
sodipodi:type="arc"
style="fill:url(#radialGradient3819);fill-opacity:1.0;fill-rule:evenodd;stroke:none"
id="path3790"
sodipodi:cx="150"
sodipodi:cy="150"
sodipodi:rx="150"
sodipodi:ry="150"
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
transform="translate(-0.28640902,0.00435494)" />
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Icon" />
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Glanz"
style="display:inline">
<path
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
sodipodi:ry="150"
sodipodi:rx="150"
sodipodi:cy="150"
sodipodi:cx="150"
id="path3821"
style="fill:url(#linearGradient3847);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:type="arc"
transform="matrix(0.649475,0,0,0.476763,52.5787,2)" />
</g>
</svg>
cockatrice/resources/counters/storm_highlight.svg 0 → 100644
View file @ 9a36ac80
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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="300"
height="300"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.5 r10040"
version="1.0"
sodipodi:docname="storm_highlight.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 150 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="300 : 150 : 1"
inkscape:persp3d-origin="150 : 100 : 1"
id="perspective31" />
<linearGradient
id="linearGradient3841">
<stop
style="stop-color:white;stop-opacity:1;"
offset="0"
id="stop3843" />
<stop
style="stop-color:#fefce9;stop-opacity:0;"
offset="1"
id="stop3845" />
</linearGradient>
<linearGradient
id="linearGradient3813">
<stop
id="stop3815"
offset="0"
style="stop-color:#ff8632;stop-opacity:0;" />
<stop
style="stop-color:#ffb98c;stop-opacity:0.40000001;"
offset="0.5"
id="stop4577" />
<stop
id="stop4579"
offset="0.75"
style="stop-color:#ffa163;stop-opacity:0.60000002;" />
<stop
id="stop3817"
offset="1"
style="stop-color:black;stop-opacity:0.80000001;" />
</linearGradient>
<linearGradient
id="linearGradient3779">
<stop
style="stop-color:#ff8232;stop-opacity:1;"
offset="0"
id="stop3781" />
<stop
style="stop-color:#ff4d32;stop-opacity:1;"
offset="1"
id="stop3783" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3779"
id="linearGradient3785"
x1="1.0101526"
y1="2.0049992"
x2="300"
y2="300"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3813"
id="radialGradient3819"
cx="150"
cy="150"
fx="150"
fy="150"
r="150"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3841"
id="linearGradient3847"
x1="149.99989"
y1="0.45544016"
x2="149.99989"
y2="299.54449"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective2461"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2511"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2578"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2650"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2467"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2519"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2571"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective2621"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3779"
id="linearGradient3782"
gradientUnits="userSpaceOnUse"
x1="1.0101526"
y1="2.0049992"
x2="300"
y2="300" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="-22.270334"
inkscape:cy="177.14958"
inkscape:document-units="px"
inkscape:current-layer="layer2"
width="765px"
height="1260px"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="-8"
inkscape:window-y="-8"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Button"
inkscape:groupmode="layer"
id="layer1"
style="display:inline">
<path
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
sodipodi:ry="150"
sodipodi:rx="150"
sodipodi:cy="150"
sodipodi:cx="150"
id="path2760"
style="fill:url(#linearGradient3785);fill-opacity:1.0;fill-rule:evenodd;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:url(#linearGradient3782);fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path3788"
sodipodi:cx="150"
sodipodi:cy="150"
sodipodi:rx="150"
sodipodi:ry="150"
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
transform="translate(-1.4253374e-6,2.8293252e-6)" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Schatten"
style="display:inline">
<path
sodipodi:type="arc"
style="fill:url(#radialGradient3819);fill-opacity:1.0;fill-rule:evenodd;stroke:none"
id="path3790"
sodipodi:cx="150"
sodipodi:cy="150"
sodipodi:rx="150"
sodipodi:ry="150"
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
transform="translate(-0.28640902,0.00435494)" />
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Icon" />
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Glanz"
style="display:inline">
<path
d="m 300,150 a 150,150 0 1 1 -300,0 150,150 0 1 1 300,0 z"
sodipodi:ry="150"
sodipodi:rx="150"
sodipodi:cy="150"
sodipodi:cx="150"
id="path3821"
style="fill:url(#linearGradient3847);fill-opacity:1;fill-rule:evenodd;stroke:none"
sodipodi:type="arc"
transform="matrix(0.649475,0,0,0.476763,52.5787,2)" />
</g>
</svg>
common/server_player.cpp
View file @ 9a36ac80
...@@ -158,7 +158,7 @@ void Server_Player::setupZones() ...@@ -158,7 +158,7 @@ void Server_Player::setupZones()
addCounter(new Server_Counter(4, "r", makeColor(250, 150, 150), 20, 0)); addCounter(new Server_Counter(4, "r", makeColor(250, 150, 150), 20, 0));
addCounter(new Server_Counter(5, "g", makeColor(150, 255, 150), 20, 0)); addCounter(new Server_Counter(5, "g", makeColor(150, 255, 150), 20, 0));
addCounter(new Server_Counter(6, "x", makeColor(255, 255, 255), 20, 0)); addCounter(new Server_Counter(6, "x", makeColor(255, 255, 255), 20, 0));
addCounter(new Server_Counter(7, "storm", makeColor(255, 255, 255), 20, 0)); addCounter(new Server_Counter(7, "storm", makeColor(255, 150, 30), 20, 0));
initialCards = 7; initialCards = 7;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment