changement nombre de cartes

HyperSet/.idea/workspace.xml

@@ -126,6 +126,7 @@
       <workItem from="1594896282228" duration="4161000" />
       <workItem from="1594923234569" duration="65000" />
       <workItem from="1594923470651" duration="68000" />
+      <workItem from="1594981177567" duration="235000" />
     </task>
     <servers />
   </component>
@@ -169,10 +170,10 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1594813492846" />
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1594923468276">
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1594981176093">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594923468276" />
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594981176093" />
     <state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>

HyperSet/set.php

@@ -13,13 +13,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') {
     $_SESSION['deck'] = new Deck($_GET['action']);
     $_SESSION['game'] = new Game($_SESSION['deck']);
     $game = $_SESSION['game'];
-    echo json_encode($game->start(20));
+    echo json_encode($game->start(21));
 
 } else if (isset($_GET['action']) && $_GET['action'] == 'deal1') {
     $_SESSION['deck1'] = new Deck($_GET['action']);
     $_SESSION['game1'] = new Game($_SESSION['deck1']);
     $game = $_SESSION['game1'];
-    echo json_encode($game->start(45));
+    echo json_encode($game->start(46));
 
 } else if (isset($_GET['action']) && $_GET['action'] == 'deal2') {
     $_SESSION['deck2'] = new Deck($_GET['action']);
@@ -43,7 +43,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') {
     $_SESSION['deck0'] = new Deck($_GET['action']);
     $_SESSION['game0'] = new Game($_SESSION['deck0']);
     $game = $_SESSION['game0'];
-    echo json_encode($game->start(12));
+    echo json_encode($game->start(10));
 } else if (isset($_GET['action']) && $_GET['action'] == 'dealHS') {
     $_SESSION['deckHS'] = new Deck($_GET['action']);
     $_SESSION['gameHS'] = new Game($_SESSION['deckHS']);

HyperSet/vues/css/style.css

@@ -63,7 +63,7 @@ h1 {
 }
 .game-board {
 	margin-top: -5%;
-	margin-left: 19%;
+	margin-left: 29%;
 	height: 700px;
 	width: 600px;
 	transform: rotate(90deg);
@@ -80,7 +80,7 @@ h1 {
 	margin-top: -4%;
 	height: 800px;
 	width: 700px;
-	margin-left: 30%;
+	margin-left: 40%;
 	transform: rotate(90deg);
 }
 

HyperSet/vues/homePage.html

@@ -126,7 +126,7 @@
     <div class="game-board2" data-display="game-board2"></div>
 </div>
 <div id='game3' class="wrapper" style="display: none;">
-    <h1>Set 4x5 Bordures + à tester</h1>
+    <h1>Set 4x5 Bordures + à tester + compteur + à regler les images</h1>
     <div class=" back-btn small-btn">
         <img class="small-btn" id="previousBtn4" onclick="goSelectMode3()" src="vues/images/previous.png">
     </div>
@@ -137,7 +137,7 @@
     <div class="game-board" data-display="game-board3"></div>
 </div>
 <div id='game4' class="wrapper" style="display: none;">
-    <h1>Set 5x5 Bordures + à tester </h1>
+    <h1>Set 5x5 Bordures + à tester+ compteur + à regler les images </h1>
     <div class=" back-btn small-btn">
         <img class="small-btn" id="previousBtn5" onclick="goSelectMode4()" src="vues/images/previous.png">
     </div>

HyperSet/vues/js/set.js

@@ -287,7 +287,7 @@ var Game = {
 			self.$board.append(cardNode);
 
 			// display 4 cards per row
-			if ((index+1) % 4 === 0) {
+			if ((index+1) % 3 === 0) {
 				self.$board.append($('<div>'));
 			}
 
@@ -326,7 +326,7 @@ var Game = {
 			self.$board1.append(cardNode);
 
 			// display 4 cards per row
-			if ((index+1) % 5 === 0) {
+			if ((index+1) % 4 === 0) {
 				self.$board1.append($('<div>'));
 			}
 
@@ -477,7 +477,7 @@ var Game = {
 			self.$board0.append(cardNode);
 
 			// display 4 cards per row
-			if ((index+1) % 3 === 0) {
+			if ((index+1) % 2 === 0) {
 				self.$board0.append($('<div>'));
 			}