From 2bbad3c5891666eeaee04c222379e56a8d445a47 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Mon, 10 Aug 2020 14:56:13 +0200
Subject: [PATCH] affichage en jeu du pseudo + rappels des modes

---
 code/game.css         |  6 +++---
 code/game.html        | 10 +++++-----
 code/infoDisplayer.js | 27 +++++++++++++++++++++++++++
 code/options.js       |  2 --
 4 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 code/infoDisplayer.js

diff --git a/code/game.css b/code/game.css
index a5cb9d7..92f083d 100644
--- a/code/game.css
+++ b/code/game.css
@@ -97,9 +97,9 @@
 
   .child {
     position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
   }
 
   .parent {
diff --git a/code/game.html b/code/game.html
index edf2d5d..63ce4b7 100644
--- a/code/game.html
+++ b/code/game.html
@@ -19,19 +19,18 @@
                 <h1 class="child" id="res_text" >R&eacute;sultat</h1>
             </div>
 
-            
-            
-            
         </ul>
 
         <ul id="obj-container" class="vitraux">
             <canvas id="canvasObj" class="vitrail-plein"></canvas>
             <canvas id="canvasTotal" class="vitrail-plein"></canvas>
 
-            <p id="temps"></p>
+            <span id="player" class="stats"></span>
+            <span id="mode" class="stats"></span>
             <span id="chronotime" class="stats">0:00:00</span>
             <span id="timer" class="stats">0:00:00</span>
-            <p id="stats" class="stats"></p>
+            <span id="stats" class="stats"></span>
+
         </ul>
         <ul id="vitraux" class="vitraux">
             <canvas id="canvas1" class="vitrail-plein"></canvas>
@@ -62,6 +61,7 @@
     <script src="bakery.js"></script>
     <script src="chrono.js"></script>
     <script src="timer.js"></script>
+    <script src="infoDisplayer.js"></script>
     <script src="vitraux.js"></script>
     <script src="themeSwitcher.js"></script>
 </body>
diff --git a/code/infoDisplayer.js b/code/infoDisplayer.js
new file mode 100644
index 0000000..d828876
--- /dev/null
+++ b/code/infoDisplayer.js
@@ -0,0 +1,27 @@
+var player = document.getElementById("player");
+var mode = document.getElementById("mode");
+var modeString;
+
+if(get['pseudo']=="")
+{
+    player.style.display="none";
+}
+else
+{
+    player.innerHTML = get['pseudo'];
+}
+
+if (get['mode'].includes('p'))
+{
+    modeString = get['mode'].substring(0,get['mode'].length-1) + " points";
+}
+else if(get['mode'].includes('m'))
+{
+    modeString = get['mode'].substring(0,get['mode'].length-1) + " minutes";
+}
+else if(get['mode'].includes('s'))
+{
+    modeString = "Survie, +" + get['mode'];
+}
+
+mode.innerHTML = modeString + ", " + (get["diff"]=="easy" ? "facile" : (get["diff"]=="med" ? "moyen" : "difficile")) + "\n" + (getCookie("pause")==0 ? "pas de pause" : "pause");
\ No newline at end of file
diff --git a/code/options.js b/code/options.js
index 26f5452..73ae3af 100644
--- a/code/options.js
+++ b/code/options.js
@@ -181,12 +181,10 @@ var gemsSelected=[];
 for(var cpt=0;cpt<8;cpt++)
 {
   gemsSelected[cpt]= (getCookie("gem"+(cpt+1))=="" ? gemsAvailable[cpt] : getCookie("gem"+(cpt+1)));
-  console.log(gemsSelected[cpt]);
 }
 
 for(var cpt=1;cpt<9;cpt++)
 {
-  console.log("disp : "+gemsSelected[cpt-1]);
   eval("var gemIcon_"+gemsSelected[cpt-1]+"=document.getElementById('gem"+cpt+"')");
   eval('gemIcon_'+gemsSelected[cpt-1]+'.src="ress/'+gemsSelected[cpt-1]+'"');
   eval('gemIcon_'+gemsSelected[cpt-1]+'.width=size/6');