From dbdfaafc447a4d09377619a7c824b87539453007 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@aalto.fi>
Date: Wed, 14 Dec 2016 20:13:11 +0200
Subject: Make Xmas fork

---
 index.html               |   4 ++--
 res/bg.mp3               | Bin 1667051 -> 5307608 bytes
 res/bg.png               | Bin 9692 -> 9336 bytes
 res/int.png              | Bin 6446 -> 106332 bytes
 res/logo1.png            | Bin 5785 -> 6843 bytes
 res/logo2.png            | Bin 5254 -> 5245 bytes
 res/player.png           | Bin 3542 -> 0 bytes
 res/players/player1.png  | Bin 0 -> 9772 bytes
 res/players/player10.png | Bin 0 -> 10590 bytes
 res/players/player11.png | Bin 0 -> 10426 bytes
 res/players/player2.png  | Bin 0 -> 10009 bytes
 res/players/player3.png  | Bin 0 -> 11298 bytes
 res/players/player4.png  | Bin 0 -> 9158 bytes
 res/players/player5.png  | Bin 0 -> 9723 bytes
 res/players/player6.png  | Bin 0 -> 8424 bytes
 res/players/player7.png  | Bin 0 -> 11034 bytes
 res/players/player8.png  | Bin 0 -> 8908 bytes
 res/players/player9.png  | Bin 0 -> 7346 bytes
 src/engine.js            |  18 +++++++++++++++++-
 src/gameobject.js        |  10 +++++++---
 src/objecttypes.js       |  14 +++++++-------
 src/player.js            |   7 ++++++-
 src/settings.js          |   3 ++-
 23 files changed, 41 insertions(+), 15 deletions(-)
 delete mode 100644 res/player.png
 create mode 100644 res/players/player1.png
 create mode 100644 res/players/player10.png
 create mode 100644 res/players/player11.png
 create mode 100644 res/players/player2.png
 create mode 100644 res/players/player3.png
 create mode 100644 res/players/player4.png
 create mode 100644 res/players/player5.png
 create mode 100644 res/players/player6.png
 create mode 100644 res/players/player7.png
 create mode 100644 res/players/player8.png
 create mode 100644 res/players/player9.png
