From fd8cc60283512c3aa649f525a4d01482af79e531 Mon Sep 17 00:00:00 2001
From: marko <marko.kl.berkenbusch@gmail.com>
Date: Wed, 23 Mar 2022 17:24:42 -0400
Subject: [PATCH] Make border thicknesses more consistent; add screenshot;
 allow running in emulator.

---
 apps/2047pp/2047pp.app.js         |   8 ++++----
 apps/2047pp/2047pp_screenshot.png | Bin 0 -> 4541 bytes
 apps/2047pp/README.md             |   2 ++
 apps/2047pp/metadata.json         |   1 +
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 apps/2047pp/2047pp_screenshot.png

diff --git a/apps/2047pp/2047pp.app.js b/apps/2047pp/2047pp.app.js
index 9b2283036..58738d04a 100644
--- a/apps/2047pp/2047pp.app.js
+++ b/apps/2047pp/2047pp.app.js
@@ -18,11 +18,11 @@ class TwoK {
     bw = Math.floor(w/4);
     g.clearRect(0, 0, g.getWidth()-1, yo).setFontAlign(0, 0, 0);
     g.setFont("Vector", 16).setColor("#fff").drawString("Score:"+this.score.toString(), g.getWidth()/2, 8);
-    this.drawBRect(xo-2, yo-2, xo+w+2, yo+h, 2, "#a88", "#caa", false);
+    this.drawBRect(xo-3, yo-3, xo+w+2, yo+h+2, 4, "#a88", "#caa", false);
     for (y=0; y<4; ++y)
       for (x=0; x<4; ++x) {
         b = this.b[y][x];
-        this.drawBRect(xo+x*bw, yo+y*bh-2, xo+(x+1)*bh, yo+(y+1)*bh-2, 4, "#a88", this.cmap[b], true);
+        this.drawBRect(xo+x*bw, yo+y*bh-1, xo+(x+1)*bh-1, yo+(y+1)*bh-2, 4, "#a88", this.cmap[b], true);
         if (b > 4) g.setColor(1, 1, 1);
         else g.setColor(0, 0, 0);
         g.setFont("Vector", bh*(b>8 ? (b>64 ? (b>512 ? 0.32 : 0.4) : 0.6) : 0.7)); 
@@ -35,7 +35,7 @@ class TwoK {
       for (y=0; y<4; ++y) {
         for (x=2; x>=0; x--)
           if (this.b[y][x]==0) {
-            for (i=x; i<3; i++) this.b[y][i] = this.b[y][i+1]; 
+            for (i=x; i<3; i++) this.b[y][i] = this.b[y][i+1];
             this.b[y][3] = 0;
           }
         for (x=0; x<3; ++x)
@@ -133,7 +133,7 @@ var twok = new TwoK();
 twok.addDigit(); twok.addDigit();
 twok.render();
 if (process.env.HWVERSION==2) Bangle.on("drag", dragHandler);
-else if (process.env.HWVERSION==1) {
+if (process.env.HWVERSION==1) {
   Bangle.on("swipe", (e) => { res = twok.shift(e); if (res) twok.addDigit(); twok.render(); });
   setWatch(() => { res = twok.shift(2); if (res) twok.addDigit(); twok.render(); }, BTN1, {repeat: true});
   setWatch(() => { res = twok.shift(-2); if (res) twok.addDigit(); twok.render(); }, BTN3, {repeat: true});
diff --git a/apps/2047pp/2047pp_screenshot.png b/apps/2047pp/2047pp_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c407fb6fe4b78d2f60c30651c60f8513b5c658d
GIT binary patch
literal 4541
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

literal 0
HcmV?d00001

diff --git a/apps/2047pp/README.md b/apps/2047pp/README.md
index 8228892fd..cac3323a6 100644
--- a/apps/2047pp/README.md
+++ b/apps/2047pp/README.md
@@ -5,3 +5,5 @@ Tile shifting game inspired by the well known 2048 game. Also very similar to an
 
 Attempt to combine equal numbers by swiping left, right, up or down (on Bangle 2) or swiping left/right and using
 the top/bottom button (Bangle 1).
+
+![Screenshot](./2047pp_screenshot.png)
diff --git a/apps/2047pp/metadata.json b/apps/2047pp/metadata.json
index 0a362c583..f0fd6c1e3 100644
--- a/apps/2047pp/metadata.json
+++ b/apps/2047pp/metadata.json
@@ -5,6 +5,7 @@
   "version":"0.01",
   "description": "Bangle version of a tile shifting game",
   "supports" : ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
   "readme": "README.md",
   "tags": "game",
   "storage": [