diff --git a/activity_2/main-script.js b/activity_2/main-script.js index fa3fe0731eaea6804fd24e685a68f23599248e55..8c73b7d87f6552af83486c48edd8e1dcad1c1bfd 100644 --- a/activity_2/main-script.js +++ b/activity_2/main-script.js @@ -19,7 +19,20 @@ window.onclick = function(event) { } } - +document.addEventListener('keydown', function(event) { + if (manual_enabled) { + if(event.keyCode == 38) { + changePower(power_ratio+0.02) + } + else if(event.keyCode == 40) { + changePower(power_ratio-0.02) + } else if (event.keyCode == 32) { + if (rocketLaunched) changeRocketStage() + else launchRocket() + } + } + +}); var canvas; @@ -112,21 +125,7 @@ function init_var() { function enableManual() { manual_enabled = true; - document.addEventListener('keydown', function(event) { - console.log("c") - if (manual_enabled) { - if(event.keyCode == 38) { - changePower(power_ratio+0.02) - } - else if(event.keyCode == 40) { - changePower(power_ratio-0.02) - } else if (event.keyCode == 32) { - if (rocketLaunched) changeRocketStage() - else launchRocket() - } - } - - }); + alert("Lancer et séparer les étage : 'Espace' - Augmenter/diminuer la puissance : 'Haut/Bas'"); } function launchRocket() { @@ -163,7 +162,7 @@ function isFuelEmpty() { } function isInMaxQ() { - return curPos>0.14 && curPos<0.23 + return curPos>0.13 && curPos<0.24 } function isInOrbit() { @@ -209,7 +208,7 @@ function stepSimulation(prevTime) { //console.log('pos' + curPos + 'speed' + curSpeed) if (curPos>0.17 && curPos<0.20 && power_ratio > 0.6 && fuel_ratio > 0) { changeRocketImgExplosion() - alert("Explosion ! Trop de puissance au point max Q !") + setTimeout(() => {alert("Explosion ! Trop de puissance au point max Q !")}, 1000); } else if (curPos >= 1) { if (curStage == 4 || curStage == 3) {