diff --git a/Readme.md b/Readme.md index 676c7e0..a4edd14 100644 --- a/Readme.md +++ b/Readme.md @@ -17,14 +17,18 @@ Break colourful bricks, catch bouncing coins and select powerful upgrades ! ## Todo -## Next release +- Perks list now only lists upgrades that have been picked, or have banned levels +- After clearing a level, that level is dimmed in the clairvoyant level list [Bearded-Axe] +- limited clairvoyant to level one outside looped runs [obigre] +- yoyo now has more effect when the ball is at the top of the screen [obigre] +- telekinesis now has more effect when the ball is at the bottom of the screen +- "Top is lava" combo lost text is now spawned a bit lower to be more visible [obigre] + +## 29061838 - New perk : Fountain toss [colin] - loosing coins makes your combo grow - Boosted : Asceticism now decreases combo instead of resetting it - -## 29061801 - -- Graphics : show respawn particles even in basic mode +- Graphics : show respawn particles even in basic mode [obigre] - Graphics : adjusted the brightness of the game a bit more ## 29061490 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17b3dae..884117b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,8 +29,8 @@ android { applicationId = "me.lecaro.breakout" minSdk = 21 targetSdk = 34 - versionCode = 29061838 - versionName = "29061838" + versionCode = 29062545 + versionName = "29062545" 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 e6f3c3d..ef1c3ac 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 adc4c35..c011c3b 100644 --- a/dist/index.html +++ b/dist/index.html @@ -874,7 +874,7 @@ async function openUpgradesPicker(gameState) { level: gameState.currentLevel + 1, max: (0, _gameUtils.max_levels)(gameState) })}

-

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

+

${(0, _gameUtils.levelsListHTMl)(gameState, gameState.currentLevel + 1)}

`, ...actions, (0, _gameUtils.pickedUpgradesHTMl)(gameState), @@ -983,7 +983,7 @@ async function openScorePanel() { }), content: [ (0, _gameUtils.pickedUpgradesHTMl)(gameState), - (0, _gameUtils.levelsListHTMl)(gameState), + (0, _gameUtils.levelsListHTMl)(gameState, gameState.currentLevel), gameState.rerolls ? (0, _i18N.t)("score_panel.rerolls_count", { rerolls: gameState.rerolls }) : "" @@ -1482,7 +1482,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("\"29061838\""); +module.exports = JSON.parse("\"29062545\""); },{}],"1u3Dx":[function(require,module,exports,__globalThis) { var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); @@ -2062,7 +2062,7 @@ const rawUpgrades = [ threshold: 145000, giftable: false, id: "clairvoyant", - max: 3, + max: 1, name: (0, _i18N.t)("upgrades.clairvoyant.name"), help: (lvl)=>(0, _i18N.t)("upgrades.clairvoyant.help"), fullHelp: (0, _i18N.t)("upgrades.clairvoyant.fullHelp") @@ -2622,8 +2622,8 @@ parcelHelpers.export(exports, "levelsListHTMl", ()=>levelsListHTMl); parcelHelpers.export(exports, "currentLevelInfo", ()=>currentLevelInfo); parcelHelpers.export(exports, "isPickyEatingPossible", ()=>isPickyEatingPossible); parcelHelpers.export(exports, "reachRedRowIndex", ()=>reachRedRowIndex); -parcelHelpers.export(exports, "isTelekinesisActive", ()=>isTelekinesisActive); -parcelHelpers.export(exports, "isYoyoActive", ()=>isYoyoActive); +parcelHelpers.export(exports, "telekinesisEffectRate", ()=>telekinesisEffectRate); +parcelHelpers.export(exports, "yoyoEffectRate", ()=>yoyoEffectRate); parcelHelpers.export(exports, "findLast", ()=>findLast); parcelHelpers.export(exports, "distance2", ()=>distance2); parcelHelpers.export(exports, "distanceBetween", ()=>distanceBetween); @@ -2633,6 +2633,7 @@ parcelHelpers.export(exports, "isMovingWhilePassiveIncome", ()=>isMovingWhilePas parcelHelpers.export(exports, "highScoreForMode", ()=>highScoreForMode); var _loadGameData = require("./loadGameData"); var _i18N = require("./i18n/i18n"); +var _pureFunctions = require("./pure_functions"); function describeLevel(level) { let bricks = 0, colors = new Set(), bombs = 0; level.bricks.forEach((color)=>{ @@ -2689,7 +2690,7 @@ function max_levels(gameState) { return Math.max(7 + gameState.perks.extra_levels - gameState.loop, 1); } function pickedUpgradesHTMl(gameState) { - const upgradesList = getPossibleUpgrades(gameState).map((u)=>{ + const upgradesList = getPossibleUpgrades(gameState).filter((u)=>gameState.bannedPerks[u.id] || gameState.perks[u.id]).map((u)=>{ const newMax = Math.max(0, u.max - gameState.bannedPerks[u.id]); let bars = []; for(let i = 0; i < Math.max(u.max, newMax, gameState.perks[u.id]); i++){ @@ -2719,11 +2720,11 @@ function pickedUpgradesHTMl(gameState) { }).sort((a, b)=>a.state - b.state).map((a)=>a.html); return `

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

