Automatic deploy 29002295

Readme.md

@@ -30,9 +30,8 @@ There's also an easy mode for kids (slower ball) and a color-blind mode (no colo
 
 ## Perk ideas
 - wrap left / right
-- puck bounce predictions (using particles)
 - n% of the broken bricks respawn when the ball touches the puck
-- bricks take twice as many hits but drop 50% more coins
+- bricks break 50% of the time but drop 50% more coins
 - wind (puck positions adds force to coins and balls)
 - balls repulse coins
 - n% of coins missed respawn at the top
@@ -61,6 +60,7 @@ There's also an easy mode for kids (slower ball) and a color-blind mode (no colo
 - new ball spawns when reaching combo X
 - missing with combo triggers explosive lightning strike
 - correction : pick one past upgrade to remove and replace by something else 
+- puck bounce predictions rendered with particles or lines (requires big refactor)
 
 ## Engine ideas
 

app/build.gradle.kts

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

app/src/main/assets/game.js

@@ -259,14 +259,16 @@ function resetBalls() {
             sx: 0,
             sy: 0,
             color: currentLevelInfo()?.black_puck ? '#000' : "#FFF",
-            hitSinceBounce: 0,
-            piercedSinceBounce: 0,
             sparks: 0,
+            piercedSinceBounce: 0,
+            hitSinceBounce: 0,
+             hitItem:[],
         });
     }
 }
 
 function putBallsAtPuck() {
+    // This reset could be abused to cheat quite easily
     const count = balls.length;
     const perBall = puckWidth / (count + 1);
     balls.forEach((ball, i) => {
@@ -280,6 +282,10 @@ function putBallsAtPuck() {
             vy: -baseSpeed,
             sx: 0,
             sy: 0,
+            hitItem:[],
+            hitSinceBounce: 0,
+            piercedSinceBounce: 0,
+            // piercedSinceBounce: 0,
         });
     });
 }
