social_stream 0.23.2 → 0.23.3

data/presence/app/assets/javascripts/presence_game_comunication.js.erb

@@ -0,0 +1,313 @@
+////////////////////
+//Multiplayer Games Core based on XMPP
+//Comunication Module
+////////////////////
+
+PRESENCE.GAME.COMUNICATION = (function(P,$,undefined){
+  
+	//////////////////////////////////////////////
+  //       GAME COMUNICATION VARIABLES        //
+  //////////////////////////////////////////////
+	 
+  var connection = null;
+	iqStanzaID['gameRequest'] = "gameRequestID";
+	iqStanzaID['gameRequestFinish'] = "gameRequestFinishID";
+	iqStanzaID['gameAction'] = "gameActionID";
+
+	
+	/////////////////////////////////
+	//    COMUNICATION METHODS     //
+	/////////////////////////////////
+	
+  var init = function(myConnection){
+    connection = myConnection;
+		//addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
+		connection.addHandler(handleRequestGameIQStanza,null, "iq", "get",iqStanzaID['gameRequest'], null);
+		connection.addHandler(handleIQResultFromGameRequest,null, "iq", "result",iqStanzaID['gameRequest'], null);
+		connection.addHandler(handleIQResultFromGameRequestFinish,null, "iq", "result", iqStanzaID['gameRequestFinish'], null);
+  };
+	
+	
+	
+	/////////////////////
+  // MANAGE GAME REQUESTS
+  /////////////////////
+	
+	//SEND GAME REQUEST
+	//Jid == Game Room or User to send the request game stanza
+	//Game == Game to play with configuration
+	var sendIQStanzaToRequestGame = function (jid,game){
+		var optionIndex=0;
+		var optionsSize=Object.keys(game.options).length;
+		
+    var iq = $iq({to: jid, type: "get", id: iqStanzaID['gameRequest']})
+    .c("query", {xmlns: "urn:ietf:params:xml:ns:xmpp-stanzas"})
+		 .c("game", {id: game.id, name: game.name})
+		   .c("players", {})
+			 
+			  $.each(game.players, function(index, value) {
+					if(index==game.players.length-1){
+						iq.c("player", {id: value.id}).t(value.name).up().up()
+					} else {
+						iq.c("player", {id: value.id}).t(value.name).up()
+					}
+        });
+				
+				iq.c("options", {})
+				
+				for (var key in game.options) {
+					if(optionIndex == optionsSize-1){
+						iq.c("option", {name: key}).t(game.options[key]).up().up()
+					} else {
+						iq.c("option", {name: key}).t(game.options[key]).up()
+					}
+					optionIndex=optionIndex+1;
+        }
+				
+    connection.sendIQ(iq);
+  };
+	
+	
+	//RECEIVE GAME REQUEST
+	var handleRequestGameIQStanza = function(iq){
+    var from = iq.getAttribute("from");
+    var slug = from.split("@")[0];
+    var gameId = "";
+    var gameName = "";
+    var players = []
+    var options = new Array();
+    
+    //Build game object
+    var gameTag = iq.getElementsByTagName('game');
+  
+    if (gameTag.length == 1) {
+      var gameElement = gameTag[0];
+      gameName = $(gameElement).attr("name")
+      gameId = $(gameElement).attr("id")
+      
+      var playersTag = iq.getElementsByTagName('players');
+      if (playersTag.length > 0) {
+          $.each($(playersTag).children(), function(index, value) {
+            players.push(new P.GAME.player($(value).attr("id"),$(value).text()))
+          });
+      }
+      
+      var optionsTag = iq.getElementsByTagName('options');
+      if (optionsTag.length > 0) {
+        $.each($(optionsTag).children(), function(index, value) {
+          options[$(value).attr("name")]=$(value).text();
+        });
+      }
+    }
+    
+		P.GAME.updateLogicAfterReceivedGameRequest(slug,gameId,gameName,players,options)
+    return true;
+  }
+  
+	
+	
+	/////////////////////
+  // MANAGE GAME REQUESTS RESPONSES
+  /////////////////////
+	
+	//SEND GAME REQUEST RESPONSE
+  var sendIQStanzaToResponseGameRequest = function(jid,result){
+    var iq = $iq({to: jid, type: "result", id: iqStanzaID['gameRequest']})
+    .c("query", {xmlns: "urn:ietf:params:xml:ns:xmpp-stanzas"})
+    .c("response").t(result);
+    connection.sendIQ(iq);
+  }
+	
+	//RECEIVE GAME REQUEST RESPONSE
+  var handleIQResultFromGameRequest = function(iq){
+    var from = iq.getAttribute("from");
+    var slug = from.split("@")[0]; 
+    var queryTag = iq.getElementsByTagName('query');
+    
+    if (queryTag.length > 0) {
+      var queryElement = queryTag[0];
+      var response = queryElement.getElementsByTagName('response');
+      
+      if(response.length == 1){
+        P.GAME.updateLogicAfterReceivedGameRequestResponse(slug,$(response).text())
+        return true;
+      }
+    }
+    return true;
+  }
+  
+	
+	
+	/////////////////////
+  // MANAGE GAME REQUESTS CANCELATIONS
+  /////////////////////
+	
+  //SEND GAME REQUEST CANCELATION
+  var sendIQStanzaToFinishGame = function(jid){
+    var iq = $iq({to: jid, type: "result", id: iqStanzaID['gameRequestFinish']})
+    .c("game", {xmlns: "urn:ietf:params:xml:ns:xmpp-stanzas"})
+    .c("status").t("finish");
+    connection.sendIQ(iq);
+  }
+
+	//RECEIVE GAME REQUEST CANCELATION
+  var handleIQResultFromGameRequestFinish = function(iq){
+    var from = iq.getAttribute("from");
+    var slug = from.split("@")[0]; 
+    var gameTag = iq.getElementsByTagName('game');
+    
+    if (gameTag.length > 0) {
+      var gameTagElement = gameTag[0];
+      var response = gameTagElement.getElementsByTagName('status');
+      
+      if(response.length == 1){
+        var gameStatus = $(response).text();
+        P.GAME.updateLogicAfterReceivedGameRequestCancelation(slug,gameStatus)
+        return true;
+      }
+    }
+    return true;
+  }
+
+
+	
+	/////////////////////
+  // MANAGE ACTION EXCHANGE 
+  /////////////////////
+	
+  function action(){}
+	
+	
+	//SEND ACTIONS
+	
+	var sendIQStanzaWithAction = function (jid,gameId,action){
+    var iqId = getIdForIqAction(gameId);
+    var iq = $iq({to: jid, type: "result", id: iqId})
+    .c("query", {xmlns: "urn:ietf:params:xml:ns:xmpp-stanzas"})
+     .c("game", {id: gameId})
+       .c("action", {type: action.type})
+		action.type=null;	  
+    iq = genetareIQStanzaWithObject(iq,action)
+    return connection.sendIQ(iq);
+  };
+	
+	var getIdForIqAction = function (gameId){
+		return iqStanzaID['gameAction'] + "_" + gameId;
+	}
+	
+	var genetareIQStanzaWithObject = function(iq,object){
+		if(typeof object != "object"){
+			return iq;
+		}
+		var childs=Object.keys(object).length;
+    var childsCounter = 0;
+		
+		$.each(object, function(index, value) {
+		  if(value==null){
+			  return;
+			}
+      if((typeof value == "object")){
+        //Complex object
+				iq.c(index, {})
+				iq = genetareIQStanzaWithObject(iq,value)
+      } else {
+        //Simple object
+        if(typeof value == "number"){
+          value = value + "";
+        }
+				if(childsCounter==childs-1){
+					iq.c(index, {}).t(value).up().up()
+				} else {
+					iq.c(index, {}).t(value).up()
+				}
+      }
+      childsCounter++;
+    });
+		return iq;
+	}
+
+
+  //RECEIVE ACTIONS
+	
+  var handleActionIQStanza = function(iq){
+		var from = iq.getAttribute("from");
+    var slug = from.split("@")[0]; 
+    var queryTags = iq.getElementsByTagName('query');
+    
+    if (queryTags.length == 1) {
+      var queryElement = queryTags[0];
+      var gameTags = queryElement.getElementsByTagName('game');
+      
+      if(gameTags.length == 1){
+        var game = gameTags[0];
+				var gameId = $(game).attr("id")
+				var actionElements = game.getElementsByTagName('action');
+				$.each(actionElements, function(index, value) {
+            var myaction = buildActionObject(value)
+						PRESENCE.GAME[gameId].onActionReceived(myaction)
+        });
+      }
+    }
+    return true;
+	}
+
+	var buildActionObject = function (actionTag){
+		var myaction = new action();
+		var type = $(actionTag).attr("type")
+		myaction.type = type;
+		myaction = buildComplexObject(myaction,actionTag)
+		return myaction
+	}
+	
+	var buildComplexObject = function(parent,childs){
+    $.each($(childs).children(), function(index, value) {
+       if ($(value).children().length>0) {
+         //Complex object
+				 parent[value.tagName]= new Object();
+				 parent[value.tagName]= buildComplexObject(parent[value.tagName],$(value))
+       } else {
+        //Simple object
+				
+        //Check dataformat
+        if(! isNaN(+($(value).text()))){
+          //$(value).text() is a string which contains a number
+          var myvalue = +($(value).text());
+        } else {
+          var myvalue = $(value).text();
+        }
+        parent[value.tagName]=myvalue
+       }
+    });
+		return parent
+	}
+
+
+  
+	/////////////////////////////
+	//REMOVE CONNECTION HANDLERS
+	/////////////////////////////
+	
+  var removeHandler = function(handler){
+		connection.deleteHandler(handler);
+	}
+	
+	var addHandler = function(gameId){
+		return connection.addHandler(handleActionIQStanza, null, "iq", "result", getIdForIqAction(gameId) , null);
+	}
+
+
+  return {
+    init: init,
+		sendIQStanzaToRequestGame: sendIQStanzaToRequestGame,
+		handleRequestGameIQStanza: handleRequestGameIQStanza,
+		sendIQStanzaToResponseGameRequest: sendIQStanzaToResponseGameRequest,
+		handleIQResultFromGameRequest: handleIQResultFromGameRequest,
+		sendIQStanzaToFinishGame: sendIQStanzaToFinishGame,
+    handleIQResultFromGameRequestFinish: handleIQResultFromGameRequestFinish,
+		sendIQStanzaWithAction: sendIQStanzaWithAction,
+    handleActionIQStanza: handleActionIQStanza,
+		addHandler : addHandler,
+		removeHandler: removeHandler
+  };
+
+}) (PRESENCE, jQuery);

