new objects

fbaiodias · Dec 16, 2013 · e4d2cf2 · e4d2cf2
1 parent 174d8d5
commit e4d2cf2
Show file tree

Hide file tree

Showing 9 changed files with 293 additions and 33 deletions.
diff --git a/Apple.js b/Apple.js
@@ -0,0 +1,52 @@
+/**************************************************
+** GAME APPLE CLASS
+**************************************************/
+var Apple = function(startX, startY) {
+	var x = startX,
+		y = startY,
+		onPlayer = false,
+		id;
+
+	// Getters and setters
+	var getX = function() {
+		return x;
+	};
+
+	var getY = function() {
+		return y;
+	};
+
+	var isOnPlayer = function() {
+		return onPlayer;
+	};
+
+	var setX = function(newX) {
+		x = newX;
+	};
+
+	var setY = function(newY) {
+		y = newY;
+	};
+
+	var setOn = function(newState) {
+		onPlayer = newState;
+	};
+
+
+
+	// Define which variables and methods can be accessed
+	return {
+		getX: getX,
+		getY: getY,
+		isOnPlayer: isOnPlayer,
+		setX: setX,
+		setY: setY,
+		setOn: setOn,
+		id: id,
+		onPlayer: onPlayer
+	}
+};
+
+// Export the Player class so you can use it in
+// other files by using require("Player").Player
+exports.Apple = Apple;
diff --git a/FirstAid.js b/FirstAid.js
@@ -0,0 +1,52 @@
+/**************************************************
+** GAME FIRST AID CLASS
+**************************************************/
+var FirstAid = function(startX, startY) {
+	var x = startX,
+		y = startY,
+		onPlayer = false,
+		id;
+
+	// Getters and setters
+	var getX = function() {
+		return x;
+	};
+
+	var getY = function() {
+		return y;
+	};
+
+	var isOnPlayer = function() {
+		return onPlayer;
+	};
+
+	var setX = function(newX) {
+		x = newX;
+	};
+
+	var setY = function(newY) {
+		y = newY;
+	};
+
+	var setOn = function(newState) {
+		onPlayer = newState;
+	};
+
+
+
+	// Define which variables and methods can be accessed
+	return {
+		getX: getX,
+		getY: getY,
+		isOnPlayer: isOnPlayer,
+		setX: setX,
+		setY: setY,
+		setOn: setOn,
+		id: id,
+		onPlayer: onPlayer
+	}
+};
+
+// Export the Player class so you can use it in
+// other files by using require("Player").Player
+exports.FirstAid = FirstAid;
diff --git a/Oxygen.js b/Oxygen.js
@@ -0,0 +1,52 @@
+/**************************************************
+** GAME Oxygen CLASS
+**************************************************/
+var Oxygen = function(startX, startY) {
+	var x = startX,
+		y = startY,
+		onPlayer = false,
+		id;
+
+	// Getters and setters
+	var getX = function() {
+		return x;
+	};
+
+	var getY = function() {
+		return y;
+	};
+
+	var isOnPlayer = function() {
+		return onPlayer;
+	};
+
+	var setX = function(newX) {
+		x = newX;
+	};
+
+	var setY = function(newY) {
+		y = newY;
+	};
+
+	var setOn = function(newState) {
+		onPlayer = newState;
+	};
+
+
+
+	// Define which variables and methods can be accessed
+	return {
+		getX: getX,
+		getY: getY,
+		isOnPlayer: isOnPlayer,
+		setX: setX,
+		setY: setY,
+		setOn: setOn,
+		id: id,
+		onPlayer: onPlayer
+	}
+};
+
+// Export the Player class so you can use it in
+// other files by using require("Player").Player
+exports.Oxygen = Oxygen;
diff --git a/game.js b/game.js
@@ -5,7 +5,10 @@ var util = require("util"),					// Utility resources (logging, object inspection
 	io = require("socket.io"),				// Socket.IO
 	Player = require("./Player").Player;	// Player class
 	Gun = require("./Gun").Gun;				// Gun class
