Ajout compétitif et restructuration API

web/api/controller/routes.php

@@ -0,0 +1,37 @@
+<?php
+
+require_once('model/classes.php');
+
+try {
+	if(!empty($_GET['page'])) {
+		if($_GET['page'] == "palmares") {
+			if(include("controller/palmares.php")) {
+        $api = $scArray;
+				$api["status"] = 1;
+			} else {
+				$api = array(
+					"status" => 0,
+					"source" => "root",
+					"message" => "Erreur d'inclusion"
+				);
+			}
+		}
+	} else {
+		if(include("controller/questions.php")) {
+			$api = $categories;
+      $api["status"] = 1;
+		} else {
+			$api = array(
+				"status" => 0,
+				"source" => "root",
+				"message" => "Erreur d'inclusion"
+			);
+		}
+	}
+} catch(Exception $e) {
+	$api = array(
+		"status" => 0,
+		"source" => $e->getTrace()[0]["class"],
+		"message" => $e->getMessage()
+	);
+}

web/api/index.php

@@ -1,39 +1,7 @@
 <?php
 
-require_once('model/classes.php');
-
 header("Content-Type:application/json");
 
-try {
-	if(!empty($_GET['page'])) {
-		if($_GET['page'] == "palmares") {
-			if(include("controller/palmares.php")) {
-				$scArray["status"] = 1;
-				echo json_encode($scArray);
-			} else {
-				echo json_encode(array(
-					"status" => 0,
-					"source" => "root",
-					"message" => "Erreur d'inclusion"
-				));
-			}
-		}
-	} else {
-		if(include("controller/questions.php")) {
-			$categories["status"] = 1;
-			echo json_encode($categories);
-		} else {
-			echo json_encode(array(
-				"status" => 0,
-				"source" => "root",
-				"message" => "Erreur d'inclusion"
-			));
-		}
-	}
-} catch(Exception $e) {
-	echo json_encode(array(
-		"status" => 0,
-		"source" => $e->getTrace()[0]["class"],
-		"message" => $e->getMessage()
-	));
-}
+include("controller/routes.php");
+
+echo json_encode($api);

web/js/game.js

@@ -13,6 +13,7 @@ var canClick = true;
 
 function play() {
   apiReq();
+  console.log(json);
   $("#play").remove();
   if(json.status != 1) {
     var message;

web/js/multi.js

@@ -12,6 +12,7 @@ var disconnect = true;
 var scoreAdversaire = 0;
 var pseudo ='';
 var reponseUser = -1, bonneReponse;
+var againstLoser = false;
 
 function init() {
 
@@ -55,8 +56,9 @@ var setEventHandlers = function() {
   socket.on("questions", play);
   socket.on("lolheded", endGame);
   socket.on("end", onEnd);
-  socket.on("qpass", function() {
+  socket.on("qpass", function(gotAPoint) {
     reponseUser = -1;
+    againstLoser = gotAPoint;
     checkAnswer();
   })
 };
@@ -128,11 +130,11 @@ function quest(id) {
   $("#question-count").html("Question "+currentQuestion+"/"+nbQuestions);
   if(canClick) {
     $("#rep1").off('click');
-    $("#rep1").one("click", function() { reponseUser = 1; checkAnswer(); socket.emit('nextQuestion'); });
+    $("#rep1").one("click", function() { reponseUser = 1; checkAnswer(); socket.emit('nextQuestion', reponseUser == bonneReponse); });
     $("#rep2").off('click');
-    $("#rep2").one("click", function() { reponseUser = 2; checkAnswer(); socket.emit('nextQuestion'); });
+    $("#rep2").one("click", function() { reponseUser = 2; checkAnswer(); socket.emit('nextQuestion', reponseUser == bonneReponse); });
     $("#both").off('click');
-    $("#both").one("click", function() { reponseUser = 0; checkAnswer(); socket.emit('nextQuestion'); });
+    $("#both").one("click", function() { reponseUser = 0; checkAnswer(); socket.emit('nextQuestion', reponseUser == bonneReponse); });
   }
 }
 
@@ -142,8 +144,9 @@ function checkAnswer() {
   $("#rep2").off('click');
   $("#both").off('click');
   stopTimer();
-  if(reponseUser == bonneReponse) {
+  if(reponseUser == bonneReponse || againstLoser) {
     score += secRestantes+1;
+    againstLoser = false;
   }
   if(score > 1) {
     $("#score").html("Score : "+score+" miams");

web/multi/server/server.js

@@ -90,12 +90,12 @@ function onSocketConnection(client) {
       });
     });
 
-    client.on('nextQuestion', function() {
+    client.on('nextQuestion', function(isRight) {
       games.forEach(function(row) {
         if(row.joueur1.socket.id === client.id) {
-          row.joueur2.socket.emit('qpass');
+          row.joueur2.socket.emit('qpass', !isRight);
         } else if(row.joueur2.socket.id === client.id) {
-          row.joueur1.socket.emit('qpass');
+          row.joueur1.socket.emit('qpass', !isRight);
         }
       });
     })