Starting on docks

samuelmaddock · Oct 6, 2012 · ebe14ed · ebe14ed
1 parent 09da70c
commit ebe14ed
Show file tree

Hide file tree

Showing 11 changed files with 361 additions and 334 deletions.
diff --git a/client/js/catan.js b/client/js/catan.js
@@ -56,6 +56,10 @@ CATAN.getState = function() {
 	return this.state;
 }
 
+CATAN.getBoard = function() {
+	return this.board;
+}
+
 CATAN.getSchema = function() {
 	return this.Schemas.get("Classic"); // static for now
 }

diff --git a/client/js/controls.js b/client/js/controls.js
@@ -149,6 +149,12 @@ THREE.CatanControls = function ( object, domElement ) {
 			* Math.cos( this.theta * Math.PI / 360 ) 
 			* Math.cos( this.phi * Math.PI / 360 );
 
+		/*if(CATAN.board) {
+			this.target = CATAN.board.getWorldHexOffset();
+			this.object.position.x += this.target.x;
+			this.object.position.z += this.target.z;
+		}*/
+
 		this.object.lookAt( this.target );
 		this.object.updateMatrix();
 

diff --git a/client/js/main.js b/client/js/main.js
@@ -20,6 +20,13 @@ CATAN._init = function() {
 		this.socket.on( 'CServerList',	this.Lobby.loadServerList );
 	}
 
+	// Request desktop notification permissions
+	document.addEventListener("mousedown", function(event) {
+		if(webkitNotifications.checkPermission() > 0) {
+			webkitNotifications.requestPermission();
+		}
+	}, false);
+
 };
 
 CATAN.createServer = function() {

diff --git a/server/game.js b/server/game.js
@@ -559,9 +559,21 @@ CATAN.Game.prototype = {
 		}
 
 		// Send tiles
+		var docks = [];
+		for(var i in this.getBoard().getDocks()) {
+			var dock = this.getBoard().getDocks()[i];
+			docks.push({
+				id: dock.getEntId(),
+				dock: true,
+				dockTo: dock.dockTo.getEntId()
+			});
+		};
+		ply.emit('CBoardEntities', { ents: docks });
+
+		// Send docks
 		var tiles = [];
-		for(var i=0; i < board.hexTiles.length; i++) {
-			var tile = board.hexTiles[i];
+		for(var i=0; i < this.getBoard().getTiles().length; i++) {
+			var tile = this.getBoard().getTiles()[i];
 			tiles.push({
 				id: tile.getEntId(),
 				resource: tile.getResource(),