diff --git a/index.html b/index.html
index 77b3837..c72896f 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="UTF-8">
-	<title>viivaintegraalipeli</title>
+	<title>Jouluinen hallituspeli</title>
 	<style>
 		body {
 			position: fixed;
@@ -30,4 +30,4 @@
 	<script type="text/javascript" src="src/platformer.js"></script>
 	<center>Huom! 16.11. asianomistajan pyynnöstä grafiikkaa parannettu.<center>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/res/bg.mp3 b/res/bg.mp3
index 9a5d616..30255b5 100644
Binary files a/res/bg.mp3 and b/res/bg.mp3 differ
diff --git a/res/bg.png b/res/bg.png
index 1363e77..9c83347 100644
Binary files a/res/bg.png and b/res/bg.png differ
diff --git a/res/int.png b/res/int.png
index 6eddea2..476723a 100644
Binary files a/res/int.png and b/res/int.png differ
diff --git a/res/logo1.png b/res/logo1.png
index 1630ac7..230db08 100644
Binary files a/res/logo1.png and b/res/logo1.png differ
diff --git a/res/logo2.png b/res/logo2.png
index 2e8b7b9..75ace39 100644
Binary files a/res/logo2.png and b/res/logo2.png differ
diff --git a/res/player.png b/res/player.png
deleted file mode 100644
index dd53460..0000000
Binary files a/res/player.png and /dev/null differ
diff --git a/res/players/player1.png b/res/players/player1.png
new file mode 100644
index 0000000..f49a795
Binary files /dev/null and b/res/players/player1.png differ
diff --git a/res/players/player10.png b/res/players/player10.png
new file mode 100644
index 0000000..37b462b
Binary files /dev/null and b/res/players/player10.png differ
diff --git a/res/players/player11.png b/res/players/player11.png
new file mode 100644
index 0000000..5a59c72
Binary files /dev/null and b/res/players/player11.png differ
diff --git a/res/players/player2.png b/res/players/player2.png
new file mode 100644
index 0000000..62498a7
Binary files /dev/null and b/res/players/player2.png differ
diff --git a/res/players/player3.png b/res/players/player3.png
new file mode 100644
index 0000000..6c3d0cf
Binary files /dev/null and b/res/players/player3.png differ
diff --git a/res/players/player4.png b/res/players/player4.png
new file mode 100644
index 0000000..b3e1dd9
Binary files /dev/null and b/res/players/player4.png differ
diff --git a/res/players/player5.png b/res/players/player5.png
new file mode 100644
index 0000000..90ca0c0
Binary files /dev/null and b/res/players/player5.png differ
diff --git a/res/players/player6.png b/res/players/player6.png
new file mode 100644
index 0000000..875cdc7
Binary files /dev/null and b/res/players/player6.png differ
diff --git a/res/players/player7.png b/res/players/player7.png
new file mode 100644
index 0000000..b4a5451
Binary files /dev/null and b/res/players/player7.png differ
diff --git a/res/players/player8.png b/res/players/player8.png
new file mode 100644
index 0000000..9f2f8ca
Binary files /dev/null and b/res/players/player8.png differ
diff --git a/res/players/player9.png b/res/players/player9.png
new file mode 100644
index 0000000..5f2a8b9
Binary files /dev/null and b/res/players/player9.png differ
diff --git a/src/engine.js b/src/engine.js
index 30d7d7a..b75886a 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -56,8 +56,19 @@ Engine.prototype.makeStageClickable = function() {
 	this.clickLayer.touchstart = this.clickLayer.mousedown = this.buttonPressed.bind(this);
 }
 
+Engine.prototype.randomizePlayer = function() {
+    this.removeSprite(player.sprite);
+    var number = Math.floor((Math.random() * Settings.PLAYER_COUNT) + 1); 
+	var newTexture = PIXI.Texture.fromImage("res/players/player" + number + ".png");
+	player.sprite = new PIXI.Sprite(newTexture);
+    this.unitsContainer.addChild(player.sprite);
+}
+
 Engine.prototype.activateMenu = function() {
 	this.state = MENU;
+
+    this.randomizePlayer();
+
 	player.score = 0
 	console.log("changed to menu!");
 	logo1.sprite.visible = true;
@@ -97,6 +108,10 @@ Engine.prototype.activateGameOver = function() {
 	this.sound.play("explosion")
 }
 
+Engine.prototype.removeSprite = function(sprite) {
+	this.unitsContainer.removeChild(sprite);
+}
+
 Engine.prototype.removeIntegral = function(integral) {
 	var i = this.gameObjectList.indexOf(integral);
 	this.gameObjectList.splice(i, 1);
@@ -198,6 +213,7 @@ Engine.prototype.setupGameObjects = function() {
 	// add player to gameobjectlist
 	this.gameObjectList = [];
 
+
 	this.unitsContainer.addChild(player.sprite);
 	this.menuContainer.addChild(logo1.sprite);
 	this.menuContainer.addChild(logo2.sprite);
@@ -214,4 +230,4 @@ Engine.prototype.setupGameObjects = function() {
 	this.stage.updateLayersOrder();
 }
 
-var engine = new Engine();
\ No newline at end of file
+var engine = new Engine();
diff --git a/src/gameobject.js b/src/gameobject.js
index 0b50553..43218b1 100644
--- a/src/gameobject.js
+++ b/src/gameobject.js
@@ -1,12 +1,16 @@
 function GameObject(texture) {
-	this.texture = PIXI.Texture.fromImage("res/" + texture + ".png");
-	this.sprite = new PIXI.Sprite(this.texture);
+    this.updateTexture(texture);
 
 	this.initPosition();
 	this.active = true;
 	this.objectType = "gameobject";
 }
 
+GameObject.prototype.updateTexture = function(name) {
+	this.texture = PIXI.Texture.fromImage("res/" + name + ".png");
+	this.sprite = new PIXI.Sprite(this.texture);
+}
+
 GameObject.prototype.initPosition = function() {
 	this.sprite.anchor.x = 0.5;
 	this.sprite.anchor.y = 0.5;
@@ -17,4 +21,4 @@ GameObject.prototype.initPosition = function() {
 
 GameObject.prototype.update = function() {
 
-}
\ No newline at end of file
+}
diff --git a/src/objecttypes.js b/src/objecttypes.js
index d7b0df4..e9f69f0 100644
--- a/src/objecttypes.js
+++ b/src/objecttypes.js
@@ -53,15 +53,15 @@ scoreBg.beginFill(0xAAAAAA, 1.0);
 scoreBg.visible = false;
 
 // score display
-var scoreText = new PIXI.Text("W", { font: '35px Arial', fill: 'black', align: 'left' });
+var scoreText = new PIXI.Text("W", { font: '35px Arial', fill: 'white', align: 'left' });
 scoreText.visible = false;
 scoreText.update = function() {
-	this.text = "W = " + player.score + " J";
+	this.text = "Tomia vältelty " + player.score + " tuntia";
 }
 
 scoreText.moveToCorner = function() {
-	this.position.x = Settings.STAGE_WIDTH * 0.7;
-	this.position.y = Settings.STAGE_HEIGHT * 0.1;
+	this.position.x = Settings.STAGE_WIDTH * 0.5;
+	this.position.y = Settings.STAGE_HEIGHT * 0.05;
 }
 
 scoreText.moveToCenter = function() {
@@ -71,14 +71,14 @@ scoreText.moveToCenter = function() {
 scoreText.moveToCorner();
 
 // gameover screen title text
-var gameOverText = new PIXI.Text("Nettovoiman tekemä työ:", { font: '35px Arial', fill: 'black', align: 'center' });
+var gameOverText = new PIXI.Text("Onneksi olkoon!", { font: '35px Arial', fill: 'black', align: 'center' });
 gameOverText.visible = false;
 gameOverText.position.x = Settings.STAGE_WIDTH * 0.5 - gameOverText.width / 2;;
 gameOverText.position.y = Settings.STAGE_HEIGHT * 0.4 - gameOverText.height / 2;;
 
 // move the gameover bg box now that we now the width of the text
 var yDiff = scoreText.position.y - gameOverText.position.y + gameOverText.height;
-scoreBg.drawRect(gameOverText.position.x - 10, gameOverText.position.y - 10, gameOverText.width + 20, -yDiff);
+scoreBg.drawRect(Settings.STAGE_WIDTH * 0.2, gameOverText.position.y - 10, Settings.STAGE_WIDTH * 0.6, -yDiff);
 
 // integral sign
 function Integral(y) {
@@ -104,4 +104,4 @@ Integral.prototype.initPosition = function() {
 
 Integral.prototype.update = function() {
 	this.sprite.position.x += this.speed;
-}
\ No newline at end of file
+}
diff --git a/src/player.js b/src/player.js
index 64f00f8..e3a43b4 100644
--- a/src/player.js
+++ b/src/player.js
@@ -64,4 +64,9 @@ Player.prototype.update = function() {
 	}
 }
 
-var player = new Player("player");
\ No newline at end of file
+Player.prototype.updateSprite = function(sprite) {
+    this.sprite = sprite;
+}
+
+var number = Math.floor((Math.random() * Settings.PLAYER_COUNT) + 1); 
+var player = new Player("players/player" + number);
diff --git a/src/settings.js b/src/settings.js
index b515171..e0c8609 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,6 +2,7 @@ var Settings = function() {}
 Settings.STAGE_WIDTH = 800;
 Settings.STAGE_HEIGHT = 600;
 Settings.STAGE_BGCOLOR = 0xA0A0A0;
+Settings.PLAYER_COUNT = 11;
 
 var lastTime = Date.now();
 var dt = 0.0;
@@ -12,4 +13,4 @@ function updateDeltaTime() {
 
 	lastTime = current;
 	dt = current - last;
-}
\ No newline at end of file
+}
-- 
cgit v1.3

