wip

Readme.md

@@ -24,10 +24,14 @@ Break colourful bricks, catch bouncing coins and select powerful upgrades !
   - you can skip the upgrades and they'll be saved for later
   - you can pick an upgrade multiple time to level it up
   - missed challenges show as greyed out choices (with unlock condition).
+  - bigger "level X or Y cleared", continue to level X/Y as button
 
+- make menu and score button more "button like" when you just installed the game.
+- 
 ## Done
 
-- better default value for mobile mode
+- passive income : paddle transparent for a much shorter time
+- better default value for mobile mode detection
 
 ## 29092809
 

dist/index.html

@@ -2672,11 +2672,11 @@ const rawUpgrades = [
         max: 4,
         name: (0, _i18N.t)("upgrades.passive_income.name"),
         help: (lvl)=>(0, _i18N.t)("upgrades.passive_income.tooltip", {
-                time: lvl * 0.25,
+                time: lvl * 0.10 - 0.05,
                 lvl
             }),
         fullHelp: (lvl)=>(0, _i18N.t)("upgrades.passive_income.verbose_description", {
-                time: lvl * 0.25,
+                time: lvl * 0.10 - 0.05,
                 lvl
             })
     },
@@ -3583,7 +3583,9 @@ 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 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;
+    if (ball.vy < 0) return 0;
+    if (!gameState.perks.yoyo) return 0;
+    return Math.abs(gameState.puckPosition - ball.x) / gameState.gameZoneWidth * gameState.perks.yoyo / 2;
 }
 function findLast(arr, predicate) {
     let i = arr.length;
@@ -3645,7 +3647,7 @@ function shouldPierceByColor(gameState, vhit, hhit, chit) {
     return true;
 }
 function isMovingWhilePassiveIncome(gameState) {
-    return !!(gameState.lastPuckMove && gameState.perks.passive_income && gameState.lastPuckMove > gameState.levelTime - 250 * gameState.perks.passive_income);
+    return !!(gameState.lastPuckMove && gameState.perks.passive_income && gameState.lastPuckMove > gameState.levelTime - (100 * gameState.perks.passive_income - 50));
 }
 function getHighScore() {
     try {
@@ -4398,8 +4400,9 @@ frames = 1) {
             }
             if (coin.previousY < gameState.gameZoneHeight && coin.y > gameState.gameZoneHeight && coin.vy > 0 && speed > 20 && !coin.floatingTime) {
                 schedulGameSound(gameState, "plouf", coin.x, (0, _pureFunctions.clamp)(speed, 20, 100) / 100 * 0.2);
-                if (gameState.perks.compound_interest) resetCombo(gameState, coin.x, coin.y);
                 if (!(0, _options.isOptionOn)("basic")) makeParticle(gameState, coin.x, gameState.gameZoneHeight, -coin.vx / 5, -coin.vy / 5, (0, _gameUtils.getCoinRenderColor)(gameState, coin), false);
+                if (gameState.perks.compound_interest && !gameState.perks.buoy) // If you dont have buoy, we directly declare the coin "lost" to make it clear
+                resetCombo(gameState, coin.x, coin.y);
             }
             if (coin.y > gameState.gameZoneHeight - coinRadius - gameState.puckHeight && coin.y < gameState.gameZoneHeight + gameState.puckHeight + coin.vy && Math.abs(coin.x - gameState.puckPosition) < coinRadius + gameState.puckWidth / 2 + // a bit of margin to be nice , negative in case it's a negative coin
             gameState.puckHeight * (coin.points ? 1 : -1) && !(0, _gameUtils.isMovingWhilePassiveIncome)(gameState)) {
@@ -4408,6 +4411,8 @@ frames = 1) {
             } else if (coin.y > gameState.canvasHeight + coinRadius * 10 || coin.y < -coinRadius * 10 || coin.x < -coinRadius * 10 || coin.x > gameState.canvasWidth + coinRadius * 10) {
                 gameState.levelLostCoins += coin.points;
                 destroy(gameState.coins, coinIndex);
+                if (gameState.perks.compound_interest && gameState.perks.buoy) // If you have buoy, we wait a bit more before declaring a coin "lost"
+                resetCombo(gameState, coin.x, coin.y);
                 if (gameState.combo < gameState.perks.fountain_toss * 30 && Math.random() / coin.points < 1 / gameState.combo * gameState.perks.fountain_toss) offsetCombo(gameState, 1, coin.x, coin.y);
             }
             const positionBeforeBrickBounceX = coin.x;
@@ -4545,7 +4550,7 @@ function ballTick(gameState, ball, frames) {
     }
     if ((0, _gameUtils.yoyoEffectRate)(gameState, ball) > 0) {
         speedLimitDampener += 3;
-        ball.vx += (gameState.puckPosition - ball.x) / 1000 * frames * gameState.perks.yoyo * (0, _gameUtils.yoyoEffectRate)(gameState, ball);
+        ball.vx += (gameState.puckPosition > ball.x ? 1 : -1) * frames * (0, _gameUtils.yoyoEffectRate)(gameState, ball);
     }
     if (ball.hitSinceBounce < gameState.perks.bricks_attract_ball * 3) goToNearestBrick(gameState, ball, gameState.perks.bricks_attract_ball * frames * 0.2, 2 + gameState.perks.bricks_attract_ball, Math.random() < 0.5 * frames);
     if (ball.vx * ball.vx + ball.vy * ball.vy < gameState.baseSpeed * gameState.baseSpeed * 2) {
@@ -5130,7 +5135,7 @@ function render(gameState) {
         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)) * ballAlpha;
+            ctx.globalAlpha = (0, _pureFunctions.clamp)(Math.max((0, _gameUtils.telekinesisEffectRate)(gameState, ball), (0, _gameUtils.yoyoEffectRate)(gameState, ball)) * ballAlpha, 0, 1);
             ctx.strokeStyle = gameState.puckColor;
             ctx.bezierCurveTo(gameState.puckPosition, gameState.gameZoneHeight, gameState.puckPosition, ball.y, ball.x, ball.y);
             ctx.stroke();
@@ -5939,7 +5944,7 @@ function updateAlertsOpen(delta) {
     document.body.classList[alertsOpen ? "add" : "remove"]("has-alert-open");
 }
 
-},{"./i18n/i18n":"eNPRm","./options":"d5NoS","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3","./tooltip":"3RWxb"}],"3RWxb":[function(require,module,exports,__globalThis) {
+},{"./i18n/i18n":"eNPRm","./options":"d5NoS","./tooltip":"3RWxb","@parcel/transformer-js/src/esmodule-helpers.js":"gkKU3"}],"3RWxb":[function(require,module,exports,__globalThis) {
 var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
 parcelHelpers.defineInteropFlag(exports);
 parcelHelpers.export(exports, "setupTooltips", ()=>setupTooltips);

src/gameStateMutators.ts

@@ -1249,9 +1249,6 @@ export function gameStateTick(
           coin.x,
           (clamp(speed, 20, 100) / 100) * 0.2,
         );
-        if (gameState.perks.compound_interest) {
-          resetCombo(gameState, coin.x, coin.y);
-        }
         if (!isOptionOn("basic")) {
           makeParticle(
             gameState,
@@ -1263,6 +1260,12 @@ export function gameStateTick(
             false,
           );
         }
+
+        if (gameState.perks.compound_interest && !gameState.perks.buoy) {
+          // If you dont have buoy, we directly declare the coin "lost" to make it clear
+          resetCombo(gameState, coin.x, coin.y);
+        }
+
       }
 
       if (
@@ -1285,6 +1288,10 @@ export function gameStateTick(
       ) {
         gameState.levelLostCoins += coin.points;
         destroy(gameState.coins, coinIndex);
+        if (gameState.perks.compound_interest && gameState.perks.buoy) {
+          // If you have buoy, we wait a bit more before declaring a coin "lost"
+          resetCombo(gameState, coin.x, coin.y);
+        }
 
         if (
           gameState.combo < gameState.perks.fountain_toss * 30 &&
@@ -1652,9 +1659,8 @@ export function ballTick(gameState: GameState, ball: Ball, frames: number) {
     speedLimitDampener += 3;
 
     ball.vx +=
-      ((gameState.puckPosition - ball.x) / 1000) *
+      (gameState.puckPosition > ball.x ? 1 :-1) *
       frames *
-      gameState.perks.yoyo *
       yoyoEffectRate(gameState, ball);
   }
 

src/game_utils.ts

@@ -202,12 +202,10 @@ export function telekinesisEffectRate(gameState: GameState, ball: Ball) {
 }
 
 export function yoyoEffectRate(gameState: GameState, ball: Ball) {
-  return (
+  if(ball.vy < 0) return 0
-    (gameState.perks.yoyo &&
+  if(!gameState.perks.yoyo) return  0
-      ball.vy > 0 &&
+  return Math.abs(gameState.puckPosition - ball.x)/gameState.gameZoneWidth * gameState.perks.yoyo/2
-      clamp(1 - (ball.y / gameState.gameZoneHeight) * 1.1 + 0.1, 0, 1)) ||
+
-    0
-  );
 }
 
 export function findLast<T>(
@@ -284,7 +282,7 @@ export function isMovingWhilePassiveIncome(gameState: GameState) {
     gameState.lastPuckMove &&
     gameState.perks.passive_income &&
     gameState.lastPuckMove >
-      gameState.levelTime - 250 * gameState.perks.passive_income
+      gameState.levelTime - (100 * gameState.perks.passive_income - 50)
   );
 }
 

src/render.ts

@@ -19,7 +19,7 @@ import { isOptionOn } from "./options";
 import {
   ballTransparency,
   catchRateBest,
-  catchRateGood,
+  catchRateGood, clamp,
   coinsBoostedCombo,
   levelTimeBest,
   levelTimeGood,
@@ -401,11 +401,11 @@ export function render(gameState: GameState) {
     ) {
       ctx.beginPath();
       ctx.moveTo(gameState.puckPosition, gameState.gameZoneHeight);
-      ctx.globalAlpha =
+      ctx.globalAlpha =clamp(
         Math.max(
           telekinesisEffectRate(gameState, ball),
           yoyoEffectRate(gameState, ball),
-        ) * ballAlpha;
+        ) * ballAlpha,0,1);
       ctx.strokeStyle = gameState.puckColor;
       ctx.bezierCurveTo(
         gameState.puckPosition,

src/upgrades.ts

@@ -926,10 +926,10 @@ export const rawUpgrades = [
     max: 4,
     name: t("upgrades.passive_income.name"),
     help: (lvl: number) =>
-      t("upgrades.passive_income.tooltip", { time: lvl * 0.25, lvl }),
+      t("upgrades.passive_income.tooltip", { time: lvl * 0.10-0.05, lvl }),
     fullHelp: (lvl: number) =>
       t("upgrades.passive_income.verbose_description", {
-        time: lvl * 0.25,
+        time: lvl * 0.10-0.05,
         lvl,
       }),
   },