chnagements

master
pisouvigne 5 years ago
parent 27b13dd4f6
commit b2ffe184a9

@ -105,6 +105,19 @@ html {
justify-content: center;
}
#selectionContainer2 {
margin: 0 auto;
width: 60%;
display: flex;
flex-wrap: wrap;
}
.flexElement {
flex-grow: 1;
width: 32%;
margin-right: 25px;
}
#generate_button_perso {
display: flex;
justify-content: center;
@ -244,6 +257,10 @@ html {
color: white;
}
#modeSelectionPage {
display: none;
}
.closebtn {
margin-left: 15px;
color: white;

@ -22,24 +22,6 @@
<label></label>
</div>
<hr id="hr">
<div id="selectionContainer">
<div class="border background dys listenerHover" onclick="wait('tuto', this)">
<a>Tutoriel</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover" onclick="wait('vanilla', this)">
<a>Vanilla</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover" onclick="wait('normal', this)">
<a>Normal</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover" onclick="wait('test', this)">
<a>Mode Perso</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
</div>
</div>
<!--Last Selection-->
<div id="LastSelectionPage" class="background">
@ -216,6 +198,44 @@
</div>
</div>
<div id="modeSelectionPage" class="dys background">
<div id="header_selection" align=center>
<i class="fa fa-arrow-left home" onclick="closePerso(this);" aria-hidden="true"></i>
<h1 class="dys" id="title_perso_setup">Sélection</h1>
<label></label>
</div>
<hr id="hr">
<div id="perso-setupContainer">
<div>
<p>Fonctions Logiques : </p>
<div>
<input type="checkbox" id="logique1" name="logique1" checked>
<label for="logique1">ET</label>
</div>
<div>
<input type="checkbox" id="logique2" name="logique2">
<label for="logique2">OU</label>
</div>
<div>
<input type="checkbox" id="logique3" name="logique3">
<label for="logique3">NON</label>
</div>
<div>
<input type="checkbox" id="logique4" name="logique4">
<label for="logique4">NON-ET</label>
</div>
<div>
<input type="checkbox" id="logique5" name="logique5">
<label for="logique5">NON-OU</label>
</div>
</div><br><br>
<div class="border background dys listenerHover" id="generate_button_perso"
onclick="buttonSpin(this,'select')">
<a>Jouer</a>
<i class="fa fa-arrow-right" id="icon_generate_2" aria-hidden="true"></i>
</div>
</div>
</div>
<!--Test Generateur-->
<div id="TestNouveauGenerateur" class="background">
@ -606,10 +626,28 @@
<div id="menu">
<p id="titleGame" class="title dys">M<a class="secret" onclick="flip()">a</a>ke It True</p>
</div>
<div class="btn_play" id="menu-selection">
<a onclick="play();"><i class="far fa-play-circle"></i></a>
<div id="selectionContainer2">
<div class="border background dys listenerHover flexElement" onclick="wait('tuto', this)">
<a>Tutoriel</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover flexElement" onclick="wait('vanilla', this)">
<a>Vanilla</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover flexElement" onclick="wait('normal', this)">
<a>Normal</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover flexElement" onclick="wait('select', this)">
<a>Mode Sélection</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
<div class="border background dys listenerHover flexElement" onclick="wait('test', this)">
<a>Mode Perso</a>
<i class="fa fa-arrow-right" id="right_select" aria-hidden="true"></i>
</div>
</div>
<a onclick="openModal('myModal')"><i class="fa fa-cog" id="setting" aria-hidden="true"></i></a>
<a onclick="openModal('infoModal')"><i class="fa fa-info" id="setting" aria-hidden="true"></i></a>
<div class="alert dys">

@ -790,6 +790,8 @@ function nextLevel(mode) {
launchImpossibleChapitre4(mode);
} else if (mode === "vanillaImpossible5" || mode === "normalImpossible5") {
launchImpossibleChapitre5(mode);
} else if (mode === "select") {
launchSelect();
}
}
@ -924,7 +926,7 @@ function hideDiv(div) {
}
function showDiv(div) {
if (div.id == "levelSelectionPage") {
if (div.id == "mainPage") {
document.querySelectorAll("#right_select").forEach(function (element) {
element.classList = "fa fa-arrow-right";
});
@ -932,14 +934,10 @@ function showDiv(div) {
div.style.display = 'block'
}
function play() {
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#levelSelectionPage"));
}
function modePerso() {
document.querySelector("#generate_button_perso").childNodes[3].classList = "fa fa-arrow-right";
hideDiv(document.querySelector("#levelSelectionPage"));
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#PersoSetupPage"));
}
@ -953,13 +951,13 @@ function playNormal() {
function goToSelection(btn) {
hideDiv(btn.parentElement.parentElement)
showDiv(document.querySelector("#levelSelectionPage"));
showDiv(document.querySelector("#mainPage"));
}
function vanillaSelection() {
document.querySelector("#selectionNormalContainer").style.display = "none";
document.querySelector("#selectionVanillaContainer").style.display = "flex";
hideDiv(document.querySelector("#levelSelectionPage"));
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#VanillalevelSelectionPage"));
document.querySelectorAll(".vanillaElement").forEach(function (element) {
if (element.children[0].innerHTML !== "")
@ -980,7 +978,7 @@ function vanillaSelection() {
function normalSelection() {
document.querySelector("#selectionNormalContainer").style.display = "none";
document.querySelector("#selectionVanillaContainer").style.display = "flex";
hideDiv(document.querySelector("#levelSelectionPage"));
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#VanillalevelSelectionPage"));
document.querySelectorAll(".vanillaElement").forEach(function (element) {
if (element.children[0].innerHTML !== "")
@ -999,7 +997,7 @@ function normalSelection() {
function playVanilla() {
hideDiv(document.querySelector("#VanillalevelSelectionPage"));
showDiv(document.querySelector("#playPage"));
showDiv(document.querySelector("#mainPage"));
niveauActuel = 1;
timeTot = 0;
launchGameOne("vanilla");
@ -1088,7 +1086,7 @@ function playMoyenNormal() {
}
function modeTuto() {
hideDiv(document.querySelector("#levelSelectionPage"));
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#playPage"));
niveauActuel = 1;
timeTot = 0;
@ -1097,7 +1095,7 @@ function modeTuto() {
function modeTest() {
document.querySelector("#generate_button_perso").childNodes[3].classList = "fa fa-arrow-right";
hideDiv(document.querySelector("#levelSelectionPage"));
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#TestNouveauGenerateur"));
calcul();
@ -1227,6 +1225,11 @@ function playImpossible5() {
launchImpossibleChapitre5(modeG);
}
function modeSelect() {
hideDiv(document.querySelector("#mainPage"));
showDiv(document.querySelector("#modeSelectionPage"));
}
function wait(mode, btn) {
document.querySelector("#lose_pannel").style.display = "none";
@ -1235,6 +1238,16 @@ function wait(mode, btn) {
spin(btn);
modeG = mode;
switch (mode) {
case "select":
niveauActuel = 1;
document.querySelector("#icon_generate_2").classList = "fa fa-arrow-right";
setTimeout(modeSelect, time);
setMode("Mode Sélection");
break;
case "selectSuite":
setTimeout(launchSelect, time);
setMode("Mode Sélection");
break;
//Normal
case "normalFacile1":
setTimeout(playFacile1, time);
@ -1915,11 +1928,10 @@ function closeGame() {
function closeSelection() {
showDiv(document.querySelector("#mainPage"));
hideDiv(document.querySelector("#LastSelectionPage"));
hideDiv(document.querySelector("#levelSelectionPage"));
}
function closePerso(div) {
showDiv(document.querySelector("#levelSelectionPage"));
showDiv(document.querySelector("#mainPage"));
hideDiv(div.parentElement.parentElement);
}
var rotated = false;
@ -1953,3 +1965,95 @@ function generateName() {
return name;
}
function launchSelect() {
mode = "select";
document.querySelector(".niveau").innerHTML = niveauActuel;
document.querySelector("#win_pannel").style.display = "none";
hideDiv(document.querySelector("#modeSelectionPage"));
timer.stop();
timer.reset();
resetAllTabs(false);
var col = [];
var matchs = [];
var porteLogique = [];
var time = 20;
switch (niveauActuel) {
case 1:
col = [2, 1];
porteLogique = [[true, "et"], [true, "ou"]];
break;
case 2:
col = [2, 2];
porteLogique = [[true, "et"], [true, "ou"]];
break;
case 3:
col = [3, 2];
matchs = [[1, 2]];
porteLogique = [[true, "et"], [true, "ou"]];
break;
case 4:
col = [3, 2];
porteLogique = [[true, "et"], [true, "inv"]];
break;
case 5:
col = [3, 3];
matchs = [[1, 2]];
porteLogique = [[true, "et"], [true, "inv"]];
break;
case 7:
case 6:
col = [4, 3];
matchs = [[1, 2]];
porteLogique = [[true, "et"], [true, "inv"], [true, "ou"]];
break;
case 8:
case 9:
case 10:
case 11:
col = [5, 4, 3];
matchs = [[1, 3], [2, 2]];
porteLogique = [[true, "et"], [true, "ou"], [true, "inv"]];
break;
case 12:
case 13:
case 14:
case 15:
case 16:
col = [5, 4, 4];
matchs = [[1, 3], [2, 2]];
porteLogique = [[true, "et"], [true, "nonou"], [true, "ou"], [true, "inv"]];
break;
case 17:
case 18:
case 19:
case 20:
case 21:
col = [6, 4, 3];
matchs = [[1, 2], [2, 2]];
porteLogique = [[true, "et"], [true, "nonou"], [true, "ou"], [true, "inv"], [true, "etnon"]];
break;
default:
if (niveauActuel < 30) time = 15;
else if (niveauActuel < 35) time = 10;
else time = 5;
col = [6, 4, 3];
matchs = [[1, 2], [1, 2], [2, 2]];
porteLogique = [[true, "et"], [true, "nonou"], [true, "ou"], [true, "inv"], [true, "etnon"]];
break;
}
for (let i = 0; i < 200; i++) {
tentative = i;
if (generator(matchs, col, null, mode, time) === false)
break;
}
while (checkIfEnd()) {
for (let i = 0; i < 200; i++) {
tentative = i;
if (generator(matchs, col, null, mode, time) === false)
break;
}
}
}

@ -106,6 +106,8 @@ function buttonSpin(button, type) {
spin(button);
if (type === 'gen') {
setTimeout(calcul(true), 20);
} else if (type == 'select') {
setTimeout(wait('selectSuite', document.querySelector("#generate_button_perso")), 20);
} else
setTimeout(loadPerso, 1000);
}

Loading…
Cancel
Save