data/presence/app/assets/javascripts/presence_game_interface.js.erb

@@ -0,0 +1,134 @@
+////////////////////
+//Multiplayer Games Interface Manager
+////////////////////
+
+PRESENCE.GAME.INTERFACE = (function(P,$,undefined){
+  
+  //////////////////////////
+  //      TRIGGERS        //
+  //////////////////////////
+	
+  var pickGamesButton = function (uiElement){
+    var slug = $(uiElement.element).attr("id");
+    var videoBoxVisibility = toggleVideoBoxForSlug(slug);
+  
+    if (videoBoxVisibility) {
+      hideVideoChatButton(slug);
+			var mygame = generateDefaultGame(slug);
+      PRESENCE.GAME.requestUserToPlay(slug,mygame);
+    } else {
+      showVideoChatButton(slug);
+      PRESENCE.GAME.finishGame(slug);
+    }
+  }
+	
+	
+	////////////////////////////
+  //       CALLBACKS        //
+  ////////////////////////////
+	
+	updateInterfaceAfterGameRequestReceived = function(slug){
+    //gameStatus="pending";
+		
+	  //Show or create chatbox
+	  createBuddyChatBox(slug);
+	  var chatBox = getChatBoxForSlug(slug);
+		
+	  //Show invitation message
+	  showGameInvitation(slug);
+	  
+		//Hide hideVideoChatButton
+    hideVideoChatButton(slug);
+		
+	  //Show gamebox
+	  toggleVideoBoxForSlug(slug,true);
+	}
+	
+	var updateInterfaceBeforeStartGame = function(slug){
+    var parentDiv = document.createElement('div');
+    var divID = 'game_' + slug + contactsInfo[slug].game.id;
+    parentDiv.setAttribute('id', divID);
+    $(parentDiv).css('width', "100%");
+    $(parentDiv).css('height', "100%");
+    setVideoBoxContent(slug,parentDiv);
+
+    PRESENCE.GAME.startGame(slug,divID)
+  }
+  
+  var updateInterfaceAfterFinishGame = function(slug){
+    toggleVideoBoxForSlug(slug,false);
+    showVideoChatButton(slug);
+  }
+	
+	var updateInterfaceOnInformationMessage = function(slug,msg){
+    setVideoBoxContent(slug,"<p class=\"game-info\"> " + msg +" </p>");
+  }
+
+
+
+	///////////////////////////////
+  //  INTERFACE HELP METHODS   //
+  ///////////////////////////////
+	
+	var showGameInvitation = function(slug){
+		var title = "<p class=\"game-info\">" + I18n.t("chat.game.call", {name: getNameFromSlug(slug)}) + " </p>";
+    var msg = title + "<p class=\"game-request\"> <a class=\"gameButton\" slug=\""+slug+"\" value=\"yes\">" + I18n.t("chat.game.accept") + "</a> -" 
+    + " <a class=\"gameButton\" slug=\""+slug+"\" value=\"no\">" + I18n.t("chat.game.deny") + "</a> </p>";
+    setVideoBoxContent(slug,msg);
+    setGameRequestButtonsFunction();
+	}
+	
+	var setGameRequestButtonsFunction = function(){
+	  $(".gameButton").click(function(event) { 
+	    event.preventDefault();
+	    var result = $(this).attr("value");
+	    var slug = $(this).attr("slug");
+			PRESENCE.GAME.responseUserToPlay(slug,result);
+	  });
+	}
+	
+	var hideVideoChatButton = function(slug){
+		$(getChatBoxButtonForSlug(slug,"video")).hide();
+	}
+	
+	var showVideoChatButton = function(slug){
+    $(getChatBoxButtonForSlug(slug,"video")).show();
+  }
+	
+
+
+  //////////////////////
+  //  DEBUG METHODS   //
+  //////////////////////
+
+	var generateDefaultGame = function(guest_slug){
+		var player1 = new PRESENCE.GAME.player(user_slug,user_name)
+		var player2 = new PRESENCE.GAME.player(guest_slug,getNameFromSlug(guest_slug))
+		var localPlayers = [player1,player2]
+    var localOptions = new Array();
+    localOptions['theme']="Modern";
+    var mygame = new PRESENCE.GAME.game("TER","Tres en Raya",localPlayers,localOptions)
+		return mygame;
+	}
+
+
+  return {
+		pickGamesButton: pickGamesButton,
+		updateInterfaceAfterGameRequestReceived: updateInterfaceAfterGameRequestReceived,
+		updateInterfaceBeforeStartGame: updateInterfaceBeforeStartGame,
+		updateInterfaceAfterFinishGame: updateInterfaceAfterFinishGame,
+		updateInterfaceOnInformationMessage: updateInterfaceOnInformationMessage,
+		generateDefaultGame: generateDefaultGame
+  };
+
+}) (PRESENCE, jQuery);
+
+
+
+////////////////////
+//Interface Events
+////////////////////
+
+function play(){
+	$(".chat-gamesthick").css("display","block");
+}

