optimizations, bug fixes

src/script/public/App/features/bosses/BossClass.js

@@ -60,7 +60,7 @@ class Boss {
     };
 
     attack = () => {
-        removeAccessToAnything();
+        gameCounter && removeAccessToAnything();
 
         // start animation
         if (this.attack_animation != null) {

src/script/public/Game/PlayerClocks.js

@@ -45,8 +45,8 @@ function removeAccessToAnything() {
     globalChooseWinnerBtn.style.color = '#56565659';
     restartBtn.removeEventListener('click', restartGame);
     restartBtn.style.color = '#56565659';
-
-    CloseOnlinePopUps(true);
+    console.log("lol")
+        // CloseOnlinePopUps(true);
     GiveUpPopUp.style.display = "none";
 
     // remove access to set

src/script/public/Game/processWinner.js

@@ -792,16 +792,19 @@ const continueGame = () => {
 
     // not advanture mode
     if (!inAdvantureMode) {
+
         // in online mode
         if (curr_mode == GameMode[2].opponent) {
 
             if (PlayingInCreatedLevel) { // Player played user created level
+
                 if (NewCreativeLevel.selectedLevel[9] == 0) {
                     // admin leaves game and this info all player get
                     if (personal_GameData.role == "admin") {
                         UserleavesGame();
                         NewCreativeLevel.verified(); // User beat his own created level and can publish it now
                     };
+
                 } else if (NewCreativeLevel.selectedLevel[9] == 1) {
                     // admin leaves game and this info all player get
                     if (personal_GameData.role == "admin") {
@@ -810,15 +813,29 @@ const continueGame = () => {
                 };
 
             } else { // user played standard card level from game
+
                 // admin leaves game and this info all player get
                 if (personal_GameData.role == "admin") {
                     UserleavesGame();
                 };
+
             };
             DarkLayer.style.display = "block";
 
+            // when user wants to leave from the game on game finished he must wait for the admin to leave the game
+            // But if user clicked "continue", a text aappears to wait for the admin
+            if (personal_GameData.role == "user") {
+
+                let bigText = document.createElement("h1");
+                bigText.classList.add("bigScreenText");
+                bigText.textContent = "Wait for the admin to continue.";
+
+                document.body.appendChild(bigText);
+            };
+
             // in offline mode
         } else if (curr_mode != GameMode[2].opponent) {
+
             if (PlayingInCreatedLevel) { // Player played user created level
                 if (NewCreativeLevel.selectedLevel[9] == 0) {
                     NewCreativeLevel.verified(); // User beat his own created level and can publish it now
@@ -835,6 +852,7 @@ const continueGame = () => {
 
         // in advanture mode
     } else {
+
         if (endGame_player1Won) { // user won and conquered the level
             UserleavesGame(true, current_selected_level);
         } else {
@@ -935,6 +953,10 @@ function UltimateGameWin(player1_won, player2_won, WinCombination, UserGivesUp)
 
     } else {
         setTimeout(() => {
+
+            console.log(current_level_boss);
+            current_level_boss && current_level_boss.stop_attack_interval();
+
             // basic stuff
             stopStatusTextInterval = false;
             cellGrid.style.opacity = "0";
@@ -1017,8 +1039,6 @@ function PlayerWon_UpdateHisData(Player1_won, player2_won, WinCombination) {
     wins_storage = wins_storage + 1;
     localStorage.setItem('onlineMatches-won', wins_storage);
 
-    console.log("lelelellelelellele", WinCombination);
-
     // all previous 100 patterns the player used
     WinCombination && recentUsedPattern_add(WinCombination); // add used pattern to recently used pattern list
 
@@ -1027,10 +1047,6 @@ function PlayerWon_UpdateHisData(Player1_won, player2_won, WinCombination) {
     lastOnlineWins = lastOnlineWins + 1;
     localStorage.setItem("Last24Hours_Won_OnlineGames", lastOnlineWins);
 
-    console.log("lelelellelelellele", lastOnlineWins);
-
-    console.log(GameData.InnerGameMode, InnerGameModes[1]);
-
     // online win in specific mode
     switch (GameData.InnerGameMode) {
         case InnerGameModes[1]: // win in boneyard mode
@@ -1054,6 +1070,14 @@ function PlayerWon_UpdateHisData(Player1_won, player2_won, WinCombination) {
 // this message recieve all clients
 socket.on('global_UltimateWin', (player1_won, player2_won, WinCombination, player1_score, player2_score) => {
     setTimeout(() => {
+
+        // to prevent bugs
+        if (current_level_boss) {
+            console.log(current_level_boss)
+            current_level_boss.died = true
+            current_level_boss.stop_attack_interval();
+        };
+
         // basic stuff
         stopStatusTextInterval = false;
         cellGrid.style.opacity = "0";

src/script/public/index.css

@@ -1876,6 +1876,18 @@ label h3 {
     color: var(--font-color);
 }
 
+.bigScreenText {
+    z-index: 500;
+    font-size: 75px;
+    position: absolute;
+    top: 40%;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto auto auto auto;
+    color: white;
+}
+
 
 /* Game Info Pop Up */
 

src/script/public/serverHandler.js

@@ -844,17 +844,22 @@ const SetClickOnProfileListeners = (fromAdmin) => {
 
 // This message goes to all users in a room and gets callen when the admin of the room leaves it
 socket.on('killed_room', () => {
-    // server
-    personal_GameData.role = 'user';
-    personal_GameData.currGameID = null;
-    personal_GameData.EnterOnlineGame = false;
-
     // some things
     OnlineGame_Lobby.style.display = 'none';
     SetPlayerNamesPopUp.style.display = 'none';
     OnlineGameLobby_alertText.style.display = 'none';
 
     CloseOnlinePopUps(true);
+
+    if (personal_GameData.role != "admin") {
+        AlertText.textContent = "Admin killed the lobby.";
+        DisplayPopUp_PopAnimation(alertPopUp, "flex", true);
+    };
+
+    // server
+    personal_GameData.role = 'user';
+    personal_GameData.currGameID = null;
+    personal_GameData.EnterOnlineGame = false;
 });
 
 // if they were in a game in the admin left the game
@@ -874,11 +879,20 @@ socket.on('killed_game', () => {
     // clear timer and stuff to prevent bugs
     clearTimer();
 
+    DarkLayer.style.display = "block";
+
+    // remove big screen text if there was one 
+    if (document.querySelector(".bigScreenText")) {
+        document.querySelector(".bigScreenText").remove();
+    };
+
+    // lobby footer remove background
+    lobbyFooter.style.background = "";
+    lobbyFooterText.style.display = 'flex';
+
     // play music
     PauseMusic();
     if (!PlayingInCreatedLevel) CreateMusicBars(audio);
-
-    DarkLayer.style.display = "block";
 });
 
 // Admin created the game and now waits for the second player
@@ -1012,11 +1026,14 @@ socket.on('INFORM_user_left_game', () => {
         // so user can select game code with mouse
         Lobby_GameCode_display.style.userSelect = 'text';
 
+        DarkLayer.style.display = 'block';
+
+        lobbyFooter.style.background = "";
+        lobbyFooterText.style.display = 'flex';
+
         // play music
         PauseMusic();
         if (!PlayingInCreatedLevel) CreateMusicBars(audio);
-
-        DarkLayer.style.display = 'block';
     };
 });
 
@@ -1041,11 +1058,14 @@ socket.on('INFORM_blocker_left_game', () => {
         friendLeft_text.textContent = 'The blocker left the game';
         Lobby_GameCode_display.style.userSelect = 'text';
 
+        DarkLayer.style.display = 'block';
+
+        lobbyFooter.style.background = "";
+        lobbyFooterText.style.display = 'flex';
+
         // play music
         PauseMusic();
         if (!PlayingInCreatedLevel) CreateMusicBars(audio);
-
-        DarkLayer.style.display = 'block';
     };
 });