-	Matches = require("./Matches").Matches;	// Matches class
+	Matches = require("./Matches").Matches,	// Matches class
+	Apple = require("./Apple").Apple,		// Apple class
+	FirstAid = require("./FirstAid").FirstAid,	// FirstAid class
+	Oxygen = require("./Oxygen").Oxygen;	// FirstAid class
 
 
 /**************************************************
@@ -40,16 +43,37 @@ function init() {
 
 	// Place guns randomly
 	for(var i=0; i < Math.round(Math.random()*(10))+5; i++) {
-		var newGun = new Gun(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
-		newGun.id = "G"+i;
-		objects.push(newGun);
+		var newObject = new Gun(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
+		newObject.id = "G"+i;
+		objects.push(newObject);
 	}
 
 	// Place matches randomly
 	for(var i=0; i < Math.round(Math.random()*(10))+5; i++) {
-		var newMatches = new Matches(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
-		newMatches.id = "M"+i;
-		objects.push(newMatches);
+		var newObject = new Matches(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
+		newObject.id = "M"+i;
+		objects.push(newObject);
+	}
+
+	// Place Apple randomly
+	for(var i=0; i < Math.round(Math.random()*(10))+5; i++) {
+		var newObject = new Apple(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
+		newObject.id = "A"+i;
+		objects.push(newObject);
+	}
+
+	// Place FirstAid randomly
+	for(var i=0; i < Math.round(Math.random()*(10))+5; i++) {
+		var newObject = new FirstAid(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
+		newObject.id = "F"+i;
+		objects.push(newObject);
+	}
+
+	// Place Oxygen randomly
+	for(var i=0; i < Math.round(Math.random()*(10))+5; i++) {
+		var newObject = new Oxygen(Math.round(Math.random()*(10000)), Math.round(Math.random()*(1000)));
+		newObject.id = "O"+i;
+		objects.push(newObject);
 	}
 
 	//util.log(JSON.stringify(objects));

diff --git a/public/index.html b/public/index.html
@@ -18,6 +18,9 @@
 		<script src="js/Player.js"></script>
 		<script src="js/Matches.js"></script>
 		<script src="js/Gun.js"></script>
+		<script src="js/Apple.js"></script>
+		<script src="js/FirstAid.js"></script>
+		<script src="js/Oxygen.js"></script>
 		<script src="js/game.js"></script>
 		<script>
 			// Initialise the game

diff --git a/public/js/Apple.js b/public/js/Apple.js
@@ -44,14 +44,14 @@ var Apple = function(startX, startY) {
 
 	var draw = function(ctx, localPlayer) {
 		if (onPlayer == false){
-			var imageX = 100-(localPlayer.getX()-x)-image.width/2,
+			var imageX = playerXposition-(localPlayer.getX()-x)-image.width/2,
 				imageY = y-image.height/2;
 
 			ctx.drawImage(image, imageX, imageY);
 		}
 		else {
-			ctx.drawImage(imageBalon, 10, localPlayer.getY()-120)
-			ctx.drawImage(image, 14, localPlayer.getY()-110)
+			ctx.drawImage(imageBalon, playerXposition-90, localPlayer.getY()-120)
+			ctx.drawImage(image, playerXposition-86, localPlayer.getY()-110)
 		}	
 	};	
 

diff --git a/public/js/FirstAid.js b/public/js/FirstAid.js
@@ -44,14 +44,14 @@ var FirstAid = function(startX, startY) {
 
 	var draw = function(ctx, localPlayer) {
 		if (onPlayer == false){
-			var imageX = 100-(localPlayer.getX()-x)-image.width/2,
+			var imageX = playerXposition-(localPlayer.getX()-x)-image.width/2,
 				imageY = y-image.height/2;
 
 			ctx.drawImage(image, imageX, imageY);
 		}
 		else {
-			ctx.drawImage(imageBalon, 10, localPlayer.getY()-120)
-			ctx.drawImage(image, 14, localPlayer.getY()-110)
+			ctx.drawImage(imageBalon, playerXposition-90, localPlayer.getY()-120)
+			ctx.drawImage(image, playerXposition-86, localPlayer.getY()-110)
 		}	
 	};	
 

diff --git a/public/js/Oxygen.js b/public/js/Oxygen.js
@@ -0,0 +1,71 @@
+/**************************************************
+** GAME Oxygen CLASS
+**************************************************/
+var Oxygen = function(startX, startY) {
+	var x = startX,
+		y = startY,
+		onPlayer = false,
+		image,
+		id;
+
+	image = new Image();
+	imageBalon = new Image();
+	image.src = "images/oxygen.png";
+	imageBalon.src = "images/balon.png";
+
+	var width = 60,
+		height = 60;
+
+
+	// Getters and setters
+	var getX = function() {
+		return x;
+	};
+
+	var getY = function() {
+		return y;
+	};
+
+	var isOnPlayer = function() {
+		return onPlayer;
+	};
+
+	var setX = function(newX) {
+		x = newX;
+	};
+
+	var setY = function(newY) {
+		y = newY;
+	};
+
+	var setOn = function(newState) {
+		onPlayer = newState;
+	};
+
+	var draw = function(ctx, localPlayer) {
+		if (onPlayer == false){
+			var imageX = playerXposition-(localPlayer.getX()-x)-image.width/2,
+				imageY = y-image.height/2;
+
+			ctx.drawImage(image, imageX, imageY);
+		}
+		else {
+			ctx.drawImage(imageBalon, playerXposition-90, localPlayer.getY()-120)
+			ctx.drawImage(image, playerXposition-86, localPlayer.getY()-110)
+		}	
+	};	
+
+	// Define which variables and methods can be accessed
+	return {
+		getX: getX,
+		getY: getY,
+		isOnPlayer: isOnPlayer,
+		setX: setX,
+		setY: setY,
+		setOn: setOn,
+		draw: draw,
+		height: height,
+		width: width,
+		id: id
+	}
+};
diff --git a/public/js/game.js b/public/js/game.js
@@ -137,27 +137,33 @@ function onNewPlayer(data) {
 
 // New object
 function onNewObject(data) {
-	//console.log("New object!")
-	if(data.id.charAt(0) == "G") {
-		console.log("New gun!", data.id);
-		// Initialise the new gun
-		var newGun = new Gun(data.x, data.y);
-		newGun.setOn(data.onPlayer);
-		newGun.id = data.id;
-
-		// Add new gun to the objects array
-		objects.push(newGun);
-	} 
-	else if(data.id.charAt(0) == "M") {
-		console.log("New matches!", data.id);
-		// Initialise the new gun
-		var newMatches = new Matches(data.x, data.y);
-		newMatches.setOn(data.onPlayer);
-		newMatches.id = data.id;
-
-		// Add new gun to the objects array
-		objects.push(newMatches);
+	console.log("New object!", data.id);
+	var newObject;
+
+	switch(data.id.charAt(0)) {
+		case "G":
+			newObject = new Gun(data.x, data.y);
+			break;
+		case "M":
+			newObject = new Matches(data.x, data.y);
+			break;
+		case "A":
+			newObject = new Apple(data.x, data.y);
+			break;
+		case "F":
+			newObject = new FirstAid(data.x, data.y);
+			break;
+		case "O":
+			newObject = new Oxygen(data.x, data.y);
+			break;
 	}
+
+	newObject.setOn(data.onPlayer);
+	newObject.id = data.id;
+
+	// Add new object to the objects array
+	objects.push(newObject);
+
 };
 
 // Move player