diff --git a/Readme.md b/Readme.md index 876ae94..a63fbf7 100644 --- a/Readme.md +++ b/Readme.md @@ -188,7 +188,7 @@ I could unlock the "pro stand" at $999 that just holds the play area higher. IMPROVEMENTS ON EXISTING PERKS : -* separate the "shoot straight" perk into two : one for left-side, the other for right-side. it will help alleviate the high difficulty of this challenge and provide more interesting ways to play around it. the wind perk could even find a use. + * wind perk is fun but very much unusable. i do not see any situation it can help with. i favor "puck control ball" anytime over it. maybe it blew less hard it could be played with. maybe reuse its mechanic as a level hazard. * soft-landing is only interesting starting level 2, and only in synergy with "single-puck hit streak" * instead of "lives", have the perk be like a fourth wall that prevents the ball from falling down but disapears after one strike. it is functionally the same but provides visual feedback to the player so they know they have that perk. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 969c051..2ef1063 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "me.lecaro.breakout" minSdk = 21 targetSdk = 34 - versionCode = 29020191 - versionName = "29020191" + versionCode = 29022953 + versionName = "29022953" 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 1efd3f5..353bb7a 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -1,108 +1,103 @@ -Breakout 71 \ No newline at end of file + `});t&&t()}async function el(){let _=_q(),e=[...f.sort((_,e)=>_.threshold-e.threshold).map(({name:e,id:t,threshold:r,icon:a,fullHelp:l})=>({text:e,help:_>=r?l:`Unlocks at total score ${r}.`,disabled:__.threshold-e.threshold).map(e=>{let t=_>=e.threshold;return{text:e.name,help:t?`A ${e.size}x${e.size} level with ${e.bricks.filter(_=>_).length} bricks`:`Unlocks at total score ${e.threshold}.`,disabled:!t,value:{level:e.name},icon:W[e.name]}})],t=Math.round(e.filter(_=>!_.disabled).length/e.length*100),r=await e_({title:`You unlocked ${t}% of the game.`,text:` +

Your total score is ${_}. Below are all the upgrades and levels the games has to offer. + ${t<100?"The greyed out ones can be unlocked by increasing your total score. The total score increases every time you score in game.":""}

+ `,textAfterButtons:`

+Your high score is ${_o}. +Click an item above to start a run with it. +

