Build 29068622

Readme.md

@@ -43,6 +43,9 @@ New players get confused as to which upgrades they have and why a side became re
 
 ## Done
 
+- fixed some issues around saved level unlocks
+- change donation text to not suggest an amount
+
 ## 29068563
 
 - review the "next unlocks" in score and game over

app/build.gradle.kts

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

src/PWA/sw-b71.js

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

src/data/levels.json

@@ -26,7 +26,7 @@
     "bricks": "ttttttt__tWWWWWWW_tWrrWttW_tWWWWWWW_ttttttt_____t______ttttt____ttttt_____t_t",
     "svg": 4,
     "color": "",
-    "credit": "https://steamcommunity.com/sharedfiles/filedetails/?id=487035876"
+    "credit": "My favorite character in https://nuclearthrone.com/"
   },
   {
     "name": "Creeper",
@@ -845,8 +845,8 @@
   },
   {
     "name": "icon:concave_puck",
-    "size": 8,
+    "size": 7,
-    "bricks": "___________W_______________W____________W__W__W_WW___WW_WWWWWWW_",
+    "bricks": "___W_____________W__________W__W__WWW___WWWWWWWWW",
     "svg": null,
     "color": ""
   },
@@ -923,7 +923,7 @@
   {
     "name": "icon:trampoline",
     "size": 8,
-    "bricks": "__y_y__y_y___y____llll___lygygl_lgggWggl_lgyggl__gllllg__g____g_",
+    "bricks": "___y_____y____y___bbyb___bttttb_bttytttb_bttttb__tbbbbt__t____t_",
     "svg": null,
     "color": ""
   },
@@ -962,13 +962,6 @@
     "svg": null,
     "color": ""
   },
-  {
-    "name": "icon:restart",
-    "size": 10,
-    "bricks": "__GGGGGGGG__GGGGGGGG________GG________GG__G_____GG_GGG____GGGGGGG___GG_GGG____GG_GGGGGGGGG_GGGGGGGGG",
-    "svg": null,
-    "color": ""
-  },
   {
     "name": "icon:clairvoyant",
     "size": 9,
@@ -1286,7 +1279,8 @@
     "size": 11,
     "bricks": "___gggg_____gggrrgg_____ggrrg_______gggg_____gggyygg_____ggyyg_______gggg_____gggCCgg_____ggCCg_______gggg________gg_____",
     "svg": null,
-    "color": ""
+    "color": "",
+    "credit": "Left a wonderful review on the play store."
   },
   {
     "name": "Obigre",
@@ -1294,21 +1288,23 @@
     "bricks": "_______________________________________OOOORgRgRgOOOOWOORgRgRgOOOOOWORgRgRgOWOOWOORgRgRgOOWOOWORgRgRgOWOOWOORgRgRgOOOOOOORgRgRgOOO_______________________________________",
     "svg": null,
     "color": "",
-    "credit": "https://colin-crapahute.bearblog.dev/"
+    "credit": "Colin helped a lot with the game design https://colin-crapahute.bearblog.dev/"
   },
   {
     "name": "Noodlemire",
     "size": 15,
     "bricks": "_________________________________ggggggggg_____g_________g___g___________g_g_____________gg_____________gg_____yyy_____ggg__yyyyyyy__ggggtyyyyyyyyytggggtttttttttttgggg_ttttttttt_gg_____ttttt___________________________________",
     "svg": null,
-    "color": ""
+    "color": "",
+    "credit": "Early adopter of the game"
   },
   {
     "name": "Bearded axe",
     "size": 12,
     "bricks": "______________WyyyOOy_____WyyyOOy_____Wyy_OO______Wyy_OO______Wyy_OO__________OO__________OO__________OO__________OO__________OO__________OO____",
     "svg": null,
-    "color": ""
+    "color": "",
+    "credit": "Did some nice bug reports"
   },
   {
     "name": "icon:minefield",

src/data/version.json

@@ -1 +1 @@
-"29068588"
+"29068622"

src/help.ts

@@ -32,15 +32,18 @@ export function helpMenuEntry() {
 
           t("main_menu.credit_levels"),
           ...allLevels
-            .filter((l) => l.credit?.startsWith("http"))
+            .filter((l) => l.credit?.trim())
             .map(
               (l) => `
 <div class="upgrade used">
             ${icons[l.name]}
+            <div>
             <p>
-                <strong>${l.name}</strong><br/>
+                <strong>${l.name}</strong> 
-          <a href="${l.credit}" target="_blank">${l.credit}</a> 
           </p> 
+          ${miniMarkDown(l.credit || "")}
+</div>
+             
         </div>`,
             ),
         ],

src/render.ts

@@ -969,7 +969,7 @@ export function drawBrick(
 
     canctx.setLineDash(offset !== -1 ? redBorderDash : emptyArray);
     canctx.lineDashOffset = offset;
-    canctx.strokeStyle = (offset !== -1 && "#FF0000") || whiteBorder || color;
+    canctx.strokeStyle = (offset !== -1 && "#FF000033") || whiteBorder || color;
     canctx.lineJoin = "round";
     canctx.lineWidth = whiteBorder ? 1 : bord;
     roundRect(