summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Worthe <justin.worthe@entelect.co.za>2014-05-28 17:06:10 +0200
committerJustin Worthe <justin.worthe@entelect.co.za>2014-05-28 17:06:10 +0200
commit46b8f845e0e8ef4534a99e2d34b604f990ac217b (patch)
tree5390ff4c07c9b1f6a7b5ffb476a15cb3703bf7c5
parent7dfbd52a082b7a33c5f81b26da859830675223ba (diff)
Hacked in changing player sprite based on turn
-rw-r--r--assets/images/player-a-dim.svg66
-rw-r--r--assets/images/player-a.svg2
-rw-r--r--assets/images/player-b-dim.svg66
-rw-r--r--assets/images/player-b.svg4
-rw-r--r--game/prefabs/player.js9
-rw-r--r--game/states/preload.js2
6 files changed, 144 insertions, 5 deletions
diff --git a/assets/images/player-a-dim.svg b/assets/images/player-a-dim.svg
new file mode 100644
index 0000000..d3d999e
--- /dev/null
+++ b/assets/images/player-a-dim.svg
@@ -0,0 +1,66 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="player-a-dim.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="13.561425"
+ inkscape:cy="12.003943"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="757"
+ inkscape:window-x="0"
+ inkscape:window-y="21"
+ 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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <path
+ sodipodi:type="arc"
+ style="fill:#992200;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path2985"
+ sodipodi:cx="50"
+ sodipodi:cy="50"
+ sodipodi:rx="48"
+ sodipodi:ry="48"
+ d="M 98,50 A 48,48 0 1 1 2,50 48,48 0 1 1 98,50 z"
+ transform="translate(0,952.36218)" />
+ </g>
+</svg>
diff --git a/assets/images/player-a.svg b/assets/images/player-a.svg
index 8592fa5..c7494a4 100644
--- a/assets/images/player-a.svg
+++ b/assets/images/player-a.svg
@@ -14,7 +14,7 @@
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="playerA.svg">
+ sodipodi:docname="player-a.svg">
<defs
id="defs4" />
<sodipodi:namedview
diff --git a/assets/images/player-b-dim.svg b/assets/images/player-b-dim.svg
new file mode 100644
index 0000000..f8de50e
--- /dev/null
+++ b/assets/images/player-b-dim.svg
@@ -0,0 +1,66 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="player-b-dim.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="13.561425"
+ inkscape:cy="12.003943"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="757"
+ inkscape:window-x="0"
+ inkscape:window-y="21"
+ 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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-952.36218)">
+ <path
+ sodipodi:type="arc"
+ style="fill:#999900;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path2985"
+ sodipodi:cx="50"
+ sodipodi:cy="50"
+ sodipodi:rx="48"
+ sodipodi:ry="48"
+ d="M 98,50 A 48,48 0 1 1 2,50 48,48 0 1 1 98,50 z"
+ transform="translate(0,952.36218)" />
+ </g>
+</svg>
diff --git a/assets/images/player-b.svg b/assets/images/player-b.svg
index 8ebbec6..74cf58a 100644
--- a/assets/images/player-b.svg
+++ b/assets/images/player-b.svg
@@ -14,7 +14,7 @@
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="playerA.svg">
+ sodipodi:docname="player-b.svg">
<defs
id="defs4" />
<sodipodi:namedview
@@ -54,7 +54,7 @@
transform="translate(0,-952.36218)">
<path
sodipodi:type="arc"
- style="fill:#fff100;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2985"
sodipodi:cx="50"
sodipodi:cy="50"
diff --git a/game/prefabs/player.js b/game/prefabs/player.js
index 0f6cb18..3492836 100644
--- a/game/prefabs/player.js
+++ b/game/prefabs/player.js
@@ -2,7 +2,7 @@
var Player = function(game, x, y, key, frame) {
Phaser.Sprite.call(this, game, x, y, key, frame);
-
+ this.baseKey = key;
this.moving = false;
this.scale = {x: 0.01, y: 0.01};
this.anchor = {x: 0.5, y: 0.5};
@@ -16,7 +16,12 @@ var Player = function(game, x, y, key, frame) {
Player.prototype = Object.create(Phaser.Sprite.prototype);
Player.prototype.constructor = Player;
-Player.prototype.update = function() {
+Player.prototype.update = function() {
+ var newKey = this.baseKey + (this.isMyTurn ? '' : '-dim');
+ if (this.key !== newKey) {
+ console.log('Setting sprite to ' + newKey);
+ this.loadTexture(newKey);
+ }
};
Player.prototype.move = function(newX, newY) {
diff --git a/game/states/preload.js b/game/states/preload.js
index c24174a..8709258 100644
--- a/game/states/preload.js
+++ b/game/states/preload.js
@@ -14,7 +14,9 @@ Preload.prototype = {
this.load.setPreloadSprite(this.asset);
this.load.image('wall', 'assets/images/wall.svg');
this.load.image('player-a', 'assets/images/player-a.svg');
+ this.load.image('player-a-dim', 'assets/images/player-a-dim.svg');
this.load.image('player-b', 'assets/images/player-b.svg');
+ this.load.image('player-b-dim', 'assets/images/player-b-dim.svg');
this.load.image('pill', 'assets/images/pill.svg');
this.load.bitmapFont('spaced-scorefont', 'assets/fonts/scorefont.png', 'assets/fonts/scorefont.fnt', undefined, 10);