diff --git a/apps/astroid/ChangeLog b/apps/astroid/ChangeLog index 8f1d5e355..0e2f13745 100644 --- a/apps/astroid/ChangeLog +++ b/apps/astroid/ChangeLog @@ -1,4 +1,5 @@ 0.02: Add "ram" keyword to allow 2v06 Espruino builds to cache function that needs to be fast 0.03: Bangle 2 support -0.04: Increase size if ship, asteroids and fonts for better readability +0.04: Increase size of ship, asteroids and fonts for better readability 0.05: improve collision detect for larger ship v astroid +0.06: added, 7 point asteroid ploygon, made ship solid, rather than outline diff --git a/apps/astroid/asteroids.js b/apps/astroid/asteroids.js index 862b6f368..076e9a4c3 100644 --- a/apps/astroid/asteroids.js +++ b/apps/astroid/asteroids.js @@ -48,10 +48,9 @@ var lastFrame; function gameStop() { running = false; - //g.clear(); g.setFont('Vector', W/7); g.setFontAlign(0,0); - g.drawString("Game Over!", W/2, H/2); + g.drawString("Game Over", W/2, H/2); g.flip(); } @@ -116,7 +115,7 @@ function onFrame() { g.setFont('Vector', 16); g.drawString(score,W-20,16); var rs = Math.PI*0.8; - g.drawPoly([ + g.fillPoly([ ship.x+Math.cos(ship.r)*SS, ship.y+Math.sin(ship.r)*SS, ship.x+Math.cos(ship.r+rs)*SL, ship.y+Math.sin(ship.r+rs)*SL, ship.x+Math.cos(ship.r-rs)*SL, ship.y+Math.sin(ship.r-rs)*SL, @@ -147,7 +146,18 @@ function onFrame() { ast.forEach(function(a) { a.x += a.vx*d; a.y += a.vy*d; - g.drawCircle(a.x, a.y, a.rad); + //g.drawCircle(a.x, a.y, a.rad); + // a 7 point asteroid with rough circle radius of scale 2 + g.drawPoly([ + a.x , a.y - 1.5 * a.rad, + a.x + a.rad , a.y , + a.x + a.rad/2 , a.y , + a.x + a.rad/2 , a.y + a.rad/2 , + a.x , a.y + a.rad , + a.x - a.rad , a.y , + a.x - a.rad , a.y - a.rad + ],true); + if (a.x<0) a.x+=W; if (a.y<0) a.y+=H; if (a.x>=W) a.x-=W; diff --git a/apps/astroid/metadata.json b/apps/astroid/metadata.json index e0f4425d8..f73feec43 100644 --- a/apps/astroid/metadata.json +++ b/apps/astroid/metadata.json @@ -1,10 +1,10 @@ { "id": "astroid", "name": "Asteroids!", - "version": "0.05", + "version": "0.06", "description": "Retro asteroids game", "icon": "asteroids.png", - "screenshots": [{"url":"screenshot_asteroids.png"}], + "screenshots": [{"url":"screenshot.png"}], "tags": "game", "supports": ["BANGLEJS","BANGLEJS2"], "allow_emulator": true, diff --git a/apps/astroid/screenshot.png b/apps/astroid/screenshot.png new file mode 100644 index 000000000..81120267d Binary files /dev/null and b/apps/astroid/screenshot.png differ diff --git a/apps/astroid/screenshot_asteroids.png b/apps/astroid/screenshot_asteroids.png deleted file mode 100644 index 4474c7a66..000000000 Binary files a/apps/astroid/screenshot_asteroids.png and /dev/null differ