` + upgradesList.join(""); } -function levelsListHTMl(gameState) { +function levelsListHTMl(gameState, level) { if (!gameState.perks.clairvoyant) return ""; if (gameState.mode === "creative") return ""; let list = ""; - for(let i = 0; i < max_levels(gameState); i++)list += `${(0, _loadGameData.icons)[gameState.runLevels[i].name]}`; + for(let i = 0; i < max_levels(gameState); i++)list += `${(0, _loadGameData.icons)[gameState.runLevels[i].name]}`; return `

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

${list}

`; } function currentLevelInfo(gameState) { @@ -2749,11 +2750,11 @@ function reachRedRowIndex(gameState) { if (maxYCount === size) return -1; return maxY; } -function isTelekinesisActive(gameState, ball) { - return gameState.perks.telekinesis && ball.vy < 0; +function telekinesisEffectRate(gameState, ball) { + return gameState.perks.telekinesis && ball.vy < 0 && (0, _pureFunctions.clamp)(ball.y / gameState.gameZoneHeight * 1.1 + 0.1, 0, 1) || 0; } -function isYoyoActive(gameState, ball) { - return gameState.perks.yoyo && ball.vy > 0; +function yoyoEffectRate(gameState, ball) { + return gameState.perks.yoyo && ball.vy > 0 && (0, _pureFunctions.clamp)(1 - ball.y / gameState.gameZoneHeight * 1.1 + 0.1, 0, 1) || 0; } function findLast(arr, predicate) { let i = arr.length; @@ -2823,7 +2824,7 @@ function highScoreForMode(mode) { return ""; } -},{"./loadGameData":"l1B4x","./i18n/i18n":"eNPRm","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3"}],"2n0gK":[function(require,module,exports,__globalThis) { +},{"./loadGameData":"l1B4x","./i18n/i18n":"eNPRm","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3","./pure_functions":"6pQh7"}],"2n0gK":[function(require,module,exports,__globalThis) { var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js"); parcelHelpers.defineInteropFlag(exports); if ("serviceWorker" in navigator && window.location.href.endsWith("/index.html?isPWA=true")) { @@ -3520,13 +3521,13 @@ function ballTick(gameState, ball, delta) { ball.previousVX = ball.vx; ball.previousVY = ball.vy; let speedLimitDampener = 1 + gameState.perks.telekinesis + gameState.perks.ball_repulse_ball + gameState.perks.puck_repulse_ball + gameState.perks.ball_attract_ball; - if ((0, _gameUtils.isTelekinesisActive)(gameState, ball)) { + if ((0, _gameUtils.telekinesisEffectRate)(gameState, ball) > 0) { speedLimitDampener += 3; - ball.vx += (gameState.puckPosition - ball.x) / 1000 * delta * gameState.perks.telekinesis; + ball.vx += (gameState.puckPosition - ball.x) / 1000 * delta * gameState.perks.telekinesis * (0, _gameUtils.telekinesisEffectRate)(gameState, ball); } - if ((0, _gameUtils.isYoyoActive)(gameState, ball)) { + if ((0, _gameUtils.yoyoEffectRate)(gameState, ball) > 0) { speedLimitDampener += 3; - ball.vx += (gameState.puckPosition - ball.x) / 1000 * delta * gameState.perks.yoyo; + ball.vx += (gameState.puckPosition - ball.x) / 1000 * delta * gameState.perks.yoyo * (0, _gameUtils.yoyoEffectRate)(gameState, ball); } if (ball.vx * ball.vx + ball.vy * ball.vy < gameState.baseSpeed * gameState.baseSpeed * 2) { ball.vx *= 1 + 0.02 / speedLimitDampener; @@ -3555,7 +3556,7 @@ function ballTick(gameState, ball, delta) { if (borderHitCode) { if (gameState.perks.left_is_lava && borderHitCode % 2 && ball.x < gameState.offsetX + gameState.gameZoneWidth / 2) resetCombo(gameState, ball.x, ball.y); if (gameState.perks.right_is_lava && borderHitCode % 2 && ball.x > gameState.offsetX + gameState.gameZoneWidth / 2) resetCombo(gameState, ball.x, ball.y); - if (gameState.perks.top_is_lava && borderHitCode >= 2) resetCombo(gameState, ball.x, ball.y + gameState.ballSize); + if (gameState.perks.top_is_lava && borderHitCode >= 2) resetCombo(gameState, ball.x, ball.y + gameState.ballSize * 3); if (gameState.perks.trampoline) decreaseCombo(gameState, gameState.perks.trampoline, ball.x, ball.y + gameState.ballSize); schedulGameSound(gameState, "wallBeep", ball.x, 1); gameState.levelWallBounces++; @@ -3997,15 +3998,17 @@ function render(gameState) { const drawingColor = gameState.ballsColor; // The white border around is to distinguish colored balls from coins/bg drawBall(ctx, drawingColor, gameState.ballSize, ball.x, ball.y, gameState.puckColor); - if ((0, _gameUtils.isTelekinesisActive)(gameState, ball) || (0, _gameUtils.isYoyoActive)(gameState, ball)) { + if ((0, _gameUtils.telekinesisEffectRate)(gameState, ball) || (0, _gameUtils.yoyoEffectRate)(gameState, ball)) { ctx.beginPath(); ctx.moveTo(gameState.puckPosition, gameState.gameZoneHeight); + ctx.globalAlpha = Math.max((0, _gameUtils.telekinesisEffectRate)(gameState, ball), (0, _gameUtils.yoyoEffectRate)(gameState, ball)); ctx.strokeStyle = gameState.puckColor; ctx.bezierCurveTo(gameState.puckPosition, gameState.gameZoneHeight, gameState.puckPosition, ball.y, ball.x, ball.y); ctx.stroke(); ctx.lineWidth = 2; ctx.setLineDash(emptyArray); } + ctx.globalAlpha = 1; if (gameState.perks.clairvoyant && gameState.ballStickToPuck) { ctx.strokeStyle = gameState.ballsColor; ctx.beginPath(); diff --git a/src/PWA/sw-b71.js b/src/PWA/sw-b71.js index 4fcc138..3d435ef 100644 --- a/src/PWA/sw-b71.js +++ b/src/PWA/sw-b71.js @@ -1,5 +1,5 @@ // The version of the cache. -const VERSION = "29061838"; +const VERSION = "29062545"; // The name of the cache const CACHE_NAME = `breakout-71-${VERSION}`; diff --git a/src/data/version.json b/src/data/version.json index e294666..842d0d1 100644 --- a/src/data/version.json +++ b/src/data/version.json @@ -1 +1 @@ -"29061838" +"29062545" diff --git a/src/game.ts b/src/game.ts index f95e873..7ff1fa6 100644 --- a/src/game.ts +++ b/src/game.ts @@ -291,7 +291,7 @@ export async function openUpgradesPicker(gameState: GameState) { level: gameState.currentLevel + 1, max: max_levels(gameState), })}

-

${levelsListHTMl(gameState)}

+

${levelsListHTMl(gameState, gameState.currentLevel + 1)}

`, ...actions, pickedUpgradesHTMl(gameState), @@ -456,7 +456,7 @@ async function openScorePanel() { content: [ pickedUpgradesHTMl(gameState), - levelsListHTMl(gameState), + levelsListHTMl(gameState, gameState.currentLevel), gameState.rerolls ? t("score_panel.rerolls_count", { rerolls: gameState.rerolls }) : "", diff --git a/src/gameStateMutators.ts b/src/gameStateMutators.ts index 985bc4b..e8d6810 100644 --- a/src/gameStateMutators.ts +++ b/src/gameStateMutators.ts @@ -24,8 +24,8 @@ import { getRowColIndex, isMovingWhilePassiveIncome, isPickyEatingPossible, - isTelekinesisActive, - isYoyoActive, + telekinesisEffectRate, + yoyoEffectRate, makeEmptyPerksMap, max_levels, reachRedRowIndex, @@ -1428,17 +1428,22 @@ export function ballTick(gameState: GameState, ball: Ball, delta: number) { gameState.perks.puck_repulse_ball + gameState.perks.ball_attract_ball; - if (isTelekinesisActive(gameState, ball)) { + if (telekinesisEffectRate(gameState, ball) > 0) { speedLimitDampener += 3; ball.vx += ((gameState.puckPosition - ball.x) / 1000) * delta * - gameState.perks.telekinesis; + gameState.perks.telekinesis * + telekinesisEffectRate(gameState, ball); } - if (isYoyoActive(gameState, ball)) { + if (yoyoEffectRate(gameState, ball) > 0) { speedLimitDampener += 3; + ball.vx += - ((gameState.puckPosition - ball.x) / 1000) * delta * gameState.perks.yoyo; + ((gameState.puckPosition - ball.x) / 1000) * + delta * + gameState.perks.yoyo * + yoyoEffectRate(gameState, ball); } if ( ball.vx * ball.vx + ball.vy * ball.vy < @@ -1511,7 +1516,7 @@ export function ballTick(gameState: GameState, ball: Ball, delta: number) { } if (gameState.perks.top_is_lava && borderHitCode >= 2) { - resetCombo(gameState, ball.x, ball.y + gameState.ballSize); + resetCombo(gameState, ball.x, ball.y + gameState.ballSize * 3); } if (gameState.perks.trampoline) { decreaseCombo( diff --git a/src/game_utils.ts b/src/game_utils.ts index d6767c9..480b0cd 100644 --- a/src/game_utils.ts +++ b/src/game_utils.ts @@ -2,6 +2,7 @@ import { Ball, GameState, Level, PerkId, PerksMap } from "./types"; import { icons, upgrades } from "./loadGameData"; import { t } from "./i18n/i18n"; import { brickAt } from "./level_editor/levels_editor_util"; +import { clamp } from "./pure_functions"; export function describeLevel(level: Level) { let bricks = 0, @@ -83,6 +84,7 @@ export function max_levels(gameState: GameState) { export function pickedUpgradesHTMl(gameState: GameState) { const upgradesList = getPossibleUpgrades(gameState) + .filter((u) => gameState.bannedPerks[u.id] || gameState.perks[u.id]) .map((u) => { const newMax = Math.max(0, u.max - gameState.bannedPerks[u.id]); @@ -118,12 +120,12 @@ export function pickedUpgradesHTMl(gameState: GameState) { return `

${t("score_panel.upgrades_picked")}

` + upgradesList.join(""); } -export function levelsListHTMl(gameState: GameState) { +export function levelsListHTMl(gameState: GameState, level: number) { if (!gameState.perks.clairvoyant) return ""; if (gameState.mode === "creative") return ""; let list = ""; for (let i = 0; i < max_levels(gameState); i++) { - list += `${icons[gameState.runLevels[i].name]}`; + list += `${icons[gameState.runLevels[i].name]}`; } return `

${t("score_panel.upcoming_levels")}

${list}

`; } @@ -159,11 +161,21 @@ export function reachRedRowIndex(gameState: GameState) { return maxY; } -export function isTelekinesisActive(gameState: GameState, ball: Ball) { - return gameState.perks.telekinesis && ball.vy < 0; +export function telekinesisEffectRate(gameState: GameState, ball: Ball) { + return ( + (gameState.perks.telekinesis && + ball.vy < 0 && + clamp((ball.y / gameState.gameZoneHeight) * 1.1 + 0.1, 0, 1)) || + 0 + ); } -export function isYoyoActive(gameState: GameState, ball: Ball) { - return gameState.perks.yoyo && ball.vy > 0; +export function yoyoEffectRate(gameState: GameState, ball: Ball) { + return ( + (gameState.perks.yoyo && + ball.vy > 0 && + clamp(1 - (ball.y / gameState.gameZoneHeight) * 1.1 + 0.1, 0, 1)) || + 0 + ); } export function findLast( diff --git a/src/render.ts b/src/render.ts index 78aa4b0..89777f9 100644 --- a/src/render.ts +++ b/src/render.ts @@ -7,8 +7,8 @@ import { currentLevelInfo, isMovingWhilePassiveIncome, isPickyEatingPossible, - isTelekinesisActive, - isYoyoActive, + telekinesisEffectRate, + yoyoEffectRate, max_levels, reachRedRowIndex, } from "./game_utils"; @@ -363,10 +363,16 @@ export function render(gameState: GameState) { gameState.puckColor, ); - if (isTelekinesisActive(gameState, ball) || isYoyoActive(gameState, ball)) { + if ( + telekinesisEffectRate(gameState, ball) || + yoyoEffectRate(gameState, ball) + ) { ctx.beginPath(); ctx.moveTo(gameState.puckPosition, gameState.gameZoneHeight); - + ctx.globalAlpha = Math.max( + telekinesisEffectRate(gameState, ball), + yoyoEffectRate(gameState, ball), + ); ctx.strokeStyle = gameState.puckColor; ctx.bezierCurveTo( gameState.puckPosition, @@ -381,6 +387,7 @@ export function render(gameState: GameState) { ctx.lineWidth = 2; ctx.setLineDash(emptyArray); } + ctx.globalAlpha = 1; if (gameState.perks.clairvoyant && gameState.ballStickToPuck) { ctx.strokeStyle = gameState.ballsColor; ctx.beginPath(); diff --git a/src/upgrades.ts b/src/upgrades.ts index bac1916..339de5a 100644 --- a/src/upgrades.ts +++ b/src/upgrades.ts @@ -596,7 +596,7 @@ export const rawUpgrades = [ threshold: 145000, giftable: false, id: "clairvoyant", - max: 3, + max: 1, name: t("upgrades.clairvoyant.name"), help: (lvl: number) => t("upgrades.clairvoyant.help"), fullHelp: t("upgrades.clairvoyant.fullHelp"),