diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d645a0c..55e9cce 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "me.lecaro.breakout" minSdk = 21 targetSdk = 34 - versionCode = 29041682 - versionName = "29041682" + versionCode = 29041685 + versionName = "29041685" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 519abd2..9c1af39 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -1 +1 @@ -Breakout 71 \ No newline at end of file +Breakout 71 \ No newline at end of file diff --git a/dist/index.html b/dist/index.html index e4d6ba9..1b70eb6 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1271,7 +1271,7 @@ const upgrades = (0, _upgrades.rawUpgrades).map((u)=>({ })); },{"./data/palette.json":"ktRBU","./data/levels.json":"8JSUc","./data/version.json":"iyP6E","./upgrades":"1u3Dx","./getLevelBackground":"7OIPf","./levelIcon":"6rQoT","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3"}],"iyP6E":[function(require,module,exports,__globalThis) { -module.exports = JSON.parse("\"29041682\""); +module.exports = JSON.parse("\"29041685\""); },{}],"1u3Dx":[function(require,module,exports,__globalThis) { var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); @@ -3392,7 +3392,7 @@ function renderAllBricks() { (0, _game.gameState).bricks.forEach((color, index)=>{ const x = (0, _gameUtils.brickCenterX)((0, _game.gameState), index), y = (0, _gameUtils.brickCenterY)((0, _game.gameState), index); if (!color) return; - let redBecauseOfReach = (0, _game.gameState).perks.reach && (0, _gameUtils.countBricksAbove)((0, _game.gameState), index) && !(0, _gameUtils.countBricksBelow)((0, _game.gameState), index); + let redBecauseOfReach = (0, _game.gameState).perks.reach && (0, _game.gameState).combo > (0, _gameStateMutators.baseCombo)((0, _game.gameState)) && (0, _gameUtils.countBricksAbove)((0, _game.gameState), index) && !(0, _gameUtils.countBricksBelow)((0, _game.gameState), index); let redBorder = (0, _game.gameState).ballsColor !== color && color !== "black" && redBorderOnBricksWithWrongColor || redBecauseOfReach; drawBrick(canctx, color, redBorder && "red" || color, x, y); if (color === "black") { diff --git a/src/PWA/sw-b71.js b/src/PWA/sw-b71.js index 71f27a7..d55ffc7 100644 --- a/src/PWA/sw-b71.js +++ b/src/PWA/sw-b71.js @@ -1,5 +1,5 @@ // The version of the cache. -const VERSION = "29041682"; +const VERSION = "29041685"; // The name of the cache const CACHE_NAME = `breakout-71-${VERSION}`; diff --git a/src/data/version.json b/src/data/version.json index a03df13..12ba5d7 100644 --- a/src/data/version.json +++ b/src/data/version.json @@ -1 +1 @@ -"29041682" +"29041685" diff --git a/src/render.ts b/src/render.ts index ee3c8e2..426e475 100644 --- a/src/render.ts +++ b/src/render.ts @@ -418,6 +418,7 @@ export function renderAllBricks() { let redBecauseOfReach = gameState.perks.reach && + gameState.combo > baseCombo(gameState) && countBricksAbove(gameState, index) && !countBricksBelow(gameState, index); let redBorder =