4x5

HyperSet/.idea/workspace.xml

@@ -131,7 +131,8 @@
       <workItem from="1595241049078" duration="8933000" />
       <workItem from="1595252250296" duration="15000" />
       <workItem from="1595260179440" duration="1355000" />
-      <workItem from="1595326918655" duration="983000" />
+      <workItem from="1595326918655" duration="7239000" />
+      <workItem from="1595344550924" duration="1025000" />
     </task>
     <servers />
   </component>
@@ -175,10 +176,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="1595243925469" />
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1595326948648">
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1595344579763">
       <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="1595326948648" />
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1595344579763" />
     <state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>

HyperSet/set.php

@@ -31,13 +31,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') {
     $_SESSION['deck3'] = new Deck($_GET['action']);
     $_SESSION['game3'] = new Game($_SESSION['deck3']);
     $game = $_SESSION['game3'];
-    echo json_encode($game->start(20));
+    echo json_encode($game->start(50));
 
 } else if (isset($_GET['action']) && $_GET['action'] == 'deal4') {
     $_SESSION['deck4'] = new Deck($_GET['action']);
     $_SESSION['game4'] = new Game($_SESSION['deck4']);
     $game = $_SESSION['game4'];
-    echo json_encode($game->start(20));
+    echo json_encode($game->start(50));
 
 }else if (isset($_GET['action']) && $_GET['action'] == 'deal0') {
     $_SESSION['deck0'] = new Deck($_GET['action']);

HyperSet/vues/css/style.css

@@ -54,6 +54,18 @@ h1 {
 	position: fixed;
 
 }
+
+.game-board3 {
+
+	margin-left: -15%;
+	height: 1000px;
+	width: 1700px;
+	position: fixed;
+
+}
+
+
+
 .game-board2 {
 	margin-top: -1%;
 	margin-left: 17%;

HyperSet/vues/homePage.html

@@ -126,15 +126,16 @@
     <div class="game-board2" data-display="game-board2"></div>
 </div>
 <div id='game3' class="wrapper" style="display: none;">
-    <h1>Set 4x5 Bordures + à tester + compteur + à regler les images</h1>
+    <h1>Set 4x5 Bordures + à regler les images</h1>
     <div class=" back-btn small-btn">
         <img class="small-btn" id="previousBtn4" onclick="goSelectMode3()" src="vues/images/previous.png">
     </div>
     <p>Nombre de carte = 4;       Nombre de critères = 5</p>
+    <p>Paramètres: 1.Couleur, 2.Forme, 3.Remplissage 4.Bordure 5.Nombre</p>
     <p>Sets found:  <span data-display="score3" class="score">0</span></p>
     <p>Number of Sets:  <span data-display="nbSets3" class="nbSets"></span></p>
 
-    <div class="game-board" data-display="game-board3"></div>
+    <div class="game-board3" data-display="game-board3"></div>
 </div>
 <div id='game4' class="wrapper" style="display: none;">
     <h1>Set 5x5 Bordures + à tester+ compteur + à regler les images </h1>
@@ -142,10 +143,11 @@
         <img class="small-btn" id="previousBtn5" onclick="goSelectMode4()" src="vues/images/previous.png">
     </div>
     <p>Nombre de carte = 5;       Nombre de critères = 5</p>
+    <p>Paramètres: 1.Couleur, 2.Forme, 3.Remplissage 4.Bordure 5.Nombre</p>
     <p>Sets found:  <span data-display="score4" class="score">0</span></p>
     <p>Number of Sets:  <span data-display="nbSets4" class="nbSets"></span></p>
 
-    <div class="game-board" data-display="game-board4"></div>
+    <div class="game-board3" data-display="game-board4"></div>
 </div>