`,actions:e,allowClose:!0});r&&(!G||await e_({title:"Restart run to try this item?",text:"You're about to start a new run with the selected unlocked item, is that really what you wanted ? ",actions:[{value:!0,text:"Restart game to test item"},{value:!1,text:"Cancel"}]}))&&(_M=r,_G())}function eo(_,e){return Math.sqrt(Math.pow(_.x-e.x,2)+Math.pow(_.y-e.y,2))}function es(){return`hsl(${2*Math.round(_5/4)%360},100%,70%)`}function ei(_,e,t,r){let a=eo(_,e),l=D/2;if(a>l)return;let o=(_.x-e.x)/a,s=(_.y-e.y)/a,i=-t*(l-a)/(1.2*l)/3*Math.min(500,_5)/500;r&&(e.vx+=o*i,e.vy+=s*i),_.vx-=o*i,_.vy-=s*i,_b.push({type:"particle",duration:100,time:_5,size:S/2,color:es(),ethereal:!0,x:_.x,y:_.y,vx:-(10*o)+_.vx+(Math.random()-.5)*2,vy:-(10*s)+_.vy+(Math.random()-.5)*2}),r&&_b.push({type:"particle",duration:100,time:_5,size:S/2,color:es(),ethereal:!0,x:e.x,y:e.y,vx:10*o+e.vx+(Math.random()-.5)*2,vy:10*s+e.vy+(Math.random()-.5)*2})}function ec(){et("record")&&r?.state==="recording"&&r?.pause()}function en(){et("record")&&r&&(r?.stop(),r=null)}function eh(){try{if(null!==document.fullscreenElement)document.exitFullscreen?document.exitFullscreen().then():document.webkitCancelFullScreen&&document.webkitCancelFullScreen();else{let _=document.documentElement;_.requestFullscreen?_.requestFullscreen().then():_.webkitRequestFullscreen&&_.webkitRequestFullscreen()}}catch(_){console.warn(_)}}_7.addEventListener("click",_=>{_.preventDefault(),er().then()}),document.getElementById("menu").addEventListener("click",_=>{_.preventDefault(),ea().then()});const em={ArrowLeft:0,ArrowRight:0,Shift:0};function eb(_,e){em[_]=e,_R=(em.ArrowRight-em.ArrowLeft)*(1+2*em.Shift)*D/50}document.addEventListener("keydown",_=>{"f"!==_.key.toLowerCase()||_.ctrlKey||_.metaKey?_.key in em&&eb(_.key,1):eh()," "===_.key&&!_8&&(H?Z(!0):q(),_.preventDefault())}),document.addEventListener("keyup",_=>{let e=document.querySelector("button:focus");if(_.key in em)eb(_.key,0);else if("ArrowDown"===_.key&&e?.nextElementSibling?.tagName==="BUTTON")e?.nextElementSibling?.focus();else if("ArrowUp"===_.key&&e?.previousElementSibling?.tagName==="BUTTON")e?.previousElementSibling?.focus();else if("Escape"===_.key&&_9)_9();else if("Escape"===_.key&&H)Z(!0);else if("m"!==_.key.toLowerCase()||_8){if("s"!==_.key.toLowerCase()||_8)return;er().then()}else ea().then();_.preventDefault()}),X(),_G(),function _(){Q();let e=performance.now();if(L=D/12*(3-A.smaller_puck+A.bigger_puck),_R&&_L($+_R),H){_5+=e-_A,_V.runTime+=e-_A,_V.max_combo=Math.max(_V.max_combo,O);let _=Math.min(4,(e-_A)/(1e3/60));_*=+!!H,_y=_y.filter(_=>!_.destroyed),_i=_i.filter(_=>!_.destroyed);let t=_m.filter(_=>_&&"black"!==_).length;if(_5>_E+1e3&&A.hot_start&&(_E=_5,function(_,e,t){let r=Math.max(0,O-(O=Math.max(T(),O-_)));r&&(_0.comboDecrease(),void 0!==e&&void 0!==t&&_b.push({type:"text",text:"-"+r,time:_5,color:"red",x:e,y:t,duration:300,size:20}))}(A.hot_start,$,j-40)),t<=A.skip_last&&!_6&&(_m.forEach((_,e)=>{_&&_I(e,_i[0],!0)}),_6++),t||_y.length){if(H||_5){let e=!1,t=Math.round(S/2);if(_y.forEach(r=>{if(r.destroyed)return;A.coin_magnet&&(r.vx+=_*($-r.x)/(100+Math.pow(r.y-j,2)+Math.pow(r.x-$,2))*A.coin_magnet*100);let a=1-(.03*A.viscosity+.005)*_;r.vy*=a,r.vx*=a,r.vx>7*C&&(r.vx=7*C),r.vx<-7*C&&(r.vx=-7*C),r.vy>7*C&&(r.vy=7*C),r.vy<-7*C&&(r.vy=-7*C),r.a+=r.sa,r.vy+=_*r.weight*.8;let l=Math.abs(r.sx)+Math.abs(r.sx),o=_P(r,t,_);if(r.y>j-t-20&&r.y_o&&!_S&&(_o=_a,localStorage.setItem("breakout-3-hs",_a.toString())),et("basic")||_b.push({type:"particle",duration:100+50*Math.random(),time:_5,size:S/2,color:r.color,x:r.previousx,y:r.previousy,vx:(z.width-r.x)/100,vy:-r.y/100,ethereal:!0}),Date.now()-_s>16&&(_s=Date.now(),_0.coinCatch(r.x)),_V.score+=r.points;else r.y>z.height+t&&(r.destroyed=!0,A.compound_interest&&P(r.x,r.y));let s=function(_){let e=S/2,{x:t,y:r,previousx:a,previousy:l}=_,o=_T(a,r,e),s=_T(t,l,e),i=void 0===o&&void 0===s&&_T(t,r,e)||void 0;if(void 0!==o||void 0!==i){_.y=_.previousy,_.vy*=-1;let a=_m[_C(t-e,r+e)],l=_m[_C(t+e,r+e)];a&&!l&&(_.vx+=1,_.sa-=1),!a&&l&&(_.vx-=1,_.sa+=1)}return(void 0!==s||void 0!==i)&&(_.x=_.previousx,_.vx*=-1),o??s??i}(r);A.metamorphosis&&void 0!==s&&_m[s]&&r.color!==_m[s]&&"black"!==_m[s]&&!r.coloredABrick&&(_m[s]=r.color,r.coloredABrick=!0),(void 0!==s||o)&&(r.vx*=.8,r.vy*=.8,r.sa*=.9,l>20&&!e&&(e=!0,_0.coinBounce(r.x,.2)),3>Math.abs(r.vy)&&(r.vy=0))}),_i.forEach(e=>(function(_,e){_.previousvx=_.vx,_.previousvy=_.vy;let t=1+A.telekinesis+A.ball_repulse_ball+A.puck_repulse_ball+A.ball_attract_ball;if(_H(_)&&(t+=3,_.vx+=($-_.x)/1e3*e*A.telekinesis),_.vx*_.vx+_.vy*_.vy0?1:-1)*.02/t),A.ball_repulse_ball)for(let e of _i)e.x>=_.x||ei(_,e,A.ball_repulse_ball,!0);if(A.ball_attract_ball)for(let e of _i)e.x>=_.x||function(_,e,t){let r=eo(_,e),a=.5*D;if(r1&&!et("basic"))for(let e=0;e<_.hitItem?.length-1&&e.5,l=Math.random()>.5?1:-1,o=Math.random()>.5?1:-1;_b.push({type:"particle",duration:250,ethereal:!0,time:_5,size:S/2,color:r,x:__(t)+l*U/2,y:_e(t)+o*U/2,vx:a?0:-l*C,vy:a?-o*C:0})}let r=_P(_,10,e);r&&(A.left_is_lava&&r%2&&_.xI+D/2&&P(_.x,_.y),A.top_is_lava&&r>=2&&P(_.x,_.y+20),_0.wallBeep(_.x),_.bouncesList?.push({x:_.previousx,y:_.previousy}));let a=j-20-10;if(_.y>a&&Math.abs(_.x-$)<10+L/2&&_.vy>0){let e=Math.sqrt(_.vx*_.vx+_.vy*_.vy),t=Math.atan2(-L/2,_.x-$);_.vx=e*Math.cos(t),_.vy=e*Math.sin(t),_0.wallBeep(_.x),A.streak_shots&&P(_.x,_.y),A.respawn&&_.hitItem.slice(0,-1).slice(0,A.respawn).forEach(({index:_,color:e})=>{_m[_]||"black"===e||(_m[_]=e)}),_.hitItem=[],_.hitSinceBounce||(_V.misses++,_d++,P(_.x,_.y),_b.push({type:"text",text:"miss",duration:500,time:_5,size:30,color:"red",x:$,y:j-40})),_V.puck_bounces++,_.hitSinceBounce=0,_.sapperUses=0,_.piercedSinceBounce=0,_.bouncesList=[{x:_.previousx,y:_.previousy}]}_.y>j+10&&H&&(_.destroyed=!0,_V.balls_lost++,_i.find(_=>!_.destroyed)||(A.extra_life?(A.extra_life--,_n(),_0.revive(),Z(!1),_y=[],_b.push({type:"ball",duration:500,time:_5,size:2*U,color:"white",x:_.x,y:_.y})):_Z("Game Over","You dropped the ball after catching "+_a+" coins. ")));let l=function(_){let{x:e,y:t,previousx:r,previousy:a}=_,l=_T(r,t,10),o=_T(e,a,10),s=void 0===l&&void 0===o&&_T(e,t,10)||void 0,i=_.piercedSinceBounce<3*A.pierce;return i&&(void 0!==l||void 0!==o||void 0!==s)&&_.piercedSinceBounce++,A.pierce_color&&(void 0===l||_m[l]===_c)&&(void 0===o||_m[o]===_c)&&(void 0===s||_m[s]===_c)&&(i=!0),void 0===l&&void 0===s||i||(_.y=_.previousy,_.vy*=-1),void 0===o&&void 0===s||i||(_.x=_.previousx,_.vx*=-1),l??o??s}(_);if(void 0!==l){let e=_m[l];_I(l,_,!1),_.sapperUses1&&(_b.push({type:"particle",duration:100*_.sparks,time:_5,size:S/2,color:_c,x:_.x,y:_.y,vx:(Math.random()-.5)*C,vy:(Math.random()-.5)*C}),_.sparks=0))})(e,_)),A.wind){let _=($-(I+D/2))/D*2*A.wind;for(let e=0;e.5&&_b.push({type:"particle",duration:150,ethereal:!0,time:_5,size:S/2,color:es(),x:F+Math.random()*N,y:Math.random()*j,vx:8*_,vy:0})}_b.forEach(e=>{"particle"===e.type&&(e.x+=e.vx*_,e.y+=e.vy*_,!e.ethereal&&(e.vy+=.5,_O(_C(e.x,e.y))&&(e.destroyed=!0)))})}}else G+1<_F()?_W(G+1):_Z("Run finished with "+_a+" points","You cleared all levels for this run.");if(O>T()){let _=!et("basic")&&(O-T())*Math.random()>5&&H&&{type:"particle",duration:100*(Math.random()+1),time:_5,size:S/2,color:"red",ethereal:!0};if(A.top_is_lava&&_&&_b.push({..._,x:F+Math.random()*N,y:0,vx:(Math.random()-.5)*10,vy:5}),A.left_is_lava&&_&&_b.push({..._,x:F,y:Math.random()*j,vx:5,vy:(Math.random()-.5)*10}),A.right_is_lava&&_&&_b.push({..._,x:F+N,y:Math.random()*j,vx:-5,vy:(Math.random()-.5)*10}),A.compound_interest){let e=$,t=0;do e=F+N*Math.random(),t++;while(Math.abs(e-$){let{x:e,y:t,time:r,color:a,size:l,type:o,duration:s}=_;x.globalAlpha=Math.min(1,2-(_5-r)/s*2),"particle"===o&&_Y(x,a,l,e,t)});else if(x.globalCompositeOperation="source-over",x.globalAlpha=.4,x.fillStyle="#000",x.fillRect(0,0,n,h),x.globalCompositeOperation="screen",x.globalAlpha=.6,_y.forEach(_=>{_.destroyed||_K(x,_.color,2*S,_.x,_.y)}),_i.forEach(_=>{_K(x,_c,40,_.x,_.y)}),x.globalAlpha=.5,_m.forEach((_,e)=>{if(!_)return;let t=__(e),r=_e(e);_K(x,"black"==_?"#666":_,U,t,r)}),x.globalAlpha=1,_b.forEach(_=>{let{x:e,y:t,time:r,color:a,size:l,type:o,duration:s}=_;x.globalAlpha=Math.min(1,2-(_5-r)/s*2),"ball"===o&&_K(x,a,l,e,t),"particle"===o&&_K(x,a,3*l,e,t)}),x.globalAlpha=.2,x.globalCompositeOperation="multiply",x.fillStyle="black",x.fillRect(0,0,n,h),x.globalAlpha=.8,x.globalCompositeOperation="multiply",c.svg&&J.width&&J.complete){if(K.title!==c.name){K.title=c.name,K.width=z.width,K.height=z.height;let _=K.getContext("2d");_.fillStyle=c.color||"#000",_.fillRect(0,0,z.width,z.height),_.fillStyle=x.createPattern(J,"repeat"),_.fillRect(0,0,n,h)}x.drawImage(K,0,0)}else x.fillStyle="#000",x.fillRect(0,0,n,h);x.globalAlpha=1,x.globalCompositeOperation="source-over";let b=Date.now()-_l+5,y=b<200;if(y){let _=(A.bigger_explosions+1)*50/b;x.translate(Math.sin(Date.now())*_,Math.sin(Date.now()+36)*_)}if(x.globalCompositeOperation="source-over",function(){x.globalAlpha=1;let _=O>T()&&A.picky_eater,e=D+"_"+_m.join("_")+R.complete+"_"+_+"_"+_c+"_"+A.pierce_color;if(e!==_N){_N=e,_D.width=D,_D.height=D+1;let t=_D.getContext("2d");t.clearRect(0,0,D,D),t.resetTransform(),t.translate(-I,0),_m.forEach((e,r)=>{let a=__(r),l=_e(r);if(!e)return;let o=_c!==e&&"black"!==e&&_&&"red"||e;(function(_,e,t,r,a){let l=Math.ceil(r-U/2),o=Math.ceil(a-U/2),s=Math.ceil(r+U/2)-1-l,i=Math.ceil(a+U/2)-1-o,c="brick"+e+"_"+t+"_"+s+"_"+i;if(!_j[c]){var n,h,m,b,y,g;let _=document.createElement("canvas");_.width=s,_.height=i;let r=_.getContext("2d");r.fillStyle=e,r.strokeStyle=t,r.lineJoin="round",r.lineWidth=2,n=r,h=1,m=1,b=s-2,y=i-2,g=2,n.beginPath(),n.moveTo(3,1),n.lineTo(h+b-g,m),n.quadraticCurveTo(h+b,m,h+b,m+g),n.lineTo(h+b,m+y-g),n.quadraticCurveTo(h+b,m+y,h+b-g,m+y),n.lineTo(h+g,m+y),n.quadraticCurveTo(h,m+y,h,m+y-g),n.lineTo(h,m+g),n.quadraticCurveTo(h,m,h+g,m),n.closePath(),r.fill(),r.stroke(),_j[c]=_}_.drawImage(_j[c],l,o,s,i)})(t,e,o,a,l),"black"===e&&(t.globalCompositeOperation="source-over",function(_,e,t,r,a){let l="svg"+e+"_"+t+"_"+e.complete;if(!_j[l]){let _=document.createElement("canvas");_.width=t,_.height=t;let r=_.getContext("2d"),a=t/Math.max(e.width,e.height),o=e.width*a,s=e.height*a;r.drawImage(e,(t-o)/2,(t-s)/2,o,s),_j[l]=_}_.drawImage(_j[l],Math.round(r-t/2),Math.round(a-t/2))}(t,R,U,a,l))})}x.drawImage(_D,I,0)}(),x.globalCompositeOperation="screen",(_b=_b.filter(_=>_5-_.time<_.duration&&!_.destroyed)).forEach(_=>{let{x:e,y:t,time:r,color:a,size:l,type:o,text:s,duration:i}=_,c=_5-r;x.globalAlpha=Math.max(0,Math.min(1,2-c/i*2)),"text"===o?(x.globalCompositeOperation="source-over",_X(x,s,a,l,e,t-c/10)):"particle"===o&&(x.globalCompositeOperation="screen",_Y(x,a,l,e,t),_K(x,a,l,e,t))}),x.globalAlpha=1,x.globalCompositeOperation="source-over",_y.forEach(_=>{_.destroyed||_J(x,_.color,S,_.x,_.y,c.color||"black",_.a)}),_y.length>10&&!et("basic")&&(x.globalAlpha=Math.min(.8,(_y.length-10)/50),_i.forEach(_=>{_Y(x,c.color||"#000",120,_.x,_.y)})),x.globalAlpha=1,x.globalCompositeOperation="source-over",_i.forEach(_=>{_Y(x,_c,20,_.x,_.y,M),_H(_)&&(x.strokeStyle=M,x.beginPath(),x.bezierCurveTo($,j,$,_.y,_.x,_.y),x.stroke())}),x.globalAlpha=1,x.globalCompositeOperation="source-over",A.streak_shots&&O>T()&&_U(x,"red",L,20,-2),_U(x,M,L,20),O>1){x.globalCompositeOperation="source-over";let _="x "+O,e=20*_.length/1.8+2*S,t=$-e/2;eT();x.globalCompositeOperation="source-over",F?(x.fillStyle=g&&A.left_is_lava?"red":M,x.fillRect(I-1,0,1,h),x.fillStyle=g&&A.right_is_lava?"red":M,x.fillRect(n-I+1,0,1,h)):(x.fillStyle="red",g&&A.left_is_lava&&x.fillRect(0,0,1,h),g&&A.right_is_lava&&x.fillRect(n-1,0,1,h)),A.top_is_lava&&O>T()&&(_=x,e=F,t=0,r=N,i=1,_.fillStyle="red",_.fillRect(e,0,r,1));let d=A.compound_interest&&O>T();x.fillStyle=d?"red":M,et("mobile-mode")?(x.fillRect(F,j,N,1),H||_X(x,"Press and hold here to play",M,20,z.width/2,j+(z.height-j)/2)):d&&x.fillRect(F,j-1,N,1),y&&x.resetTransform(),et("record")&&H&&a&&(s&&(s.drawImage(z,F,0,N,j,0,0,o.width,o.height),s.fillStyle="#FFF",s.textBaseline="top",s.font="12px monospace",s.textAlign="right",s.fillText(_a.toString(),o.width-12,12),s.textAlign="left",s.fillText("Level "+(G+1)+"/"+_F(),12,12)),l?.requestFrame?l?.requestFrame():a?.requestFrame&&a.requestFrame())})(),requestAnimationFrame(_),_A=e}(); \ No newline at end of file diff --git a/dist/index.html b/dist/index.html index 197608f..353bb7a 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,2848 +1,103 @@ - - - - - - - Breakout 71 - - - - - - - - - - - +

`,actions:e,allowClose:!0});r&&(!G||await e_({title:"Restart run to try this item?",text:"You're about to start a new run with the selected unlocked item, is that really what you wanted ? ",actions:[{value:!0,text:"Restart game to test item"},{value:!1,text:"Cancel"}]}))&&(_M=r,_G())}function eo(_,e){return Math.sqrt(Math.pow(_.x-e.x,2)+Math.pow(_.y-e.y,2))}function es(){return`hsl(${2*Math.round(_5/4)%360},100%,70%)`}function ei(_,e,t,r){let a=eo(_,e),l=D/2;if(a>l)return;let o=(_.x-e.x)/a,s=(_.y-e.y)/a,i=-t*(l-a)/(1.2*l)/3*Math.min(500,_5)/500;r&&(e.vx+=o*i,e.vy+=s*i),_.vx-=o*i,_.vy-=s*i,_b.push({type:"particle",duration:100,time:_5,size:S/2,color:es(),ethereal:!0,x:_.x,y:_.y,vx:-(10*o)+_.vx+(Math.random()-.5)*2,vy:-(10*s)+_.vy+(Math.random()-.5)*2}),r&&_b.push({type:"particle",duration:100,time:_5,size:S/2,color:es(),ethereal:!0,x:e.x,y:e.y,vx:10*o+e.vx+(Math.random()-.5)*2,vy:10*s+e.vy+(Math.random()-.5)*2})}function ec(){et("record")&&r?.state==="recording"&&r?.pause()}function en(){et("record")&&r&&(r?.stop(),r=null)}function eh(){try{if(null!==document.fullscreenElement)document.exitFullscreen?document.exitFullscreen().then():document.webkitCancelFullScreen&&document.webkitCancelFullScreen();else{let _=document.documentElement;_.requestFullscreen?_.requestFullscreen().then():_.webkitRequestFullscreen&&_.webkitRequestFullscreen()}}catch(_){console.warn(_)}}_7.addEventListener("click",_=>{_.preventDefault(),er().then()}),document.getElementById("menu").addEventListener("click",_=>{_.preventDefault(),ea().then()});const em={ArrowLeft:0,ArrowRight:0,Shift:0};function eb(_,e){em[_]=e,_R=(em.ArrowRight-em.ArrowLeft)*(1+2*em.Shift)*D/50}document.addEventListener("keydown",_=>{"f"!==_.key.toLowerCase()||_.ctrlKey||_.metaKey?_.key in em&&eb(_.key,1):eh()," "===_.key&&!_8&&(H?Z(!0):q(),_.preventDefault())}),document.addEventListener("keyup",_=>{let e=document.querySelector("button:focus");if(_.key in em)eb(_.key,0);else if("ArrowDown"===_.key&&e?.nextElementSibling?.tagName==="BUTTON")e?.nextElementSibling?.focus();else if("ArrowUp"===_.key&&e?.previousElementSibling?.tagName==="BUTTON")e?.previousElementSibling?.focus();else if("Escape"===_.key&&_9)_9();else if("Escape"===_.key&&H)Z(!0);else if("m"!==_.key.toLowerCase()||_8){if("s"!==_.key.toLowerCase()||_8)return;er().then()}else ea().then();_.preventDefault()}),X(),_G(),function _(){Q();let e=performance.now();if(L=D/12*(3-A.smaller_puck+A.bigger_puck),_R&&_L($+_R),H){_5+=e-_A,_V.runTime+=e-_A,_V.max_combo=Math.max(_V.max_combo,O);let _=Math.min(4,(e-_A)/(1e3/60));_*=+!!H,_y=_y.filter(_=>!_.destroyed),_i=_i.filter(_=>!_.destroyed);let t=_m.filter(_=>_&&"black"!==_).length;if(_5>_E+1e3&&A.hot_start&&(_E=_5,function(_,e,t){let r=Math.max(0,O-(O=Math.max(T(),O-_)));r&&(_0.comboDecrease(),void 0!==e&&void 0!==t&&_b.push({type:"text",text:"-"+r,time:_5,color:"red",x:e,y:t,duration:300,size:20}))}(A.hot_start,$,j-40)),t<=A.skip_last&&!_6&&(_m.forEach((_,e)=>{_&&_I(e,_i[0],!0)}),_6++),t||_y.length){if(H||_5){let e=!1,t=Math.round(S/2);if(_y.forEach(r=>{if(r.destroyed)return;A.coin_magnet&&(r.vx+=_*($-r.x)/(100+Math.pow(r.y-j,2)+Math.pow(r.x-$,2))*A.coin_magnet*100);let a=1-(.03*A.viscosity+.005)*_;r.vy*=a,r.vx*=a,r.vx>7*C&&(r.vx=7*C),r.vx<-7*C&&(r.vx=-7*C),r.vy>7*C&&(r.vy=7*C),r.vy<-7*C&&(r.vy=-7*C),r.a+=r.sa,r.vy+=_*r.weight*.8;let l=Math.abs(r.sx)+Math.abs(r.sx),o=_P(r,t,_);if(r.y>j-t-20&&r.y_o&&!_S&&(_o=_a,localStorage.setItem("breakout-3-hs",_a.toString())),et("basic")||_b.push({type:"particle",duration:100+50*Math.random(),time:_5,size:S/2,color:r.color,x:r.previousx,y:r.previousy,vx:(z.width-r.x)/100,vy:-r.y/100,ethereal:!0}),Date.now()-_s>16&&(_s=Date.now(),_0.coinCatch(r.x)),_V.score+=r.points;else r.y>z.height+t&&(r.destroyed=!0,A.compound_interest&&P(r.x,r.y));let s=function(_){let e=S/2,{x:t,y:r,previousx:a,previousy:l}=_,o=_T(a,r,e),s=_T(t,l,e),i=void 0===o&&void 0===s&&_T(t,r,e)||void 0;if(void 0!==o||void 0!==i){_.y=_.previousy,_.vy*=-1;let a=_m[_C(t-e,r+e)],l=_m[_C(t+e,r+e)];a&&!l&&(_.vx+=1,_.sa-=1),!a&&l&&(_.vx-=1,_.sa+=1)}return(void 0!==s||void 0!==i)&&(_.x=_.previousx,_.vx*=-1),o??s??i}(r);A.metamorphosis&&void 0!==s&&_m[s]&&r.color!==_m[s]&&"black"!==_m[s]&&!r.coloredABrick&&(_m[s]=r.color,r.coloredABrick=!0),(void 0!==s||o)&&(r.vx*=.8,r.vy*=.8,r.sa*=.9,l>20&&!e&&(e=!0,_0.coinBounce(r.x,.2)),3>Math.abs(r.vy)&&(r.vy=0))}),_i.forEach(e=>(function(_,e){_.previousvx=_.vx,_.previousvy=_.vy;let t=1+A.telekinesis+A.ball_repulse_ball+A.puck_repulse_ball+A.ball_attract_ball;if(_H(_)&&(t+=3,_.vx+=($-_.x)/1e3*e*A.telekinesis),_.vx*_.vx+_.vy*_.vy0?1:-1)*.02/t),A.ball_repulse_ball)for(let e of _i)e.x>=_.x||ei(_,e,A.ball_repulse_ball,!0);if(A.ball_attract_ball)for(let e of _i)e.x>=_.x||function(_,e,t){let r=eo(_,e),a=.5*D;if(r1&&!et("basic"))for(let e=0;e<_.hitItem?.length-1&&e.5,l=Math.random()>.5?1:-1,o=Math.random()>.5?1:-1;_b.push({type:"particle",duration:250,ethereal:!0,time:_5,size:S/2,color:r,x:__(t)+l*U/2,y:_e(t)+o*U/2,vx:a?0:-l*C,vy:a?-o*C:0})}let r=_P(_,10,e);r&&(A.left_is_lava&&r%2&&_.xI+D/2&&P(_.x,_.y),A.top_is_lava&&r>=2&&P(_.x,_.y+20),_0.wallBeep(_.x),_.bouncesList?.push({x:_.previousx,y:_.previousy}));let a=j-20-10;if(_.y>a&&Math.abs(_.x-$)<10+L/2&&_.vy>0){let e=Math.sqrt(_.vx*_.vx+_.vy*_.vy),t=Math.atan2(-L/2,_.x-$);_.vx=e*Math.cos(t),_.vy=e*Math.sin(t),_0.wallBeep(_.x),A.streak_shots&&P(_.x,_.y),A.respawn&&_.hitItem.slice(0,-1).slice(0,A.respawn).forEach(({index:_,color:e})=>{_m[_]||"black"===e||(_m[_]=e)}),_.hitItem=[],_.hitSinceBounce||(_V.misses++,_d++,P(_.x,_.y),_b.push({type:"text",text:"miss",duration:500,time:_5,size:30,color:"red",x:$,y:j-40})),_V.puck_bounces++,_.hitSinceBounce=0,_.sapperUses=0,_.piercedSinceBounce=0,_.bouncesList=[{x:_.previousx,y:_.previousy}]}_.y>j+10&&H&&(_.destroyed=!0,_V.balls_lost++,_i.find(_=>!_.destroyed)||(A.extra_life?(A.extra_life--,_n(),_0.revive(),Z(!1),_y=[],_b.push({type:"ball",duration:500,time:_5,size:2*U,color:"white",x:_.x,y:_.y})):_Z("Game Over","You dropped the ball after catching "+_a+" coins. ")));let l=function(_){let{x:e,y:t,previousx:r,previousy:a}=_,l=_T(r,t,10),o=_T(e,a,10),s=void 0===l&&void 0===o&&_T(e,t,10)||void 0,i=_.piercedSinceBounce<3*A.pierce;return i&&(void 0!==l||void 0!==o||void 0!==s)&&_.piercedSinceBounce++,A.pierce_color&&(void 0===l||_m[l]===_c)&&(void 0===o||_m[o]===_c)&&(void 0===s||_m[s]===_c)&&(i=!0),void 0===l&&void 0===s||i||(_.y=_.previousy,_.vy*=-1),void 0===o&&void 0===s||i||(_.x=_.previousx,_.vx*=-1),l??o??s}(_);if(void 0!==l){let e=_m[l];_I(l,_,!1),_.sapperUses1&&(_b.push({type:"particle",duration:100*_.sparks,time:_5,size:S/2,color:_c,x:_.x,y:_.y,vx:(Math.random()-.5)*C,vy:(Math.random()-.5)*C}),_.sparks=0))})(e,_)),A.wind){let _=($-(I+D/2))/D*2*A.wind;for(let e=0;e.5&&_b.push({type:"particle",duration:150,ethereal:!0,time:_5,size:S/2,color:es(),x:F+Math.random()*N,y:Math.random()*j,vx:8*_,vy:0})}_b.forEach(e=>{"particle"===e.type&&(e.x+=e.vx*_,e.y+=e.vy*_,!e.ethereal&&(e.vy+=.5,_O(_C(e.x,e.y))&&(e.destroyed=!0)))})}}else G+1<_F()?_W(G+1):_Z("Run finished with "+_a+" points","You cleared all levels for this run.");if(O>T()){let _=!et("basic")&&(O-T())*Math.random()>5&&H&&{type:"particle",duration:100*(Math.random()+1),time:_5,size:S/2,color:"red",ethereal:!0};if(A.top_is_lava&&_&&_b.push({..._,x:F+Math.random()*N,y:0,vx:(Math.random()-.5)*10,vy:5}),A.left_is_lava&&_&&_b.push({..._,x:F,y:Math.random()*j,vx:5,vy:(Math.random()-.5)*10}),A.right_is_lava&&_&&_b.push({..._,x:F+N,y:Math.random()*j,vx:-5,vy:(Math.random()-.5)*10}),A.compound_interest){let e=$,t=0;do e=F+N*Math.random(),t++;while(Math.abs(e-$){let{x:e,y:t,time:r,color:a,size:l,type:o,duration:s}=_;x.globalAlpha=Math.min(1,2-(_5-r)/s*2),"particle"===o&&_Y(x,a,l,e,t)});else if(x.globalCompositeOperation="source-over",x.globalAlpha=.4,x.fillStyle="#000",x.fillRect(0,0,n,h),x.globalCompositeOperation="screen",x.globalAlpha=.6,_y.forEach(_=>{_.destroyed||_K(x,_.color,2*S,_.x,_.y)}),_i.forEach(_=>{_K(x,_c,40,_.x,_.y)}),x.globalAlpha=.5,_m.forEach((_,e)=>{if(!_)return;let t=__(e),r=_e(e);_K(x,"black"==_?"#666":_,U,t,r)}),x.globalAlpha=1,_b.forEach(_=>{let{x:e,y:t,time:r,color:a,size:l,type:o,duration:s}=_;x.globalAlpha=Math.min(1,2-(_5-r)/s*2),"ball"===o&&_K(x,a,l,e,t),"particle"===o&&_K(x,a,3*l,e,t)}),x.globalAlpha=.2,x.globalCompositeOperation="multiply",x.fillStyle="black",x.fillRect(0,0,n,h),x.globalAlpha=.8,x.globalCompositeOperation="multiply",c.svg&&J.width&&J.complete){if(K.title!==c.name){K.title=c.name,K.width=z.width,K.height=z.height;let _=K.getContext("2d");_.fillStyle=c.color||"#000",_.fillRect(0,0,z.width,z.height),_.fillStyle=x.createPattern(J,"repeat"),_.fillRect(0,0,n,h)}x.drawImage(K,0,0)}else x.fillStyle="#000",x.fillRect(0,0,n,h);x.globalAlpha=1,x.globalCompositeOperation="source-over";let b=Date.now()-_l+5,y=b<200;if(y){let _=(A.bigger_explosions+1)*50/b;x.translate(Math.sin(Date.now())*_,Math.sin(Date.now()+36)*_)}if(x.globalCompositeOperation="source-over",function(){x.globalAlpha=1;let _=O>T()&&A.picky_eater,e=D+"_"+_m.join("_")+R.complete+"_"+_+"_"+_c+"_"+A.pierce_color;if(e!==_N){_N=e,_D.width=D,_D.height=D+1;let t=_D.getContext("2d");t.clearRect(0,0,D,D),t.resetTransform(),t.translate(-I,0),_m.forEach((e,r)=>{let a=__(r),l=_e(r);if(!e)return;let o=_c!==e&&"black"!==e&&_&&"red"||e;(function(_,e,t,r,a){let l=Math.ceil(r-U/2),o=Math.ceil(a-U/2),s=Math.ceil(r+U/2)-1-l,i=Math.ceil(a+U/2)-1-o,c="brick"+e+"_"+t+"_"+s+"_"+i;if(!_j[c]){var n,h,m,b,y,g;let _=document.createElement("canvas");_.width=s,_.height=i;let r=_.getContext("2d");r.fillStyle=e,r.strokeStyle=t,r.lineJoin="round",r.lineWidth=2,n=r,h=1,m=1,b=s-2,y=i-2,g=2,n.beginPath(),n.moveTo(3,1),n.lineTo(h+b-g,m),n.quadraticCurveTo(h+b,m,h+b,m+g),n.lineTo(h+b,m+y-g),n.quadraticCurveTo(h+b,m+y,h+b-g,m+y),n.lineTo(h+g,m+y),n.quadraticCurveTo(h,m+y,h,m+y-g),n.lineTo(h,m+g),n.quadraticCurveTo(h,m,h+g,m),n.closePath(),r.fill(),r.stroke(),_j[c]=_}_.drawImage(_j[c],l,o,s,i)})(t,e,o,a,l),"black"===e&&(t.globalCompositeOperation="source-over",function(_,e,t,r,a){let l="svg"+e+"_"+t+"_"+e.complete;if(!_j[l]){let _=document.createElement("canvas");_.width=t,_.height=t;let r=_.getContext("2d"),a=t/Math.max(e.width,e.height),o=e.width*a,s=e.height*a;r.drawImage(e,(t-o)/2,(t-s)/2,o,s),_j[l]=_}_.drawImage(_j[l],Math.round(r-t/2),Math.round(a-t/2))}(t,R,U,a,l))})}x.drawImage(_D,I,0)}(),x.globalCompositeOperation="screen",(_b=_b.filter(_=>_5-_.time<_.duration&&!_.destroyed)).forEach(_=>{let{x:e,y:t,time:r,color:a,size:l,type:o,text:s,duration:i}=_,c=_5-r;x.globalAlpha=Math.max(0,Math.min(1,2-c/i*2)),"text"===o?(x.globalCompositeOperation="source-over",_X(x,s,a,l,e,t-c/10)):"particle"===o&&(x.globalCompositeOperation="screen",_Y(x,a,l,e,t),_K(x,a,l,e,t))}),x.globalAlpha=1,x.globalCompositeOperation="source-over",_y.forEach(_=>{_.destroyed||_J(x,_.color,S,_.x,_.y,c.color||"black",_.a)}),_y.length>10&&!et("basic")&&(x.globalAlpha=Math.min(.8,(_y.length-10)/50),_i.forEach(_=>{_Y(x,c.color||"#000",120,_.x,_.y)})),x.globalAlpha=1,x.globalCompositeOperation="source-over",_i.forEach(_=>{_Y(x,_c,20,_.x,_.y,M),_H(_)&&(x.strokeStyle=M,x.beginPath(),x.bezierCurveTo($,j,$,_.y,_.x,_.y),x.stroke())}),x.globalAlpha=1,x.globalCompositeOperation="source-over",A.streak_shots&&O>T()&&_U(x,"red",L,20,-2),_U(x,M,L,20),O>1){x.globalCompositeOperation="source-over";let _="x "+O,e=20*_.length/1.8+2*S,t=$-e/2;eT();x.globalCompositeOperation="source-over",F?(x.fillStyle=g&&A.left_is_lava?"red":M,x.fillRect(I-1,0,1,h),x.fillStyle=g&&A.right_is_lava?"red":M,x.fillRect(n-I+1,0,1,h)):(x.fillStyle="red",g&&A.left_is_lava&&x.fillRect(0,0,1,h),g&&A.right_is_lava&&x.fillRect(n-1,0,1,h)),A.top_is_lava&&O>T()&&(_=x,e=F,t=0,r=N,i=1,_.fillStyle="red",_.fillRect(e,0,r,1));let d=A.compound_interest&&O>T();x.fillStyle=d?"red":M,et("mobile-mode")?(x.fillRect(F,j,N,1),H||_X(x,"Press and hold here to play",M,20,z.width/2,j+(z.height-j)/2)):d&&x.fillRect(F,j-1,N,1),y&&x.resetTransform(),et("record")&&H&&a&&(s&&(s.drawImage(z,F,0,N,j,0,0,o.width,o.height),s.fillStyle="#FFF",s.textBaseline="top",s.font="12px monospace",s.textAlign="right",s.fillText(_a.toString(),o.width-12,12),s.textAlign="left",s.fillText("Level "+(G+1)+"/"+_F(),12,12)),l?.requestFrame?l?.requestFrame():a?.requestFrame&&a.requestFrame())})(),requestAnimationFrame(_),_A=e}(); \ No newline at end of file diff --git a/src/game.ts b/src/game.ts index 158e5bf..442e219 100644 --- a/src/game.ts +++ b/src/game.ts @@ -8,6 +8,7 @@ import { FlashTypes, Level, PerkId, + PerksMap, RunHistoryItem, RunStats, Upgrade, @@ -48,7 +49,7 @@ bombSVG.src = // Whatever let puckWidth = 200; -const perks = {} as { [id in PerkId]: number }; +const perks: PerksMap = {}; let baseSpeed = 12; // applied to x and y let combo = 1; @@ -303,8 +304,8 @@ function resetBalls() { const perBall = puckWidth / (count + 1); balls = []; ballsColor = "#FFF"; - if(perks.picky_eater || perks.pierce_color){ - ballsColor=getMajorityValue(bricks.filter(i=>i)) || '#FFF' + if (perks.picky_eater || perks.pierce_color) { + ballsColor = getMajorityValue(bricks.filter((i) => i)) || "#FFF"; } for (let i = 0; i < count; i++) { const x = puck - puckWidth / 2 + perBall * (i + 1); @@ -470,25 +471,6 @@ function currentLevelInfo() { return runLevels[currentLevel % runLevels.length]; } -function reset_perks(): PerkId { - for (let u of upgrades) { - perks[u.id] = 0; - } - - const giftable = getPossibleUpgrades().filter((u) => u.giftable); - const randomGift = - nextRunOverrides?.perk || - (isSettingOn("easy") && "slow_down") || - giftable[Math.floor(Math.random() * giftable.length)].id; - - if(!isCreativeModeRun){ - perks[randomGift] = 1; - } - - delete nextRunOverrides.perk; - return randomGift as PerkId; -} - let totalScoreAtRunStart = getTotalScore(); function getPossibleUpgrades() { @@ -571,19 +553,36 @@ let isCreativeModeRun = false; let pauseUsesDuringRun = 0; -function restart() { +function restart(creativeModePerks: PerksMap | undefined = undefined) { // When restarting, we want to avoid restarting with the same level we're on, so we exclude from the next // run's level list totalScoreAtRunStart = getTotalScore(); - isCreativeModeRun = false; + shuffleLevels(levelTime || score ? currentLevelInfo().name : null); resetRunStatistics(); score = 0; pauseUsesDuringRun = 0; - const randomGift = reset_perks(); + for (let u of upgrades) { + perks[u.id] = 0; + } + if (creativeModePerks) { + Object.assign(perks, creativeModePerks); + isCreativeModeRun = true; + } else { + isCreativeModeRun = false; - dontOfferTooSoon(randomGift); + const giftable = getPossibleUpgrades().filter((u) => u.giftable); + const randomGift = + (nextRunOverrides?.perk as PerkId) || + (isSettingOn("easy") && "slow_down") || + giftable[Math.floor(Math.random() * giftable.length)].id; + + perks[randomGift] = 1; + delete nextRunOverrides.perk; + + dontOfferTooSoon(randomGift); + } setLevel(0); pauseRecording(); @@ -728,6 +727,7 @@ function ballBrickHitCheck(ball: Ball) { return vhit ?? hhit ?? chit; } + function coinBrickHitCheck(coin: Coin) { // Make ball/coin bonce, and return bricks that were hit const radius = coinSize / 2; @@ -845,7 +845,7 @@ function tick() { explodeBrick(index, balls[0], true); } }); - level_skip_last_uses++ + level_skip_last_uses++; } if (!remainingBricks && !coins.length) { if (currentLevel + 1 < max_levels()) { @@ -1108,7 +1108,7 @@ function ballTick(ball: Ball, delta: number) { x: puck, y: gameZoneHeight, }, - perks.puck_repulse_ball, + perks.puck_repulse_ball + 1, false, ); } @@ -1968,7 +1968,9 @@ function renderAllBricks() { "_" + redBorderOnBricksWithWrongColor + "_" + - ballsColor+'_'+perks.pierce_color; + ballsColor + + "_" + + perks.pierce_color; if (newKey !== cachedBricksRenderKey) { cachedBricksRenderKey = newKey; @@ -1986,8 +1988,12 @@ function renderAllBricks() { y = brickCenterY(index); if (!color) return; - - const borderColor = (ballsColor !== color && color !== "black" && redBorderOnBricksWithWrongColor && "red") || + + const borderColor = + (ballsColor !== color && + color !== "black" && + redBorderOnBricksWithWrongColor && + "red") || color; drawBrick(canctx, color, borderColor, x, y); @@ -2681,8 +2687,10 @@ export function isSettingOn(key: OptionId) { export function toggleSetting(key: OptionId) { cachedSettings[key] = !isSettingOn(key); try { - const lskey = "breakout-settings-enable-" + key; - localStorage.setItem(lskey, JSON.stringify(cachedSettings[key])); + localStorage.setItem( + "breakout-settings-enable-" + key, + JSON.stringify(cachedSettings[key]), + ); } catch (e) { console.warn(e); } @@ -2748,7 +2756,7 @@ async function openSettingsPanel() { }, }); } - const creativeModeTreshold=Math.max(...upgrades.map((u) => u.threshold)) + const creativeModeThreshold = Math.max(...upgrades.map((u) => u.threshold)); const cb = await asyncAlert<() => void>({ title: "Breakout 71", @@ -2789,16 +2797,18 @@ async function openSettingsPanel() { }, }), - { text: "Creative mode", - help:getTotalScore() < creativeModeTreshold ? "Unlocks at total score $"+creativeModeTreshold: "Test runs with custom perks" , - disabled: getTotalScore() < creativeModeTreshold, + help: + getTotalScore() < creativeModeThreshold + ? "Unlocks at total score $" + creativeModeThreshold + : "Test runs with custom perks", + disabled: getTotalScore() < creativeModeThreshold, async value() { let creativeModePerks = {}, - choice; + choice: "start" | Upgrade | void; while ( - (choice = await asyncAlert({ + (choice = await asyncAlert<"start" | Upgrade>({ title: "Select perks", text: 'Select perks below and press "start run" to try them out in a test run. Scores and stats are not recorded.', actionsAsGrid: true, @@ -2820,11 +2830,8 @@ async function openSettingsPanel() { })) ) { if (choice === "start") { - restart(); - isCreativeModeRun = true; - Object.assign(perks, creativeModePerks); - resetCombo(undefined, undefined); - resetBalls(); + restart(creativeModePerks); + break; } else if (choice) { creativeModePerks[choice.id] = @@ -2908,13 +2915,16 @@ async function openUnlocksList() { }), ]; + const percentUnlock = Math.round( + (actions.filter((a) => !a.disabled).length / actions.length) * 100, + ); const tryOn = await asyncAlert({ - title: `You unlocked ${Math.round((actions.filter((a) => !a.disabled).length / actions.length) * 100)}% of the game.`, + title: `You unlocked ${percentUnlock}% of the game.`, text: ` -

Your total score is ${ts}. Below are all the upgrades and levels the games has to offer. They greyed out ones can be unlocked by increasing your total score.

+

Your total score is ${ts}. Below are all the upgrades and levels the games has to offer. + ${percentUnlock < 100 ? "The greyed out ones can be unlocked by increasing your total score. The total score increases every time you score in game." : ""}

`, - textAfterButtons: `

-The total score increases every time you score in game. + textAfterButtons: `

Your high score is ${highScore}. Click an item above to start a run with it.

`, @@ -3302,18 +3312,17 @@ document.addEventListener("keyup", (e) => { e.preventDefault(); }); - -function sample(arr:T[]):T{ - return arr[Math.floor(arr.length*Math.random())] +function sample(arr: T[]): T { + return arr[Math.floor(arr.length * Math.random())]; } -function getMajorityValue(arr:string[]):string{ - const count = {} - arr.forEach(v=>count[v]=(count[v]||0)+1) - const max = Math.max(...Object.values(count)) - return sample(Object.keys(count).filter(k=>count[k]==max)) +function getMajorityValue(arr: string[]): string { + const count = {}; + arr.forEach((v) => (count[v] = (count[v] || 0) + 1)); + // Object.values inline polyfill + const max = Math.max(...Object.keys(count).map((k) => count[k])); + return sample(Object.keys(count).filter((k) => count[k] == max)); } - fitSize(); restart(); diff --git a/src/rawUpgrades.ts b/src/rawUpgrades.ts index 15437a8..43d89c5 100644 --- a/src/rawUpgrades.ts +++ b/src/rawUpgrades.ts @@ -6,7 +6,7 @@ export const rawUpgrades = [ id: "extra_life", name: "+1 life", max: 7, - help: (lvl) => + help: (lvl: number) => `Survive dropping the ball ${lvl} time${lvl > 1 ? "s" : ""}.`, fullHelp: `Normally, you just have one life, and the run is over as soon as you drop it. With this perk, you can survive dropping the ball once. A heart in the top right corner will remind you of how many extra lives you have. `, @@ -18,7 +18,7 @@ export const rawUpgrades = [ giftable: true, name: "Single puck hit streak", max: 1, - help: (lvl) => `More coins if you break many bricks at once`, + help: (lvl: number) => `More coins if you break many bricks at once`, fullHelp: `Every time you break a brick, your combo (number of coins per bricks) increases by one. However, as soon as the ball touches your puck, the combo is reset to its default value, and you'll just get one coin per brick. So you should try to hit many bricks in one go for more score. Once your combo rises above the base value, your puck will become red to remind you that it will destroy your combo to touch it with the ball. @@ -32,7 +32,7 @@ export const rawUpgrades = [ giftable: true, name: "+3 base combo", max: 7, - help: (lvl) => `Every brick drops at least ${1 + lvl * 3} coins.`, + help: (lvl: number) => `Every brick drops at least ${1 + lvl * 3} coins.`, fullHelp: `Your combo (number of coins per bricks) normally starts at 1 at the beginning of the level, and resets to one when you bounce around without hitting anything. With this perk, the combo starts 3 points higher, so you'll always get at least 4 coins per brick. Whenever your combo reset, it will go back to 4 and not 1. Your ball will glitter a bit to indicate that its combo is higher than one.`, @@ -44,7 +44,7 @@ export const rawUpgrades = [ id: "slow_down", name: "Slower ball", max: 2, - help: (lvl) => `Ball moves ${lvl > 1 ? "even" : ""} more slowly.`, + help: (lvl: number) => `Ball moves ${lvl > 1 ? "even" : ""} more slowly.`, fullHelp: `The ball starts relatively slow, but every level of your run it will start a bit faster, and it will also accelerate if you spend a lot of time in one level. This perk makes it more manageable. You can get it at the start every time by enabling kid mode in the menu.`, @@ -56,7 +56,7 @@ export const rawUpgrades = [ id: "bigger_puck", name: "Bigger puck", max: 2, - help: (lvl) => `Easily catch ${lvl > 1 ? "even" : ""} more coins.`, + help: (lvl: number) => `Easily catch ${lvl > 1 ? "even" : ""} more coins.`, fullHelp: `A bigger puck makes it easier to never miss the ball and to catch more coins, and also to precisely angle the bounces (the ball's angle only depends on where it hits the puck). However, a large puck is harder to use around the sides of the level, and will make it sometimes unavoidable to miss (not hit anything) which comes with downsides. `, }, @@ -67,7 +67,7 @@ export const rawUpgrades = [ id: "viscosity", name: "Viscosity", max: 3, - help: (lvl) => `${lvl > 1 ? "Even slower" : "Slower"} coins fall.`, + help: (lvl: number) => `${lvl > 1 ? "Even slower" : "Slower"} coins fall.`, fullHelp: `Coins normally accelerate with gravity and explosions to pretty high speeds. This perk constantly makes them slow down, as if they were in some sort of viscous liquid. This makes catching them easier, and combines nicely with perks that influence the coin's movement. `, @@ -79,7 +79,7 @@ export const rawUpgrades = [ giftable: true, name: "Avoid left side", max: 1, - help: (lvl) => `More coins if you don't touch the left side.`, + help: (lvl: number) => `More coins if you don't touch the left side.`, fullHelp: `Whenever you break a brick, your combo will increase by one, so you'll get one more coin from all the next bricks you break. However, your combo will reset as soon as your ball hits the left side . @@ -94,7 +94,7 @@ export const rawUpgrades = [ giftable: true, name: "Avoid right side", max: 1, - help: (lvl) => `More coins if you don't touch the right side.`, + help: (lvl: number) => `More coins if you don't touch the right side.`, fullHelp: `Whenever you break a brick, your combo will increase by one, so you'll get one more coin from all the next bricks you break. However, your combo will reset as soon as your ball hits the right side . @@ -109,7 +109,7 @@ export const rawUpgrades = [ giftable: true, name: "Sky is the limit", max: 1, - help: (lvl) => `More coins if you don't touch the top.`, + help: (lvl: number) => `More coins if you don't touch the top.`, fullHelp: `Whenever you break a brick, your combo will increase by one. However, your combo will reset as soon as your ball hit the top of the screen. When your combo is above the minimum, a red bar will appear at the top to remind you that you should avoid hitting it. The effect stacks with other combo perks.`, @@ -121,7 +121,7 @@ export const rawUpgrades = [ id: "skip_last", name: "Easy Cleanup", max: 7, - help: (lvl) => + help: (lvl: number) => `The last ${lvl > 1 ? lvl + " bricks" : "brick"} left will self-destruct.`, fullHelp: `You need to break all bricks to go to the next level. However, it can be hard to get the last ones. Clearing a level early brings extra choices when upgrading. Never missing the bricks is also very beneficial. @@ -134,7 +134,7 @@ export const rawUpgrades = [ giftable: true, name: "Puck controls ball", max: 2, - help: (lvl) => + help: (lvl: number) => lvl == 1 ? `Control the ball's trajectory.` : `Stronger effect on the ball`, @@ -148,7 +148,7 @@ export const rawUpgrades = [ id: "coin_magnet", name: "Coins magnet", max: 3, - help: (lvl) => + help: (lvl: number) => lvl == 1 ? `Puck attracts coins.` : `Stronger effect on the coins`, fullHelp: `Directs the coins to the puck. The effect is stronger if the coin is close to it already. Catching 90% or 100% of coins bring special bonuses in the game. @@ -161,7 +161,7 @@ export const rawUpgrades = [ giftable: true, name: "+1 ball", max: 6, - help: (lvl) => `Start every levels with ${lvl + 1} balls.`, + help: (lvl: number) => `Start every levels with ${lvl + 1} balls.`, fullHelp: `As soon as you drop the ball in Breakout 71, you loose. With this perk, you get two balls, and so you can afford to lose one. The lost balls come back on the next level or whenever you use one of your extra lives, if you picked that perk. Having more than one balls makes some further perks available, and of course clears the level faster.`, @@ -173,7 +173,7 @@ export const rawUpgrades = [ id: "smaller_puck", name: "Smaller puck", max: 2, - help: (lvl) => + help: (lvl: number) => lvl == 1 ? `Also gives +5 base combo.` : `Even smaller puck and higher base combo`, @@ -187,7 +187,8 @@ export const rawUpgrades = [ giftable: true, name: "Piercing", max: 3, - help: (lvl) => `Ball pierces ${3 * lvl} bricks after a puck bounce.`, + help: (lvl: number) => + `Ball pierces ${3 * lvl} bricks after a puck bounce.`, fullHelp: `The ball normally bounces as soon as it touches something. With this perk, it will continue its trajectory for up to 3 bricks broken. After that, it will bounce on the 4th brick, and you'll need to touch the puck to reset the counter. This combines particularly well with Sapper. `, }, @@ -198,7 +199,7 @@ export const rawUpgrades = [ giftable: true, name: "Picky eater", max: 1, - help: (lvl) => `More coins if you break bricks color by color.`, + help: (lvl: number) => `More coins if you break bricks color by color.`, fullHelp: `Whenever you break a brick the same color as your ball, your combo increases by one. If it's a different color, the ball takes that new color, but the combo resets. @@ -215,7 +216,7 @@ export const rawUpgrades = [ id: "metamorphosis", name: "Stain", max: 1, - help: (lvl) => `Coins color the bricks they touch.`, + help: (lvl: number) => `Coins color the bricks they touch.`, fullHelp: `With this perk, coins will be of the color of the brick they come from, and will color the first brick they touch in the same color. Coins spawn with the speed of the ball that broke them, which means you can aim a bit in the direction of the bricks you want to "paint". @@ -242,7 +243,8 @@ export const rawUpgrades = [ giftable: true, name: "Hot start", max: 3, - help: (lvl) => `Start at combo ${lvl * 15 + 1}, -${lvl} combo per second`, + help: (lvl: number) => + `Start at combo ${lvl * 15 + 1}, -${lvl} combo per second`, fullHelp: `At the start of every level, your combo will start at +15 points, but then every second it will be decreased by one. This means the first 15 seconds in a level will spawn many more coins than the following ones, and you should make sure that you clear the level quickly. The effect stacks with other combo related perks, so you might be able to raise the combo after the 15s timeout, but it will keep ticking down. Every time you take the perk again, the effect will be more dramatic. @@ -255,7 +257,7 @@ export const rawUpgrades = [ giftable: true, name: "Sapper", max: 7, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? "The first brick broken becomes a bomb." : `The first ${lvl} bricks broken become bombs.`, @@ -272,7 +274,7 @@ export const rawUpgrades = [ max: 1, giftable: false, - help: (lvl) => "Bigger explosions", + help: (lvl: number) => "Bigger explosions", fullHelp: `The default explosion clears a 3x3 square, with this it becomes a 5x5 square, and the blowback on the coins is also significantly stronger. `, }, @@ -283,7 +285,7 @@ export const rawUpgrades = [ id: "extra_levels", name: "+1 level", max: 3, - help: (lvl) => `Play ${lvl + 7} levels instead of 7`, + help: (lvl: number) => `Play ${lvl + 7} levels instead of 7`, fullHelp: `The default run can last a max of 7 levels, after which the game is over and whatever score you reached is your run score. Each level of this perk lets you go one level higher. The last levels are often the ones where you make the most score, so the difference can be dramatic.`, }, @@ -294,7 +296,7 @@ export const rawUpgrades = [ id: "pierce_color", name: "Color pierce", max: 1, - help: (lvl) => `Balls pierce bricks of their color.`, + help: (lvl: number) => `Balls pierce bricks of their color.`, fullHelp: `Whenever a ball hits a brick of the same color, it will just go through unimpeded. Once it reaches a brick of a different color, it will break it, take its color and bounce.`, }, @@ -305,7 +307,7 @@ export const rawUpgrades = [ id: "soft_reset", name: "Soft reset", max: 2, - help: (lvl) => + help: (lvl: number) => `Combo grows ${lvl > 1 ? "even" : ""} slower but resets less.`, fullHelp: `The combo normally climbs every time you break a brick. This will sometimes cancel that climb, but also limit the impact of a combo reset.`, }, @@ -316,7 +318,7 @@ export const rawUpgrades = [ id: "ball_repulse_ball", name: "Personal space", max: 3, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `Balls repulse balls.` : "Stronger repulsion force", fullHelp: `Balls that are less than half a screen width away will start repulsing each other. The repulsion force is stronger if they are close to each other. @@ -329,7 +331,7 @@ export const rawUpgrades = [ id: "ball_attract_ball", name: "Gravity", max: 3, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `Balls attract balls.` : "Stronger attraction force", fullHelp: `Balls that are more than half a screen width away will start attracting each other. The attraction force is stronger when they are furthest away from each other. @@ -341,8 +343,8 @@ export const rawUpgrades = [ giftable: false, id: "puck_repulse_ball", name: "Soft landing", - max: 3, - help: (lvl) => + max: 2, + help: (lvl: number) => lvl === 1 ? `Puck repulses balls.` : "Stronger repulsion force", fullHelp: `When a ball gets close to the puck, it will start slowing down, and even potentially bouncing without touching the puck.`, }, @@ -353,7 +355,7 @@ export const rawUpgrades = [ id: "wind", name: "Wind", max: 3, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `Puck position creates wind.` : "Stronger wind force", fullHelp: `The wind depends on where your puck is, if it's in the center of the screen nothing happens, if it's on the left it will blow leftwise, if it's on the right of the screen then it will blow rightwise. The wind affects both the balls and coins.`, @@ -365,7 +367,7 @@ export const rawUpgrades = [ id: "sturdy_bricks", name: "Sturdy bricks", max: 4, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `Bricks sometimes resist hits but drop more coins.` : "Bricks resist more and drop more coins", @@ -380,7 +382,7 @@ export const rawUpgrades = [ id: "respawn", name: "Respawn", max: 4, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `The first brick hit of two+ will respawn.` : "More bricks can respawn", @@ -395,7 +397,7 @@ export const rawUpgrades = [ id: "one_more_choice", name: "+1 choice until run end", max: 3, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `Further level ups will offer one more option in the list.` : "Even more options", @@ -410,7 +412,7 @@ export const rawUpgrades = [ id: "instant_upgrade", name: "+2 upgrades now", max: 2, - help: (lvl) => + help: (lvl: number) => lvl === 1 ? `-1 choice until run end.` : "Even fewer options", fullHelp: `Immediately pick two upgrades, so that you get one free one and one to repay the one used to get this perk. Every further menu to pick upgrades will have fewer options to choose from.`, }, diff --git a/src/style.css b/src/style.css index 01832ff..ed45615 100644 --- a/src/style.css +++ b/src/style.css @@ -161,7 +161,6 @@ body { } } - .popup button.close-modale { color: white; position: absolute; diff --git a/src/types.d.ts b/src/types.d.ts index 992f36d..a15e0f9 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -133,7 +133,11 @@ export type RunStats = { max_level: number; }; +export type PerksMap = Partial<{ + [k in PerkId]: number; +}>; + export type RunHistoryItem = RunStats & { - perks?: { [k in PerkId]: number }; + perks?: PerksMap; appVersion?: string; }; diff --git a/src/version.json b/src/version.json index 39006d9..c25e497 100644 --- a/src/version.json +++ b/src/version.json @@ -1 +1 @@ -"29020191" +"29022953"