Merge branch 'master' of https://git.etud.insa-toulouse.fr/nbillard/sokoban

modules/levelSelection.mjs

@@ -11,6 +11,7 @@ export const selectLevel = (ctx, gameState, id) => {
   gameState.timer.setTime(levelsBlueprint[id].time);
   gameState.playable = true;
   gameState.tutorial.hide();
+  gameState.timer.start();
   gameState.playground.draw(ctx, gameState.width, gameState.height);
 }
 
@@ -34,16 +35,20 @@ export class LevelManager {
     self.CurrentLevelId = StartingLevelId;
     self.Completed = levelsBlueprint.map(() => { return false; });
     self.winFunction = winFunction;
-  }
-
-  getFirstUncompleted() {
-    for( let i = 0; i < self.Completed.size; i++ ) {
+    self.getFirstUncompleted = () => {
+      for( let i = 0; i < self.Completed.length; i++ ) {
         if (!self.Completed[i]) {
           return i;
         }
       }
+      return -1;
+    };
   }
 
+  // getFirstUncompleted() {
+  //   self.getFirstUncompleted();
+  // }
+
   next(ctx, gameState) {
     self.Completed[self.CurrentLevelId] = true;
     let allLevelsFinished = self.Completed.reduce((a, b) => {
@@ -52,7 +57,8 @@ export class LevelManager {
     if (allLevelsFinished) {
       self.winFunction();
     }
-    self.CurrentLevelId = getFirstUncompleted();
+    self.CurrentLevelId = self.getFirstUncompleted();
+    console.log(self.CurrentLevelId);
     selectLevel(ctx, gameState, self.CurrentLevelId);
   }
 }

script.js

@@ -80,5 +80,6 @@ window.addEventListener("keydown", (event) => {
 
 //let table = document.getElementById("scoreTable");
 Scoreboard();
+window.gamestate = gameState;
 gameState.playground.draw(ctx);