From edfc8b4f08337347d128f29ecd5e44f500736aee Mon Sep 17 00:00:00 2001 From: Renan LE CARO Date: Thu, 20 Mar 2025 23:11:42 +0100 Subject: [PATCH] Build 29041811 --- app/build.gradle.kts | 4 ++-- app/src/main/assets/index.html | 2 +- dist/index.html | 9 ++++++--- src/PWA/sw-b71.js | 2 +- src/data/version.json | 2 +- src/game.ts | 2 +- src/gameStateMutators.ts | 7 +++++-- src/newGameState.ts | 1 + src/types.d.ts | 1 + 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d45ebae..15e0b9e 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 = 29041790 - versionName = "29041790" + versionCode = 29041811 + versionName = "29041811" 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 5898dc5..db37e18 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 0c39a57..940c092 100644 --- a/dist/index.html +++ b/dist/index.html @@ -842,7 +842,7 @@ async function openScorePanel() { max: (0, _gameUtils.max_levels)(gameState) }), text: ` - ${gameState.isCreativeModeRun ? "

${t('score_panel.test_run}

" : ""} + ${gameState.isCreativeModeRun ? `

${(0, _i18N.t)("score_panel.test_run")}

` : ""}

${(0, _i18N.t)("score_panel.upgrades_picked")}

${(0, _gameUtils.pickedUpgradesHTMl)(gameState)}

`, @@ -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("\"29041790\""); +module.exports = JSON.parse("\"29041811\""); },{}],"1u3Dx":[function(require,module,exports,__globalThis) { var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); @@ -2604,7 +2604,9 @@ function addToScore(gameState, coin) { if (gameState.perks.asceticism) resetCombo(gameState, coin.x, coin.y); } async function setLevel(gameState, l) { - // Here to alleviade double upgrades issues + // Here to alleviate double upgrades issues + if (gameState.upgradesOfferedFor >= l) return console.warn("Extra upgrade request ignored "); + gameState.upgradesOfferedFor = l; (0, _game.pause)(false); (0, _recording.stopRecording)(); if (l > 0) await (0, _game.openUpgradesPicker)(gameState); @@ -4003,6 +4005,7 @@ function newGameState(params) { const gameState = { runLevels, currentLevel: 0, + upgradesOfferedFor: -1, perks, puckWidth: 200, baseSpeed: 12, diff --git a/src/PWA/sw-b71.js b/src/PWA/sw-b71.js index 66f705a..e815f2c 100644 --- a/src/PWA/sw-b71.js +++ b/src/PWA/sw-b71.js @@ -1,5 +1,5 @@ // The version of the cache. -const VERSION = "29041790"; +const VERSION = "29041811"; // The name of the cache const CACHE_NAME = `breakout-71-${VERSION}`; diff --git a/src/data/version.json b/src/data/version.json index 8c81b2c..9dd0958 100644 --- a/src/data/version.json +++ b/src/data/version.json @@ -1 +1 @@ -"29041790" +"29041811" diff --git a/src/game.ts b/src/game.ts index 1764b9f..8480440 100644 --- a/src/game.ts +++ b/src/game.ts @@ -394,7 +394,7 @@ async function openScorePanel() { max: max_levels(gameState), }), text: ` - ${gameState.isCreativeModeRun ? "

${t('score_panel.test_run}

" : ""} + ${gameState.isCreativeModeRun ? `

${t("score_panel.test_run")}

` : ""}

${t("score_panel.upgrades_picked")}

${pickedUpgradesHTMl(gameState)}

`, diff --git a/src/gameStateMutators.ts b/src/gameStateMutators.ts index 2fc76da..ee465dc 100644 --- a/src/gameStateMutators.ts +++ b/src/gameStateMutators.ts @@ -497,8 +497,11 @@ export function addToScore(gameState: GameState, coin: Coin) { } export async function setLevel(gameState: GameState, l: number) { - // Here to alleviade double upgrades issues - + // Here to alleviate double upgrades issues + if (gameState.upgradesOfferedFor >= l) { + return console.warn("Extra upgrade request ignored "); + } + gameState.upgradesOfferedFor = l; pause(false); stopRecording(); if (l > 0) { diff --git a/src/newGameState.ts b/src/newGameState.ts index ec4326e..f324866 100644 --- a/src/newGameState.ts +++ b/src/newGameState.ts @@ -31,6 +31,7 @@ export function newGameState(params: RunParams): GameState { const gameState: GameState = { runLevels, currentLevel: 0, + upgradesOfferedFor: -1, perks, puckWidth: 200, baseSpeed: 12, diff --git a/src/types.d.ts b/src/types.d.ts index cab2f77..0b16cfb 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -183,6 +183,7 @@ export type GameState = { gridSize: number; // 0 based index of the current level in the run (level X / 7) currentLevel: number; + upgradesOfferedFor: number; // 10 levels selected randomly at start for the run runLevels: Level[];