From 09fac3538e05c99b74c12f6c07b1973961101f90 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Mon, 27 Jul 2020 11:22:15 +0200
Subject: [PATCH] =?UTF-8?q?le=20menu=20d'options=20charge=20les=20couleurs?=
 =?UTF-8?q?=20d=C3=A9j=C3=A0=20s=C3=A9lectionn=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/index.php  | 3 ++-
 code/options.js | 3 ++-
 code/vitraux.js | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/index.php b/code/index.php
index 7150209..c449fb0 100644
--- a/code/index.php
+++ b/code/index.php
@@ -85,7 +85,8 @@ Jouer la partie en : </br>
         <input type="radio" id="no_pause" value="0" name="pause">
         <label for="no_pause">Non</label>
 
-        <div> Choisir les couleurs des points (ne fonctionne pas en mode "gemmes" ou "les deux")
+        <div> Choisir les couleurs des points (ne fonctionne pas en mode "gemmes" ou "les deux")<br/>
+        &Eacute;vitez de mettre la même couleur pour plusieurs points, ça ne vous rendra pas le jeu plus facile, loin de l&agrave;
         <div class="color-pickers">
             <div id="col1" class="col1"></div>
             <div id="col2" class="col2"></div>
diff --git a/code/options.js b/code/options.js
index 56fb9a4..dbbff22 100644
--- a/code/options.js
+++ b/code/options.js
@@ -50,13 +50,14 @@ document.getElementById((getCookie("displayMode")!="" ? getCookie("displayMode")
 document.getElementById("range_dots").value= (getCookie("dotsAmount")!="" ? getCookie("dotsAmount") : 4);
 output.innerHTML = (getCookie("dotsAmount")!="" ? getCookie("dotsAmount") : 4);
 
+var customColorsAvailable=["#FF0000","#ffff00","#008000","#800080","#000000","#8b4513","#00ffff","#ffa500"];
 // Simple example, see optional options for more configuration.
 for(var cpt=1;cpt<9;cpt++)
 {
   eval('pickr'+cpt+` = Pickr.create({
     el: '.col`+cpt+`',
     theme: 'monolith',
-  
+    default: (getCookie("color_`+cpt+`")=="" ? customColorsAvailable[cpt-1] : getCookie("color_`+cpt+`")),
   
     components: {
   
diff --git a/code/vitraux.js b/code/vitraux.js
index 8ab5605..5328833 100644
--- a/code/vitraux.js
+++ b/code/vitraux.js
@@ -30,7 +30,7 @@ var displayType = getCookie("displayMode")=="" ? "gems" : getCookie("displayMode
 
 var dotsAmount= getCookie("dotsAmount")=="" ? 4 : getCookie("dotsAmount");
 var colors=[];
-var colorsAvailable=["red","yellow","green","purple","lightblue","brown","cyan","orange"];
+var colorsAvailable=["red","yellow","green","purple","black","brown","cyan","orange"];
 var customColorsAvailable=[];
 
 for(var cpt=1;cpt<9;cpt++)
@@ -501,7 +501,7 @@ function checkAllOK(){
         for(i=0;i<tabTotal.length;i++)
         {
             const result = verifTab.filter(point => point.toString()==tabObjCmp[i].toString());
-            console.log(verifTab.filter(point => point.toString()+" et "+tabObjCmp[i].toString()));
+            //console.log(verifTab.filter(point => point.toString()+" et "+tabObjCmp[i].toString()));
             exists*=result.length;
         }
     }