diff --git a/SwichGIT/MultiFinal/.idea/.gitignore b/SwichGIT/MultiFinal/.idea/.gitignore
deleted file mode 100644
index 416d38a..0000000
--- a/SwichGIT/MultiFinal/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/../../../../../:\wamp64\www\multi\.idea/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/SwichGIT/MultiFinal/.idea/MorpionBureau.iml b/SwichGIT/MultiFinal/.idea/MorpionBureau.iml
deleted file mode 100644
index c956989..0000000
--- a/SwichGIT/MultiFinal/.idea/MorpionBureau.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SwichGIT/MultiFinal/.idea/dataSources.xml b/SwichGIT/MultiFinal/.idea/dataSources.xml
deleted file mode 100644
index ad39e86..0000000
--- a/SwichGIT/MultiFinal/.idea/dataSources.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- sqlite.xerial
- true
- org.sqlite.JDBC
- jdbc:sqlite:C:\wamp64\www\MorpionBureau\mysqlitedb.db
- $ProjectFileDir$
-
-
-
\ No newline at end of file
diff --git a/SwichGIT/MultiFinal/.idea/deployment.xml b/SwichGIT/MultiFinal/.idea/deployment.xml
deleted file mode 100644
index 1e97584..0000000
--- a/SwichGIT/MultiFinal/.idea/deployment.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SwichGIT/MultiFinal/.idea/modules.xml b/SwichGIT/MultiFinal/.idea/modules.xml
deleted file mode 100644
index 727b7e5..0000000
--- a/SwichGIT/MultiFinal/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SwichGIT/MultiFinal/js/main.js b/SwichGIT/MultiFinal/js/main.js
index 38438fe..e3a6735 100644
--- a/SwichGIT/MultiFinal/js/main.js
+++ b/SwichGIT/MultiFinal/js/main.js
@@ -8,6 +8,7 @@ var darkprima = "#474747";
var darkseconda = "#393939";
var darktercia = "#606060";
var carteselect = [];
+var carteselectPos = [];
var deckPartie = []; //Ensemble des cartes affichees a l'ecran
var TasDuJEU = []; // Ensemble de toutes les cartes presente dans le jeu
var allMode = ["Solo", "Infini", "Multi"]; // Défini tout les modes de Jeu
@@ -108,24 +109,43 @@ class Carte {
this.link.onclick = function selectioncarte() {
var macarte = this.id;
var lacarte = "card" + macarte;
+
+ for (var i = 0; i < deckPartie.length; i++) {
+ if (this.id == deckPartie[i].identifiant) {
+ if (carteselectPos.includes(i)) {
+ carteselectPos.splice(carteselectPos.indexOf(i), 1);
+ } else {
+ if(carteselectPos.length<5) {
+ carteselectPos.push(i);
+ }
+ }
+ }
+ }
+ console.log("cartesPOS: ",carteselectPos);
+
for (var i = 0; i < deckPartie.length; i++) {
if (this.id == deckPartie[i].identifiant) {
var laCarte = deckPartie[i];//Carte liee avec le code HTML
}
}
+
+
+ //cas où la carte a déjà été cliqué
if (document.getElementById(lacarte).style.boxShadow != "") {
var pos = carteselect.indexOf(laCarte);
carteselect.splice(pos, 1);
document.getElementById(lacarte).style.boxShadow = "";
}
+ //cas où la carte n'a pas déjà été cliqué
else {
if (carteselect.length < 5) {
carteselect.push(laCarte);
document.getElementById(lacarte).style.boxShadow = "0 0 1vw red, 0 0 1vw red";
}
else
- window.alert("Bonjour !");
- }
+ window.alert("5 max !");
+ };
+
};
}
@@ -497,7 +517,24 @@ function ConvertInttoCarte(ListeDesCartes){
}
console.log("Longeurs liste : "+lescartes.length);
afficherCartes(lescartes);
+ deckPartie = lescartes;
console.log("--Conversion réussie--");
+ // console.log("CARTES SELECTS : ",carteselectPos);
+ reselectCartes();
+}
+
+function reselectCartes() {
+
+ if (carteselectPos != [] && carteselectPos!=null) {
+ // console.log("cartesPOS: ",carteselectPos);
+ carteselectPos.forEach((pos) => {
+ var lacarte = "card"+pos;
+ var numeroCarte = pos;
+ console.log("lacarte: ",lacarte);
+ console.log(deckPartie[numeroCarte].get);
+ document.getElementById(lacarte).style.boxShadow = "0 0 1vw red, 0 0 1vw red";
+ });
+ }
}
function retour() {
diff --git a/SwichGIT/MultiFinal/mysqlitedb.db b/SwichGIT/MultiFinal/mysqlitedb.db
index f5344e1..e9b132d 100644
Binary files a/SwichGIT/MultiFinal/mysqlitedb.db and b/SwichGIT/MultiFinal/mysqlitedb.db differ