Merge branch 'pr/1741' into dev

Author: Lionel Laské

CHANGELOG.md

@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Error loading Etoys activity #1717
 - Cheating in Abecedarium Activity #1720
 - X and Y axis labels are not Interchanged when switching between Vertical and Horizontal Bar Charts #1727
+- BlockRain Activity Game Over Logic Fails When Side Columns Are Full #1739
 
 ## [1.8.0] - 2024-04-10
 ### Added

activities/Blockrain.activity/js/blockrain.jquery.src.js

@@ -828,11 +828,15 @@
               if (game._checkCollisions(x, y+1, blocks, true)) {
                 drop = false;
                 var blockIndex = 0;
+                var gameOver = false;
                 for (var i=0; i<cur.blocksLen; i+=2) {
-                  game._filled.add(x + blocks[i], y + blocks[i+1], cur.blockType, cur.blockVariation, blockIndex, cur.orientation);
-                  if (y + blocks[i] < 0) {
+                  var blockX = x + blocks[i];
+                  var blockY = y + blocks[i + 1];
+                  // Check if block would be placed at or above the top
+                  if (blockY <= 0) {
                     gameOver = true;
                   }
+                  game._filled.add(blockX, blockY, cur.blockType, cur.blockVariation, blockIndex, cur.orientation);
                   blockIndex++;
                 }
                 game._filled.checkForClears();
@@ -845,6 +849,9 @@
                 this.holding.drop = null;
 
                 game.options.onPlaced.call(game.element);
+                if (gameOver) {
+                  game.gameover();
+                }
               }
             }
           }