data/presence/app/assets/javascripts/presence_game_ter.js.erb

@@ -1,96 +1,218 @@
 ////////////////////
-//Tres en Raya
+//  Tres en Raya  //
 ////////////////////
 
 PRESENCE.GAME.TER = (function(P,$,undefined){
   
-	//Game core
-	var core = P.GAME
-	
-  //Game variables  
-  var players = null;
+	//Gamecore
+	var CORE = P.GAME
+		
+  //Games variables
+	var game;             //Game and player are objects defined in the gamecore.
   var player = null;
   var currentPlayer = null;
-  var options = null;
+	var playing=true;
+	
+	//We must define our ACTION object.
+	//The information exchanged between players is performed through the exchange of action type objects.
+	//We can define our own types of actions, with different fields
   function action(player,square) {
     this.player = player;
+		this.type = "general";
     this.square = square;
   }
-  var playing=true;
-
+	
   //Html Divs
   var divID = null;
   var containerDivId = 'tresEnRayaContainerDivID';
   var messageDivId = 'tresEnRayaMessageDivID';
 
-  //Boardgame
+  //Boardgame variables
   var board = [];
   var boardDimension = null;
   var squareDimension = null;
   var middleSquareDimension = null;
 
-  var init = function(myPlayers,myPlayer,myOptions,myDivID){
-    if (!validateParams(myPlayers,myPlayer,myOptions,myDivID)){
-      showMessage("Invalid parameters");
-      return;
-    }
-    players = myPlayers;
-    player = myPlayer;
-    options = settingOptions(myOptions);
-    divID = myDivID;
+
+
+  ////////////////
+  //   STARTER  //
+	////////////////
+	//The core will invoke this method automatically to start the game.
+	//*myPlayer = myself
+	//*myGame = Game object (is the same for all players)
+	//*myDivID = Div to render the game
+  var init = function(myPlayer,myGame,myDivID){
+		player = myPlayer;
+		game = myGame;
+		divID = myDivID;
+		
+		//Setting options
+    game.options = settingOptions(myGame.options);
+
+    //Init Graphics
     drawBoard();
+		
+		//Init Logic
     settingBoard();
+		
+		//Init Events
     setBoardEvents();
-    currentPlayer = players[0];
-    if(player==currentPlayer){
+    
+		//Init game variables
+    currentPlayer = game.players[0];
+		playing=true;
+		
+		//Start Play!
+    if(player.id==currentPlayer.id){
       showMessage("You start!")
     } else {
-      showMessage(currentPlayer + " starts!")
+      showMessage(currentPlayer.name + " starts!")
     }
   };
 
-  var validateParams = function(myPlayers,myPlayer,myOptions,myDivID){
-    
-    if ((typeof myPlayers=="undefined")||(typeof myPlayer=="undefined")||(typeof myOptions=="undefined")||(typeof myDivID=="undefined")){
-      return false;
+
+  //Set defaults for unspecified options
+  var settingOptions = function(myOptions){
+
+    if (!('theme' in myOptions)){
+      myOptions['theme'] = "Modern"
+    } 
+
+    if (!('rounds' in myOptions)){
+      myOptions['rounds'] = "1"
     }
 
-    //Check if myPlayers is an Array
-    if (myPlayers.constructor.toString().indexOf("Array") == -1){
-      return false;
+    //Apply default options for non specified opts.
+    return myOptions;
+  };
+
+
+
+  ////////////////////////////////
+  //    CORE CONFIG CALLBACKS   //
+  ////////////////////////////////
+	
+	//Optional methods that can be invoked by the core
+		
+  //The Core provides basic validation
+	//We can include our own validation conditions here!
+	//The core will invoke this method automatically in the validation process
+  var validateParams = function(myPlayer,myGame,myDivID){
+    if(myGame.players.lenght < 2){
+      return new CORE.createValidationResult(false,"This game needs two players at least");
     }
+    return new CORE.createValidationResult(true,"Ok");  
+  }
+	
+	
+	//MinimumRequirements to execute this game
+  var minimumRequirements = function(){
+		var requirements = new Array();
+    return requirements;
+  }
 
-    //2 players at least
-    if(myPlayers.lenght < 2){
-      return false;
+
+
+  /////////////////////////////////     
+  // GAMECORE CALLS & CALLBACKS  //     * To send our actions to other players we will use the << sendAction >> method.   
+  /////////////////////////////////     * When some player send us a action, the core will invoke the << onActionReceived >> method.
+
+  var sendAction = function(action){
+    CORE.sendAction(game.id,game.players,action)
+    return;
+  }
+
+  var onActionReceived = function(action){
+    processAction(action);
+    return;
+  }
+
+
+
+  /////////////////////////
+  // ACTION MANAGEMENT  //     * These methods are not mandatory, but are highly recommended.   
+  ////////////////////////
+
+
+  //Processes an action of any player
+  var processAction = function(action){
+		
+    if(playing==false){
+      return
+    }
+
+    //Check if the action is legal.
+    if(!checkAction(action)){
+      showMessage("Ilegal action")
+      return false
+    }
+
+    if(player.id==action.player.id){
+      //Notify my actions!
+      sendAction(action)
     }
 
-    //Check if myOptions is an Array
-    if (myOptions.constructor.toString().indexOf("Array") == -1){
+    //Update logic
+    updateLogic(action)
+
+    //Update Graphics
+    updateInterface(action)
+
+    //Check for winner
+		//If there is a winner, checkWinner() will return the winner's name.
+		//If not, it will return "finish" if the game is over without a winner, or null if the game is not over.
+    var winner = checkWinner()
+    if(winner!=null){
+			processWinner(winner)
+      finishGame()
+      return
+    }
+
+    //We continue with the next turn if the game is not over.
+    nextTurn();
+  }
+
+
+  //Check if the action is legal.
+  var checkAction = function(action){
+    
+    if(currentPlayer.id!=action.player.id){
+      //The player has made an action out of his turn.
       return false;
     }
     
-    //Check that myPlayer is contained on myPlayers
-    if(myPlayers.indexOf(myPlayer)==-1){
+    if(board[action.square][2]!=0){
+      //Square is already occupied by another figure.
       return false;
     }
 
-    return true;  
+    return true;
+  }
+	
+	
+	//If we have a turn-based game we probably need a nextTurn method.
+	//This is an example
+  var nextTurn = function(){
+    var playersQuantity = game.players.length;
+    var indexActualPlayer = game.players.indexOf(currentPlayer);
+    if(indexActualPlayer==(playersQuantity-1)){
+      currentPlayer=game.players[0];
+    } else {
+      currentPlayer=game.players[indexActualPlayer+1];
+    }
+    if(player.id==currentPlayer.id){
+      showMessage("Is your turn!")
+    } else {  
+      showMessage(currentPlayer.name + " turn")
+    }
   }
 
-  var settingOptions = function(myOptions){
 
-    if (!('theme' in myOptions)){
-      myOptions['theme'] = "Modern"
-    } 
 
-    if (!('rounds' in myOptions)){
-      myOptions['rounds'] = "1"
-    }
-
-    //Apply default options for non specified opts.
-    return myOptions;
-  };
+  ///////////////////////   
+  // TER GAME METHODS  //      
+  ///////////////////////
 
   var drawBoard = function(){
     var containerDiv = document.createElement('div');
@@ -101,14 +223,15 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
     var messageDiv = document.createElement('div');
     messageDiv.setAttribute('id', messageDivId);
     $(messageDiv).addClass('tresEnRayaMessageDivClass')
-    $(messageDiv).addClass('tresEnRayaMessageTheme' + options['theme'])
+    $(messageDiv).addClass('tresEnRayaMessageTheme' + game.options['theme'])
     $("#" + divID).append(messageDiv);
 
     var p = document.createElement('p');
     p.setAttribute('id', messageDivId + "p");
-    $(p).addClass('tresEnRayaMessagePTheme' + options['theme'])
+    $(p).addClass('tresEnRayaMessagePTheme' + game.options['theme'])
     $("#" + messageDivId).append(p);
     
+		var messageDivHeight = 12;
 
     //Adjust dimensions
     var parentWidth = $("#" + divID).width();
@@ -116,16 +239,18 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
     var maxDimension = 300;
     var minDimension = 100;
 
-    var dimension = Math.min(parentWidth,parentHeight,maxDimension)
-    boardDimension = Math.max(dimension,minDimension)
+    var dimension = Math.max(Math.min(parentWidth,parentHeight,maxDimension),minDimension)
+    boardDimension = dimension - messageDivHeight;
     
     $("#" + containerDivId).height(boardDimension)
     $("#" + containerDivId).width(boardDimension);
+		$("#" + messageDivId).width(boardDimension);
 
     //Apply Theme
-    $("#" + containerDivId).addClass('tresEnRayaContainerTheme' + options['theme'])
+    $("#" + containerDivId).addClass('tresEnRayaContainerTheme' + game.options['theme'])
   };
 
+
   var settingBoard = function(){
     squareDimension = boardDimension/3;
     middleSquareDimension = squareDimension/2;
@@ -141,9 +266,9 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
     board[8] = [boardDimension-middleSquareDimension,boardDimension-middleSquareDimension,0]
   };
 
+
   var setBoardEvents = function(){
     $("#" + containerDivId).click(function (event) {
-      
       var offsetX = event.pageX - $("#" + containerDivId).offset().left
       var offsetY = event.pageY - $("#" + containerDivId).offset().top
 
@@ -151,15 +276,17 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
         return;
       }
 
-      if(currentPlayer!=player){
-        //return;
+      if(currentPlayer.id!=player.id){
+        return;
       }
       square = getSquare(offsetX,offsetY)
+			
       var actionNew = new action(currentPlayer,square);
       processAction(actionNew)
     });
   };
 
+
   var getSquare = function(x,y){
     for(var i=0; i<board.length; i++){
       if((Math.abs(x-board[i][0])<middleSquareDimension)&&(Math.abs(y-board[i][1])<middleSquareDimension)){
@@ -169,51 +296,6 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
     return 0;
   }
 
-
-  var processAction = function(action){
-
-    if(playing==false){
-      return;
-    }
-
-    //Check if the action is legal
-    if(!checkAction(action)){
-      showMessage("Ilegal action");
-      return false;
-    }
-
-    if(player==currentPlayer){
-      //Notify action
-      sendAction(action);
-    }
-
-
-    //Update logic
-    updateLogic(action);
-
-    //Update interface
-    updateInterface(action);
-
-    //Check for winner
-    var winner = checkWinner()
-    if(winner!=null){
-      if(winner!="finish"){
-        if(player==winner){
-          showMessage("You have won the game")
-        } else {
-          showMessage(winner + " has won the game")
-        }
-      } else {
-        showMessage("Finished game");
-      }
-      finishGame();
-      return
-    }
-
-    nextTurn();
-  }
-
-
   var showMessage = function(msg){
     $("#" + messageDivId + "p").html(msg)
   }
@@ -222,52 +304,43 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
     playing = false;
   }
 
-  var checkAction = function(action){
-    if(board[action.square][2]!=0){
-      return false;
-    }
-
-    return true;
-  }
-
   var updateLogic = function(action){
-    board[action.square][2]=players.indexOf(action.player)+1;
+		if(action.player.id == game.players[0].id){
+			var r = 1;
+		} else {
+			var r = 2;
+		}
+    board[action.square][2]=r;
   }
 
   var updateInterface = function(action){
     var img = document.createElement('img');
 
-    if(action.player==players[0]){
+    if(action.player.id==game.players[0].id){
       var figure = "circle";
     } else {
       var figure = "aspa";
     }
 
-    $(img).attr("src","themes/" + options['theme'].toLowerCase() + "_" + figure + ".png");
-
+    var path = "/assets/games/ter/modern_circle.png"
+    $(img).attr("src","/assets/games/ter/" + game.options['theme'].toLowerCase() + "_" + figure + ".png");
     $("#" + containerDivId).append(img);
-    $(img).addClass('tresEnRayaImgTheme' + options['theme'])
-    $(img).width(squareDimension*0.8)
-    $(img).height(squareDimension*0.8)
-    var x = $("#" + containerDivId).offset().left
-    var y = $("#" + containerDivId).offset().top
-    $(img).css("top",y+board[action.square][1]-middleSquareDimension*0.8)
-    $(img).css("left",x+board[action.square][0]-middleSquareDimension*0.8)
+    $(img).addClass('tresEnRayaImgTheme' + game.options['theme'])
+		
+		//Calculate displacement
+		var figureSizePercent = 0.8;
+		var xdisplacement = -squareDimension*figureSizePercent/2*0.9;
+		var ydisplacement = 10;
+		
+    $(img).width(squareDimension*figureSizePercent)
+    $(img).height(squareDimension*figureSizePercent)
+    $(img).css("top",board[action.square][1]+ydisplacement)
+    $(img).css("left",board[action.square][0]+xdisplacement)
     return;
   }
 
-  var sendAction = function(action){
-    //Notify action to other players
-    //[...]
-    return;
-  }
 
-  var onActionReceived = function(action){
-    processAction(action);
-    return;
-  }
-
-  //Return winner's name if exists and null if dont exits.
+  //Return winner's name if exists and null if don't exits.
   //Return "finish" when the game is blocked.
   var checkWinner = function(){
     
@@ -288,97 +361,73 @@ PRESENCE.GAME.TER = (function(P,$,undefined){
 
     //Check horizontal
     if((board[0][2]==board[1][2])&&(board[1][2]==board[2][2])&&(board[2][2]!=0)){
-      return players[board[0][2]-1];
+      return game.players[board[0][2]-1];
     }
     if((board[3][2]==board[4][2])&&(board[4][2]==board[5][2])&&(board[5][2]!=0)){
-      return players[board[3][2]-1];
+      return game.players[board[3][2]-1];
     }
     if((board[6][2]==board[7][2])&&(board[7][2]==board[8][2])&&(board[8][2]!=0)){
-      return players[board[6][2]-1];
+      return game.players[board[6][2]-1];
     }
 
     //Check vertical
     if((board[0][2]==board[3][2])&&(board[3][2]==board[6][2])&&(board[6][2]!=0)){
-      return players[board[0][2]-1];
+      return game.players[board[0][2]-1];
     }
     if((board[1][2]==board[4][2])&&(board[4][2]==board[7][2])&&(board[7][2]!=0)){
-      return players[board[1][2]-1];
+      return game.players[board[1][2]-1];
     }
     if((board[2][2]==board[5][2])&&(board[5][2]==board[8][2])&&(board[8][2]!=0)){
-      return players[board[2][2]-1];
+      return game.players[board[2][2]-1];
     }
 
     //Check diagonals
     if((board[0][2]==board[4][2])&&(board[4][2]==board[8][2])&&(board[8][2]!=0)){
-      return players[board[0][2]-1];
+      return game.players[board[0][2]-1];
     }
     if((board[6][2]==board[4][2])&&(board[4][2]==board[2][2])&&(board[2][2]!=0)){
-      return players[board[6][2]-1];
+      return game.players[board[6][2]-1];
     }
 
     return null;
   }
 
-  var nextTurn = function(){
-    var playersQuantity = players.length;
-    var indexActualPlayer = players.indexOf(currentPlayer);
-    if(indexActualPlayer==(playersQuantity-1)){
-      currentPlayer=players[0];
+
+  var processWinner = function(winner){
+    if(winner!="finish"){
+      if(player.id==winner.id){
+        showMessage("You have won the game")
+      } else {
+        showMessage(winner.name + " has won the game")
+      }
     } else {
-      currentPlayer=players[indexActualPlayer+1];
-    }
-    if(player==currentPlayer){
-      showMessage("Is your turn!")
-    } else {  
-      showMessage(currentPlayer + " turn")
+      showMessage("Finished game");
     }
   }
 
-  var getRandomPlayer = function(){
-    var playersQuantity = players.length;
-    var randomIndex = Math.round(Math.random()*(players.length-1))
-    return players[randomIndex]
-  }
-
   //Getters
-  var getPlayers = function(){
-    return players;
+  var getGame = function(){
+    return game;
   }
-
-  var getOptions = function(){
-    return options;
+	
+	var getBoard = function(){
+    return board;
   }
 	
-	var getDummy = function(){
-		return core;
-	}
+	var getMyplayer = function(){
+    return player;
+  }
+	
+	var getCurrentPlayer = function(){
+    return currentPlayer;
+  }
 
 
   return {
     init: init,
-		getDummy: getDummy,
-    onActionReceived: onActionReceived
+		validateParams: validateParams,
+		minimumRequirements: minimumRequirements,
+		onActionReceived: onActionReceived
   };
 
-}) (PRESENCE, jQuery);
-
-
-
-
-
-
-
-
-////////////////////
-//Interface Events
-////////////////////
-function play(){
-	$(".chat-gamesthick").css("display","block");
-}
-
-function pickGamesButton(uiElement){
-  var slug = $(uiElement.element).attr("id");
-  //clickGamesButton(slug);
-	log("clickGamesButton(slug)" + slug)
-}
-
+}) (PRESENCE, jQuery);