@@ -352,6 +358,7 @@ async function openUpgradesPicker() {
     let {text, repeats, choices} = getLevelStats();
     scoreStory.push(`Finished level ${currentLevel + 1} (${currentLevelInfo().name}): ${text}`,);
 
+
     while (repeats--) {
         const actions = pickRandomUpgrades(choices);
         if (!actions.length) break
@@ -659,6 +666,20 @@ const upgrades = [
         "max": 3,
         "help": "Puck position creates wind.",
     },
+    {
+        "threshold": 40000,
+        "id": "sturdy_bricks",
+        "name": "Sturdy bricks",
+        "max": 4,
+        "help": "Bricks sometimes resist hits but drop more coins.",
+    },
+    {
+        "threshold": 45000,
+        "id": "respawn",
+        "name": "Respawn",
+        "max": 4,
+        "help": "The first brick hit will respawn.",
+    },
 ]
 
 
@@ -1104,10 +1125,8 @@ function ballTick(ball, delta) {
         ball.vy *= (1 + .02 / speedLimitDampener);
     } else {
         ball.vx *= (1 - .02 / speedLimitDampener);
-        ;
         if (Math.abs(ball.vy) > 0.5 * baseSpeed) {
             ball.vy *= (1 - .02 / speedLimitDampener);
-            ;
         }
     }
 
@@ -1158,21 +1177,16 @@ function ballTick(ball, delta) {
         if (perks.streak_shots) {
             resetCombo(ball.x, ball.y);
         }
+
+        if(perks.respawn){
+            ball.hitItem.slice(0,-1).slice(0,perks.respawn)
+                .forEach(({index,color})=>bricks[index]=bricks[index]||color)
+        }
+        ball.hitItem=[]
         if (!ball.hitSinceBounce) {
             incrementRunStatistics('miss')
             levelMisses++;
             const loss = resetCombo(ball.x, ball.y)
-            //
-            // flashes.push({
-            //     type: "text",
-            //     text: 'miss',
-            //     time: levelTime,
-            //     color: ball.color,
-            //     x: ball.x,
-            //     y: ball.y - ballSize,
-            //     duration: 450,
-            //     size: puckHeight,
-            // })
             if (ball.bouncesList?.length) {
                 ball.bouncesList.push({
                     x: ball.previousx,
@@ -1237,12 +1251,16 @@ function ballTick(ball, delta) {
     }
     const hitBrick = brickHitCheck(ball, ballSize / 2, true);
     if (typeof hitBrick !== "undefined") {
-        const wasABomb = bricks[hitBrick] === "black";
+        const initialBrickColor = bricks[hitBrick]
+
         explodeBrick(hitBrick, ball, false);
 
-        if (perks.sapper && !wasABomb) {
+        if (perks.sapper && initialBrickColor !== "black" &&
+            // don't replace a brick that bounced with sturdy_bricks
+            !bricks[hitBrick]) {
             bricks[hitBrick] = "black";
         }
+
     }
 
     if (!isSettingOn("basic")) {
@@ -1419,6 +1437,15 @@ function explodeBrick(index, ball, isExplosion) {
         spawnExplosion(7 * (1 + perks.bigger_explosions), x, y, 'white', 150, coinSize,);
         ball.hitSinceBounce++;
     } else if (color) {
+        // Even if it bounces we don't want to count that as a miss
+        ball.hitSinceBounce++;
+
+        if(perks.sturdy_bricks && perks.sturdy_bricks*2>Math.random()*10){
+            // Resist
+            sounds.coinBounce(ball.x, 1)
+            return
+        }
+
         // Flashing is take care of by the tick loop
         const x = brickCenterX(index), y = brickCenterY(index);
 
@@ -1429,7 +1456,13 @@ function explodeBrick(index, ball, isExplosion) {
         incrementRunStatistics('spawned_coins', combo)
 
         coins = coins.filter((c) => !c.destroyed);
-        for (let i = 0; i < combo; i++) {
+        let coinsToSpawn=combo
+        if(perks.sturdy_bricks){
+            // +10% per level
+            coinsToSpawn+=Math.ceil((10+perks.sturdy_bricks) / 10 * coinsToSpawn)
+        }
+
+        while (coinsToSpawn-- ) {
             // Avoids saturating the canvas with coins
             if (coins.length > MAX_COINS * (isSettingOn("basic") ? 0.5 : 1)) {
                 // Just pick a random one
@@ -1471,13 +1504,19 @@ function explodeBrick(index, ball, isExplosion) {
                 sounds.comboIncreaseMaybe(ball.x, 1);
             }
         }
-        ball.hitSinceBounce++;
 
         flashes.push({
             type: "ball", duration: 40, time: levelTime, size: brickWidth, color: color, x, y,
         });
         spawnExplosion(5 + combo, x, y, color, 100, coinSize / 2);
     }
+
+    if(!bricks[index] ){
+        ball.hitItem?.push({
+            index,
+            color
+        })
+    }
 }
 
 function max_levels() {
@@ -1654,15 +1693,6 @@ function render() {
                 if (!type || type === "black" || okColors.has(type)) return;
                 const x = brickCenterX(index), y = brickCenterY(index);
                 drawFuzzyBall(ctx, "red", brickWidth, x, y);
-                //
-                // baseParticle && flashes.push({
-                //     ...baseParticle,
-                //     duration: 100,
-                //     x,
-                //     y,
-                //     vx: (0.5 - Math.random()) * 10,
-                //     vy: (0.5 - Math.random()) * 10,
-                // })
             });
         }
         ctx.globalAlpha = 1;
@@ -1728,7 +1758,6 @@ function render() {
         }
     });
     // The puck
-
     ctx.globalAlpha = 1
     ctx.globalCompositeOperation = "source-over";
     drawPuck(ctx, puckColor, puckWidth, puckHeight)
@@ -2037,7 +2066,8 @@ const sounds = {
     comboDecrease() {
         if (!isSettingOn("sound")) return;
         playShepard(-1, 0.5, 0.5);
-    }, coinBounce: (pan, volume) => {
+    },
+    coinBounce: (pan, volume) => {
         if (!isSettingOn("sound")) return;
         createSingleBounceSound(1200, pixelsToPan(pan), volume);
     }, explode: (pan) => {
@@ -2497,12 +2527,14 @@ Click an item above to start a test run with it.
             }
         ],
         textAfterButtons: `
-        <p>Made in France by <a href="https://lecaro.me">Renan LE CARO</a><br/>   
+        <p>
-        <a href="./privacy.html" target="_blank">privacy policy</a> - 
+            <span>Made in France by <a href="https://lecaro.me">Renan LE CARO</a>.</span> 
-        <a href="https://play.google.com/store/apps/details?id=me.lecaro.breakout" target="_blank">Google Play</a> - 
+            <a href="./privacy.html" target="_blank">Privacy Policy</a>
-        <a href="https://renanlecaro.itch.io/breakout71" target="_blank">itch.io</a><br/> 
+            <a href="https://play.google.com/store/apps/details?id=me.lecaro.breakout" target="_blank">Google Play</a>
-        v.${window.appVersion}
+            <a href="https://renanlecaro.itch.io/breakout71" target="_blank">itch.io</a>
-        
+            <a href="https://gitlab.com/lecarore/breakout71" target="_blank">Gitlab</a>
+            <a href="https://breakout.lecaro.me/" target="_blank">Web version</a>
+            <span>v.${window.appVersion}</span>
          </p>
         `
     })

app/src/main/assets/index.html

@@ -8,16 +8,16 @@
     />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>Breakout 71</title>
-    <link rel="stylesheet" href="style.css?v=29000827" />
+    <link rel="stylesheet" href="style.css?v=29002295" />
     <link rel="icon" href="./icon.svg" />
   </head>
   <body>
     <button id="menu">☰<span> menu</span></button>
     <button id="score"></button>
     <canvas id="game"></canvas>
-    <script>window.appVersion="?v=29000827".slice(3)</script>
+    <script>window.appVersion="?v=29002295".slice(3)</script>
     <script src="gif.js"></script>
-    <script src="levels.js?v=29000827"></script>
+    <script src="levels.js?v=29002295"></script>
-    <script src="game.js?v=29000827"></script>
+    <script src="game.js?v=29002295"></script>
   </body>
 </html>

app/src/main/assets/levels.js

@@ -9204,5 +9204,145 @@ let allLevels=[
       "#E67070"
     ],
     "svg": ""
+  },
+  {
+    "name": "perk:sturdy_bricks",
+    "size": 7,
+    "bricks": [
+      "#5DA3EA",
+      "#5DA3EA",
+      "#6262EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#6262EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#6262EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "",
+      "",
+      "",
+      "",
+      "white",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "white",
+      "",
+      "white",
+      "",
+      "",
+      "",
+      "white",
+      "",
+      "",
+      "",
+      "white",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "white",
+      "white",
+      "white",
+      "",
+      "",
+      "",
+      ""
+    ],
+    "svg": ""
+  },
+  {
+    "name": "perk:respawn",
+    "size": 9,
+    "bricks": [
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "",
+      "",
+      "",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "",
+      "",
+      "#5DA3EA",
+      "",
+      "",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5BECEC",
+      "",
+      "#5DA3EA",
+      "#5DA3EA",
+      "#5DA3EA",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      null,
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      null,
+      "",
+      "",
+      "white",
+      "",
+      "",
+      "",
+      "",
+      "",
+      null,
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      null,
+      null,
+      null,
+      "white",
+      "white",
+      "white"
+    ],
+    "svg": ""
   }
 ]

package-lock.json

@@ -68,6 +68,25 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="
     },
+    "body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -266,6 +285,8 @@
     },
     "express": {
       "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -606,6 +627,8 @@
     },
     "nodemon": {
       "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz",
+      "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==",
       "requires": {
         "chokidar": "^3.5.2",
         "debug": "^4",