This commit is contained in:
Renan LE CARO 2025-03-20 23:11:42 +01:00
parent 0c7d729ece
commit edfc8b4f08
9 changed files with 19 additions and 11 deletions

View file

@ -11,8 +11,8 @@ android {
applicationId = "me.lecaro.breakout" applicationId = "me.lecaro.breakout"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 34
versionCode = 29041790 versionCode = 29041811
versionName = "29041790" versionName = "29041811"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
useSupportLibrary = true useSupportLibrary = true

File diff suppressed because one or more lines are too long

9
dist/index.html vendored
View file

@ -842,7 +842,7 @@ async function openScorePanel() {
max: (0, _gameUtils.max_levels)(gameState) max: (0, _gameUtils.max_levels)(gameState)
}), }),
text: ` text: `
${gameState.isCreativeModeRun ? "<p>${t('score_panel.test_run}</p>" : ""} ${gameState.isCreativeModeRun ? `<p>${(0, _i18N.t)("score_panel.test_run")}</p>` : ""}
<p>${(0, _i18N.t)("score_panel.upgrades_picked")}</p> <p>${(0, _i18N.t)("score_panel.upgrades_picked")}</p>
<p>${(0, _gameUtils.pickedUpgradesHTMl)(gameState)}</p> <p>${(0, _gameUtils.pickedUpgradesHTMl)(gameState)}</p>
`, `,
@ -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) { },{"./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) { },{}],"1u3Dx":[function(require,module,exports,__globalThis) {
var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); 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); if (gameState.perks.asceticism) resetCombo(gameState, coin.x, coin.y);
} }
async function setLevel(gameState, l) { 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, _game.pause)(false);
(0, _recording.stopRecording)(); (0, _recording.stopRecording)();
if (l > 0) await (0, _game.openUpgradesPicker)(gameState); if (l > 0) await (0, _game.openUpgradesPicker)(gameState);
@ -4003,6 +4005,7 @@ function newGameState(params) {
const gameState = { const gameState = {
runLevels, runLevels,
currentLevel: 0, currentLevel: 0,
upgradesOfferedFor: -1,
perks, perks,
puckWidth: 200, puckWidth: 200,
baseSpeed: 12, baseSpeed: 12,

View file

@ -1,5 +1,5 @@
// The version of the cache. // The version of the cache.
const VERSION = "29041790"; const VERSION = "29041811";
// The name of the cache // The name of the cache
const CACHE_NAME = `breakout-71-${VERSION}`; const CACHE_NAME = `breakout-71-${VERSION}`;

View file

@ -1 +1 @@
"29041790" "29041811"

View file

@ -394,7 +394,7 @@ async function openScorePanel() {
max: max_levels(gameState), max: max_levels(gameState),
}), }),
text: ` text: `
${gameState.isCreativeModeRun ? "<p>${t('score_panel.test_run}</p>" : ""} ${gameState.isCreativeModeRun ? `<p>${t("score_panel.test_run")}</p>` : ""}
<p>${t("score_panel.upgrades_picked")}</p> <p>${t("score_panel.upgrades_picked")}</p>
<p>${pickedUpgradesHTMl(gameState)}</p> <p>${pickedUpgradesHTMl(gameState)}</p>
`, `,

View file

@ -497,8 +497,11 @@ export function addToScore(gameState: GameState, coin: Coin) {
} }
export async function setLevel(gameState: GameState, l: number) { 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); pause(false);
stopRecording(); stopRecording();
if (l > 0) { if (l > 0) {

View file

@ -31,6 +31,7 @@ export function newGameState(params: RunParams): GameState {
const gameState: GameState = { const gameState: GameState = {
runLevels, runLevels,
currentLevel: 0, currentLevel: 0,
upgradesOfferedFor: -1,
perks, perks,
puckWidth: 200, puckWidth: 200,
baseSpeed: 12, baseSpeed: 12,

1
src/types.d.ts vendored
View file

@ -183,6 +183,7 @@ export type GameState = {
gridSize: number; gridSize: number;
// 0 based index of the current level in the run (level X / 7) // 0 based index of the current level in the run (level X / 7)
currentLevel: number; currentLevel: number;
upgradesOfferedFor: number;
// 10 levels selected randomly at start for the run // 10 levels selected randomly at start for the run
runLevels: Level[]; runLevels: Level[];