Revert "Flappy: Tweked for Bangle.js 2"

This reverts commit f357111bab.

apps/flappy/ChangeLog

@@ -2,4 +2,3 @@
 0.03: A few tweaks to improve rendering speed
 0.04: Add "ram" keyword to allow 2v06 Espruino builds to cache function that needs to be fast
 0.05: Don't use Bangle.setLCDMode, just use offscreen buffer (allows widgets)
-0.06: Tweaked a bit for Bangle.js 2 - still much to do...

apps/flappy/app.js

@@ -1,28 +1,22 @@
+b = Graphics.createArrayBuffer(120,120,8);
+var gimg = {
+    width:120,
+    height:104,
+    bpp:8,
+    buffer:b.buffer
+  };
+
 if (process.env.HWVERSION==2) {
-  b = Graphics.createArrayBuffer(176,176,8);
-  var gimg = {
-      width:176,
-      height:176,
-      bpp:8,
-      buffer:b.buffer
-    };
   b.flip = function() {
-    g.drawImage(gimg,0,0);
+    g.drawImage(gimg,28,50);
   };
 } else {
-  b = Graphics.createArrayBuffer(120,120,8);
-  var gimg = {
-      width:120,
-      height:104,
-      bpp:8,
-      buffer:b.buffer
-    };
   b.flip = function() {
     g.drawImage(gimg,0,24,{scale:2});
   };
 }
 
-var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="));
+var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="))
 var FLOORIMG = require("heatshrink").decompress(atob("iEKxH+kklABuLAAlgAAwNFB34OLmAAO0YAO5wAOA"));
 
 
@@ -59,7 +53,6 @@ function draw() {
   "ram"
   var H = b.getHeight()-24;
   b.setColor("#71c6cf");
-  if (process.env.HWVERSION==2) b.setColor("#000000");
   b.fillRect(0,0,b.getWidth(),H-1);
   floorpos++;
   for (var x=-(floorpos&15);x<b.getWidth();x+=16)
@@ -69,7 +62,6 @@ function draw() {
   if (!running) {
     var x = b.getWidth()/2;
     b.setColor("#000000");
-    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.setFontAlign(0,0);
     b.setFont("4x6",2);
     b.drawString("GAME OVER!",x,20);
@@ -96,20 +88,16 @@ function draw() {
     r.x2--;
     var btop = r.y-r.gap;
     var bbot = r.y+r.gap;
-    b.setColor("#ffff00"); // middle
-    if (process.env.HWVERSION==2) b.setColor("#000000");	
+    b.setColor("#73bf2f"); // middle
     b.fillRect(r.x1+4, 0, r.x2-4, btop-1);
     b.fillRect(r.x1+4, bbot, r.x2-4, H-1);
     b.setColor("#c0f181"); // left
-    if (process.env.HWVERSION==2) b.setColor("#00ff00");	
     b.fillRect(r.x1+1, 0, r.x1+3, btop-1);
     b.fillRect(r.x1+1, bbot, r.x1+3, H-1);
     b.setColor("#538917"); // right
-    if (process.env.HWVERSION==2) b.setColor("#00ff00");
     b.fillRect(r.x2-3, 0, r.x2-1, btop-1);
     b.fillRect(r.x2-3, bbot, r.x2-1, H-1);
     b.setColor("#808080"); // outlines
-    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.drawRect(r.x1, btop-5, r.x2, btop); // top
     b.drawLine(r.x1+1, 0, r.x1+1, btop-6);
     b.drawLine(r.x2-2, 0, r.x2-2, btop-6);
@@ -139,6 +127,5 @@ Bangle.loadWidgets();
 g.clear();
 Bangle.drawWidgets();
 b.setBgColor("#e3db9d");
-if (process.env.HWVERSION==2) b.setBgColor("#000000");	
 gameStart();
 setInterval(draw, 100);

apps/flappy/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "flappy",
   "name": "Flappy Bird",
-  "version": "0.06",
+  "version": "0.05",
   "description": "A Flappy Bird game clone",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot1_flappy.png"},{"url":"screenshot2_flappy.png"}],